Skip to content
Merged
Show file tree
Hide file tree
Changes from 56 commits
Commits
Show all changes
73 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
8ceff01
Merge branch 'main' of github.com:open-telemetry/opentelemetry-js-con…
sudarshan12s Feb 24, 2025
30a2367
- Incorporate review comments
sudarshan12s Feb 26, 2025
2b310c5
Merge branch 'main' of github.com:open-telemetry/opentelemetry-js-con…
sudarshan12s Feb 26, 2025
fa0463b
Merge branch 'main' of github.com:open-telemetry/opentelemetry-js-con…
sudarshan12s Mar 4, 2025
34afcad
- get the baseclass, TraceHandlerBase from the parameter,
sudarshan12s Mar 5, 2025
a06b40f
- Remove copyright from source , add it in component_owners.yml
sudarshan12s Mar 5, 2025
77a08a7
- update dependencies as with other instrumentations
sudarshan12s Mar 6, 2025
c7fcb17
- retain copyrights to oracledb specific source files.
sudarshan12s Mar 8, 2025
5faff20
Merge branch 'main' of github.com:open-telemetry/opentelemetry-js-con…
sudarshan12s Mar 17, 2025
d25ee8e
- incorporate review comments
sudarshan12s Mar 17, 2025
604f833
Merge branch 'main' of github.com:open-telemetry/opentelemetry-js-con…
sudarshan12s Mar 19, 2025
0704e73
- update dependency versions. Test is changed to
sudarshan12s Mar 19, 2025
c8e0be6
- update generated dependencies for oracledb and minor change in test
sudarshan12s Mar 19, 2025
5c98035
- Add knip to ignore generated version file.
sudarshan12s Mar 19, 2025
2296e18
Merge branch 'main' of github.com:open-telemetry/opentelemetry-js-con…
sudarshan12s Mar 19, 2025
7cccc2e
Merge branch 'main' of github.com:open-telemetry/opentelemetry-js-con…
sudarshan12s Mar 20, 2025
365d523
Merge github.com:open-telemetry/opentelemetry-js-contrib
sudarshan12s Mar 20, 2025
382680c
- Incorporate semantic conventions suggestions.
sudarshan12s Mar 28, 2025
5defed8
Merge branch 'main' of github.com:open-telemetry/opentelemetry-js-con…
sudarshan12s Mar 28, 2025
988eab2
Merge branch 'main' of github.com:open-telemetry/opentelemetry-js-con…
sudarshan12s Mar 29, 2025
a0367cc
Merge branch 'main' of github.com:open-telemetry/opentelemetry-js-con…
sudarshan12s Apr 2, 2025
4a154e5
- Remove oracle specific attribute implicit_release as
sudarshan12s Apr 2, 2025
d155fb8
Merge branch 'main' of github.com:open-telemetry/opentelemetry-js-con…
sudarshan12s Apr 9, 2025
f8ff501
- Add null checks for returning bind values
sudarshan12s Apr 9, 2025
f98c7a4
Merge branch 'main' of github.com:open-telemetry/opentelemetry-js-con…
sudarshan12s Apr 9, 2025
01b2f84
Merge branch 'main' of github.com:open-telemetry/opentelemetry-js-con…
sudarshan12s Apr 13, 2025
b3bc7eb
Merge branch 'main' of github.com:open-telemetry/opentelemetry-js-con…
sudarshan12s Apr 14, 2025
3c600fe
- incorporate review comments
sudarshan12s Apr 15, 2025
3cf1bd2
Merge branch 'main' of github.com:open-telemetry/opentelemetry-js-con…
sudarshan12s Apr 16, 2025
474b6e3
Merge branch 'main' of github.com:open-telemetry/opentelemetry-js-con…
sudarshan12s Apr 17, 2025
7e26da9
- Removed redundant comment as suggested
sudarshan12s Apr 17, 2025
966e487
Merge branch 'main' of github.com:open-telemetry/opentelemetry-js-con…
sudarshan12s Apr 17, 2025
9a0f07a
Update plugins/node/opentelemetry-instrumentation-oracledb/README.md
sudarshan12s Apr 23, 2025
8ce3e88
- Removing all deprecated SEM_ATTR* constants
sudarshan12s Apr 23, 2025
f018f0f
Merge branch 'main' of github.com:sudarshan12s/opentelemetry-js-contrib
sudarshan12s Apr 23, 2025
1295e53
- Remove deprecated param, ATTR_DB_CONNECTION_STRING as per review
sudarshan12s Apr 23, 2025
5117f31
Merge branch 'main' of github.com:open-telemetry/opentelemetry-js-con…
sudarshan12s Apr 28, 2025
76b3f21
Merge branch 'main' of github.com:open-telemetry/opentelemetry-js-con…
sudarshan12s Apr 28, 2025
c3a8da9
- update nyc to v17
sudarshan12s Apr 28, 2025
12f6b2b
Merge branch 'main' of github.com:open-telemetry/opentelemetry-js-con…
sudarshan12s Apr 29, 2025
23d2923
Merge branch 'main' of github.com:open-telemetry/opentelemetry-js-con…
sudarshan12s May 2, 2025
be90e6b
Merge branch 'main' of github.com:open-telemetry/opentelemetry-js-con…
sudarshan12s May 3, 2025
f4b43e9
Merge branch 'main' of github.com:open-telemetry/opentelemetry-js-con…
sudarshan12s May 5, 2025
cbe5bd1
Merge branch 'main' of github.com:open-telemetry/opentelemetry-js-con…
sudarshan12s May 7, 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
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,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
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,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
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
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,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,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 @@ -140,6 +154,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
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
"plugins/node/opentelemetry-instrumentation-mysql2": "0.46.0",
"plugins/node/opentelemetry-instrumentation-nestjs-core": "0.46.0",
"plugins/node/opentelemetry-instrumentation-net": "0.44.0",
"plugins/node/opentelemetry-instrumentation-oracledb": "0.26.0",
"plugins/node/opentelemetry-instrumentation-pg": "0.52.0",
"plugins/node/opentelemetry-instrumentation-pino": "0.47.0",
"plugins/node/opentelemetry-instrumentation-redis": "0.47.0",
Expand Down
1 change: 1 addition & 0 deletions metapackages/auto-instrumentations-node/README.md
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
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@
"@opentelemetry/instrumentation-mysql2": "^0.46.0",
"@opentelemetry/instrumentation-nestjs-core": "^0.46.0",
"@opentelemetry/instrumentation-net": "^0.44.0",
"@opentelemetry/instrumentation-oracledb": "^0.26.0",
"@opentelemetry/instrumentation-pg": "^0.52.0",
"@opentelemetry/instrumentation-pino": "^0.47.0",
"@opentelemetry/instrumentation-redis": "^0.47.0",
Expand Down
2 changes: 2 additions & 0 deletions metapackages/auto-instrumentations-node/src/utils.ts
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
132 changes: 132 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions packages/opentelemetry-test-utils/src/test-utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ const dockerRunCmds = {
'docker run --rm -d --name otel-mssql -p 1433:1433 -e MSSQL_SA_PASSWORD=mssql_passw0rd -e ACCEPT_EULA=Y mcr.microsoft.com/mssql/server:2022-latest',
mysql:
'docker run --rm -d --name otel-mysql -p 33306:3306 -e MYSQL_ROOT_PASSWORD=rootpw -e MYSQL_DATABASE=test_db -e MYSQL_USER=otel -e MYSQL_PASSWORD=secret mysql:5.7 --log_output=TABLE --general_log=ON',
oracledb:
'docker run --rm -d --name otel-oracledb -p 1521:1521 -e ORACLE_PASSWORD=oracle -e APP_USER=otel -e APP_USER_PASSWORD=secret gvenzl/oracle-free:slim',
postgres:
'docker run --rm -d --name otel-postgres -p 54320:5432 -e POSTGRES_PASSWORD=postgres postgres:16-alpine',
redis: 'docker run --rm -d --name otel-redis -p 63790:6379 redis:alpine',
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
build
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
const parentConfig = require('../../../eslint.config.js');

module.exports = {
extends: '../../../eslint.config.js', // Extends the top-level config
ignorePatterns: [
...(parentConfig.ignorePatterns || []), // Retain parent's ignorePatterns array
'src/version.ts', // ignore this file
],
env: {
mocha: true,
node: true
},
rules: {
"header/header": ["error", "block", [{
pattern: /\* Copyright The OpenTelemetry Authors(?:, [^,\r\n]*)?[\r\n]+ \*[\r\n]+ \* Licensed under the Apache License, Version 2\.0 \(the "License"\);[\r\n]+ \* you may not use this file except in compliance with the License\.[\r\n]+ \* You may obtain a copy of the License at[\r\n]+ \*[\r\n]+ \* {6}https:\/\/www\.apache\.org\/licenses\/LICENSE-2\.0[\r\n]+ \*[\r\n]+ \* Unless required by applicable law or agreed to in writing, software[\r\n]+ \* distributed under the License is distributed on an "AS IS" BASIS,[\r\n]+ \* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied\.[\r\n]+ \* See the License for the specific language governing permissions and[\r\n]+ \* limitations under the License\.[\r\n]+ \*[\r\n]+ \* Copyright \(c\) 2025, Oracle and\/or its affiliates\.[\r\n]+ \*/gm,
template: `
* Copyright The OpenTelemetry Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* Copyright (c) 2025, Oracle and/or its affiliates.
* `
}]]
}
}

Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
oracledb:
# a sample from supported versions
- versions: ">=6.7.0 <7"
commands: npm run test
Loading