Merge branch 'main' into feat/mongodb-support-v5

open-telemetry · Jun 30, 2023 · f23eeac · f23eeac
2 parents 4afcd91 + 8777cbd
commit f23eeac
Show file tree

Hide file tree

Showing 78 changed files with 910 additions and 80 deletions.
diff --git a/.github/component_owners.yml b/.github/component_owners.yml
@@ -109,7 +109,8 @@ components:
   plugins/node/opentelemetry-instrumentation-winston:
     - seemk
   plugins/web/opentelemetry-instrumentation-document-load:
-    - obecny
+    - pkanal
+    - martinkuba 
   plugins/web/opentelemetry-instrumentation-long-task:
     - mhennoch
     - t2t2

diff --git a/archive/opentelemetry-browser-extension-autoinjection/package.json b/archive/opentelemetry-browser-extension-autoinjection/package.json
@@ -80,7 +80,8 @@
     "change-case": "4.1.2",
     "json5": "2.2.0",
     "react": "17.0.2",
-    "react-dom": "17.0.2"
+    "react-dom": "17.0.2",
+    "tslib": "^2.3.1"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/opentelemetry-browser-extension-autoinjection#readme"
 }
diff --git a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json b/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json
@@ -60,7 +60,8 @@
   },
   "dependencies": {
     "@opentelemetry/resources": "^1.0.0",
-    "@opentelemetry/semantic-conventions": "^1.0.0"
+    "@opentelemetry/semantic-conventions": "^1.0.0",
+    "tslib": "^2.3.1"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/detectors/node/opentelemetry-resource-detector-alibaba-cloud#readme"
 }
diff --git a/detectors/node/opentelemetry-resource-detector-aws/package.json b/detectors/node/opentelemetry-resource-detector-aws/package.json
@@ -60,7 +60,8 @@
   "dependencies": {
     "@opentelemetry/core": "^1.0.0",
     "@opentelemetry/resources": "^1.0.0",
-    "@opentelemetry/semantic-conventions": "^1.0.0"
+    "@opentelemetry/semantic-conventions": "^1.0.0",
+    "tslib": "^2.3.1"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/detectors/node/opentelemetry-resource-detector-aws#readme"
 }
diff --git a/detectors/node/opentelemetry-resource-detector-aws/src/detectors/AwsEcsDetector.ts b/detectors/node/opentelemetry-resource-detector-aws/src/detectors/AwsEcsDetector.ts
@@ -15,7 +15,11 @@
  */
 
 import { diag } from '@opentelemetry/api';
