Merge pull request #2 from sv-splunk/oracle_draft_attrs

Oracle additional attributes

Author: sv-splunk

receiver/oracledbreceiver/documentation.md

@@ -400,7 +400,11 @@ sample query
 | db.query.text | The text of the database query being executed. | Any Str |
 | db.system.name | The database management system (DBMS) product as identified by the client instrumentation. | Any Str |
 | user.name | Database user name under which a session is connected to | Any Str |
-| client.address | Identifies the name of the machine (host) from which the database client is connecting to the Oracle database. | Any Str |
+| db.namespace | The database name. | Any Str |
+| client.address | Hostname or address of the client. | Any Str |
+| client.port | TCP port used by the client. | Any Int |
+| network.peer.address | IP address of the peer client. | Any Str |
+| network.peer.port | TCP port used by the peer client. | Any Int |
 | oracledb.plan_hash_value | Binary hash value calculated on the query execution plan and used to identify similar query execution plans, reported in the HEX format. | Any Str |
 | oracledb.sql_id | The SQL ID of the query. | Any Str |
 | oracledb.child_number | The child number of the query. | Any Str |

receiver/oracledbreceiver/internal/metadata/generated_logs.go

@@ -101,8 +101,20 @@ attributes:
     description: Binary hash value calculated on the query execution plan and used to identify similar query execution plans, reported in the HEX format.
     type: string
   client.address:
-    description: Identifies the name of the machine (host) from which the database client is connecting to the Oracle database.
+    description: Hostname or address of the client.
     type: string
+  client.port:
+    description: TCP port used by the client.
+    type: int
+  db.namespace:
+    description: The database name.
+    type: string
+  network.peer.address:
+    description: IP address of the peer client.
+    type: string
+  network.peer.port:
+    description: TCP port used by the peer client.
+    type: int
   oracledb.sid:
     description: ID of the Oracle Server session.
     type: string
@@ -183,7 +195,11 @@ events:
       - db.query.text
       - db.system.name
       - user.name
+      - db.namespace
       - client.address
+      - client.port
+      - network.peer.address
+      - network.peer.port
       - oracledb.plan_hash_value
       - oracledb.sql_id
       - oracledb.child_number

receiver/oracledbreceiver/internal/metadata/generated_logs_test.go

@@ -558,6 +558,8 @@ func (s *oracleScraper) collectQuerySamples(ctx context.Context) (plog.Logs, err
 	const sqlText = "SQL_FULLTEXT"
 	const username = "USERNAME"
 	const waitclass = "WAIT_CLASS"
+	const port = "PORT"
+	const serviceName = "SERVICE_NAME"
 
 	var scrapeErrors []error
 
@@ -591,9 +593,15 @@ func (s *oracleScraper) collectQuerySamples(ctx context.Context) (plog.Logs, err
 			scrapeErrors = append(scrapeErrors, fmt.Errorf("failed to parse int64 for Duration, value was %s: %w", row[duration], err))
 		}
 
-		s.lb.RecordDbServerQuerySampleEvent(ctx, timestamp, obfuscatedSQL, dbSystemNameVal, row[username], row[hostName], queryPlanHashVal, row[sqlID], row[sqlChildNumber],
-			row[sid], row[serialNumber], row[process], row[schemaName], row[program], row[module], row[status], row[state], row[waitclass],
-			row[event], row[objectName], row[objectType], row[osUser], queryDuration)
+		clientPort, err := strconv.ParseInt(row[port], 10, 64)
+		if err != nil {
+			clientPort = 0
+		}
+
+		s.lb.RecordDbServerQuerySampleEvent(ctx, timestamp, obfuscatedSQL, dbSystemNameVal, row[username], row[serviceName], row[hostName],
+			clientPort, row[hostName], clientPort, queryPlanHashVal, row[sqlID], row[sqlChildNumber], row[sid], row[serialNumber], row[process],
+			row[schemaName], row[program], row[module], row[status], row[state], row[waitclass], row[event], row[objectName], row[objectType],
+			row[osUser], queryDuration)
 	}
 
 	out := s.lb.Emit(metadata.WithLogsResource(rb.Emit()))

receiver/oracledbreceiver/metadata.yaml

@@ -16,9 +16,6 @@ import (
 	"testing"
 
 	lru "github.com/hashicorp/golang-lru/v2"
-	"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden"
-	"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest/plogtest"
-	"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/oracledbreceiver/internal/metadata"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"go.opentelemetry.io/collector/component"
@@ -27,6 +24,10 @@ import (
 	"go.opentelemetry.io/collector/receiver/receivertest"
 	"go.opentelemetry.io/collector/scraper/scrapererror"
 	"go.uber.org/zap"
+
+	"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden"
+	"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest/plogtest"
+	"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/oracledbreceiver/internal/metadata"
 )
 
 func TestScraper_ErrorOnStart(t *testing.T) {

receiver/oracledbreceiver/scraper.go

@@ -14,6 +14,8 @@ S.PROGRAM,
 S.MODULE,
 S.STATUS,
 S.STATE,
+S.PORT,
+S.SERVICE_NAME,
 Q.PLAN_HASH_VALUE,
 NVL((SYSDATE - SQL_EXEC_START) * 86400,0) AS DURATION_SEC,
 CASE WHEN S.TIME_REMAINING_MICRO IS NOT NULL

receiver/oracledbreceiver/scraper_test.go

@@ -19,9 +19,21 @@ resourceLogs:
               - key: user.name
                 value:
                   stringValue: ""
+              - key: db.namespace
+                value:
+                  stringValue: ""
               - key: client.address
                 value:
                   stringValue: ""
+              - key: client.port
+                value:
+                  intValue: "0"
+              - key: network.peer.address
+                value:
+                  stringValue: ""
+              - key: network.peer.port
+                value:
+                  intValue: "0"
               - key: oracledb.plan_hash_value
                 value:
                   stringValue: ""
@@ -76,7 +88,7 @@ resourceLogs:
             body: {}
             eventName: db.server.query_sample
             spanId: ""
-            timeUnixNano: "1750964071570576000"
+            timeUnixNano: "1751324007889535000"
             traceId: ""
         scope:
           name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/oracledbreceiver