From dc74db06c73f66c197e19bb834baaf3be83e87e0 Mon Sep 17 00:00:00 2001 From: JamieDanielson Date: Thu, 18 Jan 2024 10:58:33 -0500 Subject: [PATCH 1/4] chore(otel-resources): replace deprecated spanAttributes --- packages/opentelemetry-resources/src/Resource.ts | 2 +- packages/opentelemetry-resources/src/types.ts | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/packages/opentelemetry-resources/src/Resource.ts b/packages/opentelemetry-resources/src/Resource.ts index dfddda8ae1a..40e99ceae48 100644 --- a/packages/opentelemetry-resources/src/Resource.ts +++ b/packages/opentelemetry-resources/src/Resource.ts @@ -119,7 +119,7 @@ export class Resource implements IResource { merge(other: IResource | null): IResource { if (!other) return this; - // SpanAttributes from other resource overwrite attributes from this resource. + // Attributes from other resource overwrite attributes from this resource. const mergedSyncAttributes = { ...this._syncAttributes, //Support for old resource implementation where _syncAttributes is not defined diff --git a/packages/opentelemetry-resources/src/types.ts b/packages/opentelemetry-resources/src/types.ts index d20c09faa2f..add5bb32417 100644 --- a/packages/opentelemetry-resources/src/types.ts +++ b/packages/opentelemetry-resources/src/types.ts @@ -15,15 +15,13 @@ */ import { ResourceDetectionConfig } from './config'; -import { SpanAttributes } from '@opentelemetry/api'; +import { Attributes } from '@opentelemetry/api'; import { IResource } from './IResource'; /** * Interface for Resource attributes. - * General `Attributes` interface is added in api v1.1.0. - * To backward support older api (1.0.x), the deprecated `SpanAttributes` is used here. */ -export type ResourceAttributes = SpanAttributes; +export type ResourceAttributes = Attributes; /** * @deprecated please use {@link DetectorSync} From 70b906081e83329d280ba8adf33eae7f25549ecf Mon Sep 17 00:00:00 2001 From: JamieDanielson Date: Thu, 18 Jan 2024 10:58:38 -0500 Subject: [PATCH 2/4] update minimum api version to 1.1 --- package-lock.json | 4 ++-- packages/opentelemetry-resources/package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5a1c6d47213..7d7796c5c39 100644 --- a/package-lock.json +++ b/package-lock.json @@ -31307,7 +31307,7 @@ "@opentelemetry/semantic-conventions": "1.18.1" }, "devDependencies": { - "@opentelemetry/api": ">=1.0.0 <1.8.0", + "@opentelemetry/api": ">=1.1.0 <1.8.0", "@opentelemetry/resources_1.9.0": "npm:@opentelemetry/resources@1.9.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", @@ -37075,7 +37075,7 @@ "@opentelemetry/resources": { "version": "file:packages/opentelemetry-resources", "requires": { - "@opentelemetry/api": ">=1.0.0 <1.8.0", + "@opentelemetry/api": ">=1.1.0 <1.8.0", "@opentelemetry/core": "1.18.1", "@opentelemetry/resources_1.9.0": "npm:@opentelemetry/resources@1.9.0", "@opentelemetry/semantic-conventions": "1.18.1", diff --git a/packages/opentelemetry-resources/package.json b/packages/opentelemetry-resources/package.json index 3c78e12eeb7..fc502ef6429 100644 --- a/packages/opentelemetry-resources/package.json +++ b/packages/opentelemetry-resources/package.json @@ -61,7 +61,7 @@ "access": "public" }, "devDependencies": { - "@opentelemetry/api": ">=1.0.0 <1.8.0", + "@opentelemetry/api": ">=1.1.0 <1.8.0", "@opentelemetry/resources_1.9.0": "npm:@opentelemetry/resources@1.9.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", From 39bd1243265a0a9e9b7c02876a960aaaf56bdea3 Mon Sep 17 00:00:00 2001 From: JamieDanielson Date: Thu, 18 Jan 2024 11:01:13 -0500 Subject: [PATCH 3/4] update changelog --- CHANGELOG_NEXT.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG_NEXT.md b/CHANGELOG_NEXT.md index 1865224d258..bf2072089fc 100644 --- a/CHANGELOG_NEXT.md +++ b/CHANGELOG_NEXT.md @@ -2,6 +2,7 @@ ### :boom: Breaking Change +* chore(otel-resources): replace deprecated SpanAttributes [#4428](https://github.com/open-telemetry/opentelemetry-js/pull/4428) @JamieDanielson * chore(otel-core): replace deprecated SpanAttributes [#4408](https://github.com/open-telemetry/opentelemetry-js/pull/4408) @JamieDanielson ### :rocket: (Enhancement) From 3792a7b0ebfe4d2f0bc49e6728a1772e466098e9 Mon Sep 17 00:00:00 2001 From: JamieDanielson Date: Fri, 19 Jan 2024 13:02:57 -0500 Subject: [PATCH 4/4] per legendecas, add todo for ResourceAttributes --- packages/opentelemetry-resources/src/types.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/opentelemetry-resources/src/types.ts b/packages/opentelemetry-resources/src/types.ts index add5bb32417..d86fc9da6e7 100644 --- a/packages/opentelemetry-resources/src/types.ts +++ b/packages/opentelemetry-resources/src/types.ts @@ -21,6 +21,7 @@ import { IResource } from './IResource'; /** * Interface for Resource attributes. */ +// TODO: replace ResourceAttributes with Attributes export type ResourceAttributes = Attributes; /**