Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into db-metrics
Browse files Browse the repository at this point in the history
pichlermarc authored Sep 4, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
2 parents 2ad7fe6 + 53bf776 commit 3f75b6e
Showing 145 changed files with 2,212 additions and 1,272 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/close-stale.yml
Original file line number Diff line number Diff line change
@@ -42,5 +42,5 @@ jobs:
close-pr-message: 'This issue was closed because no owner or sponsor has been found after 14 days'
stale-pr-label: pkg-status:unmaintained:autoclose-scheduled
only-labels: pkg-status:unmaintained
exempt-pr-labels: bug,has:sponsor,type:semconv-update,dependencies,autorelease:pending
exempt-pr-labels: 'bug,has:sponsor,type:semconv-update,dependencies,autorelease: pending'
remove-stale-when-updated: false
108 changes: 54 additions & 54 deletions .release-please-manifest.json
Original file line number Diff line number Diff line change
@@ -1,64 +1,64 @@
{
"detectors/node/opentelemetry-resource-detector-alibaba-cloud": "0.29.0",
"detectors/node/opentelemetry-resource-detector-aws": "1.5.2",
"detectors/node/opentelemetry-resource-detector-azure": "0.2.9",
"detectors/node/opentelemetry-resource-detector-container": "0.3.11",
"detectors/node/opentelemetry-resource-detector-gcp": "0.29.10",
"detectors/node/opentelemetry-resource-detector-alibaba-cloud": "0.29.1",
"detectors/node/opentelemetry-resource-detector-aws": "1.6.1",
"detectors/node/opentelemetry-resource-detector-azure": "0.2.11",
"detectors/node/opentelemetry-resource-detector-container": "0.4.1",
"detectors/node/opentelemetry-resource-detector-gcp": "0.29.11",
"detectors/node/opentelemetry-resource-detector-github": "0.29.0",
"detectors/node/opentelemetry-resource-detector-instana": "0.11.0",
"metapackages/auto-configuration-propagators": "0.2.0",
"metapackages/auto-instrumentations-node": "0.49.1",
"metapackages/auto-instrumentations-web": "0.40.0",
"detectors/node/opentelemetry-resource-detector-instana": "0.12.0",
"metapackages/auto-configuration-propagators": "0.3.0",
"metapackages/auto-instrumentations-node": "0.50.0",
"metapackages/auto-instrumentations-web": "0.41.0",
"packages/baggage-span-processor": "0.3.1",
"packages/opentelemetry-host-metrics": "0.35.3",
"packages/opentelemetry-id-generator-aws-xray": "1.2.2",
"packages/opentelemetry-propagation-utils": "0.30.10",
"packages/opentelemetry-propagation-utils": "0.30.11",
"packages/opentelemetry-redis-common": "0.36.2",
"packages/opentelemetry-sql-common": "0.40.1",
"packages/opentelemetry-test-utils": "0.40.0",
"packages/winston-transport": "0.5.0",
"plugins/node/instrumentation-amqplib": "0.41.0",
"plugins/node/instrumentation-cucumber": "0.8.0",
"plugins/node/instrumentation-dataloader": "0.11.0",
"plugins/node/instrumentation-fs": "0.14.0",
"plugins/node/instrumentation-kafkajs": "0.2.0",
"plugins/node/instrumentation-lru-memoizer": "0.39.0",
"plugins/node/instrumentation-mongoose": "0.40.0",
"plugins/node/instrumentation-runtime-node": "0.6.0",
"plugins/node/instrumentation-socket.io": "0.41.0",
"plugins/node/instrumentation-tedious": "0.12.0",
"plugins/node/instrumentation-undici": "0.4.0",
"plugins/node/opentelemetry-instrumentation-aws-lambda": "0.43.0",
"plugins/node/opentelemetry-instrumentation-aws-sdk": "0.43.1",
"plugins/node/opentelemetry-instrumentation-bunyan": "0.40.0",
"plugins/node/opentelemetry-instrumentation-cassandra": "0.40.0",
"plugins/node/opentelemetry-instrumentation-connect": "0.38.0",
"plugins/node/opentelemetry-instrumentation-dns": "0.38.0",
"plugins/node/opentelemetry-instrumentation-express": "0.41.1",
"plugins/node/opentelemetry-instrumentation-fastify": "0.38.0",
"plugins/node/opentelemetry-instrumentation-generic-pool": "0.38.0",
"plugins/node/opentelemetry-instrumentation-graphql": "0.42.0",
"plugins/node/opentelemetry-instrumentation-hapi": "0.40.0",
"plugins/node/opentelemetry-instrumentation-ioredis": "0.42.0",
"plugins/node/opentelemetry-instrumentation-knex": "0.39.0",
"plugins/node/opentelemetry-instrumentation-koa": "0.42.0",
"plugins/node/opentelemetry-instrumentation-memcached": "0.38.0",
"plugins/node/opentelemetry-instrumentation-mongodb": "0.46.0",
"plugins/node/opentelemetry-instrumentation-mysql": "0.40.0",
"plugins/node/opentelemetry-instrumentation-mysql2": "0.40.0",
"plugins/node/opentelemetry-instrumentation-nestjs-core": "0.39.0",
"plugins/node/opentelemetry-instrumentation-net": "0.38.0",
"plugins/node/opentelemetry-instrumentation-pg": "0.43.0",
"plugins/node/opentelemetry-instrumentation-pino": "0.41.0",
"plugins/node/opentelemetry-instrumentation-redis": "0.41.0",
"plugins/node/opentelemetry-instrumentation-redis-4": "0.41.0",
"plugins/node/opentelemetry-instrumentation-restify": "0.40.0",
"plugins/node/opentelemetry-instrumentation-router": "0.39.0",
"plugins/node/opentelemetry-instrumentation-winston": "0.39.0",
"plugins/web/opentelemetry-instrumentation-document-load": "0.39.0",
"plugins/web/opentelemetry-instrumentation-long-task": "0.39.0",
"plugins/web/opentelemetry-instrumentation-user-interaction": "0.39.0",
"plugins/web/opentelemetry-plugin-react-load": "0.30.1",
"packages/opentelemetry-test-utils": "0.41.0",
"packages/winston-transport": "0.6.0",
"plugins/node/instrumentation-amqplib": "0.42.0",
"plugins/node/instrumentation-cucumber": "0.9.0",
"plugins/node/instrumentation-dataloader": "0.12.0",
"plugins/node/instrumentation-fs": "0.15.0",
"plugins/node/instrumentation-kafkajs": "0.3.0",
"plugins/node/instrumentation-lru-memoizer": "0.40.0",
"plugins/node/instrumentation-mongoose": "0.42.0",
"plugins/node/instrumentation-runtime-node": "0.7.0",
"plugins/node/instrumentation-socket.io": "0.42.0",
"plugins/node/instrumentation-tedious": "0.14.0",
"plugins/node/instrumentation-undici": "0.6.0",
"plugins/node/opentelemetry-instrumentation-aws-lambda": "0.44.0",
"plugins/node/opentelemetry-instrumentation-aws-sdk": "0.44.0",
"plugins/node/opentelemetry-instrumentation-bunyan": "0.41.0",
"plugins/node/opentelemetry-instrumentation-cassandra": "0.41.0",
"plugins/node/opentelemetry-instrumentation-connect": "0.39.0",
"plugins/node/opentelemetry-instrumentation-dns": "0.39.0",
"plugins/node/opentelemetry-instrumentation-express": "0.42.0",
"plugins/node/opentelemetry-instrumentation-fastify": "0.39.0",
"plugins/node/opentelemetry-instrumentation-generic-pool": "0.39.0",
"plugins/node/opentelemetry-instrumentation-graphql": "0.43.0",
"plugins/node/opentelemetry-instrumentation-hapi": "0.41.0",
"plugins/node/opentelemetry-instrumentation-ioredis": "0.43.0",
"plugins/node/opentelemetry-instrumentation-knex": "0.40.0",
"plugins/node/opentelemetry-instrumentation-koa": "0.43.0",
"plugins/node/opentelemetry-instrumentation-memcached": "0.39.0",
"plugins/node/opentelemetry-instrumentation-mongodb": "0.47.0",
"plugins/node/opentelemetry-instrumentation-mysql": "0.41.0",
"plugins/node/opentelemetry-instrumentation-mysql2": "0.41.0",
"plugins/node/opentelemetry-instrumentation-nestjs-core": "0.40.0",
"plugins/node/opentelemetry-instrumentation-net": "0.39.0",
"plugins/node/opentelemetry-instrumentation-pg": "0.44.0",
"plugins/node/opentelemetry-instrumentation-pino": "0.42.0",
"plugins/node/opentelemetry-instrumentation-redis": "0.42.0",
"plugins/node/opentelemetry-instrumentation-redis-4": "0.42.0",
"plugins/node/opentelemetry-instrumentation-restify": "0.41.0",
"plugins/node/opentelemetry-instrumentation-router": "0.40.0",
"plugins/node/opentelemetry-instrumentation-winston": "0.40.0",
"plugins/web/opentelemetry-instrumentation-document-load": "0.40.0",
"plugins/web/opentelemetry-instrumentation-long-task": "0.40.0",
"plugins/web/opentelemetry-instrumentation-user-interaction": "0.40.0",
"plugins/web/opentelemetry-plugin-react-load": "0.31.0",
"propagators/opentelemetry-propagator-instana": "0.3.2",
"propagators/opentelemetry-propagator-ot-trace": "0.27.2"
}
Original file line number Diff line number Diff line change
@@ -76,7 +76,7 @@
"@opentelemetry/resources": "^1.8.0",
"@opentelemetry/sdk-trace-base": "^1.8.0",
"@opentelemetry/sdk-trace-web": "^1.8.0",
"@opentelemetry/semantic-conventions": "^1.0.0",
"@opentelemetry/semantic-conventions": "^1.27.0",
"change-case": "4.1.2",
"json5": "2.2.0",
"react": "17.0.2",
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# Changelog

