Merge branch 'main' into knex-semantic-conventions

Author: deejay1

.release-please-manifest.json

@@ -1,13 +1,13 @@
 {
-  "detectors/node/opentelemetry-resource-detector-alibaba-cloud": "0.29.7",
-  "detectors/node/opentelemetry-resource-detector-aws": "1.10.0",
-  "detectors/node/opentelemetry-resource-detector-azure": "0.5.0",
-  "detectors/node/opentelemetry-resource-detector-container": "0.5.3",
-  "detectors/node/opentelemetry-resource-detector-gcp": "0.32.0",
-  "detectors/node/opentelemetry-resource-detector-github": "0.29.0",
-  "detectors/node/opentelemetry-resource-detector-instana": "0.17.0",
+  "detectors/node/opentelemetry-resource-detector-alibaba-cloud": "0.30.0",
+  "detectors/node/opentelemetry-resource-detector-aws": "1.11.0",
+  "detectors/node/opentelemetry-resource-detector-azure": "0.6.0",
+  "detectors/node/opentelemetry-resource-detector-container": "0.6.0",
+  "detectors/node/opentelemetry-resource-detector-gcp": "0.33.0",
+  "detectors/node/opentelemetry-resource-detector-github": "0.30.0",
+  "detectors/node/opentelemetry-resource-detector-instana": "0.18.0",
   "metapackages/auto-configuration-propagators": "0.3.2",
-  "metapackages/auto-instrumentations-node": "0.55.2",
+  "metapackages/auto-instrumentations-node": "0.55.3",
   "metapackages/auto-instrumentations-web": "0.45.0",
   "packages/baggage-span-processor": "0.3.1",
   "packages/opentelemetry-host-metrics": "0.35.5",
@@ -28,14 +28,14 @@
   "plugins/node/instrumentation-socket.io": "0.46.0",
   "plugins/node/instrumentation-tedious": "0.18.0",
   "plugins/node/instrumentation-undici": "0.10.0",
-  "plugins/node/opentelemetry-instrumentation-aws-lambda": "0.50.1",
+  "plugins/node/opentelemetry-instrumentation-aws-lambda": "0.50.2",
   "plugins/node/opentelemetry-instrumentation-aws-sdk": "0.49.0",
   "plugins/node/opentelemetry-instrumentation-bunyan": "0.45.0",
   "plugins/node/opentelemetry-instrumentation-cassandra": "0.45.0",
   "plugins/node/opentelemetry-instrumentation-connect": "0.43.0",
   "plugins/node/opentelemetry-instrumentation-dns": "0.43.0",
   "plugins/node/opentelemetry-instrumentation-express": "0.47.0",
-  "plugins/node/opentelemetry-instrumentation-fastify": "0.44.0",
+  "plugins/node/opentelemetry-instrumentation-fastify": "0.44.1",
   "plugins/node/opentelemetry-instrumentation-generic-pool": "0.43.0",
   "plugins/node/opentelemetry-instrumentation-graphql": "0.47.0",
   "plugins/node/opentelemetry-instrumentation-hapi": "0.45.1",

detectors/node/opentelemetry-resource-detector-alibaba-cloud/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [0.30.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-alibaba-cloud-v0.29.7...resource-detector-alibaba-cloud-v0.30.0) (2025-01-20)
+
+
+### Features
+
+* **detectors:** generate esm build files too ([#2636](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/2636)) ([c2ad0af](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/c2ad0af34e1570f3609beefc4a8d41ddfb7f8f77))
+* **detectors:** mark as side effect free ([#2663](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/2663)) ([e9263a3](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/e9263a36255c0016cca78bf16c4598f23519d5f1))
+
 ## [0.29.7](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-alibaba-cloud-v0.29.6...resource-detector-alibaba-cloud-v0.29.7) (2024-12-18)
 
 

detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/resource-detector-alibaba-cloud",
-  "version": "0.29.7",
+  "version": "0.30.0",
   "description": "OpenTelemetry resource detector for Alibaba Cloud",
   "main": "build/src/index.js",
   "module": "build/esm/index.js",

detectors/node/opentelemetry-resource-detector-aws/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [1.11.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-aws-v1.10.0...resource-detector-aws-v1.11.0) (2025-01-20)
+
+
+### Features
+
+* **detectors:** generate esm build files too ([#2636](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/2636)) ([c2ad0af](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/c2ad0af34e1570f3609beefc4a8d41ddfb7f8f77))
+* **detectors:** mark as side effect free ([#2663](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/2663)) ([e9263a3](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/e9263a36255c0016cca78bf16c4598f23519d5f1))
+
+
+### Bug Fixes
+
+* **detector-aws:** remove all deprecation warnings ([#2642](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/2642)) ([f97bd70](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/f97bd7099ed6ec4e99af98157608040708de15c6))
+* **detector-aws:** remove semconv incubating import ([#2668](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/2668)) ([3e95995](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/3e95995fcdaa7aecdc47bf52f01fa2e48e4f98ce))
+
 ## [1.10.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-aws-v1.9.0...resource-detector-aws-v1.10.0) (2024-12-18)
 
 

detectors/node/opentelemetry-resource-detector-aws/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/resource-detector-aws",
-  "version": "1.10.0",
+  "version": "1.11.0",
   "description": "OpenTelemetry SDK resource detector for AWS",
   "main": "build/src/index.js",
   "module": "build/esm/index.js",

detectors/node/opentelemetry-resource-detector-aws/src/detectors/AwsBeanstalkDetectorSync.ts

@@ -24,16 +24,18 @@ import {
   ResourceAttributes,
   ResourceDetectionConfig,
 } from '@opentelemetry/resources';
+import {
+  ATTR_SERVICE_NAME,
+  ATTR_SERVICE_VERSION,
+} from '@opentelemetry/semantic-conventions';
 import {
   ATTR_CLOUD_PROVIDER,
   ATTR_CLOUD_PLATFORM,
-  ATTR_SERVICE_NAME,
   ATTR_SERVICE_NAMESPACE,
-  ATTR_SERVICE_VERSION,
   ATTR_SERVICE_INSTANCE_ID,
   CLOUD_PROVIDER_VALUE_AWS,
   CLOUD_PLATFORM_VALUE_AWS_ELASTIC_BEANSTALK,
-} from '@opentelemetry/semantic-conventions/incubating';
+} from '../semconv';
 import * as fs from 'fs';
 import * as util from 'util';
 

detectors/node/opentelemetry-resource-detector-aws/src/detectors/AwsEc2DetectorSync.ts

@@ -34,7 +34,7 @@ import {
   ATTR_HOST_NAME,
   CLOUD_PROVIDER_VALUE_AWS,
   CLOUD_PLATFORM_VALUE_AWS_EC2,
-} from '@opentelemetry/semantic-conventions/incubating';
+} from '../semconv';
 import * as http from 'http';
 
 /**

detectors/node/opentelemetry-resource-detector-aws/src/detectors/AwsEcsDetectorSync.ts

@@ -42,7 +42,7 @@ import {
   ATTR_AWS_LOG_STREAM_ARNS,
   CLOUD_PROVIDER_VALUE_AWS,
   CLOUD_PLATFORM_VALUE_AWS_ECS,
-} from '@opentelemetry/semantic-conventions/incubating';
+} from '../semconv';
 // Patch until the OpenTelemetry SDK is updated to ship this attribute
 import { SemanticResourceAttributes as AdditionalSemanticResourceAttributes } from './SemanticResourceAttributes';
 import * as http from 'http';
@@ -166,8 +166,7 @@ export class AwsEcsDetectorSync implements DetectorSync {
 
     const accountId: string = AwsEcsDetectorSync._getAccountFromArn(taskArn);
     const region: string = AwsEcsDetectorSync._getRegionFromArn(taskArn);
-    const availabilityZone: string | undefined =
-      taskMetadata?.['AvailabilityZone'];
+    const availabilityZone: string | undefined = taskMetadata?.AvailabilityZone;
 
     const clusterArn = cluster.startsWith('arn:')
       ? cluster

detectors/node/opentelemetry-resource-detector-aws/src/detectors/AwsEksDetectorSync.ts

@@ -30,7 +30,7 @@ import {
   ATTR_CONTAINER_ID,
   CLOUD_PROVIDER_VALUE_AWS,
   CLOUD_PLATFORM_VALUE_AWS_EKS,
-} from '@opentelemetry/semantic-conventions/incubating';
+} from '../semconv';
 import * as https from 'https';
 import * as fs from 'fs';
 import * as util from 'util';

detectors/node/opentelemetry-resource-detector-aws/src/detectors/AwsLambdaDetectorSync.ts

@@ -29,7 +29,7 @@ import {
   ATTR_FAAS_NAME,
   CLOUD_PROVIDER_VALUE_AWS,
   CLOUD_PLATFORM_VALUE_AWS_LAMBDA,
-} from '@opentelemetry/semantic-conventions/incubating';
+} from '../semconv';
 
 /**
  * The AwsLambdaDetector can be used to detect if a process is running in AWS Lambda