Merge branch 'main' into feat/add-label-mapper

.release-please-manifest.json

@@ -1 +1 @@
-{"detectors/node/opentelemetry-resource-detector-alibaba-cloud":"0.28.4","detectors/node/opentelemetry-resource-detector-aws":"1.3.4","detectors/node/opentelemetry-resource-detector-azure":"0.2.2","detectors/node/opentelemetry-resource-detector-container":"0.3.4","detectors/node/opentelemetry-resource-detector-gcp":"0.29.4","detectors/node/opentelemetry-resource-detector-github":"0.28.1","detectors/node/opentelemetry-resource-detector-instana":"0.5.4","metapackages/auto-instrumentations-node":"0.40.2","metapackages/auto-instrumentations-web":"0.34.0","packages/opentelemetry-host-metrics":"0.34.0","packages/opentelemetry-id-generator-aws-xray":"1.2.1","packages/opentelemetry-propagation-utils":"0.30.4","packages/opentelemetry-redis-common":"0.36.1","packages/opentelemetry-sql-common":"0.40.0","packages/opentelemetry-test-utils":"0.35.0","plugins/node/instrumentation-amqplib":"0.33.4","plugins/node/instrumentation-cucumber":"0.2.0","plugins/node/instrumentation-dataloader":"0.5.3","plugins/node/instrumentation-fs":"0.8.3","plugins/node/instrumentation-lru-memoizer":"0.33.4","plugins/node/instrumentation-mongoose":"0.33.4","plugins/node/instrumentation-socket.io":"0.34.4","plugins/node/instrumentation-tedious":"0.6.4","plugins/node/opentelemetry-instrumentation-aws-lambda":"0.37.3","plugins/node/opentelemetry-instrumentation-aws-sdk":"0.37.1","plugins/node/opentelemetry-instrumentation-bunyan":"0.34.0","plugins/node/opentelemetry-instrumentation-cassandra":"0.34.1","plugins/node/opentelemetry-instrumentation-connect":"0.32.3","plugins/node/opentelemetry-instrumentation-dns":"0.32.4","plugins/node/opentelemetry-instrumentation-express":"0.34.0","plugins/node/opentelemetry-instrumentation-fastify":"0.32.5","plugins/node/opentelemetry-instrumentation-generic-pool":"0.32.4","plugins/node/opentelemetry-instrumentation-graphql":"0.36.0","plugins/node/opentelemetry-instrumentation-hapi":"0.33.2","plugins/node/opentelemetry-instrumentation-ioredis":"0.36.0","plugins/node/opentelemetry-instrumentation-knex":"0.32.3","plugins/node/opentelemetry-instrumentation-koa":"0.36.3","plugins/node/opentelemetry-instrumentation-memcached":"0.32.4","plugins/node/opentelemetry-instrumentation-mongodb":"0.38.0","plugins/node/opentelemetry-instrumentation-mysql":"0.34.4","plugins/node/opentelemetry-instrumentation-mysql2":"0.34.4","plugins/node/opentelemetry-instrumentation-nestjs-core":"0.33.3","plugins/node/opentelemetry-instrumentation-net":"0.32.4","plugins/node/opentelemetry-instrumentation-pg":"0.37.1","plugins/node/opentelemetry-instrumentation-pino":"0.34.4","plugins/node/opentelemetry-instrumentation-redis":"0.35.4","plugins/node/opentelemetry-instrumentation-redis-4":"0.35.5","plugins/node/opentelemetry-instrumentation-restify":"0.34.2","plugins/node/opentelemetry-instrumentation-router":"0.33.3","plugins/node/opentelemetry-instrumentation-winston":"0.33.0","plugins/web/opentelemetry-instrumentation-document-load":"0.34.0","plugins/web/opentelemetry-instrumentation-long-task":"0.34.0","plugins/web/opentelemetry-instrumentation-user-interaction":"0.34.0","plugins/web/opentelemetry-plugin-react-load":"0.30.0","propagators/opentelemetry-propagator-aws-xray":"1.3.1","propagators/opentelemetry-propagator-grpc-census-binary":"0.27.1","propagators/opentelemetry-propagator-instana":"0.3.1","propagators/opentelemetry-propagator-ot-trace":"0.27.1"}
+{"detectors/node/opentelemetry-resource-detector-alibaba-cloud":"0.28.5","detectors/node/opentelemetry-resource-detector-aws":"1.3.5","detectors/node/opentelemetry-resource-detector-azure":"0.2.3","detectors/node/opentelemetry-resource-detector-container":"0.3.5","detectors/node/opentelemetry-resource-detector-gcp":"0.29.5","detectors/node/opentelemetry-resource-detector-github":"0.28.1","detectors/node/opentelemetry-resource-detector-instana":"0.5.5","metapackages/auto-instrumentations-node":"0.40.3","metapackages/auto-instrumentations-web":"0.35.0","packages/opentelemetry-host-metrics":"0.34.1","packages/opentelemetry-id-generator-aws-xray":"1.2.1","packages/opentelemetry-propagation-utils":"0.30.5","packages/opentelemetry-redis-common":"0.36.1","packages/opentelemetry-sql-common":"0.40.0","packages/opentelemetry-test-utils":"0.35.1","plugins/node/instrumentation-amqplib":"0.33.5","plugins/node/instrumentation-cucumber":"0.2.1","plugins/node/instrumentation-dataloader":"0.5.4","plugins/node/instrumentation-fs":"0.8.4","plugins/node/instrumentation-lru-memoizer":"0.33.5","plugins/node/instrumentation-mongoose":"0.34.0","plugins/node/instrumentation-socket.io":"0.35.0","plugins/node/instrumentation-tedious":"0.6.5","plugins/node/opentelemetry-instrumentation-aws-lambda":"0.37.4","plugins/node/opentelemetry-instrumentation-aws-sdk":"0.37.2","plugins/node/opentelemetry-instrumentation-bunyan":"0.34.1","plugins/node/opentelemetry-instrumentation-cassandra":"0.34.2","plugins/node/opentelemetry-instrumentation-connect":"0.32.4","plugins/node/opentelemetry-instrumentation-dns":"0.32.5","plugins/node/opentelemetry-instrumentation-express":"0.34.1","plugins/node/opentelemetry-instrumentation-fastify":"0.32.6","plugins/node/opentelemetry-instrumentation-generic-pool":"0.32.5","plugins/node/opentelemetry-instrumentation-graphql":"0.36.1","plugins/node/opentelemetry-instrumentation-hapi":"0.33.3","plugins/node/opentelemetry-instrumentation-ioredis":"0.36.1","plugins/node/opentelemetry-instrumentation-knex":"0.32.4","plugins/node/opentelemetry-instrumentation-koa":"0.36.4","plugins/node/opentelemetry-instrumentation-memcached":"0.32.5","plugins/node/opentelemetry-instrumentation-mongodb":"0.38.1","plugins/node/opentelemetry-instrumentation-mysql":"0.34.5","plugins/node/opentelemetry-instrumentation-mysql2":"0.34.5","plugins/node/opentelemetry-instrumentation-nestjs-core":"0.33.4","plugins/node/opentelemetry-instrumentation-net":"0.32.5","plugins/node/opentelemetry-instrumentation-pg":"0.37.2","plugins/node/opentelemetry-instrumentation-pino":"0.34.5","plugins/node/opentelemetry-instrumentation-redis":"0.35.5","plugins/node/opentelemetry-instrumentation-redis-4":"0.35.6","plugins/node/opentelemetry-instrumentation-restify":"0.34.3","plugins/node/opentelemetry-instrumentation-router":"0.33.4","plugins/node/opentelemetry-instrumentation-winston":"0.33.1","plugins/web/opentelemetry-instrumentation-document-load":"0.34.1","plugins/web/opentelemetry-instrumentation-long-task":"0.34.1","plugins/web/opentelemetry-instrumentation-user-interaction":"0.34.1","plugins/web/opentelemetry-plugin-react-load":"0.30.0","propagators/opentelemetry-propagator-aws-xray":"1.3.1","propagators/opentelemetry-propagator-grpc-census-binary":"0.27.1","propagators/opentelemetry-propagator-instana":"0.3.1","propagators/opentelemetry-propagator-ot-trace":"0.27.1"}

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