## [0.29.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-alibaba-cloud-v0.29.0...resource-detector-alibaba-cloud-v0.29.1) (2024-09-02)


### Dependencies

* The following workspace dependencies were updated
* devDependencies
* @opentelemetry/contrib-test-utils bumped from ^0.40.0 to ^0.41.0

## [0.29.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-alibaba-cloud-v0.28.10...resource-detector-alibaba-cloud-v0.29.0) (2024-08-05)


Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentelemetry/resource-detector-alibaba-cloud",
"version": "0.29.0",
"version": "0.29.1",
"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.40.0",
"@opentelemetry/contrib-test-utils": "^0.41.0",
"@types/mocha": "8.2.3",
"@types/node": "18.6.5",
"@types/sinon": "10.0.20",
@@ -57,7 +57,7 @@
},
"dependencies": {
"@opentelemetry/resources": "^1.0.0",
"@opentelemetry/semantic-conventions": "^1.22.0"
"@opentelemetry/semantic-conventions": "^1.27.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/detectors/node/opentelemetry-resource-detector-alibaba-cloud#readme"
}
21 changes: 21 additions & 0 deletions detectors/node/opentelemetry-resource-detector-aws/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,26 @@
# Changelog

## [1.6.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-aws-v1.6.0...resource-detector-aws-v1.6.1) (2024-09-02)