-import { Detector, Resource } from '@opentelemetry/resources';
+import {
+  Detector,
+  Resource,
+  ResourceAttributes,
+} from '@opentelemetry/resources';
 import {
   CloudProviderValues,
   CloudPlatformValues,
@@ -128,14 +132,19 @@ export class AwsEcsDetector implements Detector {
     const baseArn: string = taskArn.substring(0, taskArn.lastIndexOf(':'));
     const cluster: string = taskMetadata['Cluster'];
 
+    const accountId: string = AwsEcsDetector._getAccountFromArn(taskArn);
+    const region: string = AwsEcsDetector._getRegionFromArn(taskArn);
+    const availabilityZone: string | undefined =
+      taskMetadata?.['AvailabilityZone'];
+
     const clusterArn = cluster.startsWith('arn:')
       ? cluster
       : `${baseArn}:cluster/${cluster}`;
 
     const containerArn: string = containerMetadata['ContainerARN'];
 
-    // https://github.com/open-telemetry/opentelemetry-specification/blob/main/semantic_conventions/resource/cloud_provider/aws/ecs.yaml
-    return new Resource({
+    // https://github.com/open-telemetry/semantic-conventions/blob/main/semantic_conventions/resource/cloud_provider/aws/ecs.yaml
+    const attributes: ResourceAttributes = {
       [SemanticResourceAttributes.AWS_ECS_CONTAINER_ARN]: containerArn,
       [SemanticResourceAttributes.AWS_ECS_CLUSTER_ARN]: clusterArn,
       [SemanticResourceAttributes.AWS_ECS_LAUNCHTYPE]:
@@ -144,7 +153,18 @@ export class AwsEcsDetector implements Detector {
       [SemanticResourceAttributes.AWS_ECS_TASK_FAMILY]: taskMetadata['Family'],
       [SemanticResourceAttributes.AWS_ECS_TASK_REVISION]:
         taskMetadata['Revision'],
-    });
+
+      [SemanticResourceAttributes.CLOUD_ACCOUNT_ID]: accountId,
+      [SemanticResourceAttributes.CLOUD_REGION]: region,
+    };
+
+    // The availability zone is not available in all Fargate runtimes
+    if (availabilityZone) {
+      attributes[SemanticResourceAttributes.CLOUD_AVAILABILITY_ZONE] =
+        availabilityZone;
+    }
+
+    return new Resource(attributes);
   }
 
   private static async _getLogResource(

diff --git a/detectors/node/opentelemetry-resource-detector-aws/test/detectors/AwsEcsDetector.test.ts b/detectors/node/opentelemetry-resource-detector-aws/test/detectors/AwsEcsDetector.test.ts
@@ -37,6 +37,9 @@ import * as os from 'os';
 import { join } from 'path';
 
 interface EcsResourceAttributes {
+  readonly accountId?: string;
+  readonly region?: string;
+  readonly zone?: string;
   readonly clusterArn?: string;
   readonly containerArn?: string;
   readonly launchType?: 'ec2' | 'fargate';
@@ -55,6 +58,9 @@ const assertEcsResource = (
 ) => {
   assertCloudResource(resource, {
     provider: CloudProviderValues.AWS,
+    accountId: validations.accountId,
+    region: validations.region,
+    zone: validations.zone,
   });
   assert.strictEqual(
     resource.attributes[SemanticResourceAttributes.CLOUD_PLATFORM],
@@ -336,6 +342,9 @@ describe('AwsEcsResourceDetector', () => {
       describe('on Fargate', () => {
         describe('with AWS CloudWatch as log driver', () => {
           generateLaunchTypeTests({
+            accountId: '111122223333',
+            region: 'us-west-2',
+            zone: 'us-west-2a',
             clusterArn: 'arn:aws:ecs:us-west-2:111122223333:cluster/default',
             containerArn:
               'arn:aws:ecs:us-west-2:111122223333:container/05966557-f16c-49cb-9352-24b3a0dcd0e1',

diff --git a/detectors/node/opentelemetry-resource-detector-container/package.json b/detectors/node/opentelemetry-resource-detector-container/package.json
@@ -54,7 +54,8 @@
   },
   "dependencies": {
     "@opentelemetry/resources": "^1.0.0",
-    "@opentelemetry/semantic-conventions": "^1.0.0"
+    "@opentelemetry/semantic-conventions": "^1.0.0",
+    "tslib": "^2.3.1"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/detectors/node/opentelemetry-resource-detector-container#readme"
 }
diff --git a/detectors/node/opentelemetry-resource-detector-gcp/package.json b/detectors/node/opentelemetry-resource-detector-gcp/package.json
@@ -60,7 +60,8 @@
     "@opentelemetry/core": "^1.0.0",
     "@opentelemetry/resources": "^1.0.0",
     "@opentelemetry/semantic-conventions": "^1.0.0",
-    "gcp-metadata": "^5.0.0"
+    "gcp-metadata": "^5.0.0",
+    "tslib": "^2.3.1"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/detectors/node/opentelemetry-resource-detector-gcp#readme"
 }
diff --git a/detectors/node/opentelemetry-resource-detector-github/package.json b/detectors/node/opentelemetry-resource-detector-github/package.json
@@ -57,7 +57,8 @@
     "typescript": "4.4.4"
   },
   "dependencies": {
-    "@opentelemetry/resources": "^1.0.0"
+    "@opentelemetry/resources": "^1.0.0",
+    "tslib": "^2.3.1"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/detectors/node/opentelemetry-resource-detector-github#readme"
 }
diff --git a/detectors/node/opentelemetry-resource-detector-instana/package.json b/detectors/node/opentelemetry-resource-detector-instana/package.json
@@ -54,7 +54,8 @@
   },
   "dependencies": {
     "@opentelemetry/resources": "^1.0.0",
-    "@opentelemetry/semantic-conventions": "^1.0.0"
+    "@opentelemetry/semantic-conventions": "^1.0.0",
+    "tslib": "^2.3.1"
   },
   "peerDependencies": {
     "@opentelemetry/api": "^1.3.0"

diff --git a/metapackages/auto-instrumentations-node/package.json b/metapackages/auto-instrumentations-node/package.json
@@ -91,6 +91,7 @@
     "@opentelemetry/resource-detector-container": "^0.2.5",
     "@opentelemetry/resource-detector-gcp": "^0.28.3",
     "@opentelemetry/resources": "^1.12.0",
-    "@opentelemetry/sdk-node": "^0.40.0"
+    "@opentelemetry/sdk-node": "^0.40.0",
+    "tslib": "^2.3.1"
   }
 }
diff --git a/metapackages/auto-instrumentations-web/package.json b/metapackages/auto-instrumentations-web/package.json
@@ -63,6 +63,7 @@
     "@opentelemetry/instrumentation-document-load": "^0.32.3",
     "@opentelemetry/instrumentation-fetch": "^0.40.0",
     "@opentelemetry/instrumentation-user-interaction": "^0.32.4",
-    "@opentelemetry/instrumentation-xml-http-request": "^0.40.0"
+    "@opentelemetry/instrumentation-xml-http-request": "^0.40.0",
+    "tslib": "^2.3.1"
   }
 }
diff --git a/package.json b/package.json
@@ -59,7 +59,8 @@
     "lerna": "5.5.2",
     "lerna-changelog": "2.2.0",
     "prettier": "2.8.7",
-    "typescript": "4.4.4"
+    "typescript": "4.4.4",
+    "tslib": "^2.3.1"
   },
   "changelog": {
     "labels": {

diff --git a/packages/opentelemetry-host-metrics/package.json b/packages/opentelemetry-host-metrics/package.json
@@ -59,7 +59,8 @@
   },
   "dependencies": {
     "@opentelemetry/sdk-metrics": "^1.8.0",
-    "systeminformation": "^5.0.0"
+    "systeminformation": "^5.0.0",
+    "tslib": "^2.3.1"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/opentelemetry-host-metrics#readme"
 }
diff --git a/packages/opentelemetry-id-generator-aws-xray/package.json b/packages/opentelemetry-id-generator-aws-xray/package.json
@@ -76,7 +76,8 @@
     "webpack": "4.46.0"
   },
   "dependencies": {
-    "@opentelemetry/core": "^1.0.0"
+    "@opentelemetry/core": "^1.0.0",
+    "tslib": "^2.3.1"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/opentelemetry-id-generator-aws-xray#readme"
 }
diff --git a/packages/opentelemetry-propagation-utils/package.json b/packages/opentelemetry-propagation-utils/package.json
@@ -55,5 +55,8 @@
     "sinon": "15.0.1",
     "ts-mocha": "10.0.0",
     "typescript": "4.4.4"
+  },
+  "dependencies": {
+    "tslib": "^2.3.1"
   }
 }
diff --git a/packages/opentelemetry-redis-common/package.json b/packages/opentelemetry-redis-common/package.json
@@ -45,5 +45,8 @@
     "nyc": "15.1.0",
     "ts-mocha": "10.0.0",
     "typescript": "4.4.4"
+  },
+  "dependencies": {
+    "tslib": "^2.3.1"
   }
 }
diff --git a/packages/opentelemetry-sampler-aws-xray/package.json b/packages/opentelemetry-sampler-aws-xray/package.json
@@ -47,7 +47,8 @@
     "@opentelemetry/core": "^1.8.0",
     "@opentelemetry/sdk-trace-base": "^1.8.0",
     "@opentelemetry/semantic-conventions": "^1.0.0",
-    "axios": "^1.3.5"
+    "axios": "^1.3.5",
+    "tslib": "^2.3.1"
   },
   "devDependencies": {
     "@opentelemetry/api": "^1.3.0",

diff --git a/packages/opentelemetry-test-utils/package.json b/packages/opentelemetry-test-utils/package.json
@@ -52,6 +52,7 @@
     "@opentelemetry/sdk-trace-node": "^1.8.0",
     "@opentelemetry/resources": "^1.8.0",
     "@opentelemetry/sdk-trace-base": "^1.8.0",
-    "@opentelemetry/semantic-conventions": "^1.0.0"
+    "@opentelemetry/semantic-conventions": "^1.0.0",
+    "tslib": "^2.3.1"
   }
 }
