Skip to content
This repository was archived by the owner on Oct 31, 2024. It is now read-only.

chore: upgrade to opentelemetry 0.21.0 #130

Merged
nirsky merged 8 commits into from
Jun 20, 2021
Merged

chore: upgrade to opentelemetry 0.21.0 #130

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ec5f94d
update versions in package.json
Jun 14, 2021
616b653
added namespace to loggings
Jun 14, 2021
14fc113
update readme
Jun 14, 2021
5e1f67f
update mocha instrumentation
Jun 14, 2021
f50c311
update readme
Jun 14, 2021
e1af120
Merge branch 'master' of https://github.com/aspecto-io/opentelemetry-…
Jun 20, 2021
9924459
update dependencies
Jun 20, 2021
11a1812
fix: bump version
Jun 20, 2021
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
Prev Previous commit
Next Next commit
Merge branch 'master' of https://github.com/aspecto-io/opentelemetry-… 
…ext-js into otel21
  • Loading branch information
nirsky committed Jun 20, 2021
commit e1af120c520ab3f24c71a41a28200ad37b0d34c5
4 changes: 2 additions & 2 deletions packages/instrumentation-amqplib/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@
"expect": "^26.6.2",
"lodash": "^4.17.21",
"mocha": "^8.4.0",
"opentelemetry-instrumentation-mocha": "^0.0.1-rc.2",
"opentelemetry-instrumentation-testing-utils": "^0.5.0",
"opentelemetry-instrumentation-mocha": "0.0.1-rc.2",
"opentelemetry-instrumentation-testing-utils": "^0.5.1",
"sinon": "^9.2.4",
"test-all-versions": "^5.0.1",
"ts-node": "^9.1.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/instrumentation-aws-sdk/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@
"expect": "^26.6.2",
"mocha": "^8.4.0",
"nock": "^13.0.11",
"opentelemetry-instrumentation-mocha": "^0.0.1-rc.2",
"opentelemetry-instrumentation-testing-utils": "^0.5.0",
"opentelemetry-instrumentation-mocha": "0.0.1-rc.2",
"opentelemetry-instrumentation-testing-utils": "^0.5.1",
"test-all-versions": "^5.0.1",
"ts-node": "^9.1.1",
"typescript": "^4.0.5"
Expand Down
4 changes: 2 additions & 2 deletions packages/instrumentation-elasticsearch/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@
"expect": "^26.6.2",
"mocha": "^8.4.0",
"nock": "^13.0.9",
"opentelemetry-instrumentation-mocha": "^0.0.1-rc.2",
"opentelemetry-instrumentation-testing-utils": "^0.5.0",
"opentelemetry-instrumentation-mocha": "0.0.1-rc.2",
"opentelemetry-instrumentation-testing-utils": "^0.5.1",
"sinon": "^9.2.4",
"test-all-versions": "^5.0.1",
"ts-node": "^9.1.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/instrumentation-express/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@
"expect": "^26.6.2",
"express": "4.17.1",
"mocha": "^8.4.0",
"opentelemetry-instrumentation-mocha": "^0.0.1-rc.2",
"opentelemetry-instrumentation-testing-utils": "^0.5.0",
"opentelemetry-instrumentation-mocha": "0.0.1-rc.2",
"opentelemetry-instrumentation-testing-utils": "^0.5.1",
"test-all-versions": "^5.0.1"
},
"mocha": {
Expand Down
4 changes: 2 additions & 2 deletions packages/instrumentation-kafkajs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@
"expect": "^26.6.2",
"kafkajs": "^1.12.0",
"mocha": "^8.4.0",
"opentelemetry-instrumentation-mocha": "^0.0.1-rc.2",
"opentelemetry-instrumentation-testing-utils": "^0.5.0",
"opentelemetry-instrumentation-mocha": "0.0.1-rc.2",
"opentelemetry-instrumentation-testing-utils": "^0.5.1",
"ts-node": "^9.1.1",
"typescript": "^3.9.5"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/instrumentation-mongoose/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@
"mocha": "^8.4.0",
"mongodb": "^3.6.4",
"mongoose": "5.11.15",
"opentelemetry-instrumentation-mocha": "^0.0.1-rc.2",
"opentelemetry-instrumentation-testing-utils": "^0.5.0",
"opentelemetry-instrumentation-mocha": "0.0.1-rc.2",
"opentelemetry-instrumentation-testing-utils": "^0.5.1",
"ts-node": "^9.1.1",
"typescript": "^4.0.3"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/instrumentation-neo4j/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@
"expect": "^26.6.2",
"mocha": "^8.4.0",
"neo4j-driver": "^4.2.2",
"opentelemetry-instrumentation-mocha": "^0.0.1-rc.2",
"opentelemetry-instrumentation-testing-utils": "^0.5.0",
"opentelemetry-instrumentation-mocha": "0.0.1-rc.2",
"opentelemetry-instrumentation-testing-utils": "^0.5.1",
"test-all-versions": "^5.0.1",
"ts-node": "^9.1.1",
"typescript": "^4.0.3"
Expand Down
4 changes: 2 additions & 2 deletions packages/instrumentation-sequelize/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@
"expect": "^26.6.2",
"mocha": "^8.4.0",
"mysql2": "^2.2.5",
"opentelemetry-instrumentation-mocha": "^0.0.1-rc.2",
"opentelemetry-instrumentation-testing-utils": "^0.5.0",
"opentelemetry-instrumentation-mocha": "0.0.1-rc.2",
"opentelemetry-instrumentation-testing-utils": "^0.5.1",
"pg": "^8.4.2",
"sequelize": "^5.22.0",
"sqlite3": "^5.0.2",
Expand Down
4 changes: 2 additions & 2 deletions packages/instrumentation-socket.io/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@
"@types/mocha": "^8.2.2",
"expect": "^26.6.2",
"mocha": "^8.4.0",
"opentelemetry-instrumentation-mocha": "^0.0.1-rc.2",
"opentelemetry-instrumentation-testing-utils": "^0.5.0",
"opentelemetry-instrumentation-mocha": "0.0.1-rc.2",
"opentelemetry-instrumentation-testing-utils": "^0.5.1",
"socket.io": "^4.1.2",
"socket.io-client": "^4.1.1",
"test-all-versions": "^5.0.1",
Expand Down
8 changes: 5 additions & 3 deletions packages/instrumentation-typeorm/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,17 +38,19 @@
"@opentelemetry/api": "^0.21.0"
},
"dependencies": {
"@opentelemetry/core": "^0.21.0",
"@opentelemetry/instrumentation": "^0.21.0",
"@opentelemetry/semantic-conventions": "^0.21.0"
"@opentelemetry/semantic-conventions": "^0.21.0",
"is-promise": "^4.0.0"
},
"devDependencies": {
"@opentelemetry/api": "^0.21.0",
"@opentelemetry/tracing": "^0.21.0",
"@types/mocha": "^8.2.2",
"expect": "^26.6.2",
"mocha": "^8.4.0",
"opentelemetry-instrumentation-mocha": "^0.0.1-rc.2",
"opentelemetry-instrumentation-testing-utils": "^0.5.0",
"opentelemetry-instrumentation-mocha": "0.0.1-rc.2",
"opentelemetry-instrumentation-testing-utils": "^0.5.1",
"reflect-metadata": "^0.1.13",
"sqlite3": "^5.0.2",
"test-all-versions": "^5.0.1",
Expand Down
19 changes: 1 addition & 18 deletions packages/instrumentation-typeorm/src/typeorm.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,24 +91,7 @@ export class TypeormInstrumentation extends InstrumentationBase<typeof typeorm>
return module;
}

protected patch(moduleExports: typeof typeorm, moduleVersion: string) {
this.moduleVersion = moduleVersion;
if (moduleExports === undefined || moduleExports === null) {
return moduleExports;
}
diag.debug(`typeorm instrumentation: applying patch to typeorm`);
this.unpatch(moduleExports);
this._wrap(moduleExports.ConnectionManager.prototype, 'create', this._createConnectionManagerPatch.bind(this));

return moduleExports;
}

protected unpatch(moduleExports: typeof typeorm): void {
if (isWrapped(moduleExports.ConnectionManager.prototype.create))
this._unwrap(moduleExports.ConnectionManager.prototype, 'create');
}

private _createConnectionManagerPatch(original: (options: typeorm.ConnectionOptions) => typeorm.Connection) {
private _createConnectionManagerPatch(moduleVersion?: string) {
const self = this;
return (original: Function) => {
return function (options: typeorm.ConnectionOptions) {
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.