### Dependencies

* The following workspace dependencies were updated
* devDependencies
* @opentelemetry/contrib-test-utils bumped from ^0.40.0 to ^0.41.0

## [1.6.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-aws-v1.5.2...resource-detector-aws-v1.6.0) (2024-08-27)


### Features

* **detector-aws:** add sync version for all detectors ([#2376](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/2376)) ([167dced](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/167dced09de0d2104561542b4f83047fa656505f))


### Bug Fixes

* **detectors:** reduce diag level on detectors failing to detect ([#2382](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/2382)) ([d7a5bd4](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/d7a5bd45838f34bab45f4ba235093fa686032622))

## [1.5.2](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-aws-v1.5.1...resource-detector-aws-v1.5.2) (2024-07-03)


Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentelemetry/resource-detector-aws",
"version": "1.5.2",
"version": "1.6.1",
"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.40.0",
"@opentelemetry/contrib-test-utils": "^0.41.0",
"@types/mocha": "8.2.3",
"@types/node": "18.6.5",
"@types/sinon": "10.0.20",
@@ -57,7 +57,7 @@
"dependencies": {
"@opentelemetry/core": "^1.0.0",
"@opentelemetry/resources": "^1.10.0",
"@opentelemetry/semantic-conventions": "^1.22.0"
"@opentelemetry/semantic-conventions": "^1.27.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/detectors/node/opentelemetry-resource-detector-aws#readme"
}
Original file line number Diff line number Diff line change
@@ -137,7 +137,7 @@ export class AwsEcsDetectorSync implements DetectorSync {
}
}
} catch (e) {
diag.warn('AwsEcsDetector failed to read container ID', e);
diag.debug('AwsEcsDetector failed to read container ID', e);
}

if (hostName || containerId) {
Original file line number Diff line number Diff line change
@@ -95,7 +95,7 @@ export class AwsEksDetectorSync implements DetectorSync {
[SEMRESATTRS_CONTAINER_ID]: containerId || '',
};
} catch (e) {
diag.warn('Process is not running on K8S', e);
diag.debug('Process is not running on K8S', e);
return {};
}
}
@@ -138,7 +138,7 @@ export class AwsEksDetectorSync implements DetectorSync {
try {
return JSON.parse(response).data['cluster.name'];
} catch (e) {
diag.warn('Cannot get cluster name on EKS', e);
diag.debug('Cannot get cluster name on EKS', e);
}
return '';
}
@@ -154,7 +154,7 @@ export class AwsEksDetectorSync implements DetectorSync {
);
return 'Bearer ' + content;
} catch (e) {
diag.warn('Unable to read Kubernetes client token.', e);
diag.debug('Unable to read Kubernetes client token.', e);
}
return '';
}
@@ -189,7 +189,7 @@ export class AwsEksDetectorSync implements DetectorSync {
}
}
} catch (e: any) {
diag.warn(`AwsEksDetector failed to read container ID: ${e.message}`);
diag.debug(`AwsEksDetector failed to read container ID: ${e.message}`);
}
return undefined;
}
16 changes: 16 additions & 0 deletions detectors/node/opentelemetry-resource-detector-azure/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,21 @@
# Changelog

