Add oracledb instrumentation (#1)

Add Oracledb instrumentation
open-telemetry · Dec 20, 2024 · 90db232 · 90db232
1 parent 21e1331
commit 90db232
Show file tree

Hide file tree

Showing 25 changed files with 9,182 additions and 4,770 deletions.
diff --git a/.github/component-label-map.yml b/.github/component-label-map.yml
@@ -183,6 +183,11 @@ pkg:instrumentation-net:
   - changed-files:
       - any-glob-to-any-file:
           - plugins/node/opentelemetry-instrumentation-net/**
+pkg:instrumentation-oracledb:
+  - changed-files:
+      - any-glob-to-any-file:
+          - plugins/node/opentelemetry-instrumentation-oracledb/**
+          - packages/opentelemetry-test-utils/**
 pkg:instrumentation-pg:
   - changed-files:
       - any-glob-to-any-file:

diff --git a/.github/component_owners.yml b/.github/component_owners.yml
@@ -114,6 +114,8 @@ components:
     # Unmaintained
   plugins/node/opentelemetry-instrumentation-net:
     - seemk
+  plugins/node/opentelemetry-instrumentation-oracledb:
+    - sudarshan12s
   plugins/node/instrumentation-runtime-node:
     - d4nyll
   plugins/node/opentelemetry-instrumentation-pg:

diff --git a/.github/workflows/test-all-versions.yml b/.github/workflows/test-all-versions.yml
@@ -80,6 +80,19 @@ jobs:
           --health-interval 10s
           --health-timeout 5s
           --health-retries 5
+      oracledb:
+        image: gvenzl/oracle-free:slim
+        env:
+          APP_USER: otel
+          APP_USER_PASSWORD: secret
+          ORACLE_PASSWORD: oracle
+        ports:
+          - 1521:1521
+        options: >-
+          --health-cmd "sqlplus system/oracle@//localhost/FREEPDB1"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
       postgres:
         image: postgres:16-alpine
         env:
@@ -122,6 +135,12 @@ jobs:
       MYSQL_USER: otel
       OPENTELEMETRY_REDIS_HOST: localhost
       OPENTELEMETRY_REDIS_PORT: 6379
+      ORACLE_HOSTNAME: localhost
+      ORACLE_PORT: 1521
+      ORACLE_CONNECTSTRING: localhost:1521/freepdb1
+      ORACLE_USER: otel
+      ORACLE_PASSWORD: secret
+      ORACLE_SERVICENAME: FREEPDB1
       POSTGRES_DB: otel_pg_database
       POSTGRES_HOST: localhost
       POSTGRES_PORT: 5432
@@ -130,6 +149,7 @@ jobs:
       RUN_MONGODB_TESTS: 1
       RUN_MSSQL_TESTS: 1
       RUN_MYSQL_TESTS: 1
+      RUN_ORACLEDB_TESTS: 1
       RUN_POSTGRES_TESTS: 1
       RUN_REDIS_TESTS: 1
       NPM_CONFIG_UNSAFE_PERM: true

diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
@@ -78,6 +78,19 @@ jobs:
           --health-interval 10s
           --health-timeout 5s
           --health-retries 5
+      oracledb:
+        image: gvenzl/oracle-free:slim
+        env:
+          APP_USER: otel
+          APP_USER_PASSWORD: secret
+          ORACLE_PASSWORD: oracle
+        ports:
+          - 1521:1521
+        options: >-
+          --health-cmd "sqlplus system/oracle@//localhost/FREEPDB1"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
       postgres:
         image: postgres:16-alpine
         env:
@@ -117,6 +130,7 @@ jobs:
       RUN_MONGODB_TESTS: 1
       RUN_MYSQL_TESTS: 1
       RUN_MSSQL_TESTS: 1
+      RUN_ORACLEDB_TESTS: 1
       RUN_POSTGRES_TESTS: 1
       RUN_REDIS_TESTS: 1
       RUN_RABBIT_TESTS: 1
@@ -135,6 +149,12 @@ jobs:
       OPENTELEMETRY_MEMCACHED_PORT: 11211
       OPENTELEMETRY_REDIS_HOST: localhost
       OPENTELEMETRY_REDIS_PORT: 6379
+      ORACLE_HOSTNAME: localhost
+      ORACLE_PORT: 1521
+      ORACLE_CONNECTSTRING: localhost:1521/freepdb1
+      ORACLE_USER: otel
+      ORACLE_PASSWORD: secret
+      ORACLE_SERVICENAME: FREEPDB1
       POSTGRES_DB: otel_pg_database
       POSTGRES_HOST: localhost
       POSTGRES_PORT: 5432

diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -48,6 +48,7 @@
   "plugins/node/opentelemetry-instrumentation-mysql2": "0.45.0",
   "plugins/node/opentelemetry-instrumentation-nestjs-core": "0.44.0",
   "plugins/node/opentelemetry-instrumentation-net": "0.43.0",
+  "plugins/node/opentelemetry-instrumentation-oracledb": "0.26.0",
   "plugins/node/opentelemetry-instrumentation-pg": "0.50.0",
   "plugins/node/opentelemetry-instrumentation-pino": "0.46.0",
   "plugins/node/opentelemetry-instrumentation-redis": "0.46.0",

diff --git a/metapackages/auto-instrumentations-node/README.md b/metapackages/auto-instrumentations-node/README.md
@@ -188,6 +188,7 @@ registerInstrumentations({
 - [@opentelemetry/instrumentation-mysql2](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-mysql2)
 - [@opentelemetry/instrumentation-nestjs-core](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-nestjs-core)
 - [@opentelemetry/instrumentation-net](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-net)
+- [@opentelemetry/instrumentation-oracledb](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-oracledb)
 - [@opentelemetry/instrumentation-pg](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-pg)
 - [@opentelemetry/instrumentation-pino](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-pino)
 - [@opentelemetry/instrumentation-redis](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-redis)

diff --git a/metapackages/auto-instrumentations-node/package.json b/metapackages/auto-instrumentations-node/package.json
@@ -76,6 +76,7 @@
     "@opentelemetry/instrumentation-mysql2": "^0.45.0",
     "@opentelemetry/instrumentation-nestjs-core": "^0.44.0",
     "@opentelemetry/instrumentation-net": "^0.43.0",
+    "@opentelemetry/instrumentation-oracledb": "^0.26.0",
     "@opentelemetry/instrumentation-pg": "^0.50.0",
     "@opentelemetry/instrumentation-pino": "^0.46.0",
     "@opentelemetry/instrumentation-redis": "^0.46.0",

diff --git a/metapackages/auto-instrumentations-node/src/utils.ts b/metapackages/auto-instrumentations-node/src/utils.ts
@@ -46,6 +46,7 @@ import { MySQL2Instrumentation } from '@opentelemetry/instrumentation-mysql2';
 import { MySQLInstrumentation } from '@opentelemetry/instrumentation-mysql';
 import { NestInstrumentation } from '@opentelemetry/instrumentation-nestjs-core';
 import { NetInstrumentation } from '@opentelemetry/instrumentation-net';
+import { OracleInstrumentation } from '@opentelemetry/instrumentation-oracledb';
 import { PgInstrumentation } from '@opentelemetry/instrumentation-pg';
 import { PinoInstrumentation } from '@opentelemetry/instrumentation-pino';
 import { RedisInstrumentation as RedisInstrumentationV2 } from '@opentelemetry/instrumentation-redis';
@@ -124,6 +125,7 @@ const InstrumentationMap = {
   '@opentelemetry/instrumentation-mysql': MySQLInstrumentation,
   '@opentelemetry/instrumentation-nestjs-core': NestInstrumentation,
   '@opentelemetry/instrumentation-net': NetInstrumentation,
+  '@opentelemetry/instrumentation-oracledb': OracleInstrumentation,
   '@opentelemetry/instrumentation-pg': PgInstrumentation,
   '@opentelemetry/instrumentation-pino': PinoInstrumentation,
   '@opentelemetry/instrumentation-redis': RedisInstrumentationV2,