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 <[email protected]>
open-telemetry · Jan 22, 2024 · 0aba75c · 0aba75c
1 parent 9727686
commit 0aba75c
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git 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
diff --git 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/[email protected]",
     "@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
@@ -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
@@ -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}