diff --git a/plugins/node/instrumentation-amqplib/package.json b/plugins/node/instrumentation-amqplib/package.json
@@ -48,7 +48,8 @@
   "dependencies": {
     "@opentelemetry/core": "^1.8.0",
     "@opentelemetry/instrumentation": "^0.40.0",
-    "@opentelemetry/semantic-conventions": "^1.0.0"
+    "@opentelemetry/semantic-conventions": "^1.0.0",
+    "tslib": "^2.3.1"
   },
   "devDependencies": {
     "@opentelemetry/api": "^1.3.0",

diff --git a/plugins/node/instrumentation-dataloader/package.json b/plugins/node/instrumentation-dataloader/package.json
@@ -61,7 +61,8 @@
     "typescript": "4.4.4"
   },
   "dependencies": {
-    "@opentelemetry/instrumentation": "^0.40.0"
+    "@opentelemetry/instrumentation": "^0.40.0",
+    "tslib": "^2.3.1"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-dataloader#readme"
 }
diff --git a/plugins/node/instrumentation-fs/package.json b/plugins/node/instrumentation-fs/package.json
@@ -60,7 +60,8 @@
   "dependencies": {
     "@opentelemetry/core": "^1.8.0",
     "@opentelemetry/instrumentation": "^0.40.0",
-    "@opentelemetry/semantic-conventions": "^1.0.0"
+    "@opentelemetry/semantic-conventions": "^1.0.0",
+    "tslib": "^2.3.1"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-fs#readme"
 }
