Skip to content

Commit

Permalink
feat: use latest instrumentation base (#769)
Browse files Browse the repository at this point in the history
  • Loading branch information
@dyladan
dyladan authored Nov 30, 2021
1 parent 92221ba commit 7aff23e
Show file tree
Hide file tree
Showing 34 changed files with 39 additions and 39 deletions.
2 changes: 1 addition & 1 deletion examples/fastify/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"@opentelemetry/exporter-jaeger": "^1.0.0",
"@opentelemetry/exporter-zipkin": "^1.0.0",
"@opentelemetry/exporter-collector": "^0.25.0",
"@opentelemetry/instrumentation": "^0.26.0",
"@opentelemetry/instrumentation": "^0.27.0",
"@opentelemetry/instrumentation-fastify": "^0.25.0",
"@opentelemetry/instrumentation-http": "^0.26.0",
"@opentelemetry/sdk-trace-node": "^1.0.0",
Expand Down
6 changes: 3 additions & 3 deletions metapackages/auto-instrumentations-node/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,12 @@
"typescript": "4.3.5"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.26.0",
"@opentelemetry/instrumentation": "^0.27.0",
"@opentelemetry/instrumentation-dns": "^0.26.0",
"@opentelemetry/instrumentation-express": "^0.26.0",
"@opentelemetry/instrumentation-graphql": "^0.26.1",
"@opentelemetry/instrumentation-grpc": "^0.26.0",
"@opentelemetry/instrumentation-http": "^0.26.0",
"@opentelemetry/instrumentation-grpc": "^0.27.0",
"@opentelemetry/instrumentation-http": "^0.27.0",
"@opentelemetry/instrumentation-ioredis": "^0.26.0",
"@opentelemetry/instrumentation-koa": "^0.27.0",
"@opentelemetry/instrumentation-mongodb": "^0.26.0",
Expand Down
6 changes: 3 additions & 3 deletions metapackages/auto-instrumentations-web/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,10 @@
"webpack-merge": "5.8.0"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.26.0",
"@opentelemetry/instrumentation": "^0.27.0",
"@opentelemetry/instrumentation-document-load": "^0.26.0",
"@opentelemetry/instrumentation-fetch": "^0.26.0",
"@opentelemetry/instrumentation-fetch": "^0.27.0",
"@opentelemetry/instrumentation-user-interaction": "^0.26.0",
"@opentelemetry/instrumentation-xml-http-request": "^0.26.0"
"@opentelemetry/instrumentation-xml-http-request": "^0.27.0"
}
}
2 changes: 1 addition & 1 deletion packages/opentelemetry-browser-extension-autoinjection/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
"@opentelemetry/core": "1.0.1",
"@opentelemetry/exporter-otlp-http": "0.26.0",
"@opentelemetry/exporter-zipkin": "1.0.1",
"@opentelemetry/instrumentation": "0.26.0",
"@opentelemetry/instrumentation": "0.27.0",
"@opentelemetry/instrumentation-document-load": "^0.26.0",
"@opentelemetry/instrumentation-fetch": "0.26.0",
"@opentelemetry/instrumentation-xml-http-request": "0.26.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-test-utils/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"dependencies": {
"@opentelemetry/core": "1.0.1",
"@opentelemetry/exporter-jaeger": "1.0.1",
"@opentelemetry/instrumentation": "0.26.0",
"@opentelemetry/instrumentation": "0.27.0",
"@opentelemetry/sdk-trace-node": "1.0.1",
"@opentelemetry/resources": "1.0.1",
"@opentelemetry/sdk-trace-base": "1.0.1",
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-aws-lambda/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"typescript": "4.3.5"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.26.0",
"@opentelemetry/instrumentation": "^0.27.0",
"@opentelemetry/propagator-aws-xray": "^1.0.0",
"@opentelemetry/resources": "^1.0.0",
"@opentelemetry/semantic-conventions": "^1.0.0",
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-aws-sdk/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
},
"dependencies": {
"@opentelemetry/core": "^1.0.0",
"@opentelemetry/instrumentation": "^0.26.0",
"@opentelemetry/instrumentation": "^0.27.0",
"@opentelemetry/semantic-conventions": "^1.0.0",
"@opentelemetry/propagation-utils": "^0.26.0"
},
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-bunyan/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
"typescript": "4.3.5"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.26.0",
"@opentelemetry/instrumentation": "^0.27.0",
"@types/bunyan": "1.8.7"
}
}
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-cassandra/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
"typescript": "4.3.5"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.26.0",
"@opentelemetry/instrumentation": "^0.27.0",
"@opentelemetry/semantic-conventions": "^1.0.0"
}
}
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-connect/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
},
"dependencies": {
"@opentelemetry/core": "^1.0.0",
"@opentelemetry/instrumentation": "^0.26.0",
"@opentelemetry/instrumentation": "^0.27.0",
"@opentelemetry/semantic-conventions": "^1.0.0",
"@types/connect": "3.4.35"
}
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-dns/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
"typescript": "4.3.5"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.26.0",
"@opentelemetry/instrumentation": "^0.27.0",
"@opentelemetry/semantic-conventions": "^1.0.0",
"semver": "^7.3.2"
}
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-express/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
},
"dependencies": {
"@opentelemetry/core": "^1.0.0",
"@opentelemetry/instrumentation": "^0.26.0",
"@opentelemetry/instrumentation": "^0.27.0",
"@opentelemetry/semantic-conventions": "^1.0.0",
"@types/express": "4.17.13"
}
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-fastify/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
},
"dependencies": {
"@opentelemetry/core": "^1.0.0",
"@opentelemetry/instrumentation": "^0.26.0",
"@opentelemetry/instrumentation": "^0.27.0",
"@opentelemetry/semantic-conventions": "^1.0.0",
"fastify": "^3.19.2"
}
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-generic-pool/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"typescript": "4.3.5"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.26.0",
"@opentelemetry/instrumentation": "^0.27.0",
"@opentelemetry/semantic-conventions": "^1.0.0",
"@types/generic-pool": "^3.1.9"
}
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-graphql/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"typescript": "4.3.5"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.26.0",
"@opentelemetry/instrumentation": "^0.27.0",
"@types/graphql": "14.5.0"
}
}
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-hapi/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
},
"dependencies": {
"@opentelemetry/core": "^1.0.0",
"@opentelemetry/instrumentation": "^0.26.0",
"@opentelemetry/instrumentation": "^0.27.0",
"@opentelemetry/semantic-conventions": "^1.0.0",
"@types/hapi__hapi": "20.0.9"
}
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-ioredis/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
"typescript": "4.3.5"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.26.0",
"@opentelemetry/instrumentation": "^0.27.0",
"@opentelemetry/semantic-conventions": "^1.0.0",
"@types/ioredis": "4.26.6"
}
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-knex/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"typescript": "4.3.5"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.26.0",
"@opentelemetry/instrumentation": "^0.27.0",
"@opentelemetry/semantic-conventions": "^1.0.0"
}
}
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-koa/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
},
"dependencies": {
"@opentelemetry/core": "^1.0.0",
"@opentelemetry/instrumentation": "^0.26.0",
"@opentelemetry/instrumentation": "^0.27.0",
"@opentelemetry/semantic-conventions": "^1.0.0",
"@types/koa": "2.13.4",
"@types/koa__router": "8.0.7"
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-memcached/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
"typescript": "4.3.5"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.26.0",
"@opentelemetry/instrumentation": "^0.27.0",
"@opentelemetry/semantic-conventions": "^1.0.0",
"@types/memcached": "^2.2.6"
}
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-mongodb/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
"typescript": "4.3.5"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.26.0",
"@opentelemetry/instrumentation": "^0.27.0",
"@opentelemetry/semantic-conventions": "^1.0.0",
"@types/mongodb": "3.6.20"
}
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-mysql/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"typescript": "4.3.5"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.26.0",
"@opentelemetry/instrumentation": "^0.27.0",
"@opentelemetry/semantic-conventions": "^1.0.0",
"@types/mysql": "2.15.19"
}
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-mysql2/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
"typescript": "4.3.5"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.26.0",
"@opentelemetry/instrumentation": "^0.27.0",
"@opentelemetry/semantic-conventions": "^1.0.0"
}
}
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-nestjs-core/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
"typescript": "4.3.5"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.26.0",
"@opentelemetry/instrumentation": "^0.27.0",
"@opentelemetry/semantic-conventions": "^1.0.0"
}
}
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-net/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"typescript": "4.3.5"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.26.0",
"@opentelemetry/instrumentation": "^0.27.0",
"@opentelemetry/semantic-conventions": "^1.0.0"
}
}
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-pg/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
"typescript": "4.3.5"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.26.0",
"@opentelemetry/instrumentation": "^0.27.0",
"@opentelemetry/semantic-conventions": "^1.0.0",
"@types/pg": "8.6.1",
"@types/pg-pool": "2.0.3"
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-pino/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
"typescript": "4.3.5"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.26.0",
"@opentelemetry/instrumentation": "^0.27.0",
"pino": "7.2.0",
"semver": "^7.3.5"
}
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-redis/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
"typescript": "4.3.5"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.26.0",
"@opentelemetry/instrumentation": "^0.27.0",
"@opentelemetry/semantic-conventions": "^1.0.0",
"@types/redis": "2.8.31"
}
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-restify/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
},
"dependencies": {
"@opentelemetry/core": "^1.0.0",
"@opentelemetry/instrumentation": "^0.26.0",
"@opentelemetry/instrumentation": "^0.27.0",
"@opentelemetry/semantic-conventions": "^1.0.0",
"@types/restify": "4.3.8"
}
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-router/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"typescript": "4.3.5"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.26.0",
"@opentelemetry/instrumentation": "^0.27.0",
"@opentelemetry/semantic-conventions": "^1.0.0"
}
}
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-winston/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,6 @@
"winston2": "npm:winston@2.4.5"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.26.0"
"@opentelemetry/instrumentation": "^0.27.0"
}
}
2 changes: 1 addition & 1 deletion plugins/web/opentelemetry-instrumentation-document-load/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
},
"dependencies": {
"@opentelemetry/core": "^1.0.0",
"@opentelemetry/instrumentation": "^0.26.0",
"@opentelemetry/instrumentation": "^0.27.0",
"@opentelemetry/sdk-trace-base": "^1.0.0",
"@opentelemetry/sdk-trace-web": "^1.0.0",
"@opentelemetry/semantic-conventions": "^1.0.0"
Expand Down
4 changes: 2 additions & 2 deletions plugins/web/opentelemetry-instrumentation-user-interaction/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"@babel/core": "7.15.0",
"@opentelemetry/api": "1.0.2",
"@opentelemetry/context-zone-peer-dep": "1.0.1",
"@opentelemetry/instrumentation-xml-http-request": "0.26.0",
"@opentelemetry/instrumentation-xml-http-request": "0.27.0",
"@opentelemetry/sdk-trace-base": "1.0.1",
"@types/jquery": "3.5.6",
"@types/mocha": "7.0.2",
Expand Down Expand Up @@ -83,7 +83,7 @@
},
"dependencies": {
"@opentelemetry/core": "^1.0.0",
"@opentelemetry/instrumentation": "^0.26.0",
"@opentelemetry/instrumentation": "^0.27.0",
"@opentelemetry/sdk-trace-web": "^1.0.0"
},
"peerDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion plugins/web/opentelemetry-instrumentation-user-interaction/src/instrumentation.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export class UserInteractionInstrumentation extends InstrumentationBase<unknown>
readonly version = VERSION;
moduleName = this.component;
private _spansData = new WeakMap<api.Span, SpanData>();
private _zonePatched = false;
private _zonePatched?: boolean;
// for addEventListener/removeEventListener state
private _wrappedListeners = new WeakMap<
Function | EventListenerObject,
Expand Down

0 comments on commit 7aff23e

Please sign in to comment.