@@ -54,6 +54,12 @@
   * devDependencies
     * @opentelemetry/contrib-test-utils bumped from ^0.34.3 to ^0.35.0
 
+### Dependencies
+
+* The following workspace dependencies were updated
+  * devDependencies
+    * @opentelemetry/contrib-test-utils bumped from ^0.35.0 to ^0.35.1
+
 ## [0.28.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-alibaba-cloud-v0.28.0...resource-detector-alibaba-cloud-v0.28.1) (2023-08-14)
 
 

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

@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/resource-detector-alibaba-cloud",
-  "version": "0.28.4",
+  "version": "0.28.5",
   "description": "OpenTelemetry resource detector for Alibaba Cloud",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",
@@ -40,7 +40,7 @@
   },
   "devDependencies": {
     "@opentelemetry/api": "^1.0.0",
-    "@opentelemetry/contrib-test-utils": "^0.35.0",
+    "@opentelemetry/contrib-test-utils": "^0.35.1",
     "@types/mocha": "8.2.3",
     "@types/node": "18.6.5",
     "@types/sinon": "10.0.18",

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

@@ -54,6 +54,12 @@
   * devDependencies
     * @opentelemetry/contrib-test-utils bumped from ^0.34.3 to ^0.35.0
 
+### Dependencies
+
+* The following workspace dependencies were updated
+  * devDependencies
+    * @opentelemetry/contrib-test-utils bumped from ^0.35.0 to ^0.35.1
+
 ## [1.3.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-aws-v1.3.0...resource-detector-aws-v1.3.1) (2023-08-14)
 
 

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

@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/resource-detector-aws",
-  "version": "1.3.4",
+  "version": "1.3.5",
   "description": "OpenTelemetry SDK resource detector for AWS",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",
@@ -39,7 +39,7 @@
   },
   "devDependencies": {
     "@opentelemetry/api": "^1.0.0",
-    "@opentelemetry/contrib-test-utils": "^0.35.0",
+    "@opentelemetry/contrib-test-utils": "^0.35.1",
     "@types/mocha": "8.2.3",
     "@types/node": "18.6.5",
     "@types/sinon": "10.0.18",

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

@@ -1,5 +1,19 @@
 # Changelog
 
+## [0.2.3](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-azure-v0.2.2...resource-detector-azure-v0.2.3) (2024-01-04)
+
+
+### Bug Fixes
+
+* Fix Azure Fns Detector When Running with App Service Detector ([#1884](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1884)) ([006c963](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/006c963721b2040416e312d7e469fdd9755410d7))
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * devDependencies
+    * @opentelemetry/contrib-test-utils bumped from ^0.35.0 to ^0.35.1
+
 ## [0.2.2](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-azure-v0.2.1...resource-detector-azure-v0.2.2) (2023-12-07)
 
 

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

@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/resource-detector-azure",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "OpenTelemetry SDK resource detector for Azure",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",
@@ -32,7 +32,7 @@
   },
   "devDependencies": {
     "@opentelemetry/api": "^1.0.0",
-    "@opentelemetry/contrib-test-utils": "^0.35.0",
+    "@opentelemetry/contrib-test-utils": "^0.35.1",
     "@types/mocha": "8.2.3",
     "@types/node": "18.6.5",
     "@types/sinon": "10.0.18",

detectors/node/opentelemetry-resource-detector-azure/src/detectors/AzureAppServiceDetector.ts

@@ -26,6 +26,7 @@ import {
   WEBSITE_SITE_NAME,
   WEBSITE_SLOT_NAME,
   CLOUD_RESOURCE_ID_RESOURCE_ATTRIBUTE,
+  FUNCTIONS_VERSION,
 } from '../types';
 import {
   CloudProviderValues,
@@ -49,7 +50,8 @@ class AzureAppServiceDetector implements DetectorSync {
   detect(): IResource {
     let attributes = {};
     const websiteSiteName = process.env[WEBSITE_SITE_NAME];
-    if (websiteSiteName) {
+    const isAzureFunction = !!process.env[FUNCTIONS_VERSION];
+    if (websiteSiteName && !isAzureFunction) {
       attributes = {
         ...attributes,
         [SemanticResourceAttributes.SERVICE_NAME]: websiteSiteName,

detectors/node/opentelemetry-resource-detector-azure/test/detectors/AzureAppServiceDetector.test.ts

@@ -17,6 +17,8 @@
 import * as assert from 'assert';
 import { azureAppServiceDetector } from '../../src/detectors/AzureAppServiceDetector';
 import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions';
+import { azureFunctionsDetector } from '../../src';
+import { detectResourcesSync } from '@opentelemetry/resources';
 
 describe('AzureAppServiceDetector', () => {
   let originalEnv: NodeJS.ProcessEnv;
@@ -38,7 +40,9 @@ describe('AzureAppServiceDetector', () => {
     process.env.WEBSITE_RESOURCE_GROUP = 'test-resource-group';
     process.env.WEBSITE_OWNER_NAME = 'test-owner-name';
 
-    const resource = azureAppServiceDetector.detect();
+    const resource = detectResourcesSync({
+      detectors: [azureFunctionsDetector, azureAppServiceDetector],
+    });
     assert.ok(resource);
     const attributes = resource.attributes;
     assert.strictEqual(
@@ -88,7 +92,9 @@ describe('AzureAppServiceDetector', () => {
     process.env.WEBSITE_HOME_STAMPNAME = 'test-home-stamp';
     process.env.WEBSITE_OWNER_NAME = 'test-owner-name';
 
-    const resource = azureAppServiceDetector.detect();
+    const resource = detectResourcesSync({
+      detectors: [azureFunctionsDetector, azureAppServiceDetector],
+    });
     assert.ok(resource);
     const attributes = resource.attributes;
     assert.strictEqual(
@@ -123,7 +129,9 @@ describe('AzureAppServiceDetector', () => {
     process.env.WEBSITE_RESOURCE_GROUP = 'test-resource-group';
     delete process.env.WEBSITE_OWNER_NAME;
 
-    const resource = azureAppServiceDetector.detect();
+    const resource = detectResourcesSync({
+      detectors: [azureFunctionsDetector, azureAppServiceDetector],
+    });
     assert.ok(resource);
     const attributes = resource.attributes;
     assert.strictEqual(

detectors/node/opentelemetry-resource-detector-azure/test/detectors/AzureFunctionsDetector.test.ts

@@ -16,7 +16,10 @@
 
 import * as assert from 'assert';
 import { azureFunctionsDetector } from '../../src/detectors/AzureFunctionsDetector';
+import { azureAppServiceDetector } from '../../src/detectors/AzureAppServiceDetector';
 import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions';
+import { detectResourcesSync } from '@opentelemetry/resources';
+import { AZURE_APP_SERVICE_STAMP_RESOURCE_ATTRIBUTE } from '../../src/types';
 
 describe('AzureFunctionsDetector', () => {
   let originalEnv: NodeJS.ProcessEnv;
@@ -35,7 +38,9 @@ describe('AzureFunctionsDetector', () => {
     process.env.FUNCTIONS_EXTENSION_VERSION = '~4';
     process.env.WEBSITE_MEMORY_LIMIT_MB = '1000';
 
-    const resource = azureFunctionsDetector.detect();
+    const resource = detectResourcesSync({
+      detectors: [azureFunctionsDetector, azureAppServiceDetector],
+    });
     assert.ok(resource);
     const attributes = resource.attributes;
     assert.strictEqual(
@@ -66,5 +71,16 @@ describe('AzureFunctionsDetector', () => {
       attributes[SemanticResourceAttributes.FAAS_VERSION],
       '~4'
     );
+
+    // Should not detect app service values
+    assert.strictEqual(
+      attributes[SemanticResourceAttributes.SERVICE_INSTANCE_ID],
+      undefined
+    );
+
+    assert.strictEqual(
+      attributes[AZURE_APP_SERVICE_STAMP_RESOURCE_ATTRIBUTE],
+      undefined
+    );
   });
 });

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

@@ -42,6 +42,12 @@
   * devDependencies
     * @opentelemetry/contrib-test-utils bumped from ^0.34.3 to ^0.35.0
 
+### Dependencies
+
+* The following workspace dependencies were updated
+  * devDependencies
+    * @opentelemetry/contrib-test-utils bumped from ^0.35.0 to ^0.35.1
+
 ## [0.3.2](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-container-v0.3.1...resource-detector-container-v0.3.2) (2023-10-10)
 
 

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

@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/resource-detector-container",
-  "version": "0.3.4",
+  "version": "0.3.5",
   "description": "Opentelemetry resource detector to get container resource attributes",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",
@@ -34,7 +34,7 @@
   },
   "devDependencies": {
     "@opentelemetry/api": "^1.0.0",
-    "@opentelemetry/contrib-test-utils": "^0.35.0",
+    "@opentelemetry/contrib-test-utils": "^0.35.1",
     "@types/mocha": "8.2.3",
     "@types/node": "18.6.5",
     "@types/sinon": "10.0.18",

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

@@ -42,6 +42,12 @@
   * devDependencies
     * @opentelemetry/contrib-test-utils bumped from ^0.34.3 to ^0.35.0
 
+### Dependencies
+
+* The following workspace dependencies were updated
+  * devDependencies
+    * @opentelemetry/contrib-test-utils bumped from ^0.35.0 to ^0.35.1
+
 ## [0.29.3](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-gcp-v0.29.2...resource-detector-gcp-v0.29.3) (2023-11-13)
 
 

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

@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/resource-detector-gcp",
-  "version": "0.29.4",
+  "version": "0.29.5",
   "description": "OpenTelemetry SDK resource detector for GCP",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",
@@ -39,7 +39,7 @@
   },
   "devDependencies": {
     "@opentelemetry/api": "^1.0.0",
-    "@opentelemetry/contrib-test-utils": "^0.35.0",
+    "@opentelemetry/contrib-test-utils": "^0.35.1",
     "@types/mocha": "8.2.3",
     "@types/node": "18.6.5",
     "@types/semver": "7.5.3",

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

@@ -6,6 +6,20 @@
   * devDependencies
     * @opentelemetry/contrib-test-utils bumped from ^0.34.3 to ^0.35.0
 
+## [0.5.5](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-instana-v0.5.4...resource-detector-instana-v0.5.5) (2024-01-04)
+
+
+### Bug Fixes
+
+* **deps:** update otel core experimental ([#1866](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1866)) ([9366543](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/9366543f5572e1e976ce176ddeb0b438f6c16c45))
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * devDependencies
+    * @opentelemetry/contrib-test-utils bumped from ^0.35.0 to ^0.35.1
+
 ## [0.5.3](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-instana-v0.5.2...resource-detector-instana-v0.5.3) (2023-11-13)
 
 

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

@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/resource-detector-instana",
-  "version": "0.5.4",
+  "version": "0.5.5",
   "description": "OpenTelemetry SDK resource detector for Instana",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",
@@ -38,7 +38,7 @@
   },
   "devDependencies": {
     "@opentelemetry/api": "^1.3.0",
-    "@opentelemetry/contrib-test-utils": "^0.35.0",
+    "@opentelemetry/contrib-test-utils": "^0.35.1",
     "@opentelemetry/sdk-node": "^0.46.0",
     "@types/mocha": "8.2.3",
     "@types/node": "18.6.5",