Skip to content

Commit 80cbee7

Browse files
blumamirtrentm
blumamir
and
trentm
authored
chore: experimental 0.51.0, remove instrumentations generic type to align with upstream (#2091)
* chore: remove instrumentations generic type to align with upstream * fix: lint * chore: update core to 0.51.0 * revert: redundant any type * fix: merged issue * fix: apply original types from generics * revert: cucumber testing * fix: tedious import types --------- Co-authored-by: Trent Mick <[email protected]>
1 parent 46b6775 commit 80cbee7

File tree

83 files changed

+717
-746
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+717
-746
lines changed

‎detectors/node/opentelemetry-resource-detector-instana/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"devDependencies": {
4040
"@opentelemetry/api": "^1.3.0",
4141
"@opentelemetry/contrib-test-utils": "^0.38.0",
42-
"@opentelemetry/sdk-node": "^0.50.0",
42+
"@opentelemetry/sdk-node": "^0.51.0",
4343
"@types/mocha": "8.2.3",
4444
"@types/node": "18.6.5",
4545
"@types/semver": "7.5.3",

‎metapackages/auto-instrumentations-node/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
"typescript": "4.4.4"
5050
},
5151
"dependencies": {
52-
"@opentelemetry/instrumentation": "^0.50.0",
52+
"@opentelemetry/instrumentation": "^0.51.0",
5353
"@opentelemetry/instrumentation-amqplib": "^0.36.0",
5454
"@opentelemetry/instrumentation-aws-lambda": "^0.40.0",
5555
"@opentelemetry/instrumentation-aws-sdk": "^0.40.0",
@@ -64,9 +64,9 @@
6464
"@opentelemetry/instrumentation-fs": "^0.11.0",
6565
"@opentelemetry/instrumentation-generic-pool": "^0.35.0",
6666
"@opentelemetry/instrumentation-graphql": "^0.39.0",
67-
"@opentelemetry/instrumentation-grpc": "^0.50.0",
67+
"@opentelemetry/instrumentation-grpc": "^0.51.0",
6868
"@opentelemetry/instrumentation-hapi": "^0.36.0",
69-
"@opentelemetry/instrumentation-http": "^0.50.0",
69+
"@opentelemetry/instrumentation-http": "^0.51.0",
7070
"@opentelemetry/instrumentation-ioredis": "^0.39.0",
7171
"@opentelemetry/instrumentation-knex": "^0.35.0",
7272
"@opentelemetry/instrumentation-koa": "^0.39.0",
@@ -92,7 +92,7 @@
9292
"@opentelemetry/resource-detector-container": "^0.3.8",
9393
"@opentelemetry/resource-detector-gcp": "^0.29.8",
9494
"@opentelemetry/resources": "^1.12.0",
95-
"@opentelemetry/sdk-node": "^0.50.0"
95+
"@opentelemetry/sdk-node": "^0.51.0"
9696
},
9797
"files": [
9898
"build/src/**/*.js",

‎metapackages/auto-instrumentations-web/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,11 @@
6161
"webpack-merge": "5.8.0"
6262
},
6363
"dependencies": {
64-
"@opentelemetry/instrumentation": "^0.50.0",
64+
"@opentelemetry/instrumentation": "^0.51.0",
6565
"@opentelemetry/instrumentation-document-load": "^0.37.0",
66-
"@opentelemetry/instrumentation-fetch": "^0.50.0",
66+
"@opentelemetry/instrumentation-fetch": "^0.51.0",
6767
"@opentelemetry/instrumentation-user-interaction": "^0.37.0",
68-
"@opentelemetry/instrumentation-xml-http-request": "^0.50.0"
68+
"@opentelemetry/instrumentation-xml-http-request": "^0.51.0"
6969
},
7070
"files": [
7171
"build/src/**/*.js",

‎package-lock.json

Lines changed: 465 additions & 465 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/opentelemetry-test-utils/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@
4646
"dependencies": {
4747
"@opentelemetry/core": "^1.0.0",
4848
"@opentelemetry/exporter-jaeger": "^1.3.1",
49-
"@opentelemetry/instrumentation": "^0.50.0",
49+
"@opentelemetry/instrumentation": "^0.51.0",
5050
"@opentelemetry/resources": "^1.8.0",
51-
"@opentelemetry/sdk-node": "^0.50.0",
51+
"@opentelemetry/sdk-node": "^0.51.0",
5252
"@opentelemetry/sdk-trace-base": "^1.8.0",
5353
"@opentelemetry/sdk-trace-node": "^1.8.0",
5454
"@opentelemetry/semantic-conventions": "^1.22.0"

‎packages/winston-transport/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"typescript": "4.4.4"
5151
},
5252
"dependencies": {
53-
"@opentelemetry/api-logs": "^0.50.0",
53+
"@opentelemetry/api-logs": "^0.51.0",
5454
"winston-transport": "4.*"
5555
},
5656
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/winston-transport#readme"

‎plugins/node/instrumentation-amqplib/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
},
4646
"dependencies": {
4747
"@opentelemetry/core": "^1.8.0",
48-
"@opentelemetry/instrumentation": "^0.50.0",
48+
"@opentelemetry/instrumentation": "^0.51.0",
4949
"@opentelemetry/semantic-conventions": "^1.22.0"
5050
},
5151
"devDependencies": {

‎plugins/node/instrumentation-cucumber/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
"typescript": "4.4.4"
6363
},
6464
"dependencies": {
65-
"@opentelemetry/instrumentation": "^0.50.0",
65+
"@opentelemetry/instrumentation": "^0.51.0",
6666
"@opentelemetry/semantic-conventions": "^1.0.0"
6767
},
6868
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-cucumber#readme"

‎plugins/node/instrumentation-cucumber/src/instrumentation.ts

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,12 @@ export class CucumberInstrumentation extends InstrumentationBase {
4848
super('@opentelemetry/instrumentation-cucumber', VERSION, config);
4949
}
5050

51-
init(): InstrumentationNodeModuleDefinition<any>[] {
51+
init(): InstrumentationNodeModuleDefinition[] {
5252
return [
53-
new InstrumentationNodeModuleDefinition<Cucumber>(
53+
new InstrumentationNodeModuleDefinition(
5454
'@cucumber/cucumber',
5555
['^8.0.0', '^9.0.0', '^10.0.0'],
56-
(moduleExports, moduleVersion) => {
56+
(moduleExports: Cucumber, moduleVersion) => {
5757
this._diag.debug(
5858
`Applying patch for @cucumber/cucumber@${moduleVersion}`
5959
);
@@ -72,7 +72,7 @@ export class CucumberInstrumentation extends InstrumentationBase {
7272
});
7373
return moduleExports;
7474
},
75-
(moduleExports, moduleVersion) => {
75+
(moduleExports: Cucumber, moduleVersion) => {
7676
if (moduleExports === undefined) return;
7777
this._diag.debug(
7878
`Removing patch for @cucumber/cucumber@${moduleVersion}`
@@ -82,9 +82,7 @@ export class CucumberInstrumentation extends InstrumentationBase {
8282
});
8383
},
8484
[
85-
new InstrumentationNodeModuleFile<{
86-
default: { new (): TestCaseRunner; prototype: TestCaseRunner };
87-
}>(
85+
new InstrumentationNodeModuleFile(
8886
'@cucumber/cucumber/lib/runtime/test_case_runner.js',
8987
['^8.0.0', '^9.0.0', '^10.0.0'],
9088
(moduleExports, moduleVersion) => {

‎plugins/node/instrumentation-dataloader/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
"typescript": "4.4.4"
5959
},
6060
"dependencies": {
61-
"@opentelemetry/instrumentation": "^0.50.0"
61+
"@opentelemetry/instrumentation": "^0.51.0"
6262
},
6363
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-dataloader#readme"
6464
}

‎plugins/node/instrumentation-dataloader/src/instrumentation.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ export class DataloaderInstrumentation extends InstrumentationBase {
5151

5252
protected init() {
5353
return [
54-
new InstrumentationNodeModuleDefinition<typeof Dataloader>(
54+
new InstrumentationNodeModuleDefinition(
5555
MODULE_NAME,
5656
['^2.0.0'],
5757
(dataloader, moduleVersion) => {
@@ -73,8 +73,7 @@ export class DataloaderInstrumentation extends InstrumentationBase {
7373
this._unwrap(dataloader.prototype, 'loadMany');
7474
}
7575
}
76-
// cast it to module definition of unknown type to avoid exposing Dataloader types on public APIs
77-
) as InstrumentationNodeModuleDefinition<unknown>,
76+
) as InstrumentationNodeModuleDefinition,
7877
];
7978
}
8079

‎plugins/node/instrumentation-fs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
},
6060
"dependencies": {
6161
"@opentelemetry/core": "^1.8.0",
62-
"@opentelemetry/instrumentation": "^0.50.0"
62+
"@opentelemetry/instrumentation": "^0.51.0"
6363
},
6464
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-fs#readme"
6565
}

‎plugins/node/instrumentation-fs/src/instrumentation.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,17 +51,17 @@ function patchedFunctionWithOriginalProperties<
5151
return Object.assign(patchedFunction, original);
5252
}
5353

54-
export default class FsInstrumentation extends InstrumentationBase<FS> {
54+
export default class FsInstrumentation extends InstrumentationBase {
5555
constructor(config?: FsInstrumentationConfig) {
5656
super('@opentelemetry/instrumentation-fs', VERSION, config);
5757
}
5858

5959
init(): (
60-
| InstrumentationNodeModuleDefinition<FS>
61-
| InstrumentationNodeModuleDefinition<FSPromises>
60+
| InstrumentationNodeModuleDefinition
61+
| InstrumentationNodeModuleDefinition
6262
)[] {
6363
return [
64-
new InstrumentationNodeModuleDefinition<FS>(
64+
new InstrumentationNodeModuleDefinition(
6565
'fs',
6666
['*'],
6767
(fs: FS) => {
@@ -133,7 +133,7 @@ export default class FsInstrumentation extends InstrumentationBase<FS> {
133133
}
134134
}
135135
),
136-
new InstrumentationNodeModuleDefinition<FSPromises>(
136+
new InstrumentationNodeModuleDefinition(
137137
'fs/promises',
138138
['*'],
139139
(fsPromises: FSPromises) => {

‎plugins/node/instrumentation-lru-memoizer/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
"typescript": "4.4.4"
5858
},
5959
"dependencies": {
60-
"@opentelemetry/instrumentation": "^0.50.0"
60+
"@opentelemetry/instrumentation": "^0.51.0"
6161
},
6262
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-lru-memoizer#readme"
6363
}

‎plugins/node/instrumentation-lru-memoizer/src/instrumentation.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ export default class LruMemoizerInstrumentation extends InstrumentationBase {
2727
super('@opentelemetry/instrumentation-lru-memoizer', VERSION, config);
2828
}
2929

30-
init(): InstrumentationNodeModuleDefinition<any>[] {
30+
init(): InstrumentationNodeModuleDefinition[] {
3131
return [
32-
new InstrumentationNodeModuleDefinition<any>(
32+
new InstrumentationNodeModuleDefinition(
3333
'lru-memoizer',
3434
['>=1.3 <3'],
3535
moduleExports => {

‎plugins/node/instrumentation-mongoose/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
},
6262
"dependencies": {
6363
"@opentelemetry/core": "^1.8.0",
64-
"@opentelemetry/instrumentation": "^0.50.0",
64+
"@opentelemetry/instrumentation": "^0.51.0",
6565
"@opentelemetry/semantic-conventions": "^1.22.0"
6666
},
6767
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-mongoose#readme"

‎plugins/node/instrumentation-mongoose/src/mongoose.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ const contextCaptureFunctions = [
5757
// calls. this bypass the unlinked spans issue on thenables await operations.
5858
export const _STORED_PARENT_SPAN: unique symbol = Symbol('stored-parent-span');
5959

60-
export class MongooseInstrumentation extends InstrumentationBase<any> {
60+
export class MongooseInstrumentation extends InstrumentationBase {
6161
protected override _config!: MongooseInstrumentationConfig;
6262

6363
constructor(config: MongooseInstrumentationConfig = {}) {
@@ -72,8 +72,8 @@ export class MongooseInstrumentation extends InstrumentationBase<any> {
7272
this._config = Object.assign({}, config);
7373
}
7474

75-
protected init(): InstrumentationModuleDefinition<any> {
76-
const module = new InstrumentationNodeModuleDefinition<any>(
75+
protected init(): InstrumentationModuleDefinition {
76+
const module = new InstrumentationNodeModuleDefinition(
7777
'mongoose',
7878
['>=5.9.7 <7'],
7979
this.patch.bind(this),

‎plugins/node/instrumentation-runtime-node/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"access": "public"
4040
},
4141
"dependencies": {
42-
"@opentelemetry/instrumentation": "^0.50.0"
42+
"@opentelemetry/instrumentation": "^0.51.0"
4343
},
4444
"devDependencies": {
4545
"@opentelemetry/api": "^1.3.0",

‎plugins/node/instrumentation-socket.io/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
"typescript": "4.4.4"
5959
},
6060
"dependencies": {
61-
"@opentelemetry/instrumentation": "^0.50.0",
61+
"@opentelemetry/instrumentation": "^0.51.0",
6262
"@opentelemetry/semantic-conventions": "^1.0.0"
6363
},
6464
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-socket.io#readme"

0 commit comments

Comments
 (0)