diff --git a/detectors/node/opentelemetry-resource-detector-github/package.json b/detectors/node/opentelemetry-resource-detector-github/package.json index 74433cf731e..c17137b53a7 100644 --- a/detectors/node/opentelemetry-resource-detector-github/package.json +++ b/detectors/node/opentelemetry-resource-detector-github/package.json @@ -58,6 +58,7 @@ "typescript": "4.1.3" }, "dependencies": { - "@opentelemetry/resources": "^0.18.2" + "@opentelemetry/api": "1.0.0-rc.0", + "@opentelemetry/resources": "^0.19.0" } } diff --git a/examples/dns/package.json b/examples/dns/package.json index 02c96176011..076690f41a6 100644 --- a/examples/dns/package.json +++ b/examples/dns/package.json @@ -26,13 +26,13 @@ "url": "https://github.com/open-telemetry/opentelemetry-js-contrib/issues" }, "dependencies": { - "@opentelemetry/api": "^0.18.1", - "@opentelemetry/exporter-jaeger": "^0.18.2", - "@opentelemetry/exporter-zipkin": "^0.18.2", - "@opentelemetry/instrumentation": "^0.18.2", + "@opentelemetry/api": "^1.0.0-rc.0", + "@opentelemetry/exporter-jaeger": "^0.19.0", + "@opentelemetry/exporter-zipkin": "^0.19.0", + "@opentelemetry/instrumentation": "^0.19.0", "@opentelemetry/instrumentation-dns": "^0.15.0", - "@opentelemetry/node": "^0.18.2", - "@opentelemetry/tracing": "^0.18.2" + "@opentelemetry/node": "^0.19.0", + "@opentelemetry/tracing": "^0.19.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib#readme", "devDependencies": { diff --git a/examples/express/package.json b/examples/express/package.json index 1940b1bbd1e..a8c031c2f66 100644 --- a/examples/express/package.json +++ b/examples/express/package.json @@ -28,14 +28,14 @@ "url": "https://github.com/open-telemetry/opentelemetry-js/issues" }, "dependencies": { - "@opentelemetry/api": "^0.18.1", - "@opentelemetry/exporter-jaeger": "^0.18.2", - "@opentelemetry/exporter-zipkin": "^0.18.2", - "@opentelemetry/instrumentation": "^0.18.2", + "@opentelemetry/api": "^1.0.0-rc.0", + "@opentelemetry/exporter-jaeger": "^0.19.0", + "@opentelemetry/exporter-zipkin": "^0.19.0", + "@opentelemetry/instrumentation": "^0.19.0", "@opentelemetry/instrumentation-express": "^0.15.0", - "@opentelemetry/instrumentation-http": "^0.18.2", - "@opentelemetry/node": "^0.18.2", - "@opentelemetry/tracing": "^0.18.2", + "@opentelemetry/instrumentation-http": "^0.19.0", + "@opentelemetry/node": "^0.19.0", + "@opentelemetry/tracing": "^0.19.0", "axios": "^0.19.0", "cross-env": "^7.0.3", "express": "^4.17.1" diff --git a/examples/graphql/package.json b/examples/graphql/package.json index 9da18aa89ba..d1137117f20 100644 --- a/examples/graphql/package.json +++ b/examples/graphql/package.json @@ -31,14 +31,14 @@ "url": "https://github.com/open-telemetry/opentelemetry-js/issues" }, "dependencies": { - "@opentelemetry/api": "^0.18.1", - "@opentelemetry/exporter-collector": "^0.18.2", - "@opentelemetry/instrumentation": "^0.18.2", + "@opentelemetry/api": "^1.0.0-rc.0", + "@opentelemetry/exporter-collector": "^0.19.0", + "@opentelemetry/instrumentation": "^0.19.0", "@opentelemetry/instrumentation-graphql": "^0.15.0", - "@opentelemetry/node": "^0.18.2", + "@opentelemetry/node": "^0.19.0", "@opentelemetry/instrumentation-express": "^0.15.0", - "@opentelemetry/instrumentation-http": "^0.18.2", - "@opentelemetry/tracing": "^0.18.2", + "@opentelemetry/instrumentation-http": "^0.19.0", + "@opentelemetry/tracing": "^0.19.0", "apollo-server": "^2.18.1", "express": "^4.17.1", "express-graphql": "^0.11.0", diff --git a/examples/grpc-census-prop/package.json b/examples/grpc-census-prop/package.json index 76fc84f3b16..9eec5cceaf0 100644 --- a/examples/grpc-census-prop/package.json +++ b/examples/grpc-census-prop/package.json @@ -34,13 +34,13 @@ "@opencensus/instrumentation-grpc": "0.0.21", "@opencensus/nodejs": "0.0.21", "@opencensus/propagation-binaryformat": "0.0.21", - "@opentelemetry/api": "^0.18.1", - "@opentelemetry/core": "^0.18.2", - "@opentelemetry/instrumentation": "^0.18.2", - "@opentelemetry/instrumentation-grpc": "^0.18.2", - "@opentelemetry/node": "^0.18.2", + "@opentelemetry/api": "^1.0.0-rc.0", + "@opentelemetry/core": "^0.19.0", + "@opentelemetry/instrumentation": "^0.19.0", + "@opentelemetry/instrumentation-grpc": "^0.19.0", + "@opentelemetry/node": "^0.19.0", "@opentelemetry/propagator-grpc-census-binary": "^0.15.0", - "@opentelemetry/tracing": "^0.18.2", + "@opentelemetry/tracing": "^0.19.0", "grpc": "^1.24.2", "node-pre-gyp": "0.12.0" }, diff --git a/examples/grpc_dynamic_codegen/package.json b/examples/grpc_dynamic_codegen/package.json index 5183f709a20..832f132f9f5 100644 --- a/examples/grpc_dynamic_codegen/package.json +++ b/examples/grpc_dynamic_codegen/package.json @@ -28,12 +28,12 @@ }, "dependencies": { "@grpc/proto-loader": "^0.4.0", - "@opentelemetry/api": "^0.18.1", - "@opentelemetry/exporter-jaeger": "^0.18.2", - "@opentelemetry/exporter-zipkin": "^0.18.2", - "@opentelemetry/node": "^0.18.2", - "@opentelemetry/instrumentation-grpc": "^0.18.2", - "@opentelemetry/tracing": "^0.18.2", + "@opentelemetry/api": "^1.0.0-rc.0", + "@opentelemetry/exporter-jaeger": "^0.19.0", + "@opentelemetry/exporter-zipkin": "^0.19.0", + "@opentelemetry/node": "^0.19.0", + "@opentelemetry/instrumentation-grpc": "^0.19.0", + "@opentelemetry/tracing": "^0.19.0", "grpc": "^1.24.6", "node-pre-gyp": "^0.17.0" }, diff --git a/examples/hapi/package.json b/examples/hapi/package.json index 242ce42c557..0ef6abd0a50 100644 --- a/examples/hapi/package.json +++ b/examples/hapi/package.json @@ -32,14 +32,14 @@ }, "dependencies": { "@hapi/hapi": "^19.2.0", - "@opentelemetry/api": "^0.18.1", - "@opentelemetry/exporter-jaeger": "^0.18.2", - "@opentelemetry/exporter-zipkin": "^0.18.2", - "@opentelemetry/instrumentation": "^0.18.2", + "@opentelemetry/api": "^1.0.0-rc.0", + "@opentelemetry/exporter-jaeger": "^0.19.0", + "@opentelemetry/exporter-zipkin": "^0.19.0", + "@opentelemetry/instrumentation": "^0.19.0", "@opentelemetry/instrumentation-hapi": "^0.15.0", - "@opentelemetry/instrumentation-http": "^0.18.2", - "@opentelemetry/node": "^0.18.2", - "@opentelemetry/tracing": "^0.18.2", + "@opentelemetry/instrumentation-http": "^0.19.0", + "@opentelemetry/node": "^0.19.0", + "@opentelemetry/tracing": "^0.19.0", "axios": "^0.19.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib#readme", diff --git a/examples/host-metrics/package.json b/examples/host-metrics/package.json index 9c5046d46ed..aa5d4c19b08 100644 --- a/examples/host-metrics/package.json +++ b/examples/host-metrics/package.json @@ -26,13 +26,13 @@ "url": "https://github.com/open-telemetry/opentelemetry-js/issues" }, "dependencies": { - "@opentelemetry/api": "^0.18.1", - "@opentelemetry/core": "^0.18.2", - "@opentelemetry/exporter-collector": "^0.18.2", - "@opentelemetry/exporter-prometheus": "^0.18.2", + "@opentelemetry/api": "^1.0.0-rc.0", + "@opentelemetry/core": "^0.19.0", + "@opentelemetry/exporter-collector": "^0.19.0", + "@opentelemetry/exporter-prometheus": "^0.19.0", "@opentelemetry/host-metrics": "^0.15.0", - "@opentelemetry/instrumentation": "^0.18.2", - "@opentelemetry/metrics": "^0.18.2" + "@opentelemetry/instrumentation": "^0.19.0", + "@opentelemetry/metrics": "^0.19.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js#readme" } diff --git a/examples/ioredis/package.json b/examples/ioredis/package.json index 605e9597341..78a122341e2 100644 --- a/examples/ioredis/package.json +++ b/examples/ioredis/package.json @@ -28,12 +28,12 @@ "url": "https://github.com/open-telemetry/opentelemetry-js-contrib/issues" }, "dependencies": { - "@opentelemetry/api": "^0.18.1", - "@opentelemetry/exporter-jaeger": "^0.18.2", - "@opentelemetry/instrumentation": "^0.18.2", + "@opentelemetry/api": "^1.0.0-rc.0", + "@opentelemetry/exporter-jaeger": "^0.19.0", + "@opentelemetry/instrumentation": "^0.19.0", "@opentelemetry/instrumentation-ioredis": "^0.15.0", - "@opentelemetry/node": "^0.18.2", - "@opentelemetry/tracing": "^0.18.2", + "@opentelemetry/node": "^0.19.0", + "@opentelemetry/tracing": "^0.19.0", "ioredis": "^4.22.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib#readme" diff --git a/examples/koa/package.json b/examples/koa/package.json index 51988bc15f6..146b0a950c0 100644 --- a/examples/koa/package.json +++ b/examples/koa/package.json @@ -32,14 +32,14 @@ }, "dependencies": { "@koa/router": "^9.3.1", - "@opentelemetry/api": "^0.18.1", - "@opentelemetry/exporter-jaeger": "^0.18.2", - "@opentelemetry/exporter-zipkin": "^0.18.2", - "@opentelemetry/instrumentation": "^0.18.2", - "@opentelemetry/instrumentation-http": "^0.18.2", + "@opentelemetry/api": "^1.0.0-rc.0", + "@opentelemetry/exporter-jaeger": "^0.19.0", + "@opentelemetry/exporter-zipkin": "^0.19.0", + "@opentelemetry/instrumentation": "^0.19.0", + "@opentelemetry/instrumentation-http": "^0.19.0", "@opentelemetry/instrumentation-koa": "^0.15.0", - "@opentelemetry/node": "^0.18.2", - "@opentelemetry/tracing": "^0.18.2", + "@opentelemetry/node": "^0.19.0", + "@opentelemetry/tracing": "^0.19.0", "axios": "^0.19.0", "koa": "^2.13.0" }, diff --git a/examples/meta-node/package.json b/examples/meta-node/package.json index 24911087171..7231eb03648 100644 --- a/examples/meta-node/package.json +++ b/examples/meta-node/package.json @@ -35,12 +35,12 @@ "eslint": "^7.4.0" }, "dependencies": { - "@opentelemetry/api": "^0.18.1", + "@opentelemetry/api": "^1.0.0-rc.0", "@opentelemetry/auto-instrumentations-node": "^0.15.0", - "@opentelemetry/exporter-collector": "^0.18.2", - "@opentelemetry/instrumentation": "^0.18.2", - "@opentelemetry/node": "^0.18.2", - "@opentelemetry/tracing": "^0.18.2", + "@opentelemetry/exporter-collector": "^0.19.0", + "@opentelemetry/instrumentation": "^0.19.0", + "@opentelemetry/node": "^0.19.0", + "@opentelemetry/tracing": "^0.19.0", "axios": "^0.21.1", "express": "^4.17.1" } diff --git a/examples/mongodb/package.json b/examples/mongodb/package.json index 71746f9196d..de364317181 100644 --- a/examples/mongodb/package.json +++ b/examples/mongodb/package.json @@ -28,14 +28,14 @@ "url": "https://github.com/open-telemetry/opentelemetry-js-contrib/issues" }, "dependencies": { - "@opentelemetry/api": "^0.18.1", - "@opentelemetry/exporter-jaeger": "^0.18.2", - "@opentelemetry/exporter-zipkin": "^0.18.2", - "@opentelemetry/instrumentation": "^0.18.2", - "@opentelemetry/instrumentation-http": "^0.18.2", + "@opentelemetry/api": "^1.0.0-rc.0", + "@opentelemetry/exporter-jaeger": "^0.19.0", + "@opentelemetry/exporter-zipkin": "^0.19.0", + "@opentelemetry/instrumentation": "^0.19.0", + "@opentelemetry/instrumentation-http": "^0.19.0", "@opentelemetry/instrumentation-mongodb": "^0.15.0", - "@opentelemetry/node": "^0.18.2", - "@opentelemetry/tracing": "^0.18.2", + "@opentelemetry/node": "^0.19.0", + "@opentelemetry/tracing": "^0.19.0", "mongodb": "^3.5.7" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib#readme", diff --git a/examples/mysql/package.json b/examples/mysql/package.json index 0694e60f34f..f0420d5d9f3 100644 --- a/examples/mysql/package.json +++ b/examples/mysql/package.json @@ -28,14 +28,14 @@ "url": "https://github.com/open-telemetry/opentelemetry-js/issues" }, "dependencies": { - "@opentelemetry/api": "^0.18.1", - "@opentelemetry/exporter-jaeger": "^0.18.2", - "@opentelemetry/exporter-zipkin": "^0.18.2", - "@opentelemetry/instrumentation": "^0.18.2", - "@opentelemetry/instrumentation-http": "^0.18.2", + "@opentelemetry/api": "^1.0.0-rc.0", + "@opentelemetry/exporter-jaeger": "^0.19.0", + "@opentelemetry/exporter-zipkin": "^0.19.0", + "@opentelemetry/instrumentation": "^0.19.0", + "@opentelemetry/instrumentation-http": "^0.19.0", "@opentelemetry/instrumentation-mysql": "^0.15.0", - "@opentelemetry/node": "^0.18.2", - "@opentelemetry/tracing": "^0.18.2", + "@opentelemetry/node": "^0.19.0", + "@opentelemetry/tracing": "^0.19.0", "mysql": "*" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js#readme", diff --git a/examples/postgres/package.json b/examples/postgres/package.json index 66f0e2e9181..d4525cd9de3 100644 --- a/examples/postgres/package.json +++ b/examples/postgres/package.json @@ -30,14 +30,14 @@ "url": "https://github.com/open-telemetry/opentelemetry-js/issues" }, "dependencies": { - "@opentelemetry/api": "^0.18.1", - "@opentelemetry/exporter-jaeger": "^0.18.2", - "@opentelemetry/exporter-zipkin": "^0.18.2", - "@opentelemetry/instrumentation": "^0.18.2", - "@opentelemetry/instrumentation-http": "^0.18.2", + "@opentelemetry/api": "^1.0.0-rc.0", + "@opentelemetry/exporter-jaeger": "^0.19.0", + "@opentelemetry/exporter-zipkin": "^0.19.0", + "@opentelemetry/instrumentation": "^0.19.0", + "@opentelemetry/instrumentation-http": "^0.19.0", "@opentelemetry/instrumentation-pg": "^0.15.0", - "@opentelemetry/node": "^0.18.2", - "@opentelemetry/tracing": "^0.18.2", + "@opentelemetry/node": "^0.19.0", + "@opentelemetry/tracing": "^0.19.0", "express": "^4.17.1", "pg": "^7.12.1" }, diff --git a/examples/react-load/preact/package.json b/examples/react-load/preact/package.json index 3c746b4c677..a480b0d1bfb 100644 --- a/examples/react-load/preact/package.json +++ b/examples/react-load/preact/package.json @@ -37,11 +37,11 @@ "sirv-cli": "1.0.3" }, "dependencies": { - "@opentelemetry/context-zone": "^0.18.2", - "@opentelemetry/exporter-collector": "^0.18.2", + "@opentelemetry/context-zone": "^0.19.0", + "@opentelemetry/exporter-collector": "^0.19.0", "@opentelemetry/plugin-react-load": "^0.15.0", - "@opentelemetry/tracing": "^0.18.2", - "@opentelemetry/web": "^0.18.2", + "@opentelemetry/tracing": "^0.19.0", + "@opentelemetry/web": "^0.19.0", "preact": "^10.3.2", "preact-render-to-string": "^5.1.4", "preact-router": "^3.2.1" diff --git a/examples/react-load/react/package.json b/examples/react-load/react/package.json index 0004a25838e..250833e2b6b 100644 --- a/examples/react-load/react/package.json +++ b/examples/react-load/react/package.json @@ -36,12 +36,12 @@ "ts-loader": "^6.0.4" }, "dependencies": { - "@opentelemetry/context-zone": "^0.18.2", - "@opentelemetry/core": "^0.18.2", - "@opentelemetry/exporter-collector": "^0.18.2", + "@opentelemetry/context-zone": "^0.19.0", + "@opentelemetry/core": "^0.19.0", + "@opentelemetry/exporter-collector": "^0.19.0", "@opentelemetry/plugin-react-load": "^0.15.0", - "@opentelemetry/tracing": "^0.18.2", - "@opentelemetry/web": "^0.18.2", + "@opentelemetry/tracing": "^0.19.0", + "@opentelemetry/web": "^0.19.0", "react": "^16.13.1", "react-dom": "^16.13.1", "react-router-dom": "^5.2.0", diff --git a/examples/redis/package.json b/examples/redis/package.json index 593acb4700e..b6f1d3a3ec5 100644 --- a/examples/redis/package.json +++ b/examples/redis/package.json @@ -30,14 +30,14 @@ "url": "https://github.com/open-telemetry/opentelemetry-js/issues" }, "dependencies": { - "@opentelemetry/api": "^0.18.1", - "@opentelemetry/exporter-jaeger": "^0.18.2", - "@opentelemetry/exporter-zipkin": "^0.18.2", - "@opentelemetry/instrumentation": "^0.18.2", - "@opentelemetry/instrumentation-http": "^0.18.2", + "@opentelemetry/api": "^1.0.0-rc.0", + "@opentelemetry/exporter-jaeger": "^0.19.0", + "@opentelemetry/exporter-zipkin": "^0.19.0", + "@opentelemetry/instrumentation": "^0.19.0", + "@opentelemetry/instrumentation-http": "^0.19.0", "@opentelemetry/instrumentation-redis": "^0.15.0", - "@opentelemetry/node": "^0.18.2", - "@opentelemetry/tracing": "^0.18.2", + "@opentelemetry/node": "^0.19.0", + "@opentelemetry/tracing": "^0.19.0", "axios": "^0.19.0", "express": "^4.17.1", "redis": "^2.8.0" diff --git a/examples/restify/package.json b/examples/restify/package.json index 357c9772527..7bb3e2b1da9 100644 --- a/examples/restify/package.json +++ b/examples/restify/package.json @@ -28,13 +28,13 @@ "url": "https://github.com/open-telemetry/opentelemetry-js/issues" }, "dependencies": { - "@opentelemetry/api": "^0.18.0", - "@opentelemetry/exporter-jaeger": "^0.18.0", - "@opentelemetry/exporter-zipkin": "^0.18.0", - "@opentelemetry/instrumentation": "^0.18.0", - "@opentelemetry/instrumentation-http": "^0.18.0", - "@opentelemetry/node": "^0.18.0", - "@opentelemetry/tracing": "^0.18.0", + "@opentelemetry/api": "^1.0.0-rc.0", + "@opentelemetry/exporter-jaeger": "^0.19.0", + "@opentelemetry/exporter-zipkin": "^0.19.0", + "@opentelemetry/instrumentation": "^0.19.0", + "@opentelemetry/instrumentation-http": "^0.19.0", + "@opentelemetry/node": "^0.19.0", + "@opentelemetry/tracing": "^0.19.0", "restify": "^4.3.4" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js#readme", diff --git a/examples/web/package.json b/examples/web/package.json index d6c776991db..d3752ce096f 100644 --- a/examples/web/package.json +++ b/examples/web/package.json @@ -34,18 +34,18 @@ "webpack-merge": "^4.2.2" }, "dependencies": { - "@opentelemetry/api": "^0.18.1", + "@opentelemetry/api": "^1.0.0-rc.0", "@opentelemetry/auto-instrumentations-web": "^0.15.0", - "@opentelemetry/context-zone": "^0.18.2", - "@opentelemetry/core": "^0.18.2", - "@opentelemetry/exporter-collector": "^0.18.2", - "@opentelemetry/instrumentation": "^0.18.2", + "@opentelemetry/context-zone": "^0.19.0", + "@opentelemetry/core": "^0.19.0", + "@opentelemetry/exporter-collector": "^0.19.0", + "@opentelemetry/instrumentation": "^0.19.0", "@opentelemetry/instrumentation-document-load": "^0.15.0", "@opentelemetry/instrumentation-user-interaction": "^0.15.0", - "@opentelemetry/instrumentation-xml-http-request": "^0.18.2", - "@opentelemetry/propagator-b3": "^0.18.2", - "@opentelemetry/tracing": "^0.18.2", - "@opentelemetry/web": "^0.18.2" + "@opentelemetry/instrumentation-xml-http-request": "^0.19.0", + "@opentelemetry/propagator-b3": "^0.19.0", + "@opentelemetry/tracing": "^0.19.0", + "@opentelemetry/web": "^0.19.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib#readme" } diff --git a/metapackages/auto-instrumentations-node/package.json b/metapackages/auto-instrumentations-node/package.json index ab4c4285522..ab64390e530 100644 --- a/metapackages/auto-instrumentations-node/package.json +++ b/metapackages/auto-instrumentations-node/package.json @@ -43,13 +43,13 @@ "typescript": "4.1.3" }, "dependencies": { - "@opentelemetry/api": "^0.18.1", - "@opentelemetry/instrumentation": "^0.18.2", + "@opentelemetry/api": "^1.0.0-rc.0", + "@opentelemetry/instrumentation": "^0.19.0", "@opentelemetry/instrumentation-dns": "^0.15.0", "@opentelemetry/instrumentation-express": "^0.15.0", "@opentelemetry/instrumentation-graphql": "^0.15.0", - "@opentelemetry/instrumentation-grpc": "^0.18.2", - "@opentelemetry/instrumentation-http": "^0.18.2", + "@opentelemetry/instrumentation-grpc": "^0.19.0", + "@opentelemetry/instrumentation-http": "^0.19.0", "@opentelemetry/instrumentation-ioredis": "^0.15.0", "@opentelemetry/instrumentation-koa": "^0.15.0", "@opentelemetry/instrumentation-mongodb": "^0.15.0", diff --git a/metapackages/auto-instrumentations-web/package.json b/metapackages/auto-instrumentations-web/package.json index bae046d1d3c..1fc92b0155d 100644 --- a/metapackages/auto-instrumentations-web/package.json +++ b/metapackages/auto-instrumentations-web/package.json @@ -55,11 +55,11 @@ "webpack-merge": "5.7.3" }, "dependencies": { - "@opentelemetry/api": "^0.18.1", - "@opentelemetry/instrumentation": "^0.18.2", + "@opentelemetry/api": "^1.0.0-rc.0", + "@opentelemetry/instrumentation": "^0.19.0", "@opentelemetry/instrumentation-document-load": "^0.15.0", - "@opentelemetry/instrumentation-fetch": "^0.18.2", + "@opentelemetry/instrumentation-fetch": "^0.19.0", "@opentelemetry/instrumentation-user-interaction": "^0.15.0", - "@opentelemetry/instrumentation-xml-http-request": "^0.18.2" + "@opentelemetry/instrumentation-xml-http-request": "^0.19.0" } } diff --git a/packages/opentelemetry-host-metrics/package.json b/packages/opentelemetry-host-metrics/package.json index c6701b1f2b8..d12b91963c4 100644 --- a/packages/opentelemetry-host-metrics/package.json +++ b/packages/opentelemetry-host-metrics/package.json @@ -42,7 +42,7 @@ "access": "public" }, "devDependencies": { - "@opentelemetry/exporter-prometheus": "0.18.2", + "@opentelemetry/exporter-prometheus": "0.19.0", "@types/mocha": "8.0.2", "@types/node": "14.0.27", "@types/sinon": "9.0.4", @@ -61,10 +61,10 @@ "typescript": "4.1.3" }, "dependencies": { - "@opentelemetry/api": "^0.18.1", - "@opentelemetry/api-metrics": "^0.18.2", - "@opentelemetry/core": "^0.18.2", - "@opentelemetry/metrics": "^0.18.2", + "@opentelemetry/api": "^1.0.0-rc.0", + "@opentelemetry/api-metrics": "^0.19.0", + "@opentelemetry/core": "^0.19.0", + "@opentelemetry/metrics": "^0.19.0", "systeminformation": "^5.0.0" } } diff --git a/packages/opentelemetry-id-generator-aws-xray/package.json b/packages/opentelemetry-id-generator-aws-xray/package.json index c5c3c479037..88947eb38f8 100644 --- a/packages/opentelemetry-id-generator-aws-xray/package.json +++ b/packages/opentelemetry-id-generator-aws-xray/package.json @@ -67,7 +67,7 @@ "webpack": "4.46.0" }, "dependencies": { - "@opentelemetry/api": "^0.18.0", - "@opentelemetry/core": "^0.18.0" + "@opentelemetry/api": "^1.0.0-rc.0", + "@opentelemetry/core": "^0.19.0" } } diff --git a/packages/opentelemetry-test-utils/package.json b/packages/opentelemetry-test-utils/package.json index a34f7032ed4..6e5235c6330 100644 --- a/packages/opentelemetry-test-utils/package.json +++ b/packages/opentelemetry-test-utils/package.json @@ -32,8 +32,8 @@ "typescript": "4.1.3" }, "dependencies": { - "@opentelemetry/api": "0.18.1", - "@opentelemetry/core": "0.18.2", - "@opentelemetry/tracing": "0.18.2" + "@opentelemetry/api": "1.0.0-rc.0", + "@opentelemetry/core": "0.19.0", + "@opentelemetry/tracing": "0.19.0" } } diff --git a/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json b/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json index 5943fd3a7a0..005d0e3629b 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json +++ b/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json @@ -41,8 +41,8 @@ "access": "public" }, "devDependencies": { - "@opentelemetry/core": "0.18.2", - "@opentelemetry/node": "0.18.2", + "@opentelemetry/core": "0.19.0", + "@opentelemetry/node": "0.19.0", "@types/aws-lambda": "8.10.73", "@types/mocha": "7.0.2", "@types/node": "14.0.27", @@ -63,10 +63,10 @@ "typescript": "3.9.7" }, "dependencies": { - "@opentelemetry/api": "^0.18.1", - "@opentelemetry/instrumentation": "^0.18.2", - "@opentelemetry/resources": "^0.18.2", - "@opentelemetry/semantic-conventions": "^0.18.2", - "@opentelemetry/tracing": "^0.18.2" + "@opentelemetry/api": "^1.0.0-rc.0", + "@opentelemetry/instrumentation": "^0.19.0", + "@opentelemetry/resources": "^0.19.0", + "@opentelemetry/semantic-conventions": "^0.19.0", + "@opentelemetry/tracing": "^0.19.0" } } diff --git a/plugins/node/opentelemetry-instrumentation-aws-lambda/src/aws-lambda.ts b/plugins/node/opentelemetry-instrumentation-aws-lambda/src/aws-lambda.ts index c6664b7bd63..1ca0468eefe 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-lambda/src/aws-lambda.ts +++ b/plugins/node/opentelemetry-instrumentation-aws-lambda/src/aws-lambda.ts @@ -33,7 +33,7 @@ import { TracerProvider, } from '@opentelemetry/api'; import { CLOUD_RESOURCE } from '@opentelemetry/resources'; -import { FaasAttribute } from '@opentelemetry/semantic-conventions'; +import { SemanticAttributes } from '@opentelemetry/semantic-conventions'; import { Callback, Context, Handler } from 'aws-lambda'; @@ -120,8 +120,8 @@ export class AwsLambdaInstrumentation extends InstrumentationBase { const span = plugin.tracer.startSpan(name, { kind: SpanKind.SERVER, attributes: { - [FaasAttribute.FAAS_EXECUTION]: context.awsRequestId, - [FaasAttribute.FAAS_ID]: context.invokedFunctionArn, + [SemanticAttributes.FAAS_EXECUTION]: context.awsRequestId, + 'faas.id': context.invokedFunctionArn, [CLOUD_RESOURCE.ACCOUNT_ID]: AwsLambdaInstrumentation._extractAccountId( context.invokedFunctionArn ), diff --git a/plugins/node/opentelemetry-instrumentation-aws-lambda/test/integrations/lambda-handler.test.ts b/plugins/node/opentelemetry-instrumentation-aws-lambda/test/integrations/lambda-handler.test.ts index 8837b1e399f..3dd9691ce98 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-lambda/test/integrations/lambda-handler.test.ts +++ b/plugins/node/opentelemetry-instrumentation-aws-lambda/test/integrations/lambda-handler.test.ts @@ -29,10 +29,7 @@ import { NodeTracerProvider } from '@opentelemetry/node'; import { Context } from 'aws-lambda'; import * as assert from 'assert'; import { SpanKind, SpanStatusCode } from '@opentelemetry/api'; -import { - ExceptionAttribute, - FaasAttribute, -} from '@opentelemetry/semantic-conventions'; +import { SemanticAttributes } from '@opentelemetry/semantic-conventions'; const memoryExporter = new InMemorySpanExporter(); const provider = new NodeTracerProvider(); @@ -43,10 +40,10 @@ const assertSpanSuccess = (span: ReadableSpan) => { assert.strictEqual(span.kind, SpanKind.SERVER); assert.strictEqual(span.name, 'my_function'); assert.strictEqual( - span.attributes[FaasAttribute.FAAS_EXECUTION], + span.attributes[SemanticAttributes.FAAS_EXECUTION], 'aws_request_id' ); - assert.strictEqual(span.attributes[FaasAttribute.FAAS_ID], 'my_arn'); + assert.strictEqual(span.attributes['faas.id'], 'my_arn'); assert.strictEqual(span.status.code, SpanStatusCode.UNSET); assert.strictEqual(span.status.message, undefined); }; @@ -55,15 +52,15 @@ const assertSpanFailure = (span: ReadableSpan) => { assert.strictEqual(span.kind, SpanKind.SERVER); assert.strictEqual(span.name, 'my_function'); assert.strictEqual( - span.attributes[FaasAttribute.FAAS_EXECUTION], + span.attributes[SemanticAttributes.FAAS_EXECUTION], 'aws_request_id' ); - assert.strictEqual(span.attributes[FaasAttribute.FAAS_ID], 'my_arn'); + assert.strictEqual(span.attributes['faas.id'], 'my_arn'); assert.strictEqual(span.status.code, SpanStatusCode.ERROR); assert.strictEqual(span.status.message, 'handler error'); assert.strictEqual(span.events.length, 1); assert.strictEqual( - span.events[0].attributes![ExceptionAttribute.MESSAGE], + span.events[0].attributes![SemanticAttributes.EXCEPTION_MESSAGE], 'handler error' ); }; diff --git a/plugins/node/opentelemetry-instrumentation-bunyan/package.json b/plugins/node/opentelemetry-instrumentation-bunyan/package.json index f539196a377..ce1fe9f0028 100644 --- a/plugins/node/opentelemetry-instrumentation-bunyan/package.json +++ b/plugins/node/opentelemetry-instrumentation-bunyan/package.json @@ -42,10 +42,10 @@ "access": "public" }, "devDependencies": { - "@opentelemetry/context-async-hooks": "0.18.2", - "@opentelemetry/core": "0.18.2", - "@opentelemetry/node": "0.18.2", - "@opentelemetry/tracing": "0.18.2", + "@opentelemetry/context-async-hooks": "0.19.0", + "@opentelemetry/core": "0.19.0", + "@opentelemetry/node": "0.19.0", + "@opentelemetry/tracing": "0.19.0", "@types/mocha": "7.0.2", "@types/node": "14.0.27", "@types/sinon": "9.0.4", @@ -64,7 +64,7 @@ "typescript": "4.1.3" }, "dependencies": { - "@opentelemetry/api": "^0.18.0", - "@opentelemetry/instrumentation": "^0.18.0" + "@opentelemetry/api": "^1.0.0-rc.0", + "@opentelemetry/instrumentation": "^0.19.0" } } diff --git a/plugins/node/opentelemetry-instrumentation-dns/package.json b/plugins/node/opentelemetry-instrumentation-dns/package.json index 0fae06fdfdb..d663ee7a01a 100644 --- a/plugins/node/opentelemetry-instrumentation-dns/package.json +++ b/plugins/node/opentelemetry-instrumentation-dns/package.json @@ -41,9 +41,9 @@ "access": "public" }, "devDependencies": { - "@opentelemetry/core": "0.18.2", - "@opentelemetry/node": "0.18.2", - "@opentelemetry/tracing": "0.18.2", + "@opentelemetry/core": "0.19.0", + "@opentelemetry/node": "0.19.0", + "@opentelemetry/tracing": "0.19.0", "@types/mocha": "7.0.2", "@types/node": "14.0.27", "@types/semver": "7.3.1", @@ -62,9 +62,9 @@ "typescript": "3.9.7" }, "dependencies": { - "@opentelemetry/api": "^0.18.1", - "@opentelemetry/instrumentation": "^0.18.2", - "@opentelemetry/semantic-conventions": "^0.18.2", + "@opentelemetry/api": "^1.0.0-rc.0", + "@opentelemetry/instrumentation": "^0.19.0", + "@opentelemetry/semantic-conventions": "^0.19.0", "semver": "^7.3.2" } } diff --git a/plugins/node/opentelemetry-instrumentation-dns/src/dns.ts b/plugins/node/opentelemetry-instrumentation-dns/src/dns.ts index 5308de035bc..3ab8d096571 100644 --- a/plugins/node/opentelemetry-instrumentation-dns/src/dns.ts +++ b/plugins/node/opentelemetry-instrumentation-dns/src/dns.ts @@ -16,7 +16,7 @@ import { LookupAddress } from 'dns'; import { diag, Span, SpanKind } from '@opentelemetry/api'; -import { GeneralAttribute } from '@opentelemetry/semantic-conventions'; +import { SemanticAttributes } from '@opentelemetry/semantic-conventions'; import { InstrumentationBase, InstrumentationNodeModuleDefinition, @@ -114,7 +114,7 @@ export class DnsInstrumentation extends InstrumentationBase { const span = plugin.tracer.startSpan(name, { kind: SpanKind.CLIENT, attributes: { - [GeneralAttribute.NET_PEER_HOSTNAME]: hostname, + [SemanticAttributes.NET_PEER_NAME]: hostname, }, }); diff --git a/plugins/node/opentelemetry-instrumentation-dns/test/utils/assertSpan.ts b/plugins/node/opentelemetry-instrumentation-dns/test/utils/assertSpan.ts index 6f88f1a3b8f..be30c58b324 100644 --- a/plugins/node/opentelemetry-instrumentation-dns/test/utils/assertSpan.ts +++ b/plugins/node/opentelemetry-instrumentation-dns/test/utils/assertSpan.ts @@ -17,7 +17,7 @@ import { SpanKind, SpanStatus, SpanStatusCode } from '@opentelemetry/api'; import { hrTimeToNanoseconds } from '@opentelemetry/core'; import { ReadableSpan } from '@opentelemetry/tracing'; -import { GeneralAttribute } from '@opentelemetry/semantic-conventions'; +import { SemanticAttributes } from '@opentelemetry/semantic-conventions'; import * as assert from 'assert'; import type { LookupAddress } from 'dns'; import { AttributeNames } from '../../src/enums/AttributeNames'; @@ -45,7 +45,7 @@ export const assertSpan = ( span.status.message ); assert.strictEqual( - span.attributes[GeneralAttribute.NET_PEER_HOSTNAME], + span.attributes[SemanticAttributes.NET_PEER_NAME], validations.hostname ); diff --git a/plugins/node/opentelemetry-instrumentation-express/package.json b/plugins/node/opentelemetry-instrumentation-express/package.json index 899606bf5a3..a44eaab1255 100644 --- a/plugins/node/opentelemetry-instrumentation-express/package.json +++ b/plugins/node/opentelemetry-instrumentation-express/package.json @@ -42,9 +42,9 @@ "access": "public" }, "devDependencies": { - "@opentelemetry/context-async-hooks": "0.18.2", - "@opentelemetry/node": "0.18.2", - "@opentelemetry/tracing": "0.18.2", + "@opentelemetry/context-async-hooks": "0.19.0", + "@opentelemetry/node": "0.19.0", + "@opentelemetry/tracing": "0.19.0", "@types/express": "4.17.7", "@types/mocha": "7.0.2", "@types/node": "14.0.27", @@ -61,9 +61,9 @@ "typescript": "4.1.3" }, "dependencies": { - "@opentelemetry/api": "^0.18.1", - "@opentelemetry/core": "^0.18.2", - "@opentelemetry/instrumentation": "^0.18.2", - "@opentelemetry/semantic-conventions": "^0.18.2" + "@opentelemetry/api": "^1.0.0-rc.0", + "@opentelemetry/core": "^0.19.0", + "@opentelemetry/instrumentation": "^0.19.0", + "@opentelemetry/semantic-conventions": "^0.19.0" } } diff --git a/plugins/node/opentelemetry-instrumentation-express/src/express.ts b/plugins/node/opentelemetry-instrumentation-express/src/express.ts index 1d67d25df92..676d9358a43 100644 --- a/plugins/node/opentelemetry-instrumentation-express/src/express.ts +++ b/plugins/node/opentelemetry-instrumentation-express/src/express.ts @@ -34,7 +34,7 @@ import { InstrumentationNodeModuleDefinition, isWrapped, } from '@opentelemetry/instrumentation'; -import { HttpAttribute } from '@opentelemetry/semantic-conventions'; +import { SemanticAttributes } from '@opentelemetry/semantic-conventions'; /** * This symbol is used to mark express layer as being already instrumented @@ -183,7 +183,7 @@ export class ExpressInstrumentation extends InstrumentationBase< .filter(path => path !== '/' && path !== '/*') .join(''); const attributes: SpanAttributes = { - [HttpAttribute.HTTP_ROUTE]: route.length > 0 ? route : undefined, + [SemanticAttributes.HTTP_ROUTE]: route.length > 0 ? route : undefined, }; const metadata = getLayerMetadata(layer, layerPath); const type = metadata.attributes[ diff --git a/plugins/node/opentelemetry-instrumentation-express/test/express.test.ts b/plugins/node/opentelemetry-instrumentation-express/test/express.test.ts index 30ef71c5a6e..a72d2f4452c 100644 --- a/plugins/node/opentelemetry-instrumentation-express/test/express.test.ts +++ b/plugins/node/opentelemetry-instrumentation-express/test/express.test.ts @@ -24,7 +24,7 @@ import { import * as assert from 'assert'; import { CustomAttributeNames, ExpressInstrumentationSpan } from '../src/types'; import { ExpressInstrumentation } from '../src'; -import { HttpAttribute } from '@opentelemetry/semantic-conventions'; +import { SemanticAttributes } from '@opentelemetry/semantic-conventions'; const instrumentation = new ExpressInstrumentation(); instrumentation.enable(); @@ -164,7 +164,7 @@ describe('ExpressInstrumentation', () => { .find(span => span.name.includes('request handler')); assert.notStrictEqual(requestHandlerSpan, undefined); assert.strictEqual( - requestHandlerSpan?.attributes[HttpAttribute.HTTP_ROUTE], + requestHandlerSpan?.attributes[SemanticAttributes.HTTP_ROUTE], '/toto/:id' ); assert.strictEqual( diff --git a/plugins/node/opentelemetry-instrumentation-graphql/package.json b/plugins/node/opentelemetry-instrumentation-graphql/package.json index c35c5e12915..5075460b095 100644 --- a/plugins/node/opentelemetry-instrumentation-graphql/package.json +++ b/plugins/node/opentelemetry-instrumentation-graphql/package.json @@ -43,7 +43,7 @@ "access": "public" }, "devDependencies": { - "@opentelemetry/tracing": "0.18.2", + "@opentelemetry/tracing": "0.19.0", "@types/graphql": "14.5.0", "@types/mocha": "8.0.1", "@types/node": "14.0.27", @@ -61,7 +61,7 @@ "typescript": "4.1.3" }, "dependencies": { - "@opentelemetry/api": "^0.18.1", - "@opentelemetry/instrumentation": "^0.18.2" + "@opentelemetry/api": "^1.0.0-rc.0", + "@opentelemetry/instrumentation": "^0.19.0" } } diff --git a/plugins/node/opentelemetry-instrumentation-hapi/package.json b/plugins/node/opentelemetry-instrumentation-hapi/package.json index fbc719b477b..2339fbeaf78 100644 --- a/plugins/node/opentelemetry-instrumentation-hapi/package.json +++ b/plugins/node/opentelemetry-instrumentation-hapi/package.json @@ -43,9 +43,9 @@ "devDependencies": { "@hapi/hapi": "20.0.1", "@hapi/podium": "4.1.1", - "@opentelemetry/context-async-hooks": "0.18.2", - "@opentelemetry/node": "0.18.2", - "@opentelemetry/tracing": "0.18.2", + "@opentelemetry/context-async-hooks": "0.19.0", + "@opentelemetry/node": "0.19.0", + "@opentelemetry/tracing": "0.19.0", "@types/hapi__hapi": "20.0.1", "@types/mocha": "7.0.2", "@types/node": "12.12.47", @@ -62,8 +62,8 @@ "typescript": "4.1.3" }, "dependencies": { - "@opentelemetry/api": "^0.18.1", - "@opentelemetry/instrumentation": "^0.18.2", - "@opentelemetry/semantic-conventions": "^0.18.2" + "@opentelemetry/api": "^1.0.0-rc.0", + "@opentelemetry/instrumentation": "^0.19.0", + "@opentelemetry/semantic-conventions": "^0.19.0" } } diff --git a/plugins/node/opentelemetry-instrumentation-hapi/src/utils.ts b/plugins/node/opentelemetry-instrumentation-hapi/src/utils.ts index e3deceb9e46..c42378554fe 100644 --- a/plugins/node/opentelemetry-instrumentation-hapi/src/utils.ts +++ b/plugins/node/opentelemetry-instrumentation-hapi/src/utils.ts @@ -15,7 +15,7 @@ */ import { SpanAttributes } from '@opentelemetry/api'; -import { HttpAttribute } from '@opentelemetry/semantic-conventions'; +import { SemanticAttributes } from '@opentelemetry/semantic-conventions'; import type * as Hapi from '@hapi/hapi'; import { AttributeNames, @@ -76,8 +76,8 @@ export const getRouteMetadata = ( if (pluginName) { return { attributes: { - [HttpAttribute.HTTP_ROUTE]: route.path, - [HttpAttribute.HTTP_METHOD]: route.method, + [SemanticAttributes.HTTP_ROUTE]: route.path, + [SemanticAttributes.HTTP_METHOD]: route.method, [AttributeNames.HAPI_TYPE]: HapiLayerType.PLUGIN, [AttributeNames.PLUGIN_NAME]: pluginName, }, @@ -86,8 +86,8 @@ export const getRouteMetadata = ( } return { attributes: { - [HttpAttribute.HTTP_ROUTE]: route.path, - [HttpAttribute.HTTP_METHOD]: route.method, + [SemanticAttributes.HTTP_ROUTE]: route.path, + [SemanticAttributes.HTTP_METHOD]: route.method, [AttributeNames.HAPI_TYPE]: HapiLayerType.ROUTER, }, name: `route - ${route.path}`, diff --git a/plugins/node/opentelemetry-instrumentation-ioredis/package.json b/plugins/node/opentelemetry-instrumentation-ioredis/package.json index cc80567c60a..d9bd3801be9 100644 --- a/plugins/node/opentelemetry-instrumentation-ioredis/package.json +++ b/plugins/node/opentelemetry-instrumentation-ioredis/package.json @@ -44,10 +44,10 @@ "access": "public" }, "devDependencies": { - "@opentelemetry/context-async-hooks": "0.18.2", - "@opentelemetry/node": "0.18.2", + "@opentelemetry/context-async-hooks": "0.19.0", + "@opentelemetry/node": "0.19.0", "@opentelemetry/test-utils": "^0.15.0", - "@opentelemetry/tracing": "0.18.2", + "@opentelemetry/tracing": "0.19.0", "@types/ioredis": "4.17.3", "@types/mocha": "7.0.2", "@types/node": "14.0.27", @@ -66,8 +66,8 @@ "typescript": "3.9.7" }, "dependencies": { - "@opentelemetry/api": "^0.18.1", - "@opentelemetry/instrumentation": "^0.18.2", - "@opentelemetry/semantic-conventions": "^0.18.2" + "@opentelemetry/api": "^1.0.0-rc.0", + "@opentelemetry/instrumentation": "^0.19.0", + "@opentelemetry/semantic-conventions": "^0.19.0" } } diff --git a/plugins/node/opentelemetry-instrumentation-ioredis/src/ioredis.ts b/plugins/node/opentelemetry-instrumentation-ioredis/src/ioredis.ts index 62aaff24608..97f2e46b83a 100644 --- a/plugins/node/opentelemetry-instrumentation-ioredis/src/ioredis.ts +++ b/plugins/node/opentelemetry-instrumentation-ioredis/src/ioredis.ts @@ -33,7 +33,6 @@ export class IORedisInstrumentation extends InstrumentationBase< typeof ioredisTypes > { static readonly DB_SYSTEM = 'redis'; - readonly supportedVersions = ['>1 <5']; constructor(_config: IORedisInstrumentationConfig = {}) { super( @@ -47,7 +46,7 @@ export class IORedisInstrumentation extends InstrumentationBase< return [ new InstrumentationNodeModuleDefinition( 'ioredis', - this.supportedVersions, + ['>1 <5'], moduleExports => { diag.debug('Applying patch for ioredis'); if (isWrapped(moduleExports.prototype.sendCommand)) { diff --git a/plugins/node/opentelemetry-instrumentation-ioredis/src/utils.ts b/plugins/node/opentelemetry-instrumentation-ioredis/src/utils.ts index c1db621a333..5136dafce96 100644 --- a/plugins/node/opentelemetry-instrumentation-ioredis/src/utils.ts +++ b/plugins/node/opentelemetry-instrumentation-ioredis/src/utils.ts @@ -30,10 +30,7 @@ import { DbStatementSerializer, } from './types'; import { IORedisInstrumentation } from './ioredis'; -import { - DatabaseAttribute, - GeneralAttribute, -} from '@opentelemetry/semantic-conventions'; +import { SemanticAttributes } from '@opentelemetry/semantic-conventions'; import { safeExecuteInTheMiddle } from '@opentelemetry/instrumentation'; const endSpan = (span: Span, err: NodeJS.ErrnoException | null | undefined) => { @@ -52,16 +49,16 @@ export const traceConnection = (tracer: Tracer, original: Function) => { const span = tracer.startSpan('connect', { kind: SpanKind.CLIENT, attributes: { - [DatabaseAttribute.DB_SYSTEM]: IORedisInstrumentation.DB_SYSTEM, - [DatabaseAttribute.DB_STATEMENT]: 'connect', + [SemanticAttributes.DB_SYSTEM]: IORedisInstrumentation.DB_SYSTEM, + [SemanticAttributes.DB_STATEMENT]: 'connect', }, }); const { host, port } = this.options; span.setAttributes({ - [GeneralAttribute.NET_PEER_NAME]: host, - [GeneralAttribute.NET_PEER_PORT]: port, - [GeneralAttribute.NET_PEER_ADDRESS]: `redis://${host}:${port}`, + [SemanticAttributes.NET_PEER_NAME]: host, + [SemanticAttributes.NET_PEER_PORT]: port, + [SemanticAttributes.NET_PEER_IP]: `redis://${host}:${port}`, }); try { const client = original.apply(this, arguments); @@ -102,8 +99,8 @@ export const traceSendCommand = ( const span = tracer.startSpan(cmd.name, { kind: SpanKind.CLIENT, attributes: { - [DatabaseAttribute.DB_SYSTEM]: IORedisInstrumentation.DB_SYSTEM, - [DatabaseAttribute.DB_STATEMENT]: dbStatementSerializer( + [SemanticAttributes.DB_SYSTEM]: IORedisInstrumentation.DB_SYSTEM, + [SemanticAttributes.DB_STATEMENT]: dbStatementSerializer( cmd.name, cmd.args ), @@ -113,9 +110,9 @@ export const traceSendCommand = ( const { host, port } = this.options; span.setAttributes({ - [GeneralAttribute.NET_PEER_NAME]: host, - [GeneralAttribute.NET_PEER_PORT]: port, - [GeneralAttribute.NET_PEER_ADDRESS]: `redis://${host}:${port}`, + [SemanticAttributes.NET_PEER_NAME]: host, + [SemanticAttributes.NET_PEER_PORT]: port, + [SemanticAttributes.NET_PEER_IP]: `redis://${host}:${port}`, }); try { diff --git a/plugins/node/opentelemetry-instrumentation-ioredis/test/ioredis.test.ts b/plugins/node/opentelemetry-instrumentation-ioredis/test/ioredis.test.ts index 841de123379..0b8c4c4cdbf 100644 --- a/plugins/node/opentelemetry-instrumentation-ioredis/test/ioredis.test.ts +++ b/plugins/node/opentelemetry-instrumentation-ioredis/test/ioredis.test.ts @@ -38,11 +38,7 @@ import { IORedisInstrumentationConfig, DbStatementSerializer, } from '../src/types'; -import { - DatabaseAttribute, - ExceptionAttribute, - GeneralAttribute, -} from '@opentelemetry/semantic-conventions'; +import { SemanticAttributes } from '@opentelemetry/semantic-conventions'; const memoryExporter = new InMemorySpanExporter(); @@ -54,10 +50,10 @@ const CONFIG = { const URL = `redis://${CONFIG.host}:${CONFIG.port}`; const DEFAULT_ATTRIBUTES = { - [DatabaseAttribute.DB_SYSTEM]: IORedisInstrumentation.DB_SYSTEM, - [GeneralAttribute.NET_PEER_NAME]: CONFIG.host, - [GeneralAttribute.NET_PEER_PORT]: CONFIG.port, - [GeneralAttribute.NET_PEER_ADDRESS]: URL, + [SemanticAttributes.DB_SYSTEM]: IORedisInstrumentation.DB_SYSTEM, + [SemanticAttributes.NET_PEER_NAME]: CONFIG.host, + [SemanticAttributes.NET_PEER_PORT]: CONFIG.port, + [SemanticAttributes.NET_PEER_IP]: URL, }; const unsetStatus: SpanStatus = { @@ -69,8 +65,10 @@ const predictableStackTrace = const sanitizeEventForAssertion = (span: ReadableSpan) => { span.events.forEach(e => { // stack trace includes data such as /user/{userName}/repos/{projectName} - if (e.attributes?.[ExceptionAttribute.STACKTRACE]) { - e.attributes[ExceptionAttribute.STACKTRACE] = predictableStackTrace; + if (e.attributes?.[SemanticAttributes.EXCEPTION_STACKTRACE]) { + e.attributes[ + SemanticAttributes.EXCEPTION_STACKTRACE + ] = predictableStackTrace; } // since time will change on each test invocation, it is being replaced to predicable value @@ -133,7 +131,7 @@ describe('ioredis', () => { let client: ioredisTypes.Redis; const attributes = { ...DEFAULT_ATTRIBUTES, - [DatabaseAttribute.DB_STATEMENT]: 'connect', + [SemanticAttributes.DB_STATEMENT]: 'connect', }; const readyHandler = () => { const endedSpans = memoryExporter.getFinishedSpans(); @@ -232,7 +230,7 @@ describe('ioredis', () => { it(`should create a child span for cb style ${command.description}`, done => { const attributes = { ...DEFAULT_ATTRIBUTES, - [DatabaseAttribute.DB_STATEMENT]: `${ + [SemanticAttributes.DB_STATEMENT]: `${ command.name } ${command.args.join(' ')}`, }; @@ -264,7 +262,7 @@ describe('ioredis', () => { it('should create a child span for hset promise', async () => { const attributes = { ...DEFAULT_ATTRIBUTES, - [DatabaseAttribute.DB_STATEMENT]: `hset ${hashKeyName} random random`, + [SemanticAttributes.DB_STATEMENT]: `hset ${hashKeyName} random random`, }; const span = provider.getTracer('ioredis-test').startSpan('test span'); await context.with(setSpan(context.active(), span), async () => { @@ -306,15 +304,17 @@ describe('ioredis', () => { const exceptionEvent = ioredisSpan.events[0]; assert.strictEqual(exceptionEvent.name, 'exception'); assert.strictEqual( - exceptionEvent.attributes?.[ExceptionAttribute.MESSAGE], + exceptionEvent.attributes?.[SemanticAttributes.EXCEPTION_MESSAGE], ex.message ); assert.strictEqual( - exceptionEvent.attributes?.[ExceptionAttribute.STACKTRACE], + exceptionEvent.attributes?.[ + SemanticAttributes.EXCEPTION_STACKTRACE + ], ex.stack ); assert.strictEqual( - exceptionEvent.attributes?.[ExceptionAttribute.TYPE], + exceptionEvent.attributes?.[SemanticAttributes.EXCEPTION_TYPE], ex.name ); } @@ -324,7 +324,7 @@ describe('ioredis', () => { it('should create a child span for streamify scanning', done => { const attributes = { ...DEFAULT_ATTRIBUTES, - [DatabaseAttribute.DB_STATEMENT]: 'scan 0', + [SemanticAttributes.DB_STATEMENT]: 'scan 0', }; const span = provider.getTracer('ioredis-test').startSpan('test span'); context.with(setSpan(context.active(), span), () => { @@ -402,7 +402,7 @@ describe('ioredis', () => { const attributes = { ...DEFAULT_ATTRIBUTES, - [DatabaseAttribute.DB_STATEMENT]: 'subscribe news music', + [SemanticAttributes.DB_STATEMENT]: 'subscribe news music', }; testUtils.assertSpan( endedSpans[4], @@ -421,7 +421,7 @@ describe('ioredis', () => { it('should create a child span for lua', done => { const attributes = { ...DEFAULT_ATTRIBUTES, - [DatabaseAttribute.DB_STATEMENT]: `evalsha bfbf458525d6a0b19200bfd6db3af481156b367b 1 ${testKeyName}`, + [SemanticAttributes.DB_STATEMENT]: `evalsha bfbf458525d6a0b19200bfd6db3af481156b367b 1 ${testKeyName}`, }; const span = provider.getTracer('ioredis-test').startSpan('test span'); @@ -454,10 +454,10 @@ describe('ioredis', () => { [ { attributes: { - [ExceptionAttribute.MESSAGE]: + [SemanticAttributes.EXCEPTION_MESSAGE]: 'NOSCRIPT No matching script. Please use EVAL.', - [ExceptionAttribute.STACKTRACE]: predictableStackTrace, - [ExceptionAttribute.TYPE]: 'ReplyError', + [SemanticAttributes.EXCEPTION_STACKTRACE]: predictableStackTrace, + [SemanticAttributes.EXCEPTION_TYPE]: 'ReplyError', }, name: 'exception', time: [0, 0], @@ -488,7 +488,7 @@ describe('ioredis', () => { it('should create a child span for multi/transaction', done => { const attributes = { ...DEFAULT_ATTRIBUTES, - [DatabaseAttribute.DB_STATEMENT]: 'multi', + [SemanticAttributes.DB_STATEMENT]: 'multi', }; const span = provider.getTracer('ioredis-test').startSpan('test span'); @@ -524,7 +524,7 @@ describe('ioredis', () => { it('should create a child span for pipeline', done => { const attributes = { ...DEFAULT_ATTRIBUTES, - [DatabaseAttribute.DB_STATEMENT]: 'set foo bar', + [SemanticAttributes.DB_STATEMENT]: 'set foo bar', }; const span = provider.getTracer('ioredis-test').startSpan('test span'); @@ -558,7 +558,7 @@ describe('ioredis', () => { it('should create a child span for get promise', async () => { const attributes = { ...DEFAULT_ATTRIBUTES, - [DatabaseAttribute.DB_STATEMENT]: `get ${testKeyName}`, + [SemanticAttributes.DB_STATEMENT]: `get ${testKeyName}`, }; const span = provider.getTracer('ioredis-test').startSpan('test span'); await context.with(setSpan(context.active(), span), async () => { @@ -587,7 +587,7 @@ describe('ioredis', () => { it('should create a child span for del', async () => { const attributes = { ...DEFAULT_ATTRIBUTES, - [DatabaseAttribute.DB_STATEMENT]: `del ${testKeyName}`, + [SemanticAttributes.DB_STATEMENT]: `del ${testKeyName}`, }; const span = provider.getTracer('ioredis-test').startSpan('test span'); await context.with(setSpan(context.active(), span), async () => { @@ -649,7 +649,7 @@ describe('ioredis', () => { SpanKind.CLIENT, { ...DEFAULT_ATTRIBUTES, - [DatabaseAttribute.DB_STATEMENT]: `set ${testKeyName} data`, + [SemanticAttributes.DB_STATEMENT]: `set ${testKeyName} data`, }, [], unsetStatus @@ -690,7 +690,7 @@ describe('ioredis', () => { it(`should tag the span with a custom db.statement for cb style ${command.description}`, done => { const attributes = { ...DEFAULT_ATTRIBUTES, - [DatabaseAttribute.DB_STATEMENT]: dbStatementSerializer( + [SemanticAttributes.DB_STATEMENT]: dbStatementSerializer( command.name, command.args ), diff --git a/plugins/node/opentelemetry-instrumentation-koa/package.json b/plugins/node/opentelemetry-instrumentation-koa/package.json index 40f3be9e839..6bd7c94c6ff 100644 --- a/plugins/node/opentelemetry-instrumentation-koa/package.json +++ b/plugins/node/opentelemetry-instrumentation-koa/package.json @@ -44,9 +44,9 @@ }, "devDependencies": { "@koa/router": "9.4.0", - "@opentelemetry/context-async-hooks": "0.18.2", - "@opentelemetry/node": "0.18.2", - "@opentelemetry/tracing": "0.18.2", + "@opentelemetry/context-async-hooks": "0.19.0", + "@opentelemetry/node": "0.19.0", + "@opentelemetry/tracing": "0.19.0", "@types/koa": "2.11.4", "@types/koa__router": "8.0.2", "@types/mocha": "7.0.2", @@ -64,9 +64,9 @@ "typescript": "4.1.3" }, "dependencies": { - "@opentelemetry/api": "^0.18.1", - "@opentelemetry/core": "^0.18.2", - "@opentelemetry/instrumentation": "^0.18.2", - "@opentelemetry/semantic-conventions": "^0.18.2" + "@opentelemetry/api": "^1.0.0-rc.0", + "@opentelemetry/core": "^0.19.0", + "@opentelemetry/instrumentation": "^0.19.0", + "@opentelemetry/semantic-conventions": "^0.19.0" } } diff --git a/plugins/node/opentelemetry-instrumentation-koa/src/utils.ts b/plugins/node/opentelemetry-instrumentation-koa/src/utils.ts index 1496d1ec34b..8e43934dbf2 100644 --- a/plugins/node/opentelemetry-instrumentation-koa/src/utils.ts +++ b/plugins/node/opentelemetry-instrumentation-koa/src/utils.ts @@ -20,7 +20,7 @@ import { KoaLayerType, } from './types'; import { SpanAttributes } from '@opentelemetry/api'; -import { HttpAttribute } from '@opentelemetry/semantic-conventions'; +import { SemanticAttributes } from '@opentelemetry/semantic-conventions'; export const getMiddlewareMetadata = ( context: KoaContext, @@ -36,7 +36,7 @@ export const getMiddlewareMetadata = ( attributes: { [AttributeNames.KOA_NAME]: layerPath, [AttributeNames.KOA_TYPE]: KoaLayerType.ROUTER, - [HttpAttribute.HTTP_ROUTE]: layerPath, + [SemanticAttributes.HTTP_ROUTE]: layerPath, }, name: `router - ${layerPath}`, }; diff --git a/plugins/node/opentelemetry-instrumentation-koa/test/koa.test.ts b/plugins/node/opentelemetry-instrumentation-koa/test/koa.test.ts index 24633ff0df1..3aae196cf97 100644 --- a/plugins/node/opentelemetry-instrumentation-koa/test/koa.test.ts +++ b/plugins/node/opentelemetry-instrumentation-koa/test/koa.test.ts @@ -22,11 +22,7 @@ import { InMemorySpanExporter, SimpleSpanProcessor, } from '@opentelemetry/tracing'; -import { - ExceptionAttribute, - ExceptionEventName, - HttpAttribute, -} from '@opentelemetry/semantic-conventions'; +import { SemanticAttributes } from '@opentelemetry/semantic-conventions'; import { KoaInstrumentation } from '../src'; const plugin = new KoaInstrumentation(); @@ -152,7 +148,7 @@ describe('Koa Instrumentation', () => { ); assert.strictEqual( - requestHandlerSpan?.attributes[HttpAttribute.HTTP_ROUTE], + requestHandlerSpan?.attributes[SemanticAttributes.HTTP_ROUTE], '/post/:id' ); @@ -194,7 +190,7 @@ describe('Koa Instrumentation', () => { ); assert.strictEqual( - requestHandlerSpan?.attributes[HttpAttribute.HTTP_ROUTE], + requestHandlerSpan?.attributes[SemanticAttributes.HTTP_ROUTE], '/:first/post/:id' ); @@ -234,7 +230,7 @@ describe('Koa Instrumentation', () => { ); assert.strictEqual( - requestHandlerSpan?.attributes[HttpAttribute.HTTP_ROUTE], + requestHandlerSpan?.attributes[SemanticAttributes.HTTP_ROUTE], '/:first/post/:id' ); @@ -364,12 +360,12 @@ describe('Koa Instrumentation', () => { .find(span => span.name === 'rootSpan'); assert.ok(exportedRootSpan); const exceptionEvent = requestHandlerSpan.events.find( - event => event.name === ExceptionEventName + event => event.name === 'exception' ); assert.ok(exceptionEvent, 'There should be an exception event recorded'); assert.deepStrictEqual(exceptionEvent.name, 'exception'); assert.deepStrictEqual( - exceptionEvent.attributes![ExceptionAttribute.MESSAGE], + exceptionEvent.attributes![SemanticAttributes.EXCEPTION_MESSAGE], 'I failed!' ); }); diff --git a/plugins/node/opentelemetry-instrumentation-mongodb/package.json b/plugins/node/opentelemetry-instrumentation-mongodb/package.json index 06243a63ca3..308b4a1e1ca 100644 --- a/plugins/node/opentelemetry-instrumentation-mongodb/package.json +++ b/plugins/node/opentelemetry-instrumentation-mongodb/package.json @@ -43,9 +43,9 @@ "access": "public" }, "devDependencies": { - "@opentelemetry/context-async-hooks": "0.18.2", - "@opentelemetry/node": "0.18.2", - "@opentelemetry/tracing": "0.18.2", + "@opentelemetry/context-async-hooks": "0.19.0", + "@opentelemetry/node": "0.19.0", + "@opentelemetry/tracing": "0.19.0", "@types/mocha": "7.0.2", "@types/mongodb": "3.5.25", "@types/node": "14.0.27", @@ -62,8 +62,8 @@ "typescript": "4.1.3" }, "dependencies": { - "@opentelemetry/api": "^0.18.1", - "@opentelemetry/instrumentation": "^0.18.2", - "@opentelemetry/semantic-conventions": "^0.18.2" + "@opentelemetry/api": "^1.0.0-rc.0", + "@opentelemetry/instrumentation": "^0.19.0", + "@opentelemetry/semantic-conventions": "^0.19.0" } } diff --git a/plugins/node/opentelemetry-instrumentation-mongodb/src/mongodb.ts b/plugins/node/opentelemetry-instrumentation-mongodb/src/mongodb.ts index ff62d865ec0..f180a481b93 100644 --- a/plugins/node/opentelemetry-instrumentation-mongodb/src/mongodb.ts +++ b/plugins/node/opentelemetry-instrumentation-mongodb/src/mongodb.ts @@ -15,33 +15,30 @@ */ import { - getSpan, - SpanStatusCode, - Span, context, diag, + getSpan, + Span, SpanKind, + SpanStatusCode, } from '@opentelemetry/api'; +import { + InstrumentationBase, + InstrumentationNodeModuleDefinition, + InstrumentationNodeModuleFile, + isWrapped, +} from '@opentelemetry/instrumentation'; +import { SemanticAttributes } from '@opentelemetry/semantic-conventions'; import type * as mongodb from 'mongodb'; import { + CursorState, MongodbCommandType, + MongoDBInstrumentationConfig, MongoInternalCommand, MongoInternalTopology, WireProtocolInternal, - MongoDBInstrumentationConfig, - CursorState, } from './types'; import { VERSION } from './version'; -import { - DatabaseAttribute, - GeneralAttribute, -} from '@opentelemetry/semantic-conventions'; -import { - InstrumentationBase, - InstrumentationNodeModuleDefinition, - InstrumentationNodeModuleFile, - isWrapped, -} from '@opentelemetry/instrumentation'; const supportedVersions = ['>=3.3 <4']; @@ -383,10 +380,10 @@ export class MongoDBInstrumentation extends InstrumentationBase< // add network attributes to determine the remote server if (topology && topology.s) { span.setAttributes({ - [GeneralAttribute.NET_HOST_NAME]: `${ + [SemanticAttributes.NET_HOST_NAME]: `${ topology.s.options?.host ?? topology.s.host }`, - [GeneralAttribute.NET_HOST_PORT]: `${ + [SemanticAttributes.NET_HOST_PORT]: `${ topology.s.options?.port ?? topology.s.port }`, }); @@ -400,9 +397,9 @@ export class MongoDBInstrumentation extends InstrumentationBase< // add database related attributes span.setAttributes({ - [DatabaseAttribute.DB_SYSTEM]: 'mongodb', - [DatabaseAttribute.DB_NAME]: dbName, - [DatabaseAttribute.DB_MONGODB_COLLECTION]: dbCollection, + [SemanticAttributes.DB_SYSTEM]: 'mongodb', + [SemanticAttributes.DB_NAME]: dbName, + [SemanticAttributes.DB_MONGODB_COLLECTION]: dbCollection, }); if (command === undefined) return; @@ -417,7 +414,7 @@ export class MongoDBInstrumentation extends InstrumentationBase< return obj; }, {} as { [key: string]: unknown }); - span.setAttribute(DatabaseAttribute.DB_STATEMENT, JSON.stringify(query)); + span.setAttribute(SemanticAttributes.DB_STATEMENT, JSON.stringify(query)); } /** diff --git a/plugins/node/opentelemetry-instrumentation-mongodb/test/utils.ts b/plugins/node/opentelemetry-instrumentation-mongodb/test/utils.ts index 36e161aa655..bc0336cd657 100644 --- a/plugins/node/opentelemetry-instrumentation-mongodb/test/utils.ts +++ b/plugins/node/opentelemetry-instrumentation-mongodb/test/utils.ts @@ -14,14 +14,11 @@ * limitations under the License. */ -import { SpanStatusCode, SpanKind } from '@opentelemetry/api'; +import { SpanKind, SpanStatusCode } from '@opentelemetry/api'; +import { SemanticAttributes } from '@opentelemetry/semantic-conventions'; import { ReadableSpan } from '@opentelemetry/tracing'; import * as assert from 'assert'; import * as mongodb from 'mongodb'; -import { - DatabaseAttribute, - GeneralAttribute, -} from '@opentelemetry/semantic-conventions'; export interface MongoDBAccess { client: mongodb.MongoClient; @@ -79,18 +76,18 @@ export function assertSpans( assert.strictEqual(mongoSpan.name, expectedName); assert.strictEqual(mongoSpan.kind, expectedKind); assert.strictEqual( - mongoSpan.attributes[DatabaseAttribute.DB_SYSTEM], + mongoSpan.attributes[SemanticAttributes.DB_SYSTEM], 'mongodb' ); assert.strictEqual( - mongoSpan.attributes[GeneralAttribute.NET_HOST_NAME], + mongoSpan.attributes[SemanticAttributes.NET_HOST_NAME], process.env.MONGODB_HOST || 'localhost' ); assert.strictEqual(mongoSpan.status.code, SpanStatusCode.UNSET); if (isEnhancedDatabaseReportingEnabled) { const dbStatement = mongoSpan.attributes[ - DatabaseAttribute.DB_STATEMENT + SemanticAttributes.DB_STATEMENT ] as any; for (const key in dbStatement) { assert.notStrictEqual(dbStatement[key], '?'); diff --git a/plugins/node/opentelemetry-instrumentation-mysql/package.json b/plugins/node/opentelemetry-instrumentation-mysql/package.json index dd62e04be0f..123d51d7182 100644 --- a/plugins/node/opentelemetry-instrumentation-mysql/package.json +++ b/plugins/node/opentelemetry-instrumentation-mysql/package.json @@ -41,9 +41,9 @@ "access": "public" }, "devDependencies": { - "@opentelemetry/context-async-hooks": "0.18.2", + "@opentelemetry/context-async-hooks": "0.19.0", "@opentelemetry/test-utils": "^0.15.0", - "@opentelemetry/tracing": "0.18.2", + "@opentelemetry/tracing": "0.19.0", "@types/mocha": "7.0.2", "@types/mysql": "2.15.18", "@types/node": "14.0.27", @@ -60,8 +60,8 @@ "typescript": "4.1.3" }, "dependencies": { - "@opentelemetry/api": "^0.18.1", - "@opentelemetry/instrumentation": "^0.18.2", - "@opentelemetry/semantic-conventions": "^0.18.2" + "@opentelemetry/api": "^1.0.0-rc.0", + "@opentelemetry/instrumentation": "^0.19.0", + "@opentelemetry/semantic-conventions": "^0.19.0" } } diff --git a/plugins/node/opentelemetry-instrumentation-mysql/src/mysql.ts b/plugins/node/opentelemetry-instrumentation-mysql/src/mysql.ts index 17d094f165a..301b85e51d3 100644 --- a/plugins/node/opentelemetry-instrumentation-mysql/src/mysql.ts +++ b/plugins/node/opentelemetry-instrumentation-mysql/src/mysql.ts @@ -20,7 +20,7 @@ import { InstrumentationNodeModuleDefinition, isWrapped, } from '@opentelemetry/instrumentation'; -import { DatabaseAttribute } from '@opentelemetry/semantic-conventions'; +import { SemanticAttributes } from '@opentelemetry/semantic-conventions'; import type * as mysqlTypes from 'mysql'; import { MySQLInstrumentationConfig } from './types'; import { getConnectionAttributes, getDbStatement, getSpanName } from './utils'; @@ -33,7 +33,7 @@ export class MySQLInstrumentation extends InstrumentationBase< > { static readonly COMPONENT = 'mysql'; static readonly COMMON_ATTRIBUTES = { - [DatabaseAttribute.DB_SYSTEM]: MySQLInstrumentation.COMPONENT, + [SemanticAttributes.DB_SYSTEM]: MySQLInstrumentation.COMPONENT, }; constructor(protected _config: MySQLInstrumentationConfig = {}) { @@ -256,7 +256,7 @@ export class MySQLInstrumentation extends InstrumentationBase< } span.setAttribute( - DatabaseAttribute.DB_STATEMENT, + SemanticAttributes.DB_STATEMENT, getDbStatement(query, format, values) ); diff --git a/plugins/node/opentelemetry-instrumentation-mysql/src/utils.ts b/plugins/node/opentelemetry-instrumentation-mysql/src/utils.ts index 2ffe83a92cc..b89d19e9a6c 100644 --- a/plugins/node/opentelemetry-instrumentation-mysql/src/utils.ts +++ b/plugins/node/opentelemetry-instrumentation-mysql/src/utils.ts @@ -15,10 +15,7 @@ */ import { SpanAttributes } from '@opentelemetry/api'; -import { - DatabaseAttribute, - GeneralAttribute, -} from '@opentelemetry/semantic-conventions'; +import { SemanticAttributes } from '@opentelemetry/semantic-conventions'; import type { ConnectionConfig, PoolActualConfig, @@ -37,11 +34,11 @@ export function getConnectionAttributes( const { host, port, database, user } = getConfig(config); return { - [GeneralAttribute.NET_PEER_HOSTNAME]: host, - [GeneralAttribute.NET_PEER_PORT]: port, - [GeneralAttribute.NET_PEER_ADDRESS]: getJDBCString(host, port, database), - [DatabaseAttribute.DB_NAME]: database, - [DatabaseAttribute.DB_USER]: user, + [SemanticAttributes.NET_PEER_NAME]: host, + [SemanticAttributes.NET_PEER_PORT]: port, + [SemanticAttributes.NET_PEER_IP]: getJDBCString(host, port, database), + [SemanticAttributes.DB_NAME]: database, + [SemanticAttributes.DB_USER]: user, }; } diff --git a/plugins/node/opentelemetry-instrumentation-mysql/test/mysql.test.ts b/plugins/node/opentelemetry-instrumentation-mysql/test/mysql.test.ts index 2b475c3f4db..c954b5d4d84 100644 --- a/plugins/node/opentelemetry-instrumentation-mysql/test/mysql.test.ts +++ b/plugins/node/opentelemetry-instrumentation-mysql/test/mysql.test.ts @@ -16,10 +16,7 @@ import { context, setSpan, SpanStatusCode } from '@opentelemetry/api'; import { AsyncHooksContextManager } from '@opentelemetry/context-async-hooks'; -import { - DatabaseAttribute, - GeneralAttribute, -} from '@opentelemetry/semantic-conventions'; +import { SemanticAttributes } from '@opentelemetry/semantic-conventions'; import * as testUtils from '@opentelemetry/test-utils'; import { BasicTracerProvider, @@ -612,13 +609,13 @@ function assertSpan( values?: any, errorMessage?: string ) { - assert.strictEqual(span.attributes[DatabaseAttribute.DB_SYSTEM], 'mysql'); - assert.strictEqual(span.attributes[DatabaseAttribute.DB_NAME], database); - assert.strictEqual(span.attributes[GeneralAttribute.NET_PEER_PORT], port); - assert.strictEqual(span.attributes[GeneralAttribute.NET_PEER_HOSTNAME], host); - assert.strictEqual(span.attributes[DatabaseAttribute.DB_USER], user); + assert.strictEqual(span.attributes[SemanticAttributes.DB_SYSTEM], 'mysql'); + assert.strictEqual(span.attributes[SemanticAttributes.DB_NAME], database); + assert.strictEqual(span.attributes[SemanticAttributes.NET_PEER_PORT], port); + assert.strictEqual(span.attributes[SemanticAttributes.NET_PEER_NAME], host); + assert.strictEqual(span.attributes[SemanticAttributes.DB_USER], user); assert.strictEqual( - span.attributes[DatabaseAttribute.DB_STATEMENT], + span.attributes[SemanticAttributes.DB_STATEMENT], mysqlTypes.format(sql, values) ); if (errorMessage) { diff --git a/plugins/node/opentelemetry-instrumentation-net/package.json b/plugins/node/opentelemetry-instrumentation-net/package.json index a5a14661a2a..11ca9be7510 100644 --- a/plugins/node/opentelemetry-instrumentation-net/package.json +++ b/plugins/node/opentelemetry-instrumentation-net/package.json @@ -42,9 +42,9 @@ "access": "public" }, "devDependencies": { - "@opentelemetry/core": "0.18.2", - "@opentelemetry/node": "0.18.2", - "@opentelemetry/tracing": "0.18.2", + "@opentelemetry/core": "0.19.0", + "@opentelemetry/node": "0.19.0", + "@opentelemetry/tracing": "0.19.0", "@types/mocha": "7.0.2", "@types/node": "14.0.27", "@types/sinon": "9.0.4", @@ -61,8 +61,8 @@ "typescript": "4.1.3" }, "dependencies": { - "@opentelemetry/api": "^0.18.1", - "@opentelemetry/instrumentation": "^0.18.2", - "@opentelemetry/semantic-conventions": "^0.18.2" + "@opentelemetry/api": "^1.0.0-rc.0", + "@opentelemetry/instrumentation": "^0.19.0", + "@opentelemetry/semantic-conventions": "^0.19.0" } } diff --git a/plugins/node/opentelemetry-instrumentation-net/src/net.ts b/plugins/node/opentelemetry-instrumentation-net/src/net.ts index 8a00878e78d..7665a62ffee 100644 --- a/plugins/node/opentelemetry-instrumentation-net/src/net.ts +++ b/plugins/node/opentelemetry-instrumentation-net/src/net.ts @@ -22,7 +22,10 @@ import { isWrapped, safeExecuteInTheMiddle, } from '@opentelemetry/instrumentation'; -import { GeneralAttribute } from '@opentelemetry/semantic-conventions'; +import { + SemanticAttributes, + NetTransportValues, +} from '@opentelemetry/semantic-conventions'; import { Net, NormalizedOptions, SocketEvent } from './types'; import { getNormalizedArgs, IPC_TRANSPORT } from './utils'; import { VERSION } from './version'; @@ -101,8 +104,8 @@ export class NetInstrumentation extends InstrumentationBase { private _startIpcSpan(options: NormalizedOptions, socket: Socket) { const span = this.tracer.startSpan('ipc.connect', { attributes: { - [GeneralAttribute.NET_TRANSPORT]: IPC_TRANSPORT, - [GeneralAttribute.NET_PEER_NAME]: options.path, + [SemanticAttributes.NET_TRANSPORT]: IPC_TRANSPORT, + [SemanticAttributes.NET_PEER_NAME]: options.path, }, }); @@ -114,9 +117,9 @@ export class NetInstrumentation extends InstrumentationBase { private _startTcpSpan(options: NormalizedOptions, socket: Socket) { const span = this.tracer.startSpan('tcp.connect', { attributes: { - [GeneralAttribute.NET_TRANSPORT]: GeneralAttribute.IP_TCP, - [GeneralAttribute.NET_PEER_NAME]: options.host, - [GeneralAttribute.NET_PEER_PORT]: options.port, + [SemanticAttributes.NET_TRANSPORT]: NetTransportValues.IP_TCP, + [SemanticAttributes.NET_PEER_NAME]: options.host, + [SemanticAttributes.NET_PEER_PORT]: options.port, }, }); @@ -157,9 +160,9 @@ function registerListeners( const setHostAttributes = () => { span.setAttributes({ - [GeneralAttribute.NET_PEER_IP]: socket.remoteAddress, - [GeneralAttribute.NET_HOST_IP]: socket.localAddress, - [GeneralAttribute.NET_HOST_PORT]: socket.localPort, + [SemanticAttributes.NET_PEER_IP]: socket.remoteAddress, + [SemanticAttributes.NET_HOST_IP]: socket.localAddress, + [SemanticAttributes.NET_HOST_PORT]: socket.localPort, }); }; diff --git a/plugins/node/opentelemetry-instrumentation-net/src/utils.ts b/plugins/node/opentelemetry-instrumentation-net/src/utils.ts index e38ff6193a6..3e7f94f8d7c 100644 --- a/plugins/node/opentelemetry-instrumentation-net/src/utils.ts +++ b/plugins/node/opentelemetry-instrumentation-net/src/utils.ts @@ -15,11 +15,11 @@ */ import { NormalizedOptions } from './types'; -import { GeneralAttribute } from '@opentelemetry/semantic-conventions'; +import { NetTransportValues } from '@opentelemetry/semantic-conventions'; import { platform } from 'os'; export const IPC_TRANSPORT = - platform() === 'win32' ? GeneralAttribute.PIPE : GeneralAttribute.UNIX; + platform() === 'win32' ? NetTransportValues.PIPE : NetTransportValues.UNIX; export function getNormalizedArgs( args: unknown[] diff --git a/plugins/node/opentelemetry-instrumentation-net/test/connect.test.ts b/plugins/node/opentelemetry-instrumentation-net/test/connect.test.ts index ce827381119..ded3907cc1e 100644 --- a/plugins/node/opentelemetry-instrumentation-net/test/connect.test.ts +++ b/plugins/node/opentelemetry-instrumentation-net/test/connect.test.ts @@ -19,7 +19,7 @@ import { InMemorySpanExporter, SimpleSpanProcessor, } from '@opentelemetry/tracing'; -import { GeneralAttribute } from '@opentelemetry/semantic-conventions'; +import { SemanticAttributes } from '@opentelemetry/semantic-conventions'; import { NodeTracerProvider } from '@opentelemetry/node'; import * as net from 'net'; import * as assert from 'assert'; @@ -178,7 +178,7 @@ describe('NetInstrumentation', () => { socket.once(SocketEvent.CLOSE, () => { const span = getSpan(); assert.strictEqual( - span.attributes[GeneralAttribute.NET_TRANSPORT], + span.attributes[SemanticAttributes.NET_TRANSPORT], undefined ); assert.strictEqual(span.status.code, SpanStatusCode.ERROR); diff --git a/plugins/node/opentelemetry-instrumentation-net/test/utils.ts b/plugins/node/opentelemetry-instrumentation-net/test/utils.ts index dcc04bdd492..06dc7f34ddc 100644 --- a/plugins/node/opentelemetry-instrumentation-net/test/utils.ts +++ b/plugins/node/opentelemetry-instrumentation-net/test/utils.ts @@ -16,7 +16,10 @@ import { SpanKind } from '@opentelemetry/api'; import { ReadableSpan } from '@opentelemetry/tracing'; -import { GeneralAttribute } from '@opentelemetry/semantic-conventions'; +import { + NetTransportValues, + SemanticAttributes, +} from '@opentelemetry/semantic-conventions'; import * as assert from 'assert'; import * as path from 'path'; import * as os from 'os'; @@ -29,17 +32,21 @@ export const IPC_PATH = path.join(os.tmpdir(), 'otel-js-net-test-ipc'); export function assertTcpSpan(span: ReadableSpan, socket: Socket) { assertSpanKind(span); - assertAttrib(span, GeneralAttribute.NET_TRANSPORT, GeneralAttribute.IP_TCP); - assertAttrib(span, GeneralAttribute.NET_PEER_NAME, HOST); - assertAttrib(span, GeneralAttribute.NET_PEER_PORT, PORT); - assertAttrib(span, GeneralAttribute.NET_HOST_IP, socket.localAddress); - assertAttrib(span, GeneralAttribute.NET_HOST_PORT, socket.localPort); + assertAttrib( + span, + SemanticAttributes.NET_TRANSPORT, + NetTransportValues.IP_TCP + ); + assertAttrib(span, SemanticAttributes.NET_PEER_NAME, HOST); + assertAttrib(span, SemanticAttributes.NET_PEER_PORT, PORT); + assertAttrib(span, SemanticAttributes.NET_HOST_IP, socket.localAddress); + assertAttrib(span, SemanticAttributes.NET_HOST_PORT, socket.localPort); } export function assertIpcSpan(span: ReadableSpan) { assertSpanKind(span); - assertAttrib(span, GeneralAttribute.NET_TRANSPORT, IPC_TRANSPORT); - assertAttrib(span, GeneralAttribute.NET_PEER_NAME, IPC_PATH); + assertAttrib(span, SemanticAttributes.NET_TRANSPORT, IPC_TRANSPORT); + assertAttrib(span, SemanticAttributes.NET_PEER_NAME, IPC_PATH); } export function assertSpanKind(span: ReadableSpan) { diff --git a/plugins/node/opentelemetry-instrumentation-pg/package.json b/plugins/node/opentelemetry-instrumentation-pg/package.json index 610e8e2ae25..849f20600b1 100644 --- a/plugins/node/opentelemetry-instrumentation-pg/package.json +++ b/plugins/node/opentelemetry-instrumentation-pg/package.json @@ -47,10 +47,10 @@ "access": "public" }, "devDependencies": { - "@opentelemetry/context-async-hooks": "0.18.2", - "@opentelemetry/node": "0.18.2", + "@opentelemetry/context-async-hooks": "0.19.0", + "@opentelemetry/node": "0.19.0", "@opentelemetry/test-utils": "^0.15.0", - "@opentelemetry/tracing": "0.18.2", + "@opentelemetry/tracing": "0.19.0", "@types/mocha": "7.0.2", "@types/node": "14.0.27", "@types/pg": "7.14.4", @@ -70,7 +70,7 @@ "typescript": "4.1.3" }, "dependencies": { - "@opentelemetry/api": "^0.18.1", - "@opentelemetry/instrumentation": "^0.18.2" + "@opentelemetry/api": "^1.0.0-rc.0", + "@opentelemetry/instrumentation": "^0.19.0" } } diff --git a/plugins/node/opentelemetry-instrumentation-pino/package.json b/plugins/node/opentelemetry-instrumentation-pino/package.json index ae2b1e7878d..8588dae9bd9 100644 --- a/plugins/node/opentelemetry-instrumentation-pino/package.json +++ b/plugins/node/opentelemetry-instrumentation-pino/package.json @@ -42,9 +42,9 @@ "access": "public" }, "devDependencies": { - "@opentelemetry/context-async-hooks": "0.18.2", - "@opentelemetry/node": "0.18.2", - "@opentelemetry/tracing": "0.18.2", + "@opentelemetry/context-async-hooks": "0.19.0", + "@opentelemetry/node": "0.19.0", + "@opentelemetry/tracing": "0.19.0", "@types/mocha": "7.0.2", "@types/node": "14.0.27", "@types/pino": "^6.3.7", @@ -64,8 +64,8 @@ "pino": "^6.11.2" }, "dependencies": { - "@opentelemetry/api": "^0.18.0", - "@opentelemetry/instrumentation": "^0.18.0", + "@opentelemetry/api": "^1.0.0-rc.0", + "@opentelemetry/instrumentation": "^0.19.0", "semver": "^7.3.5" } } diff --git a/plugins/node/opentelemetry-instrumentation-redis/package.json b/plugins/node/opentelemetry-instrumentation-redis/package.json index 79df2e326a5..094c74bcc78 100644 --- a/plugins/node/opentelemetry-instrumentation-redis/package.json +++ b/plugins/node/opentelemetry-instrumentation-redis/package.json @@ -43,10 +43,10 @@ "access": "public" }, "devDependencies": { - "@opentelemetry/context-async-hooks": "0.18.2", - "@opentelemetry/node": "0.18.2", + "@opentelemetry/context-async-hooks": "0.19.0", + "@opentelemetry/node": "0.19.0", "@opentelemetry/test-utils": "^0.15.0", - "@opentelemetry/tracing": "0.18.2", + "@opentelemetry/tracing": "0.19.0", "@types/mocha": "7.0.2", "@types/node": "14.0.27", "@types/redis": "2.8.25", @@ -64,8 +64,8 @@ "typescript": "4.1.3" }, "dependencies": { - "@opentelemetry/api": "^0.18.1", - "@opentelemetry/instrumentation": "^0.18.2", - "@opentelemetry/semantic-conventions": "^0.18.2" + "@opentelemetry/api": "^1.0.0-rc.0", + "@opentelemetry/instrumentation": "^0.19.0", + "@opentelemetry/semantic-conventions": "^0.19.0" } } diff --git a/plugins/node/opentelemetry-instrumentation-redis/src/utils.ts b/plugins/node/opentelemetry-instrumentation-redis/src/utils.ts index 8298999b091..0f86bd0e77e 100644 --- a/plugins/node/opentelemetry-instrumentation-redis/src/utils.ts +++ b/plugins/node/opentelemetry-instrumentation-redis/src/utils.ts @@ -25,10 +25,7 @@ import { import { RedisCommand, RedisPluginClientTypes } from './types'; import { EventEmitter } from 'events'; import { RedisInstrumentation } from './redis'; -import { - DatabaseAttribute, - GeneralAttribute, -} from '@opentelemetry/semantic-conventions'; +import { SemanticAttributes } from '@opentelemetry/semantic-conventions'; const endSpan = (span: Span, err?: Error | null) => { if (err) { @@ -83,8 +80,8 @@ export const getTracedInternalSendCommand = ( { kind: SpanKind.CLIENT, attributes: { - [DatabaseAttribute.DB_SYSTEM]: RedisInstrumentation.COMPONENT, - [DatabaseAttribute.DB_STATEMENT]: cmd.command, + [SemanticAttributes.DB_SYSTEM]: RedisInstrumentation.COMPONENT, + [SemanticAttributes.DB_STATEMENT]: cmd.command, }, } ); @@ -92,13 +89,13 @@ export const getTracedInternalSendCommand = ( // Set attributes for not explicitly typed RedisPluginClientTypes if (this.options) { span.setAttributes({ - [GeneralAttribute.NET_PEER_HOSTNAME]: this.options.host, - [GeneralAttribute.NET_PEER_PORT]: this.options.port, + [SemanticAttributes.NET_PEER_NAME]: this.options.host, + [SemanticAttributes.NET_PEER_PORT]: this.options.port, }); } if (this.address) { span.setAttribute( - GeneralAttribute.NET_PEER_ADDRESS, + SemanticAttributes.NET_PEER_IP, `redis://${this.address}` ); } diff --git a/plugins/node/opentelemetry-instrumentation-redis/test/redis.test.ts b/plugins/node/opentelemetry-instrumentation-redis/test/redis.test.ts index 66979ae47cf..4013f9213c0 100644 --- a/plugins/node/opentelemetry-instrumentation-redis/test/redis.test.ts +++ b/plugins/node/opentelemetry-instrumentation-redis/test/redis.test.ts @@ -31,10 +31,7 @@ import { } from '@opentelemetry/tracing'; import * as assert from 'assert'; import { RedisInstrumentation } from '../src'; -import { - DatabaseAttribute, - GeneralAttribute, -} from '@opentelemetry/semantic-conventions'; +import { SemanticAttributes } from '@opentelemetry/semantic-conventions'; const instrumentation = new RedisInstrumentation(); instrumentation.enable(); @@ -52,10 +49,10 @@ const CONFIG = { const URL = `redis://${CONFIG.host}:${CONFIG.port}`; const DEFAULT_ATTRIBUTES = { - [DatabaseAttribute.DB_SYSTEM]: RedisInstrumentation.COMPONENT, - [GeneralAttribute.NET_PEER_HOSTNAME]: CONFIG.host, - [GeneralAttribute.NET_PEER_PORT]: CONFIG.port, - [GeneralAttribute.NET_PEER_ADDRESS]: URL, + [SemanticAttributes.DB_SYSTEM]: RedisInstrumentation.COMPONENT, + [SemanticAttributes.NET_PEER_NAME]: CONFIG.host, + [SemanticAttributes.NET_PEER_PORT]: CONFIG.port, + [SemanticAttributes.NET_PEER_IP]: URL, }; const unsetStatus: SpanStatus = { @@ -183,7 +180,7 @@ describe('redis@2.x', () => { it(`should create a child span for ${operation.description}`, done => { const attributes = { ...DEFAULT_ATTRIBUTES, - [DatabaseAttribute.DB_STATEMENT]: operation.command, + [SemanticAttributes.DB_STATEMENT]: operation.command, }; const span = tracer.startSpan('test span'); context.with(setSpan(context.active(), span), () => { diff --git a/plugins/node/opentelemetry-instrumentation-restify/package.json b/plugins/node/opentelemetry-instrumentation-restify/package.json index 611c12bd2da..a5b6095a6d4 100644 --- a/plugins/node/opentelemetry-instrumentation-restify/package.json +++ b/plugins/node/opentelemetry-instrumentation-restify/package.json @@ -41,9 +41,9 @@ "access": "public" }, "devDependencies": { - "@opentelemetry/context-async-hooks": "0.18.0", - "@opentelemetry/node": "0.18.0", - "@opentelemetry/tracing": "0.18.0", + "@opentelemetry/context-async-hooks": "0.19.0", + "@opentelemetry/node": "0.19.0", + "@opentelemetry/tracing": "0.19.0", "@types/mocha": "7.0.2", "@types/node": "14.0.27", "@types/restify": "^4.3.7", @@ -60,9 +60,9 @@ "typescript": "4.1.3" }, "dependencies": { - "@opentelemetry/api": "^0.18.0", - "@opentelemetry/core": "^0.18.0", - "@opentelemetry/instrumentation": "^0.18.0", - "@opentelemetry/semantic-conventions": "^0.18.0" + "@opentelemetry/api": "^1.0.0-rc.0", + "@opentelemetry/core": "^0.19.0", + "@opentelemetry/instrumentation": "^0.19.0", + "@opentelemetry/semantic-conventions": "^0.19.0" } } diff --git a/plugins/node/opentelemetry-instrumentation-restify/src/instrumentation.ts b/plugins/node/opentelemetry-instrumentation-restify/src/instrumentation.ts index 0eb2ff97ae5..d7de0f4c5e1 100644 --- a/plugins/node/opentelemetry-instrumentation-restify/src/instrumentation.ts +++ b/plugins/node/opentelemetry-instrumentation-restify/src/instrumentation.ts @@ -26,7 +26,7 @@ import { InstrumentationNodeModuleFile, isWrapped, } from '@opentelemetry/instrumentation'; -import { HttpAttribute } from '@opentelemetry/semantic-conventions'; +import { SemanticAttributes } from '@opentelemetry/semantic-conventions'; import { isPromise, isAsyncFunction } from './utils'; const { diag } = api; @@ -187,7 +187,7 @@ export class RestifyInstrumentation extends InstrumentationBase< [types.CustomAttributeNames.VERSION]: this._moduleVersion || 'n/a', [types.CustomAttributeNames.TYPE]: metadata.type, [types.CustomAttributeNames.METHOD]: metadata.methodName, - [HttpAttribute.HTTP_ROUTE]: route, + [SemanticAttributes.HTTP_ROUTE]: route, }; const span = this.tracer.startSpan( spanName, diff --git a/plugins/node/opentelemetry-instrumentation-winston/package.json b/plugins/node/opentelemetry-instrumentation-winston/package.json index f7a71ba39b0..25c41961c17 100644 --- a/plugins/node/opentelemetry-instrumentation-winston/package.json +++ b/plugins/node/opentelemetry-instrumentation-winston/package.json @@ -42,9 +42,9 @@ "access": "public" }, "devDependencies": { - "@opentelemetry/context-async-hooks": "0.18.2", - "@opentelemetry/node": "0.18.2", - "@opentelemetry/tracing": "0.18.2", + "@opentelemetry/context-async-hooks": "0.19.0", + "@opentelemetry/node": "0.19.0", + "@opentelemetry/tracing": "0.19.0", "@types/mocha": "7.0.2", "@types/node": "14.0.27", "@types/sinon": "9.0.4", @@ -63,7 +63,7 @@ "winston2": "npm:winston@^2.4.4" }, "dependencies": { - "@opentelemetry/api": "^0.18.0", - "@opentelemetry/instrumentation": "^0.18.0" + "@opentelemetry/api": "^1.0.0-rc.0", + "@opentelemetry/instrumentation": "^0.19.0" } } diff --git a/plugins/web/opentelemetry-instrumentation-document-load/package.json b/plugins/web/opentelemetry-instrumentation-document-load/package.json index 6d788b009d2..97090266fd3 100644 --- a/plugins/web/opentelemetry-instrumentation-document-load/package.json +++ b/plugins/web/opentelemetry-instrumentation-document-load/package.json @@ -72,11 +72,11 @@ "webpack-merge": "5.0.9" }, "dependencies": { - "@opentelemetry/api": "^0.18.1", - "@opentelemetry/core": "^0.18.2", - "@opentelemetry/instrumentation": "^0.18.2", - "@opentelemetry/semantic-conventions": "^0.18.2", - "@opentelemetry/tracing": "^0.18.2", - "@opentelemetry/web": "^0.18.2" + "@opentelemetry/api": "^1.0.0-rc.0", + "@opentelemetry/core": "^0.19.0", + "@opentelemetry/instrumentation": "^0.19.0", + "@opentelemetry/semantic-conventions": "^0.19.0", + "@opentelemetry/tracing": "^0.19.0", + "@opentelemetry/web": "^0.19.0" } } diff --git a/plugins/web/opentelemetry-instrumentation-document-load/src/documentLoad.ts b/plugins/web/opentelemetry-instrumentation-document-load/src/documentLoad.ts index 7a55e65b9dc..a72eca1e461 100644 --- a/plugins/web/opentelemetry-instrumentation-document-load/src/documentLoad.ts +++ b/plugins/web/opentelemetry-instrumentation-document-load/src/documentLoad.ts @@ -36,7 +36,7 @@ import { } from '@opentelemetry/instrumentation'; import { AttributeNames } from './enums/AttributeNames'; import { VERSION } from './version'; -import { HttpAttribute } from '@opentelemetry/semantic-conventions'; +import { SemanticAttributes } from '@opentelemetry/semantic-conventions'; /** * This class represents a document load plugin @@ -211,7 +211,7 @@ export class DocumentLoadInstrumentation extends InstrumentationBase { parentSpan ); if (span) { - span.setAttribute(HttpAttribute.HTTP_URL, resource.name); + span.setAttribute(SemanticAttributes.HTTP_URL, resource.name); addSpanNetworkEvents(span, resource); this._endSpan(span, PTN.RESPONSE_END, resource); } diff --git a/plugins/web/opentelemetry-instrumentation-document-load/test/documentLoad.test.ts b/plugins/web/opentelemetry-instrumentation-document-load/test/documentLoad.test.ts index 5fb96394789..63b0d921b71 100644 --- a/plugins/web/opentelemetry-instrumentation-document-load/test/documentLoad.test.ts +++ b/plugins/web/opentelemetry-instrumentation-document-load/test/documentLoad.test.ts @@ -30,7 +30,7 @@ import { import * as assert from 'assert'; import * as sinon from 'sinon'; import { DocumentLoadInstrumentation } from '../src'; -import { HttpAttribute } from '@opentelemetry/semantic-conventions'; +import { SemanticAttributes } from '@opentelemetry/semantic-conventions'; const exporter = new InMemorySpanExporter(); const provider = new BasicTracerProvider(); @@ -310,7 +310,7 @@ describe('DocumentLoad Instrumentation', () => { assert.strictEqual(rootSpan.name, 'documentFetch'); assert.ok( (rootSpan.attributes[ - HttpAttribute.HTTP_RESPONSE_CONTENT_LENGTH + SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH ] as number) > 0 ); assert.strictEqual(fetchSpan.name, 'documentLoad'); @@ -404,11 +404,11 @@ describe('DocumentLoad Instrumentation', () => { const srEvents2 = spanResource2.events; assert.strictEqual( - spanResource1.attributes[HttpAttribute.HTTP_URL], + spanResource1.attributes[SemanticAttributes.HTTP_URL], 'http://localhost:8090/bundle.js' ); assert.strictEqual( - spanResource2.attributes[HttpAttribute.HTTP_URL], + spanResource2.attributes[SemanticAttributes.HTTP_URL], 'http://localhost:8090/sockjs-node/info?t=1572620894466' ); @@ -439,7 +439,7 @@ describe('DocumentLoad Instrumentation', () => { const srEvents1 = spanResource1.events; assert.strictEqual( - spanResource1.attributes[HttpAttribute.HTTP_URL], + spanResource1.attributes[SemanticAttributes.HTTP_URL], 'http://localhost:8090/bundle.js' ); diff --git a/plugins/web/opentelemetry-instrumentation-user-interaction/package.json b/plugins/web/opentelemetry-instrumentation-user-interaction/package.json index 946a69e035d..42a9ac98cfb 100644 --- a/plugins/web/opentelemetry-instrumentation-user-interaction/package.json +++ b/plugins/web/opentelemetry-instrumentation-user-interaction/package.json @@ -43,9 +43,9 @@ }, "devDependencies": { "@babel/core": "7.11.1", - "@opentelemetry/context-zone-peer-dep": "0.18.2", - "@opentelemetry/instrumentation-xml-http-request": "0.18.2", - "@opentelemetry/tracing": "0.18.2", + "@opentelemetry/context-zone-peer-dep": "0.19.0", + "@opentelemetry/instrumentation-xml-http-request": "0.19.0", + "@opentelemetry/tracing": "0.19.0", "@types/jquery": "3.5.1", "@types/mocha": "7.0.2", "@types/node": "14.0.27", @@ -79,10 +79,10 @@ "zone.js": "0.10.3" }, "dependencies": { - "@opentelemetry/api": "^0.18.1", - "@opentelemetry/core": "^0.18.2", - "@opentelemetry/instrumentation": "^0.18.2", - "@opentelemetry/web": "^0.18.2" + "@opentelemetry/api": "^1.0.0-rc.0", + "@opentelemetry/core": "^0.19.0", + "@opentelemetry/instrumentation": "^0.19.0", + "@opentelemetry/web": "^0.19.0" }, "peerDependencies": { "zone.js": "0.10.3" diff --git a/plugins/web/opentelemetry-plugin-react-load/package.json b/plugins/web/opentelemetry-plugin-react-load/package.json index 90f59cebe44..0e068a144ca 100644 --- a/plugins/web/opentelemetry-plugin-react-load/package.json +++ b/plugins/web/opentelemetry-plugin-react-load/package.json @@ -43,7 +43,7 @@ }, "devDependencies": { "@babel/core": "7.10.2", - "@opentelemetry/propagator-b3": "0.18.2", + "@opentelemetry/propagator-b3": "0.19.0", "@types/mocha": "7.0.2", "@types/node": "12.12.47", "@types/react": "17.0.3", @@ -82,12 +82,12 @@ "react": "^16.13.1 || ^17.0.0" }, "dependencies": { - "@opentelemetry/api": "^0.18.1", - "@opentelemetry/context-zone": "^0.18.2", - "@opentelemetry/core": "^0.18.2", - "@opentelemetry/semantic-conventions": "^0.18.2", - "@opentelemetry/tracing": "^0.18.2", - "@opentelemetry/web": "^0.18.2", + "@opentelemetry/api": "^1.0.0-rc.0", + "@opentelemetry/context-zone": "^0.19.0", + "@opentelemetry/core": "^0.19.0", + "@opentelemetry/semantic-conventions": "^0.19.0", + "@opentelemetry/tracing": "^0.19.0", + "@opentelemetry/web": "^0.19.0", "shimmer": "^1.2.1" } } diff --git a/propagators/opentelemetry-propagator-aws-xray/package.json b/propagators/opentelemetry-propagator-aws-xray/package.json index 732ea153ce9..7a586858ebe 100644 --- a/propagators/opentelemetry-propagator-aws-xray/package.json +++ b/propagators/opentelemetry-propagator-aws-xray/package.json @@ -63,7 +63,7 @@ "webpack": "4.46.0" }, "dependencies": { - "@opentelemetry/api": "^0.18.0", - "@opentelemetry/core": "^0.18.0" + "@opentelemetry/api": "^1.0.0-rc.0", + "@opentelemetry/core": "^0.19.0" } } diff --git a/propagators/opentelemetry-propagator-grpc-census-binary/package.json b/propagators/opentelemetry-propagator-grpc-census-binary/package.json index 1a0d7a074ce..489b3aec74b 100644 --- a/propagators/opentelemetry-propagator-grpc-census-binary/package.json +++ b/propagators/opentelemetry-propagator-grpc-census-binary/package.json @@ -58,7 +58,7 @@ "typescript": "4.1.3" }, "dependencies": { - "@opentelemetry/api": "^0.18.1", - "@opentelemetry/core": "^0.18.2" + "@opentelemetry/api": "^1.0.0-rc.0", + "@opentelemetry/core": "^0.19.0" } } diff --git a/propagators/opentelemetry-propagator-ot-trace/package.json b/propagators/opentelemetry-propagator-ot-trace/package.json index a13a460118a..94c63831670 100644 --- a/propagators/opentelemetry-propagator-ot-trace/package.json +++ b/propagators/opentelemetry-propagator-ot-trace/package.json @@ -43,7 +43,7 @@ "access": "public" }, "dependencies": { - "@opentelemetry/api": "^0.18.1" + "@opentelemetry/api": "^1.0.0-rc.0" }, "devDependencies": { "@types/mocha": "8.2.0",