From 0aba75ceefb2ee1cf6e576b0ccda9ee289d62cb6 Mon Sep 17 00:00:00 2001 From: Jamie Danielson Date: Mon, 22 Jan 2024 10:35:50 -0500 Subject: [PATCH] chore(otel-resources): replace deprecated spanAttributes (#4428) * chore(otel-resources): replace deprecated spanAttributes * update minimum api version to 1.1 * update changelog * per legendecas, add todo for ResourceAttributes --------- Co-authored-by: Marc Pichler --- CHANGELOG_NEXT.md | 1 + package-lock.json | 4 ++-- packages/opentelemetry-resources/package.json | 2 +- packages/opentelemetry-resources/src/Resource.ts | 2 +- packages/opentelemetry-resources/src/types.ts | 7 +++---- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CHANGELOG_NEXT.md b/CHANGELOG_NEXT.md index 5d735167aa..73772e677f 100644 --- a/CHANGELOG_NEXT.md +++ b/CHANGELOG_NEXT.md @@ -4,6 +4,7 @@ * chore(shim-opentracing): replace deprecated SpanAttributes [#4430](https://github.com/open-telemetry/opentelemetry-js/pull/4430) @JamieDanielson * chore(otel-core): replace deprecated SpanAttributes [#4408](https://github.com/open-telemetry/opentelemetry-js/pull/4408) @JamieDanielson +* chore(otel-resources): replace deprecated SpanAttributes [#4428](https://github.com/open-telemetry/opentelemetry-js/pull/4428) @JamieDanielson ### :rocket: (Enhancement) diff --git a/package-lock.json b/package-lock.json index 9c685a2e95..7800ff33d6 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 3c78e12eeb..fc502ef642 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", diff --git a/packages/opentelemetry-resources/src/Resource.ts b/packages/opentelemetry-resources/src/Resource.ts index dfddda8ae1..40e99ceae4 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 d20c09faa2..d86fc9da6e 100644 --- a/packages/opentelemetry-resources/src/types.ts +++ b/packages/opentelemetry-resources/src/types.ts @@ -15,15 +15,14 @@ */ 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; +// TODO: replace ResourceAttributes with Attributes +export type ResourceAttributes = Attributes; /** * @deprecated please use {@link DetectorSync}