Lint and cleanup

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

@@ -344,9 +344,7 @@ export class NodeSDK {
         detectors: this._resourceDetectors,
       };
 
-      this._resource = this._resource.merge(
-        detectResources(internalConfig)
-      );
+      this._resource = this._resource.merge(detectResources(internalConfig));
     }
 
     this._resource =

packages/opentelemetry-resources/src/Resource.ts

@@ -24,10 +24,7 @@ import {
 } from '@opentelemetry/semantic-conventions';
 import { IResource } from './IResource';
 import { defaultServiceName } from './platform';
-import {
-  DetectedResource,
-  MaybePromise,
-} from './types';
+import { DetectedResource, MaybePromise } from './types';
 import { isPromiseLike } from './utils';
 
 export class Resource implements IResource {
@@ -36,7 +33,7 @@ export class Resource implements IResource {
 
   private _memoizedAttributes?: Attributes;
 
-  public static EMPTY = new Resource({ attributes: {}});
+  public static EMPTY = new Resource({ attributes: {} });
   /**
    * Returns a Resource that identifies the SDK in use.
    */
@@ -51,10 +48,13 @@ export class Resource implements IResource {
     });
   }
 
-  static FromAttributeList(attributes: [string, MaybePromise<AttributeValue | undefined>][]): Resource {
+  static FromAttributeList(
+    attributes: [string, MaybePromise<AttributeValue | undefined>][]
+  ): Resource {
     const res = new Resource({});
     res._rawAttributes = attributes;
-    res._asyncAttributesPending = attributes.filter(([_,val]) => isPromiseLike(val)).length > 0
+    res._asyncAttributesPending =
+      attributes.filter(([_, val]) => isPromiseLike(val)).length > 0;
     return res;
   }
 
@@ -87,7 +87,7 @@ export class Resource implements IResource {
     }
 
     for (let i = 0; i < this._rawAttributes.length; i++) {
-      const [k,v] = this._rawAttributes[i];
+      const [k, v] = this._rawAttributes[i];
       try {
         this._rawAttributes[i] = [k, await v];
       } catch (err) {
@@ -112,7 +112,6 @@ export class Resource implements IResource {
 
     const attrs: Attributes = {};
     for (const [k, v] of this._rawAttributes) {
-      console.log(k,v)
       if (isPromiseLike(v)) {
         diag.debug(`Unsettled resource attribute ${k} skipped`);
         continue;
@@ -133,16 +132,9 @@ export class Resource implements IResource {
   public merge(resource: Resource | null) {
     if (resource == null) return this;
 
-    // incoming attributes have a higher priority
-    // const attributes: DetectedResourceAttributes = {};
-    // for (const [k, v] of [...resource._rawAttributes, ...this._rawAttributes]) {
-    //   if (v != null) {
-    //     attributes[k] ??= v;
-    //   }
-    // }
-
-    // return new Resource({ attributes });
-
-    return Resource.FromAttributeList([...resource._rawAttributes, ...this._rawAttributes]);
+    return Resource.FromAttributeList([
+      ...resource._rawAttributes,
+      ...this._rawAttributes,
+    ]);
   }
 }

packages/opentelemetry-resources/src/detect-resources.ts

@@ -34,7 +34,7 @@ export const detectResources = (
       return resource;
     } catch (e) {
       diag.debug(`${d.constructor.name} failed: ${e.message}`);
-      return new Resource({ attributes: {}});
+      return new Resource({ attributes: {} });
     }
   });
 
@@ -43,7 +43,7 @@ export const detectResources = (
 
   return resources.reduce(
     (acc, resource) => acc.merge(resource),
-    new Resource({ attributes: {}})
+    new Resource({ attributes: {} })
   );
 };
 

packages/opentelemetry-resources/src/detectors/index.ts

@@ -14,14 +14,12 @@
  * limitations under the License.
  */
 
-export {
-  browserDetector,
-} from './BrowserDetector';
+export { browserDetector } from './BrowserDetector';
 export { envDetector } from './EnvDetector';
 export {
   hostDetector,
   osDetector,
   processDetector,
   serviceInstanceIdDetector,
 } from './platform';
-export { noopDetector } from "./NoopDetector";
+export { noopDetector } from './NoopDetector';

packages/opentelemetry-resources/src/detectors/platform/node/HostDetector.ts

@@ -21,7 +21,11 @@ import {
 } from '@opentelemetry/semantic-conventions';
 import { arch, hostname } from 'os';
 import { ResourceDetectionConfig } from '../../../config';
-import { DetectedResource, DetectedResourceAttributes, ResourceDetector } from '../../../types';
+import {
+  DetectedResource,
+  DetectedResourceAttributes,
+  ResourceDetector,
+} from '../../../types';
 import { getMachineId } from './machine-id/getMachineId';
 import { normalizeArch } from './utils';
 

packages/opentelemetry-resources/src/detectors/platform/node/ServiceInstanceIdDetector.ts

@@ -35,5 +35,4 @@ class ServiceInstanceIdDetector implements ResourceDetector {
 /**
  * @experimental
  */
-export const serviceInstanceIdDetector =
-  new ServiceInstanceIdDetector();
+export const serviceInstanceIdDetector = new ServiceInstanceIdDetector();

packages/opentelemetry-resources/src/index.ts

@@ -27,4 +27,8 @@ export {
 export { IResource } from './IResource';
 export { defaultServiceName } from './platform';
 export { Resource } from './Resource';
-export { ResourceDetector, DetectedResource, DetectedResourceAttributes } from './types';
+export {
+  ResourceDetector,
+  DetectedResource,
+  DetectedResourceAttributes,
+} from './types';

packages/opentelemetry-resources/test/Resource.test.ts

@@ -61,7 +61,10 @@ describe('Resource', () => {
     });
     const actualResource = resource1.merge(resource2);
     assert.strictEqual(Object.keys(actualResource.attributes).length, 5);
-    assert.deepStrictEqual(actualResource.attributes, expectedResource.attributes);
+    assert.deepStrictEqual(
+      actualResource.attributes,
+      expectedResource.attributes
+    );
   });
 
   it('should return merged resource when collision in attributes', () => {
@@ -75,7 +78,10 @@ describe('Resource', () => {
     });
     const actualResource = resource1.merge(resource3);
     assert.strictEqual(Object.keys(actualResource.attributes).length, 4);
-    assert.deepStrictEqual(actualResource.attributes, expectedResource.attributes);
+    assert.deepStrictEqual(
+      actualResource.attributes,
+      expectedResource.attributes
+    );
   });
 
   it('should return merged resource when first resource is empty', () => {
@@ -152,7 +158,9 @@ describe('Resource', () => {
       const resourceReject = new Resource({
         attributes: {
           async: new Promise((_, reject) => {
-            setTimeout(() => { reject(new Error('reject')) }, 1);
+            setTimeout(() => {
+              reject(new Error('reject'));
+            }, 1);
           }),
         },
       });
@@ -169,7 +177,9 @@ describe('Resource', () => {
         attributes: {
           sync: 'fromsync',
           // async attribute resolves after 1ms
-          async: new Promise(resolve => setTimeout(() => resolve('fromasync'), 1)),
+          async: new Promise(resolve =>
+            setTimeout(() => resolve('fromasync'), 1)
+          ),
         },
       });
 

packages/opentelemetry-resources/test/util/resource-assertions.ts

@@ -411,7 +411,10 @@ export const assertEmptyResource = (resource: DetectedResource) => {
  * Assert that the `resource` has at least one known attribute with the given
  * `prefix`. By "known", we mean it is an attribute defined in semconv.
  */
-const assertHasOneLabel = (prefix: string, resource: DetectedResource): void => {
+const assertHasOneLabel = (
+  prefix: string,
+  resource: DetectedResource
+): void => {
   const semconvModPrefix = `SEMRESATTRS_${prefix.toUpperCase()}_`;
   const knownAttrs: Set<string> = new Set(
     Object.entries(semconv)

packages/sdk-metrics/test/export/MetricReader.test.ts

@@ -143,7 +143,7 @@ describe('MetricReader', () => {
           resource: new Resource({
             attributes: {
               shouldBeDiscarded: 'should-be-discarded',
-            }
+            },
           }),
           scopeMetrics: testScopeMetrics,
         },