Merge branch 'next' into feat/remove-addmetricreader

open-telemetry · Jan 17, 2024 · 86392ac · 86392ac
2 parents 686331c + 7f613e0
commit 86392ac
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 32 deletions.
diff --git a/CHANGELOG_NEXT.md b/CHANGELOG_NEXT.md
@@ -2,6 +2,7 @@
 
 ### :boom: Breaking Change
 
+* chore(otel-core): replace deprecated SpanAttributes [#4408](https://github.com/open-telemetry/opentelemetry-js/pull/4408) @JamieDanielson
 * feat(sdk-metrics)!: remove MeterProvider.addMetricReader() in favor of constructor option [#4419](https://github.com/open-telemetry/opentelemetry-js/pull/4419) @pichlermarc
 
 ### :rocket: (Enhancement)

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/opentelemetry-core/package.json b/packages/opentelemetry-core/package.json
@@ -64,7 +64,7 @@
     "access": "public"
   },
   "devDependencies": {
-    "@opentelemetry/api": ">=1.0.0 <1.8.0",
+    "@opentelemetry/api": ">=1.1.0 <1.8.0",
     "@types/mocha": "10.0.6",
     "@types/node": "18.6.5",
     "@types/sinon": "10.0.20",
@@ -88,7 +88,7 @@
     "webpack": "4.46.0"
   },
   "peerDependencies": {
-    "@opentelemetry/api": ">=1.0.0 <1.8.0"
+    "@opentelemetry/api": ">=1.1.0 <1.8.0"
   },
   "dependencies": {
     "@opentelemetry/semantic-conventions": "1.18.1"

diff --git a/packages/opentelemetry-core/src/common/attributes.ts b/packages/opentelemetry-core/src/common/attributes.ts
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-import { diag, SpanAttributeValue, SpanAttributes } from '@opentelemetry/api';
+import { diag, AttributeValue, Attributes } from '@opentelemetry/api';
 
-export function sanitizeAttributes(attributes: unknown): SpanAttributes {
-  const out: SpanAttributes = {};
+export function sanitizeAttributes(attributes: unknown): Attributes {
+  const out: Attributes = {};
 
   if (typeof attributes !== 'object' || attributes == null) {
     return out;
@@ -46,7 +46,7 @@ export function isAttributeKey(key: unknown): key is string {
   return typeof key === 'string' && key.length > 0;
 }
 
-export function isAttributeValue(val: unknown): val is SpanAttributeValue {
+export function isAttributeValue(val: unknown): val is AttributeValue {
   if (val == null) {
     return true;
   }

diff --git a/packages/opentelemetry-core/src/trace/sampler/ParentBasedSampler.ts b/packages/opentelemetry-core/src/trace/sampler/ParentBasedSampler.ts
@@ -20,7 +20,7 @@ import {
   Link,
   Sampler,
   SamplingResult,
-  SpanAttributes,
+  Attributes,
   SpanKind,
   TraceFlags,
   trace,
@@ -66,7 +66,7 @@ export class ParentBasedSampler implements Sampler {
     traceId: string,
     spanName: string,
     spanKind: SpanKind,
-    attributes: SpanAttributes,
+    attributes: Attributes,
     links: Link[]
   ): SamplingResult {
     const parentContext = trace.getSpanContext(context);