Merge branch 'main' into example-koa

open-telemetry · Apr 25, 2024 · 8f67c61 · 8f67c61
2 parents 51d6709 + 80cbee7
commit 8f67c61
Show file tree

Hide file tree

Showing 109 changed files with 1,249 additions and 1,261 deletions.
diff --git a/detectors/node/opentelemetry-resource-detector-instana/package.json b/detectors/node/opentelemetry-resource-detector-instana/package.json
@@ -39,7 +39,7 @@
   "devDependencies": {
     "@opentelemetry/api": "^1.3.0",
     "@opentelemetry/contrib-test-utils": "^0.38.0",
-    "@opentelemetry/sdk-node": "^0.50.0",
+    "@opentelemetry/sdk-node": "^0.51.0",
     "@types/mocha": "8.2.3",
     "@types/node": "18.6.5",
     "@types/semver": "7.5.3",

diff --git a/examples/connect/package.json b/examples/connect/package.json
@@ -45,7 +45,7 @@
     "@opentelemetry/instrumentation-http": "^0.25.0",
     "@opentelemetry/sdk-trace-node": "^0.25.0",
     "@opentelemetry/resources": "^0.25.0",
-    "@opentelemetry/semantic-conventions": "^0.25.0",
+    "@opentelemetry/semantic-conventions": "^1.23.0",
     "@opentelemetry/sdk-trace-base": "^0.25.0",
     "axios": "^0.21.1",
     "cross-env": "^7.0.3",

diff --git a/examples/connect/tracing.js b/examples/connect/tracing.js
@@ -6,7 +6,7 @@ const { diag, DiagConsoleLogger, DiagLogLevel } = opentelemetry;
 diag.setLogger(new DiagConsoleLogger(), DiagLogLevel.INFO);
 
 const { Resource } = require('@opentelemetry/resources');
-const { ResourceAttributes: SemanticResourceAttributes } = require('@opentelemetry/semantic-conventions');
+const { SEMRESATTRS_SERVICE_NAME } = require('@opentelemetry/semantic-conventions');
 const { registerInstrumentations } = require('@opentelemetry/instrumentation');
 const { NodeTracerProvider } = require('@opentelemetry/sdk-trace-node');
 const { SimpleSpanProcessor } = require('@opentelemetry/sdk-trace-base');
@@ -24,7 +24,7 @@ function log() {
 module.exports = (serviceName) => {
   const provider = new NodeTracerProvider({
     resource: new Resource({
-      [SemanticResourceAttributes.SERVICE_NAME]: serviceName,
+      [SEMRESATTRS_SERVICE_NAME]: serviceName,
     }),
   });
   const connectInstrumentation = new ConnectInstrumentation();

diff --git a/examples/web/examples/document-load/index.js b/examples/web/examples/document-load/index.js
@@ -9,11 +9,11 @@ import { B3Propagator } from '@opentelemetry/propagator-b3';
 import { CompositePropagator, W3CTraceContextPropagator } from '@opentelemetry/core';
 import { registerInstrumentations } from '@opentelemetry/instrumentation';
 import { Resource } from '@opentelemetry/resources';
-import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions';
+import { SEMRESATTRS_SERVICE_NAME } from '@opentelemetry/semantic-conventions';
 
 const provider = new WebTracerProvider({
   resource: new Resource({
-    [SemanticResourceAttributes.SERVICE_NAME]: 'web-service-dl',
+    [SEMRESATTRS_SERVICE_NAME]: 'web-service-dl',
   }),
 });
 

diff --git a/examples/web/examples/meta/index.js b/examples/web/examples/meta/index.js
@@ -6,11 +6,11 @@ import { B3Propagator } from '@opentelemetry/propagator-b3';
 import { getWebAutoInstrumentations } from '@opentelemetry/auto-instrumentations-web';
 import { registerInstrumentations } from '@opentelemetry/instrumentation';
 import { Resource } from '@opentelemetry/resources';
-import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions';
+import { SEMRESATTRS_SERVICE_NAME } from '@opentelemetry/semantic-conventions';
 
 const providerWithZone = new WebTracerProvider({
   resource: new Resource({
-    [SemanticResourceAttributes.SERVICE_NAME]: 'web-service-meta',
+    [SEMRESATTRS_SERVICE_NAME]: 'web-service-meta',
   }),
 });
 

diff --git a/examples/web/examples/user-interaction/index.js b/examples/web/examples/user-interaction/index.js
@@ -7,11 +7,11 @@ import { B3Propagator } from '@opentelemetry/propagator-b3';
 import { XMLHttpRequestInstrumentation } from '@opentelemetry/instrumentation-xml-http-request';
 import { registerInstrumentations } from '@opentelemetry/instrumentation';
 import { Resource } from '@opentelemetry/resources';
-import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions';
+import { SEMRESATTRS_SERVICE_NAME } from '@opentelemetry/semantic-conventions';
 
 const providerWithZone = new WebTracerProvider({
   resource: new Resource({
-    [SemanticResourceAttributes.SERVICE_NAME]: 'web-service-ui',
+    [SEMRESATTRS_SERVICE_NAME]: 'web-service-ui',
   }),
 });
 

diff --git a/examples/web/package.json b/examples/web/package.json
@@ -46,7 +46,7 @@
     "@opentelemetry/instrumentation-xml-http-request": "^0.39.1",
     "@opentelemetry/propagator-b3": "^1.13.0",
     "@opentelemetry/sdk-trace-web": "^1.13.0",
-    "@opentelemetry/semantic-conventions": "^1.13.0"
+    "@opentelemetry/semantic-conventions": "^1.23.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
@@ -49,7 +49,7 @@
     "typescript": "4.4.4"
   },
   "dependencies": {
-    "@opentelemetry/instrumentation": "^0.50.0",
+    "@opentelemetry/instrumentation": "^0.51.0",
     "@opentelemetry/instrumentation-amqplib": "^0.36.0",
     "@opentelemetry/instrumentation-aws-lambda": "^0.40.0",
     "@opentelemetry/instrumentation-aws-sdk": "^0.40.0",
@@ -64,9 +64,9 @@
     "@opentelemetry/instrumentation-fs": "^0.11.0",
     "@opentelemetry/instrumentation-generic-pool": "^0.35.0",
     "@opentelemetry/instrumentation-graphql": "^0.39.0",
-    "@opentelemetry/instrumentation-grpc": "^0.50.0",
+    "@opentelemetry/instrumentation-grpc": "^0.51.0",
     "@opentelemetry/instrumentation-hapi": "^0.36.0",
-    "@opentelemetry/instrumentation-http": "^0.50.0",
+    "@opentelemetry/instrumentation-http": "^0.51.0",
     "@opentelemetry/instrumentation-ioredis": "^0.39.0",
     "@opentelemetry/instrumentation-knex": "^0.35.0",
     "@opentelemetry/instrumentation-koa": "^0.39.0",
@@ -92,7 +92,7 @@
     "@opentelemetry/resource-detector-container": "^0.3.8",
     "@opentelemetry/resource-detector-gcp": "^0.29.8",
     "@opentelemetry/resources": "^1.12.0",
-    "@opentelemetry/sdk-node": "^0.50.0"
+    "@opentelemetry/sdk-node": "^0.51.0"
   },
   "files": [
     "build/src/**/*.js",

diff --git a/metapackages/auto-instrumentations-web/package.json b/metapackages/auto-instrumentations-web/package.json
@@ -61,11 +61,11 @@
     "webpack-merge": "5.8.0"
   },
   "dependencies": {
-    "@opentelemetry/instrumentation": "^0.50.0",
+    "@opentelemetry/instrumentation": "^0.51.0",
     "@opentelemetry/instrumentation-document-load": "^0.37.0",
-    "@opentelemetry/instrumentation-fetch": "^0.50.0",
+    "@opentelemetry/instrumentation-fetch": "^0.51.0",
     "@opentelemetry/instrumentation-user-interaction": "^0.37.0",
-    "@opentelemetry/instrumentation-xml-http-request": "^0.50.0"
+    "@opentelemetry/instrumentation-xml-http-request": "^0.51.0"
   },
   "files": [
     "build/src/**/*.js",