feat(sdk-trace): add option to opt-out from merging the resource with…

… Resource.default()
open-telemetry · Apr 9, 2024 · 1eb145d · 1eb145d
1 parent c046867
commit 1eb145d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/packages/opentelemetry-sdk-trace-base/src/BasicTracerProvider.ts b/packages/opentelemetry-sdk-trace-base/src/BasicTracerProvider.ts
@@ -80,7 +80,11 @@ export class BasicTracerProvider implements TracerProvider {
       reconfigureLimits(config)
     );
     this.resource = mergedConfig.resource ?? Resource.empty();
-    this.resource = Resource.default().merge(this.resource);
+
+    if (mergedConfig.mergeResourceWithDefaults) {
+      this.resource = Resource.default().merge(this.resource);
+    }
+
     this._config = Object.assign({}, mergedConfig, {
       resource: this.resource,
     });

diff --git a/packages/opentelemetry-sdk-trace-base/src/config.ts b/packages/opentelemetry-sdk-trace-base/src/config.ts
@@ -54,6 +54,7 @@ export function loadDefaultConfig() {
       attributePerLinkCountLimit:
         getEnv().OTEL_SPAN_ATTRIBUTE_PER_LINK_COUNT_LIMIT,
     },
+    mergeResourceWithDefaults: true,
   };
 }
 

diff --git a/packages/opentelemetry-sdk-trace-base/src/types.ts b/packages/opentelemetry-sdk-trace-base/src/types.ts
@@ -34,6 +34,12 @@ export interface TracerConfig {
   /** Span Limits */
   spanLimits?: SpanLimits;
 
+  /**
+   * Merge resource with {@link Resource.default()}?
+   * Default: {@code true}
+   **/
+  mergeResourceWithDefaults?: boolean;
+
   /** Resource associated with trace telemetry  */
   resource?: IResource;