Merge branch 'main' into lambda-remove-hardcoded-propagator

martinkuba · web-flow · commit d2760d4caba0 · 2024-08-06T11:15:55.000-07:00
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -1,13 +1,13 @@
 {
-  "detectors/node/opentelemetry-resource-detector-alibaba-cloud": "0.28.10",
+  "detectors/node/opentelemetry-resource-detector-alibaba-cloud": "0.29.0",
   "detectors/node/opentelemetry-resource-detector-aws": "1.5.2",
   "detectors/node/opentelemetry-resource-detector-azure": "0.2.9",
   "detectors/node/opentelemetry-resource-detector-container": "0.3.11",
   "detectors/node/opentelemetry-resource-detector-gcp": "0.29.10",
-  "detectors/node/opentelemetry-resource-detector-github": "0.28.2",
-  "detectors/node/opentelemetry-resource-detector-instana": "0.10.0",
+  "detectors/node/opentelemetry-resource-detector-github": "0.29.0",
+  "detectors/node/opentelemetry-resource-detector-instana": "0.11.0",
   "metapackages/auto-configuration-propagators": "0.2.0",
-  "metapackages/auto-instrumentations-node": "0.49.0",
+  "metapackages/auto-instrumentations-node": "0.49.1",
   "metapackages/auto-instrumentations-web": "0.40.0",
   "packages/baggage-span-processor": "0.3.1",
   "packages/opentelemetry-host-metrics": "0.35.3",
@@ -17,7 +17,7 @@
   "packages/opentelemetry-sql-common": "0.40.1",
   "packages/opentelemetry-test-utils": "0.40.0",
   "packages/winston-transport": "0.5.0",
-  "plugins/node/instrumentation-amqplib": "0.40.0",
+  "plugins/node/instrumentation-amqplib": "0.41.0",
   "plugins/node/instrumentation-cucumber": "0.8.0",
   "plugins/node/instrumentation-dataloader": "0.11.0",
   "plugins/node/instrumentation-fs": "0.14.0",
diff --git a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/CHANGELOG.md b/detectors/node/opentelemetry-resource-detector-alibaba-cloud/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Changelog
 
+## [0.29.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-alibaba-cloud-v0.28.10...resource-detector-alibaba-cloud-v0.29.0) (2024-08-05)
+
+
+### ⚠ BREAKING CHANGES
+
+* **detector-alibaba:** change implementation to DetectorSync interface ([#2328](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/2328))
+
+### Features
+
+* **detector-alibaba:** change implementation to DetectorSync interface ([#2328](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/2328)) ([25e85c7](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/25e85c7b128f7424b51987e9f4c067e0b538fe2f))
+
 ## [0.28.10](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-alibaba-cloud-v0.28.9...resource-detector-alibaba-cloud-v0.28.10) (2024-06-06)
 
 
diff --git a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json b/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/resource-detector-alibaba-cloud",
-  "version": "0.28.10",
+  "version": "0.29.0",
   "description": "OpenTelemetry resource detector for Alibaba Cloud",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",
diff --git a/detectors/node/opentelemetry-resource-detector-github/CHANGELOG.md b/detectors/node/opentelemetry-resource-detector-github/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Changelog
 
+## [0.29.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-github-v0.28.2...resource-detector-github-v0.29.0) (2024-08-05)
+
+
+### ⚠ BREAKING CHANGES
+
+* **detector-github:** change implementation to DetectorSync interface ([#2336](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/2336))
+
+### Features
+
+* **detector-github:** change implementation to DetectorSync interface ([#2336](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/2336)) ([d52d421](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/d52d4218235528dcecc706867425b86bac49b1f0))
+
 ## [0.28.2](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-github-v0.28.1...resource-detector-github-v0.28.2) (2024-04-25)
 
 
diff --git a/detectors/node/opentelemetry-resource-detector-github/package.json b/detectors/node/opentelemetry-resource-detector-github/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/resource-detector-github",
-  "version": "0.28.2",
+  "version": "0.29.0",
   "description": "OpenTelemetry SDK resource detector for GitHub",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",
diff --git a/detectors/node/opentelemetry-resource-detector-instana/CHANGELOG.md b/detectors/node/opentelemetry-resource-detector-instana/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Changelog
 
+## [0.11.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-instana-v0.10.0...resource-detector-instana-v0.11.0) (2024-08-05)
+
+
+### ⚠ BREAKING CHANGES
+
+* **detector-alibaba:** change implementation to DetectorSync interface ([#2328](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/2328))
+
+### Features
+
+* **detector-alibaba:** change implementation to DetectorSync interface ([#2328](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/2328)) ([25e85c7](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/25e85c7b128f7424b51987e9f4c067e0b538fe2f))
+
 ## [0.10.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-instana-v0.9.0...resource-detector-instana-v0.10.0) (2024-06-06)
 
 
diff --git a/detectors/node/opentelemetry-resource-detector-instana/package.json b/detectors/node/opentelemetry-resource-detector-instana/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/resource-detector-instana",
-  "version": "0.10.0",
+  "version": "0.11.0",
   "description": "OpenTelemetry SDK resource detector for Instana",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",
diff --git a/metapackages/auto-instrumentations-node/CHANGELOG.md b/metapackages/auto-instrumentations-node/CHANGELOG.md
@@ -1,5 +1,15 @@
 # Changelog
 
+## [0.49.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/auto-instrumentations-node-v0.49.0...auto-instrumentations-node-v0.49.1) (2024-08-05)
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * dependencies
+    * @opentelemetry/instrumentation-amqplib bumped from ^0.40.0 to ^0.41.0
+    * @opentelemetry/resource-detector-alibaba-cloud bumped from ^0.28.10 to ^0.29.0
+
 ## [0.49.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/auto-instrumentations-node-v0.48.0...auto-instrumentations-node-v0.49.0) (2024-07-23)
 
 
diff --git a/metapackages/auto-instrumentations-node/package.json b/metapackages/auto-instrumentations-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/auto-instrumentations-node",
-  "version": "0.49.0",
+  "version": "0.49.1",
   "description": "Metapackage which bundles opentelemetry node core and contrib instrumentations",
   "author": "OpenTelemetry Authors",
   "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/metapackages/auto-instrumentations-node#readme",
@@ -50,7 +50,7 @@
   },
   "dependencies": {
     "@opentelemetry/instrumentation": "^0.52.0",
-    "@opentelemetry/instrumentation-amqplib": "^0.40.0",
+    "@opentelemetry/instrumentation-amqplib": "^0.41.0",
     "@opentelemetry/instrumentation-aws-lambda": "^0.43.0",
     "@opentelemetry/instrumentation-aws-sdk": "^0.43.1",
     "@opentelemetry/instrumentation-bunyan": "^0.40.0",
@@ -89,7 +89,7 @@
     "@opentelemetry/instrumentation-tedious": "^0.12.0",
     "@opentelemetry/instrumentation-undici": "^0.4.0",
     "@opentelemetry/instrumentation-winston": "^0.39.0",
-    "@opentelemetry/resource-detector-alibaba-cloud": "^0.28.10",
+    "@opentelemetry/resource-detector-alibaba-cloud": "^0.29.0",
     "@opentelemetry/resource-detector-aws": "^1.5.2",
     "@opentelemetry/resource-detector-azure": "^0.2.9",
     "@opentelemetry/resource-detector-container": "^0.3.11",
diff --git a/package-lock.json b/package-lock.json
diff --git a/plugins/node/instrumentation-amqplib/CHANGELOG.md b/plugins/node/instrumentation-amqplib/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Changelog
 
+## [0.41.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-amqplib-v0.40.0...instrumentation-amqplib-v0.41.0) (2024-08-05)
+
+
+### ⚠ BREAKING CHANGES
+
+* **amqplib:** instrumentation produced high cardinality span names ([#2366](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/2366))
+
+### Bug Fixes
+
+* **amqplib:** instrumentation produced high cardinality span names ([#2366](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/2366)) ([184b19f](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/184b19f191635fa8d433eddcc6ed3f7d94a35d8a))
+
 ## [0.40.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-amqplib-v0.39.0...instrumentation-amqplib-v0.40.0) (2024-07-23)
 
 
diff --git a/plugins/node/instrumentation-amqplib/package.json b/plugins/node/instrumentation-amqplib/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/instrumentation-amqplib",
-  "version": "0.40.0",
+  "version": "0.41.0",
   "description": "OpenTelemetry instrumentation for the `amqplib` messaging client for RabbitMQ",
   "keywords": [
     "amqplib",
diff --git a/plugins/node/instrumentation-amqplib/src/amqplib.ts b/plugins/node/instrumentation-amqplib/src/amqplib.ts
@@ -655,21 +655,18 @@ export class AmqplibInstrumentation extends InstrumentationBase<AmqplibInstrumen
   ) {
     const normalizedExchange = normalizeExchange(exchange);
 
-    const span = self.tracer.startSpan(
-      `${normalizedExchange} -> ${routingKey} send`,
-      {
-        kind: SpanKind.PRODUCER,
-        attributes: {
-          ...channel.connection[CONNECTION_ATTRIBUTES],
-          [SEMATTRS_MESSAGING_DESTINATION]: exchange,
-          [SEMATTRS_MESSAGING_DESTINATION_KIND]:
-            MESSAGINGDESTINATIONKINDVALUES_TOPIC,
-          [SEMATTRS_MESSAGING_RABBITMQ_ROUTING_KEY]: routingKey,
-          [SEMATTRS_MESSAGING_MESSAGE_ID]: options?.messageId,
-          [SEMATTRS_MESSAGING_CONVERSATION_ID]: options?.correlationId,
-        },
-      }
-    );
+    const span = self.tracer.startSpan(`publish ${normalizedExchange}`, {
+      kind: SpanKind.PRODUCER,
+      attributes: {
+        ...channel.connection[CONNECTION_ATTRIBUTES],
+        [SEMATTRS_MESSAGING_DESTINATION]: exchange,
+        [SEMATTRS_MESSAGING_DESTINATION_KIND]:
+          MESSAGINGDESTINATIONKINDVALUES_TOPIC,
+        [SEMATTRS_MESSAGING_RABBITMQ_ROUTING_KEY]: routingKey,
+        [SEMATTRS_MESSAGING_MESSAGE_ID]: options?.messageId,
+        [SEMATTRS_MESSAGING_CONVERSATION_ID]: options?.correlationId,
+      },
+    });
     const modifiedOptions = options ?? {};
     modifiedOptions.headers = modifiedOptions.headers ?? {};
 
diff --git a/plugins/node/instrumentation-amqplib/test/amqplib-callbacks.test.ts b/plugins/node/instrumentation-amqplib/test/amqplib-callbacks.test.ts
@@ -136,6 +136,7 @@ describe('amqplib instrumentation callback model', () => {
         const [publishSpan, consumeSpan] = getTestSpans();
 
         // assert publish span
+        expect(publishSpan.name).toMatch('publish <default>');
         expect(publishSpan.kind).toEqual(SpanKind.PRODUCER);
         expect(publishSpan.attributes[SEMATTRS_MESSAGING_SYSTEM]).toEqual(
           'rabbitmq'

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@opentelemetry/resource-detector-alibaba-cloud",`
`3`		`- "version": "0.28.10",`
	`3`	`+ "version": "0.29.0",`
`4`	`4`	`"description": "OpenTelemetry resource detector for Alibaba Cloud",`
`5`	`5`	`"main": "build/src/index.js",`
`6`	`6`	`"types": "build/src/index.d.ts",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@opentelemetry/resource-detector-github",`
`3`		`- "version": "0.28.2",`
	`3`	`+ "version": "0.29.0",`
`4`	`4`	`"description": "OpenTelemetry SDK resource detector for GitHub",`
`5`	`5`	`"main": "build/src/index.js",`
`6`	`6`	`"types": "build/src/index.d.ts",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@opentelemetry/resource-detector-instana",`
`3`		`- "version": "0.10.0",`
	`3`	`+ "version": "0.11.0",`
`4`	`4`	`"description": "OpenTelemetry SDK resource detector for Instana",`
`5`	`5`	`"main": "build/src/index.js",`
`6`	`6`	`"types": "build/src/index.d.ts",`