diff --git a/plugins/node/instrumentation-lru-memoizer/package.json b/plugins/node/instrumentation-lru-memoizer/package.json
@@ -57,7 +57,8 @@
     "typescript": "4.4.4"
   },
   "dependencies": {
-    "@opentelemetry/instrumentation": "^0.40.0"
+    "@opentelemetry/instrumentation": "^0.40.0",
+    "tslib": "^2.3.1"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-lru-memoizer#readme"
 }
diff --git a/plugins/node/instrumentation-mongoose/package.json b/plugins/node/instrumentation-mongoose/package.json
@@ -62,7 +62,8 @@
   "dependencies": {
     "@opentelemetry/core": "^1.8.0",
     "@opentelemetry/instrumentation": "^0.40.0",
-    "@opentelemetry/semantic-conventions": "^1.0.0"
+    "@opentelemetry/semantic-conventions": "^1.0.0",
+    "tslib": "^2.3.1"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-mongoose#readme"
 }
diff --git a/plugins/node/instrumentation-socket.io/package.json b/plugins/node/instrumentation-socket.io/package.json
@@ -59,7 +59,8 @@
   },
   "dependencies": {
     "@opentelemetry/instrumentation": "^0.40.0",
-    "@opentelemetry/semantic-conventions": "^1.0.0"
+    "@opentelemetry/semantic-conventions": "^1.0.0",
+    "tslib": "^2.3.1"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-socket.io#readme"
 }
