Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(oracledb): Add support for Oracle DB instrumentation #2612

Open
wants to merge 29 commits into
base: main
Choose a base branch
from
+2,909 −0
Open

feat(oracledb): Add support for Oracle DB instrumentation #2612

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
90db232
Add oracledb instrumentation (#1)
sudarshan12s Dec 20, 2024
c299caa
- Make the new types TitleCase aligning to rest of the code
sudarshan12s Jan 7, 2025
93d21e1
Merge branch 'main' of github.com:open-telemetry/opentelemetry-js-con…
sudarshan12s Jan 8, 2025
440db83
Merge branch 'main' of github.com:open-telemetry/opentelemetry-js-con…
sudarshan12s Jan 8, 2025
6faff54
Merge branch 'main' of github.com:open-telemetry/opentelemetry-js-con…
sudarshan12s Jan 10, 2025
91d65e4
Merge branch 'main' of github.com:open-telemetry/opentelemetry-js-con…
sudarshan12s Jan 13, 2025
759ae13
Merge branch 'main' of github.com:open-telemetry/opentelemetry-js-con…
sudarshan12s Jan 15, 2025
badc18a
- update package-lock.json
sudarshan12s Jan 15, 2025
6219bc4
Merge branch 'main' of github.com:open-telemetry/opentelemetry-js-con…
sudarshan12s Jan 15, 2025
3ae4d72
Merge branch 'main' of github.com:open-telemetry/opentelemetry-js-con…
sudarshan12s Jan 15, 2025
f670ac0
Merge branch 'main' of github.com:open-telemetry/opentelemetry-js-con…
sudarshan12s Jan 17, 2025
7f00bf6
- Adding second owner.
sudarshan12s Jan 17, 2025
91136ce
Merge branch 'main' of github.com:open-telemetry/opentelemetry-js-con…
sudarshan12s Jan 18, 2025
3774f0d
Merge branch 'main' of github.com:open-telemetry/opentelemetry-js-con…
sudarshan12s Jan 20, 2025
34ef02d
Merge branch 'main' of github.com:open-telemetry/opentelemetry-js-con…
sudarshan12s Jan 23, 2025
07c76fd
Merge branch 'main' of github.com:open-telemetry/opentelemetry-js-con…
sudarshan12s Jan 27, 2025
ae1b7ac
- Add NOTICE.txt as per legal requirements.
sudarshan12s Jan 28, 2025
5c4f37f
Merge branch 'main' of github.com:open-telemetry/opentelemetry-js-con…
sudarshan12s Jan 29, 2025
13e79db
- Minor changes to re-order code.
sudarshan12s Jan 29, 2025
0e25652
Merge branch 'main' of github.com:open-telemetry/opentelemetry-js-con…
sudarshan12s Jan 30, 2025
e19e1ea
Merge branch 'main' of github.com:open-telemetry/opentelemetry-js-con…
sudarshan12s Feb 5, 2025
f41f62c
- Minor changes to align naming variable and more comments added.
sudarshan12s Feb 5, 2025
4c36312
- Remove Few Deprecated semantic convention constants.
sudarshan12s Feb 11, 2025
34cd418
- update the copyright year
sudarshan12s Feb 11, 2025
0290b81
- make db.system.name to oracle.db from oracle
sudarshan12s Feb 12, 2025
bf73ff5
- Incorporate review comments
sudarshan12s Feb 18, 2025
e1698e1
Merge branch 'main' of github.com:open-telemetry/opentelemetry-js-con…
sudarshan12s Feb 18, 2025
e076936
- update link for semconv
sudarshan12s Feb 19, 2025
92c1c80
- rename the attribute name
sudarshan12s Feb 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .github/component-label-map.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 3 additions & 0 deletions .github/component_owners.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,9 @@ components:
# Unmaintained
plugins/node/opentelemetry-instrumentation-net:
- seemk
plugins/node/opentelemetry-instrumentation-oracledb:
- sudarshan12s
- sharadraju
plugins/node/instrumentation-runtime-node:
- d4nyll
plugins/node/opentelemetry-instrumentation-pg:
Expand Down
20 changes: 20 additions & 0 deletions .github/workflows/test-all-versions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
20 changes: 20 additions & 0 deletions .github/workflows/unit-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
1 change: 1 addition & 0 deletions .release-please-manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
"plugins/node/opentelemetry-instrumentation-mysql2": "0.45.1",
"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.51.0",
"plugins/node/opentelemetry-instrumentation-pino": "0.46.0",
"plugins/node/opentelemetry-instrumentation-redis": "0.46.0",
Expand Down
1 change: 1 addition & 0 deletions metapackages/auto-instrumentations-node/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,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)
Expand Down
1 change: 1 addition & 0 deletions metapackages/auto-instrumentations-node/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@
"@opentelemetry/instrumentation-mysql2": "^0.45.1",
"@opentelemetry/instrumentation-nestjs-core": "^0.44.0",
"@opentelemetry/instrumentation-net": "^0.43.0",
"@opentelemetry/instrumentation-oracledb": "^0.26.0",
"@opentelemetry/instrumentation-pg": "^0.51.0",
"@opentelemetry/instrumentation-pino": "^0.46.0",
"@opentelemetry/instrumentation-redis": "^0.46.0",
Expand Down
2 changes: 2 additions & 0 deletions metapackages/auto-instrumentations-node/src/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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,
Expand Down
Loading