From d52d4218235528dcecc706867425b86bac49b1f0 Mon Sep 17 00:00:00 2001 From: David Luna Date: Thu, 1 Aug 2024 12:14:27 +0200 Subject: [PATCH 1/5] feat(detector-github)!: change implementation to DetectorSync interface (#2336) --- .../package.json | 2 +- .../src/detectors/GitHubDetector.ts | 13 ++++++------- package-lock.json | 4 ++-- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/detectors/node/opentelemetry-resource-detector-github/package.json b/detectors/node/opentelemetry-resource-detector-github/package.json index b4c45dbba2..5f4b3f493a 100644 --- a/detectors/node/opentelemetry-resource-detector-github/package.json +++ b/detectors/node/opentelemetry-resource-detector-github/package.json @@ -54,7 +54,7 @@ "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/resources": "^1.0.0" + "@opentelemetry/resources": "^1.10.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/detectors/node/opentelemetry-resource-detector-github#readme" } diff --git a/detectors/node/opentelemetry-resource-detector-github/src/detectors/GitHubDetector.ts b/detectors/node/opentelemetry-resource-detector-github/src/detectors/GitHubDetector.ts index bc828be92c..8ee6404a6c 100644 --- a/detectors/node/opentelemetry-resource-detector-github/src/detectors/GitHubDetector.ts +++ b/detectors/node/opentelemetry-resource-detector-github/src/detectors/GitHubDetector.ts @@ -15,7 +15,8 @@ */ import { - Detector, + DetectorSync, + IResource, Resource, ResourceAttributes, } from '@opentelemetry/resources'; @@ -30,7 +31,7 @@ import { * * Returns an empty Resource if detection fails. */ -class GitHubDetector implements Detector { +class GitHubDetector implements DetectorSync { private _attributes: ResourceAttributes = {}; /** @@ -49,12 +50,10 @@ class GitHubDetector implements Detector { * environment variables: * https://docs.github.com/en/free-pro-team@latest/actions/reference/environment-variables * - * If successful it returns a promise containing a {@link Resource} - * populated with GitHub metadata. Returns a promise containing an - * empty {@link Resource} if the connection fails. - * + * If successful it returns a {@link Resource} populated with GitHub metadata. + * Returns an empty {@link Resource} if the env vars are not present. */ - async detect(): Promise { + detect(): IResource { this._attributes = {}; this.addAttributeIfExists('github.workflow', process.env.GITHUB_WORKFLOW); this.addAttributeIfExists('github.run_id', process.env.GITHUB_RUN_ID); diff --git a/package-lock.json b/package-lock.json index 29c9747eef..63775108ae 100644 --- a/package-lock.json +++ b/package-lock.json @@ -219,7 +219,7 @@ "version": "0.28.2", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/resources": "^1.0.0" + "@opentelemetry/resources": "^1.10.0" }, "devDependencies": { "@opentelemetry/api": "^1.0.0", @@ -55597,7 +55597,7 @@ "version": "file:detectors/node/opentelemetry-resource-detector-github", "requires": { "@opentelemetry/api": "^1.0.0", - "@opentelemetry/resources": "^1.0.0", + "@opentelemetry/resources": "^1.10.0", "@types/mocha": "8.2.3", "@types/node": "18.6.5", "@types/sinon": "10.0.18", From 25e85c7b128f7424b51987e9f4c067e0b538fe2f Mon Sep 17 00:00:00 2001 From: David Luna Date: Fri, 2 Aug 2024 09:25:19 +0200 Subject: [PATCH 2/5] feat(detector-alibaba)!: change implementation to DetectorSync interface (#2328) --- .../src/detectors/AlibabaCloudEcsDetector.ts | 20 ++++++-- .../src/detectors/index.ts | 2 +- .../src/index.ts | 2 +- .../detectors/AlibabaCloudEcsDetector.test.ts | 46 ++++++++----------- .../package.json | 2 +- package-lock.json | 4 +- 6 files changed, 39 insertions(+), 37 deletions(-) diff --git a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/src/detectors/AlibabaCloudEcsDetector.ts b/detectors/node/opentelemetry-resource-detector-alibaba-cloud/src/detectors/AlibabaCloudEcsDetector.ts index 776e5dbccd..bfcf29e3a2 100644 --- a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/src/detectors/AlibabaCloudEcsDetector.ts +++ b/detectors/node/opentelemetry-resource-detector-alibaba-cloud/src/detectors/AlibabaCloudEcsDetector.ts @@ -15,8 +15,10 @@ */ import { - Detector, + DetectorSync, + IResource, Resource, + ResourceAttributes, ResourceDetectionConfig, } from '@opentelemetry/resources'; import { @@ -31,6 +33,7 @@ import { SEMRESATTRS_HOST_NAME, SEMRESATTRS_HOST_TYPE, } from '@opentelemetry/semantic-conventions'; + import * as http from 'http'; /** @@ -38,7 +41,7 @@ import * as http from 'http'; * AlibabaCloud ECS and return a {@link Resource} populated with metadata about * the ECS instance. Returns an empty Resource if detection fails. */ -class AlibabaCloudEcsDetector implements Detector { +class AlibabaCloudEcsDetector implements DetectorSync { /** * See https://www.alibabacloud.com/help/doc-detail/67254.htm for * documentation about the AlibabaCloud instance identity document. @@ -57,7 +60,14 @@ class AlibabaCloudEcsDetector implements Detector { * * @param config (unused) The resource detection config */ - async detect(_config?: ResourceDetectionConfig): Promise { + detect(_config?: ResourceDetectionConfig): IResource { + return new Resource({}, this._getAttributes()); + } + + /** Gets identity and host info and returns them as attribs. Empty object if fails */ + async _getAttributes( + _config?: ResourceDetectionConfig + ): Promise { const { 'owner-account-id': accountId, 'instance-id': instanceId, @@ -67,7 +77,7 @@ class AlibabaCloudEcsDetector implements Detector { } = await this._fetchIdentity(); const hostname = await this._fetchHost(); - return new Resource({ + return { [SEMRESATTRS_CLOUD_PROVIDER]: CLOUDPROVIDERVALUES_ALIBABA_CLOUD, [SEMRESATTRS_CLOUD_PLATFORM]: CLOUDPLATFORMVALUES_ALIBABA_CLOUD_ECS, [SEMRESATTRS_CLOUD_ACCOUNT_ID]: accountId, @@ -76,7 +86,7 @@ class AlibabaCloudEcsDetector implements Detector { [SEMRESATTRS_HOST_ID]: instanceId, [SEMRESATTRS_HOST_TYPE]: instanceType, [SEMRESATTRS_HOST_NAME]: hostname, - }); + }; } /** diff --git a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/src/detectors/index.ts b/detectors/node/opentelemetry-resource-detector-alibaba-cloud/src/detectors/index.ts index 362ed6ecb7..1f43069640 100644 --- a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/src/detectors/index.ts +++ b/detectors/node/opentelemetry-resource-detector-alibaba-cloud/src/detectors/index.ts @@ -14,4 +14,4 @@ * limitations under the License. */ -export * from './AlibabaCloudEcsDetector'; +export { alibabaCloudEcsDetector } from './AlibabaCloudEcsDetector'; diff --git a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/src/index.ts b/detectors/node/opentelemetry-resource-detector-alibaba-cloud/src/index.ts index 0acba8788c..b14741ba21 100644 --- a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/src/index.ts +++ b/detectors/node/opentelemetry-resource-detector-alibaba-cloud/src/index.ts @@ -14,4 +14,4 @@ * limitations under the License. */ -export * from './detectors'; +export { alibabaCloudEcsDetector } from './detectors'; diff --git a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/test/detectors/AlibabaCloudEcsDetector.test.ts b/detectors/node/opentelemetry-resource-detector-alibaba-cloud/test/detectors/AlibabaCloudEcsDetector.test.ts index c4a2c41d36..15cd13dd99 100644 --- a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/test/detectors/AlibabaCloudEcsDetector.test.ts +++ b/detectors/node/opentelemetry-resource-detector-alibaba-cloud/test/detectors/AlibabaCloudEcsDetector.test.ts @@ -18,11 +18,11 @@ import * as nock from 'nock'; import * as assert from 'assert'; import { Resource } from '@opentelemetry/resources'; import { CLOUDPROVIDERVALUES_ALIBABA_CLOUD } from '@opentelemetry/semantic-conventions'; -import { alibabaCloudEcsDetector } from '../../src'; import { assertCloudResource, assertHostResource, } from '@opentelemetry/contrib-test-utils'; +import { alibabaCloudEcsDetector } from '../../src'; const ALIYUN_HOST = 'http://' + alibabaCloudEcsDetector.ALIBABA_CLOUD_IDMS_ENDPOINT; @@ -64,6 +64,7 @@ describe('alibabaCloudEcsDetector', () => { .reply(200, () => mockedHostResponse); const resource: Resource = await alibabaCloudEcsDetector.detect(); + await resource.waitForAsyncAttributes?.(); scope.done(); @@ -84,8 +85,7 @@ describe('alibabaCloudEcsDetector', () => { }); describe('with unsuccessful request', () => { - it('should throw when receiving error response code', async () => { - const expectedError = new Error('Failed to load page, status code: 404'); + it('should return empty resource when receiving error response code', async () => { const scope = nock(ALIYUN_HOST) .persist() .get(ALIYUN_IDENTITY_PATH) @@ -93,18 +93,15 @@ describe('alibabaCloudEcsDetector', () => { .get(ALIYUN_HOST_PATH) .reply(404, () => new Error()); - try { - await alibabaCloudEcsDetector.detect(); - assert.ok(false, 'Expected to throw'); - } catch (err) { - assert.deepStrictEqual(err, expectedError); - } + const resource = await alibabaCloudEcsDetector.detect(); + await resource.waitForAsyncAttributes?.(); + + assert.deepStrictEqual(resource.attributes, {}); scope.done(); }); - it('should throw when timed out', async () => { - const expectedError = new Error('ECS metadata api request timed out.'); + it('should return empty resource when timed out', async () => { const scope = nock(ALIYUN_HOST) .get(ALIYUN_IDENTITY_PATH) .reply(200, () => mockedIdentityResponse) @@ -112,28 +109,23 @@ describe('alibabaCloudEcsDetector', () => { .delayConnection(2000) .reply(200, () => mockedHostResponse); - try { - await alibabaCloudEcsDetector.detect(); - assert.ok(false, 'Expected to throw'); - } catch (err) { - assert.deepStrictEqual(err, expectedError); - } + const resource = await alibabaCloudEcsDetector.detect(); + await resource.waitForAsyncAttributes?.(); + + assert.deepStrictEqual(resource.attributes, {}); scope.done(); }); - it('should throw when replied with an Error', async () => { - const expectedError = new Error('NOT FOUND'); + it('should return empty resource when replied with an Error', async () => { const scope = nock(ALIYUN_HOST) .get(ALIYUN_IDENTITY_PATH) - .replyWithError(expectedError.message); - - try { - await alibabaCloudEcsDetector.detect(); - assert.ok(false, 'Expected to throw'); - } catch (err) { - assert.deepStrictEqual(err, expectedError); - } + .replyWithError('NOT FOUND'); + + const resource = await alibabaCloudEcsDetector.detect(); + await resource.waitForAsyncAttributes?.(); + + assert.deepStrictEqual(resource.attributes, {}); scope.done(); }); diff --git a/detectors/node/opentelemetry-resource-detector-instana/package.json b/detectors/node/opentelemetry-resource-detector-instana/package.json index 93d915730e..5ed0ce5dd5 100644 --- a/detectors/node/opentelemetry-resource-detector-instana/package.json +++ b/detectors/node/opentelemetry-resource-detector-instana/package.json @@ -51,7 +51,7 @@ "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/resources": "^1.0.0", + "@opentelemetry/resources": "^1.10.0", "@opentelemetry/semantic-conventions": "^1.22.0" }, "peerDependencies": { diff --git a/package-lock.json b/package-lock.json index 63775108ae..ffc20fc4fa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -251,7 +251,7 @@ "version": "0.10.0", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/resources": "^1.0.0", + "@opentelemetry/resources": "^1.10.0", "@opentelemetry/semantic-conventions": "^1.22.0" }, "devDependencies": { @@ -55622,7 +55622,7 @@ "requires": { "@opentelemetry/api": "^1.3.0", "@opentelemetry/contrib-test-utils": "^0.40.0", - "@opentelemetry/resources": "^1.0.0", + "@opentelemetry/resources": "^1.10.0", "@opentelemetry/sdk-node": "^0.52.0", "@opentelemetry/semantic-conventions": "^1.22.0", "@types/mocha": "8.2.3", From 184b19f191635fa8d433eddcc6ed3f7d94a35d8a Mon Sep 17 00:00:00 2001 From: Cedric Ziel Date: Mon, 5 Aug 2024 13:04:24 +0200 Subject: [PATCH 3/5] fix(amqplib)!: instrumentation produced high cardinality span names (#2366) * fix: amqplib instrumentation produced high cardinality span names This change amends the amqplib instrumentation so it adheres to span name conventions mentioned here https://opentelemetry.io/docs/specs/semconv/messaging/messaging-spans/#span-name * remove wrong import * fix: add test to assert that operation is publish * add test for span name * use correct queue name * fix: lint * Update plugins/node/instrumentation-amqplib/test/amqplib-callbacks.test.ts * Update plugins/node/instrumentation-amqplib/src/amqplib.ts Co-authored-by: Amir Blum * Update plugins/node/instrumentation-amqplib/src/amqplib.ts * Update plugins/node/instrumentation-amqplib/test/amqplib-callbacks.test.ts * Update amqplib-callbacks.test.ts --------- Co-authored-by: Amir Blum --- .../instrumentation-amqplib/src/amqplib.ts | 27 +++++++++---------- .../test/amqplib-callbacks.test.ts | 1 + 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/plugins/node/instrumentation-amqplib/src/amqplib.ts b/plugins/node/instrumentation-amqplib/src/amqplib.ts index 9b27d3d29c..519bf056f1 100644 --- 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 ${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 index a323cebee9..1e415cb084 100644 --- 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 '); expect(publishSpan.kind).toEqual(SpanKind.PRODUCER); expect(publishSpan.attributes[SEMATTRS_MESSAGING_SYSTEM]).toEqual( 'rabbitmq' From 0e96b2acdb553b17db7fcae0638443c38b04e968 Mon Sep 17 00:00:00 2001 From: Daniel Dyla Date: Mon, 5 Aug 2024 07:56:59 -0400 Subject: [PATCH 4/5] chore: release main (#2362) * chore: release main * chore: sync package-lock.json --------- Co-authored-by: opentelemetrybot <107717825+opentelemetrybot@users.noreply.github.com> --- .release-please-manifest.json | 10 +++++----- .../CHANGELOG.md | 11 +++++++++++ .../package.json | 2 +- .../CHANGELOG.md | 11 +++++++++++ .../package.json | 2 +- .../CHANGELOG.md | 11 +++++++++++ .../package.json | 2 +- .../auto-instrumentations-node/CHANGELOG.md | 10 ++++++++++ .../auto-instrumentations-node/package.json | 6 +++--- package-lock.json | 18 +++++++++--------- .../node/instrumentation-amqplib/CHANGELOG.md | 11 +++++++++++ .../node/instrumentation-amqplib/package.json | 2 +- 12 files changed, 75 insertions(+), 21 deletions(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 26fa623ec4..d17d841f61 100644 --- 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 index b5465ad164..29295a2944 100644 --- 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 index 604db0575f..86e0bd9077 100644 --- 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 index 02e132ad53..0e0a9866d2 100644 --- 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 index 5f4b3f493a..0655e7af2c 100644 --- 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 index 856279dc56..7e8afbad5e 100644 --- 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 index 5ed0ce5dd5..920966c654 100644 --- 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 index 6b7fadcb4a..80199825b3 100644 --- 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 index a3821acb5f..2c19262383 100644 --- 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 index ffc20fc4fa..b5a4633aa3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -39,7 +39,7 @@ }, "detectors/node/opentelemetry-resource-detector-alibaba-cloud": { "name": "@opentelemetry/resource-detector-alibaba-cloud", - "version": "0.28.10", + "version": "0.29.0", "license": "Apache-2.0", "dependencies": { "@opentelemetry/resources": "^1.0.0", @@ -216,7 +216,7 @@ }, "detectors/node/opentelemetry-resource-detector-github": { "name": "@opentelemetry/resource-detector-github", - "version": "0.28.2", + "version": "0.29.0", "license": "Apache-2.0", "dependencies": { "@opentelemetry/resources": "^1.10.0" @@ -248,7 +248,7 @@ }, "detectors/node/opentelemetry-resource-detector-instana": { "name": "@opentelemetry/resource-detector-instana", - "version": "0.10.0", + "version": "0.11.0", "license": "Apache-2.0", "dependencies": { "@opentelemetry/resources": "^1.10.0", @@ -314,11 +314,11 @@ }, "metapackages/auto-instrumentations-node": { "name": "@opentelemetry/auto-instrumentations-node", - "version": "0.49.0", + "version": "0.49.1", "license": "Apache-2.0", "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", @@ -357,7 +357,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", @@ -37681,7 +37681,7 @@ }, "plugins/node/instrumentation-amqplib": { "name": "@opentelemetry/instrumentation-amqplib", - "version": "0.40.0", + "version": "0.41.0", "license": "Apache-2.0", "dependencies": { "@opentelemetry/core": "^1.8.0", @@ -50441,7 +50441,7 @@ "requires": { "@opentelemetry/api": "^1.4.1", "@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", @@ -50480,7 +50480,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/plugins/node/instrumentation-amqplib/CHANGELOG.md b/plugins/node/instrumentation-amqplib/CHANGELOG.md index 6fe5df2ed4..4e16078ba0 100644 --- 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 index eed572e9a6..7e7b0822c4 100644 --- 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", From efe3c920c5f1a3d93bc5ad4a2af95f9385d83d51 Mon Sep 17 00:00:00 2001 From: Bastian Krol Date: Wed, 7 Aug 2024 11:16:22 +0200 Subject: [PATCH 5/5] chore(opentelemetry-propagator-instana): update component owners (#2363) * chore(opentelemetry-propagator-instana): update component owners Reason: I do no longer work for or on Instana. * chore: remove component owner from yaml --------- Co-authored-by: Marc Pichler Co-authored-by: Amir Blum --- .github/component_owners.yml | 2 -- propagators/opentelemetry-propagator-instana/README.md | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/component_owners.yml b/.github/component_owners.yml index e79dce3994..f13d45b523 100644 --- a/.github/component_owners.yml +++ b/.github/component_owners.yml @@ -15,7 +15,6 @@ components: detectors/node/opentelemetry-resource-detector-github: [] # Unmaintained detectors/node/opentelemetry-resource-detector-instana: - - basti1302 - kirrg001 incubator/opentelemetry-sampler-aws-xray: - carolabadeer @@ -144,7 +143,6 @@ components: plugins/web/opentelemetry-plugin-react-load: - martinkuba propagators/opentelemetry-propagator-instana: - - basti1302 - kirrg001 propagators/opentelemetry-propagator-ot-trace: [] # Unmaintained diff --git a/propagators/opentelemetry-propagator-instana/README.md b/propagators/opentelemetry-propagator-instana/README.md index 13b1635335..87605247d6 100644 --- a/propagators/opentelemetry-propagator-instana/README.md +++ b/propagators/opentelemetry-propagator-instana/README.md @@ -3,7 +3,7 @@ [![NPM Published Version][npm-img]][npm-url] [![Apache License][license-image]][license-image] -[component owners](https://github.com/open-telemetry/opentelemetry-js-contrib/blob/main/.github/component_owners.yml): @basti1302, @kirrg001 +[component owners](https://github.com/open-telemetry/opentelemetry-js-contrib/blob/main/.github/component_owners.yml): @kirrg001 The OpenTelemetry Propagator for Instana provides HTTP header propagation for systems that are using IBM Observability by Instana. This propagator translates the Instana trace correlation headers (`X-INSTANA-T/X-INSTANA-S/X-INSTANA-L`) into the OpenTelemetry `SpanContext`, and vice versa.