diff --git a/plugins/node/instrumentation-tedious/package.json b/plugins/node/instrumentation-tedious/package.json
@@ -64,7 +64,8 @@
   "dependencies": {
     "@opentelemetry/instrumentation": "^0.40.0",
     "@opentelemetry/semantic-conventions": "^1.0.0",
-    "@types/tedious": "^4.0.6"
+    "@types/tedious": "^4.0.6",
+    "tslib": "^2.3.1"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-tedious#readme"
 }
diff --git a/plugins/node/opentelemetry-instrumentation-aws-lambda/README.md b/plugins/node/opentelemetry-instrumentation-aws-lambda/README.md
@@ -50,7 +50,7 @@ In your Lambda function configuration, add or update the `NODE_OPTIONS` environm
 | --- | --- | --- |
 | `requestHook` | `RequestHook` (function) | Hook for adding custom attributes before lambda starts handling the request. Receives params: `span, { event, context }` |
 | `responseHook` | `ResponseHook` (function) | Hook for adding custom attributes before lambda returns the response. Receives params: `span, { err?, res? }` |
-| `disableAwsContextPropagation` | `boolean` | By default, this instrumentation will try to read the context from the `_X_AMZN_TRACE_ID` environment variable set by Lambda, set this to `true` to disable this behavior |
+| `disableAwsContextPropagation` | `boolean` | By default, this instrumentation will try to read the context from the `_X_AMZN_TRACE_ID` environment variable set by Lambda, set this to `true` or set the environment variable `OTEL_LAMBDA_DISABLE_AWS_CONTEXT_PROPAGATION=true` to disable this behavior |
 | `eventContextExtractor` | `EventContextExtractor` (function) | Function for providing custom context extractor in order to support different event types that are handled by AWS Lambda (e.g., SQS, CloudWatch, Kinesis, API Gateway). Applied only when `disableAwsContextPropagation` is set to `true`. Receives params: `event, context` |
 
 ### Hooks Usage Example

diff --git a/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json b/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json
@@ -63,7 +63,8 @@
     "@opentelemetry/propagator-aws-xray": "^1.2.1",
     "@opentelemetry/resources": "^1.8.0",
     "@opentelemetry/semantic-conventions": "^1.0.0",
-    "@types/aws-lambda": "8.10.81"
+    "@types/aws-lambda": "8.10.81",
+    "tslib": "^2.3.1"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-aws-lambda#readme"
 }
diff --git a/plugins/node/opentelemetry-instrumentation-aws-lambda/src/instrumentation.ts b/plugins/node/opentelemetry-instrumentation-aws-lambda/src/instrumentation.ts
@@ -57,6 +57,7 @@ import {
 
 import { AwsLambdaInstrumentationConfig, EventContextExtractor } from './types';
 import { VERSION } from './version';
+import { env } from 'process';
 import { LambdaModule } from './internal-types';
 
 const awsPropagator = new AWSXRayPropagator();
@@ -77,6 +78,17 @@ export class AwsLambdaInstrumentation extends InstrumentationBase {
 
   constructor(protected override _config: AwsLambdaInstrumentationConfig = {}) {
     super('@opentelemetry/instrumentation-aws-lambda', VERSION, _config);
+    if (this._config.disableAwsContextPropagation == null) {
+      if (
+        typeof env['OTEL_LAMBDA_DISABLE_AWS_CONTEXT_PROPAGATION'] ===
+          'string' &&
+        env[
+          'OTEL_LAMBDA_DISABLE_AWS_CONTEXT_PROPAGATION'
+        ].toLocaleLowerCase() === 'true'
+      ) {
+        this._config.disableAwsContextPropagation = true;
+      }
+    }
   }
 
   override setConfig(config: AwsLambdaInstrumentationConfig = {}) {