Merge branch 'main' into fix/graphql-support-range

open-telemetry · Mar 6, 2024 · be1797e · be1797e
2 parents 01b3568 + d2f59e9
commit be1797e
Show file tree

Hide file tree

Showing 60 changed files with 763 additions and 1,202 deletions.
diff --git a/detectors/node/opentelemetry-resource-detector-aws/src/detectors/AwsLambdaDetector.ts b/detectors/node/opentelemetry-resource-detector-aws/src/detectors/AwsLambdaDetector.ts
@@ -17,6 +17,7 @@
 import {
   Detector,
   Resource,
+  ResourceAttributes,
   ResourceDetectionConfig,
 } from '@opentelemetry/resources';
 import {
@@ -40,7 +41,7 @@ export class AwsLambdaDetector implements Detector {
     const functionVersion = process.env.AWS_LAMBDA_FUNCTION_VERSION;
     const region = process.env.AWS_REGION;
 
-    const attributes = {
+    const attributes: ResourceAttributes = {
       [SemanticResourceAttributes.CLOUD_PROVIDER]: String(
         CloudProviderValues.AWS
       ),

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
@@ -202,7 +202,7 @@ describe('AwsEcsResourceDetector', () => {
     describe('when succesfully retrieving the data', () => {
       function generateLaunchTypeTests(
         resourceAttributes: EcsResourceAttributes,
-        suffix: String = ''
+        suffix = ''
       ) {
         let nockScope: nock.Scope;
 

diff --git a/detectors/node/opentelemetry-resource-detector-instana/package.json b/detectors/node/opentelemetry-resource-detector-instana/package.json
@@ -39,7 +39,7 @@
   "devDependencies": {
     "@opentelemetry/api": "^1.3.0",
     "@opentelemetry/contrib-test-utils": "^0.36.0",
-    "@opentelemetry/sdk-node": "^0.48.0",
+    "@opentelemetry/sdk-node": "^0.49.1",
     "@types/mocha": "8.2.3",
     "@types/node": "18.6.5",
     "@types/semver": "7.5.3",

diff --git a/metapackages/auto-instrumentations-node/package.json b/metapackages/auto-instrumentations-node/package.json
@@ -49,7 +49,7 @@
     "typescript": "4.4.4"
   },
   "dependencies": {
-    "@opentelemetry/instrumentation": "^0.48.0",
+    "@opentelemetry/instrumentation": "^0.49.1",
     "@opentelemetry/instrumentation-amqplib": "^0.34.0",
     "@opentelemetry/instrumentation-aws-lambda": "^0.38.0",
     "@opentelemetry/instrumentation-aws-sdk": "^0.38.1",
@@ -60,13 +60,13 @@
     "@opentelemetry/instrumentation-dataloader": "^0.6.0",
     "@opentelemetry/instrumentation-dns": "^0.33.0",
     "@opentelemetry/instrumentation-express": "^0.35.0",
-    "@opentelemetry/instrumentation-fs": "^0.9.0",
     "@opentelemetry/instrumentation-fastify": "^0.33.0",
+    "@opentelemetry/instrumentation-fs": "^0.9.0",
     "@opentelemetry/instrumentation-generic-pool": "^0.33.0",
     "@opentelemetry/instrumentation-graphql": "^0.37.0",
-    "@opentelemetry/instrumentation-grpc": "^0.48.0",
+    "@opentelemetry/instrumentation-grpc": "^0.49.1",
     "@opentelemetry/instrumentation-hapi": "^0.34.0",
-    "@opentelemetry/instrumentation-http": "^0.48.0",
+    "@opentelemetry/instrumentation-http": "^0.49.1",
     "@opentelemetry/instrumentation-ioredis": "^0.37.0",
     "@opentelemetry/instrumentation-knex": "^0.33.0",
     "@opentelemetry/instrumentation-koa": "^0.37.0",
@@ -92,7 +92,7 @@
     "@opentelemetry/resource-detector-container": "^0.3.6",
     "@opentelemetry/resource-detector-gcp": "^0.29.6",
     "@opentelemetry/resources": "^1.12.0",
-    "@opentelemetry/sdk-node": "^0.48.0"
+    "@opentelemetry/sdk-node": "^0.49.1"
   },
   "files": [
     "build/src/**/*.js",

diff --git a/metapackages/auto-instrumentations-web/package.json b/metapackages/auto-instrumentations-web/package.json
@@ -32,17 +32,17 @@
   },
   "peerDependencies": {
     "@opentelemetry/api": "^1.3.0",
-    "zone.js": "0.11.4"
+    "zone.js": "^0.11.4 || ^0.13.0 || ^0.14.0"
   },
   "devDependencies": {
     "@babel/core": "7.22.17",
+    "@jsdevtools/coverage-istanbul-loader": "3.0.5",
     "@opentelemetry/api": "^1.3.0",
     "@types/mocha": "8.2.3",
     "@types/node": "18.6.5",
     "@types/sinon": "10.0.18",
     "@types/webpack-env": "1.16.2",
     "babel-loader": "8.2.2",
-    "@jsdevtools/coverage-istanbul-loader": "3.0.5",
     "karma": "6.3.16",
     "karma-chrome-launcher": "^3.1.1",
     "karma-coverage-istanbul-reporter": "3.0.3",
@@ -61,11 +61,11 @@
     "webpack-merge": "5.8.0"
   },
   "dependencies": {
-    "@opentelemetry/instrumentation": "^0.48.0",
+    "@opentelemetry/instrumentation": "^0.49.1",
     "@opentelemetry/instrumentation-document-load": "^0.35.0",
-    "@opentelemetry/instrumentation-fetch": "^0.48.0",
+    "@opentelemetry/instrumentation-fetch": "^0.49.1",
     "@opentelemetry/instrumentation-user-interaction": "^0.35.0",
-    "@opentelemetry/instrumentation-xml-http-request": "^0.48.0"
+    "@opentelemetry/instrumentation-xml-http-request": "^0.49.1"
   },
   "files": [
     "build/src/**/*.js",