Merge remote-tracking branch 'origin/main' into resource-async-sync

experimental/packages/opentelemetry-sdk-node/src/sdk.ts

@@ -209,7 +209,6 @@ export class NodeSDK {
 
   private _resource: IResource;
   private _resourceDetectors: Array<ResourceDetector>;
-  private _mergeResourceWithDefaults: boolean;
 
   private _autoDetectResources: boolean;
 
@@ -244,9 +243,7 @@ export class NodeSDK {
 
     this._configuration = configuration;
 
-    this._resource = configuration.resource ?? new Resource({ attributes: {}});
-    this._mergeResourceWithDefaults =
-      configuration.mergeResourceWithDefaults ?? true;
+    this._resource = configuration.resource ?? Resource.default();
     this._autoDetectResources = configuration.autoDetectResources ?? true;
     if (!this._autoDetectResources) {
       this._resourceDetectors = [];

experimental/packages/opentelemetry-sdk-node/src/types.ts

@@ -40,7 +40,6 @@ export interface NodeSDKConfiguration {
   instrumentations: (Instrumentation | Instrumentation[])[];
   resource: IResource;
   resourceDetectors: Array<ResourceDetector>;
-  mergeResourceWithDefaults?: boolean;
   sampler: Sampler;
   serviceName?: string;
   /** @deprecated use spanProcessors instead*/

experimental/packages/opentelemetry-sdk-node/test/sdk.test.ts

@@ -941,7 +941,7 @@ describe('Node SDK', () => {
         const resource = sdk['_resource'];
         await resource.waitForAsyncAttributes?.();
 
-        assert.deepStrictEqual(resource, Resource.EMPTY);
+        assert.deepStrictEqual(resource, Resource.default());
         await sdk.shutdown();
       });
     });

experimental/packages/sdk-logs/src/LoggerProvider.ts

@@ -16,7 +16,7 @@
 import { diag } from '@opentelemetry/api';
 import type * as logsAPI from '@opentelemetry/api-logs';
 import { NOOP_LOGGER } from '@opentelemetry/api-logs';
-import { IResource, Resource } from '@opentelemetry/resources';
+import { Resource } from '@opentelemetry/resources';
 import { BindOnceFuture, merge } from '@opentelemetry/core';
 
 import type { LoggerProviderConfig } from './types';
@@ -28,18 +28,6 @@ import { LoggerProviderSharedState } from './internal/LoggerProviderSharedState'
 
 export const DEFAULT_LOGGER_NAME = 'unknown';
 
-function prepareResource(
-  mergeWithDefaults: boolean,
-  providedResource: IResource | undefined
-) {
-  const resource = providedResource ?? Resource.EMPTY;
-
-  if (mergeWithDefaults) {
-    return Resource.default().merge(resource);
-  }
-  return resource;
-}
-
 export class LoggerProvider implements logsAPI.LoggerProvider {
   private _shutdownOnce: BindOnceFuture<void>;
   private readonly _sharedState: LoggerProviderSharedState;

experimental/packages/sdk-logs/test/common/LoggerProvider.test.ts

@@ -63,38 +63,15 @@ describe('LoggerProvider', () => {
         assert.deepStrictEqual(resource, Resource.default());
       });
 
-      it('should fallback to default resource attrs', () => {
-        const passedInResource = new Resource({ attributes: { foo: 'bar' }});
-        const provider = new LoggerProvider({ resource: passedInResource });
-        const { resource } = provider['_sharedState'];
-        assert.deepStrictEqual(
-          resource,
-          Resource.default().merge(passedInResource)
-        );
-      });
-
-      it('should not merge with default resource attrs when flag is set to false', function () {
-        const passedInResource = new Resource({ attributes: { foo: 'bar' }});
+      it('should not have default resource if passed', function () {
+        const passedInResource = new Resource({ attributes: { foo: 'bar' } });
         const provider = new LoggerProvider({
           resource: passedInResource,
         });
         const { resource } = provider['_sharedState'];
         assert.deepStrictEqual(resource, passedInResource);
       });
 
-      it('should merge with default resource attrs when flag is set to true', function () {
-        const passedInResource = new Resource({ attributes: { foo: 'bar' }});
-        const provider = new LoggerProvider({
-          resource: passedInResource,
-          mergeResourceWithDefaults: true,
-        });
-        const { resource } = provider['_sharedState'];
-        assert.deepStrictEqual(
-          resource,
-          Resource.default().merge(passedInResource)
-        );
-      });
-
       it('should have default forceFlushTimeoutMillis if not pass', () => {
         const provider = new LoggerProvider();
         const sharedState = provider['_sharedState'];