## [0.2.11](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-azure-v0.2.10...resource-detector-azure-v0.2.11) (2024-09-02)


### Dependencies

* The following workspace dependencies were updated
* devDependencies
* @opentelemetry/contrib-test-utils bumped from ^0.40.0 to ^0.41.0

## [0.2.10](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-azure-v0.2.9...resource-detector-azure-v0.2.10) (2024-08-27)


### Bug Fixes

* **detector-azure:** suppress tracing for AzureVmDetector ([#2371](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/2371)) ([5952127](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/595212739068c16c7ab9e407340983a0784efde6))

## [0.2.9](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-azure-v0.2.8...resource-detector-azure-v0.2.9) (2024-06-10)


Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentelemetry/resource-detector-azure",
"version": "0.2.9",
"version": "0.2.11",
"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.40.0",
"@opentelemetry/contrib-test-utils": "^0.41.0",
"@types/mocha": "8.2.3",
"@types/node": "18.6.5",
"@types/sinon": "10.0.20",
@@ -49,7 +49,7 @@
"dependencies": {
"@opentelemetry/core": "^1.25.1",
"@opentelemetry/resources": "^1.10.1",
"@opentelemetry/semantic-conventions": "^1.22.0"
"@opentelemetry/semantic-conventions": "^1.27.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/detectors/node/opentelemetry-resource-detector-azure#readme"
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,31 @@
# Changelog

## [0.4.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-container-v0.4.0...resource-detector-container-v0.4.1) (2024-09-02)


### Dependencies

* The following workspace dependencies were updated
* devDependencies
* @opentelemetry/contrib-test-utils bumped from ^0.40.0 to ^0.41.0

## [0.4.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-container-v0.3.11...resource-detector-container-v0.4.0) (2024-08-27)


### ⚠ BREAKING CHANGES

* **detector-container:** change implementation to DetectorSync interface ([#2334](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/2334))

### Features

* added prefix to look for containerid ([#2341](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/2341)) ([1991aed](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/1991aed1e23a8def91d067e0ffaf75c2eee8c1b8))
* **detector-container:** change implementation to DetectorSync interface ([#2334](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/2334)) ([18a5731](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/18a5731a409551103bd8c9ed7bd02f2f59fe5536))


### Bug Fixes

* **detectors:** reduce diag level on detectors failing to detect ([#2382](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/2382)) ([d7a5bd4](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/d7a5bd45838f34bab45f4ba235093fa686032622))

## [0.3.11](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-container-v0.3.10...resource-detector-container-v0.3.11) (2024-06-10)


Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentelemetry/resource-detector-container",
"version": "0.3.11",
"version": "0.4.1",
"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.40.0",
"@opentelemetry/contrib-test-utils": "^0.41.0",
"@types/mocha": "8.2.3",
"@types/node": "18.6.5",
"@types/sinon": "10.0.20",
@@ -52,7 +52,7 @@
},
"dependencies": {
"@opentelemetry/resources": "^1.10.0",
"@opentelemetry/semantic-conventions": "^1.22.0"
"@opentelemetry/semantic-conventions": "^1.27.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/detectors/node/opentelemetry-resource-detector-container#readme"
}
Original file line number Diff line number Diff line change
@@ -62,7 +62,7 @@ export class ContainerDetector implements DetectorSync {
[SEMRESATTRS_CONTAINER_ID]: containerId,
};
} catch (e) {
diag.info(
diag.debug(
'Container Detector did not identify running inside a supported container, no container attributes will be added to resource: ',
e
);
@@ -128,7 +128,7 @@ export class ContainerDetector implements DetectorSync {
} catch (e) {
if (e instanceof Error) {
const errorMessage = e.message;
diag.info(
diag.debug(
'Container Detector failed to read the Container ID: ',
errorMessage
);
Loading

0 comments on commit 3f75b6e

Please sign in to comment.