Skip to content

Commit e69318c

Browse files
garysassanogarysassano
authored
Merge branch 'main' into upd-aws-detector
2 parents 71b122f + fd547c8 commit e69318c

File tree

71 files changed

+1943
-1569
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+1943
-1569
lines changed

‎.github/component_owners.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ components:
8787
plugins/node/opentelemetry-instrumentation-express:
8888
- JamieDanielson
8989
- pkanal
90+
- raphael-theriault-swi
9091
plugins/node/opentelemetry-instrumentation-fastify: []
9192
# Unmaintained
9293
plugins/node/opentelemetry-instrumentation-generic-pool: []
@@ -108,8 +109,8 @@ components:
108109
# Unmaintained
109110
plugins/node/opentelemetry-instrumentation-mysql: []
110111
# Unmaintained
111-
plugins/node/opentelemetry-instrumentation-mysql2: []
112-
# Unmaintained
112+
plugins/node/opentelemetry-instrumentation-mysql2:
113+
- raphael-theriault-swi
113114
plugins/node/opentelemetry-instrumentation-nestjs-core: []
114115
# Unmaintained
115116
plugins/node/opentelemetry-instrumentation-net:

‎.github/workflows/unit-test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
runs-on: ubuntu-latest
4545
services:
4646
memcached:
47-
image: memcached:1.6.34-alpine
47+
image: memcached:1.6.36-alpine
4848
ports:
4949
- 11211:11211
5050
mongo:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"@opentelemetry/api": "^1.0.0",
4545
"@opentelemetry/contrib-test-utils": "^0.45.0",
4646
"@opentelemetry/instrumentation-fs": "^0.19.0",
47-
"@opentelemetry/instrumentation-http": "^0.57.0",
47+
"@opentelemetry/instrumentation-http": "^0.57.1",
4848
"@types/mocha": "8.2.3",
4949
"@types/node": "18.18.14",
5050
"@types/sinon": "10.0.20",

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ import * as http from 'http';
4848
import * as util from 'util';
4949
import * as fs from 'fs';
5050
import * as os from 'os';
51-
import { getEnv } from '@opentelemetry/core';
5251

5352
const HTTP_TIMEOUT_IN_MS = 1000;
5453

@@ -77,8 +76,10 @@ export class AwsEcsDetectorSync implements DetectorSync {
7776
}
7877

7978
private async _getAttributes(): Promise<ResourceAttributes> {
80-
const env = getEnv();
81-
if (!env.ECS_CONTAINER_METADATA_URI_V4 && !env.ECS_CONTAINER_METADATA_URI) {
79+
if (
80+
!process.env.ECS_CONTAINER_METADATA_URI_V4 &&
81+
!process.env.ECS_CONTAINER_METADATA_URI
82+
) {
8283
diag.debug('AwsEcsDetector failed: Process is not on ECS');
8384
return {};
8485
}
@@ -89,7 +90,7 @@ export class AwsEcsDetectorSync implements DetectorSync {
8990
[ATTR_CLOUD_PLATFORM]: CLOUD_PLATFORM_VALUE_AWS_ECS,
9091
}).merge(await AwsEcsDetectorSync._getContainerIdAndHostnameResource());
9192

92-
const metadataUrl = getEnv().ECS_CONTAINER_METADATA_URI_V4;
93+
const metadataUrl = process.env.ECS_CONTAINER_METADATA_URI_V4;
9394
if (metadataUrl) {
9495
const [containerMetadata, taskMetadata] = await Promise.all([
9596
AwsEcsDetectorSync._getUrlAsJson(metadataUrl),

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"devDependencies": {
3737
"@opentelemetry/api": "^1.0.0",
3838
"@opentelemetry/contrib-test-utils": "^0.45.0",
39-
"@opentelemetry/instrumentation-http": "^0.57.0",
39+
"@opentelemetry/instrumentation-http": "^0.57.1",
4040
"@types/mocha": "8.2.3",
4141
"@types/node": "18.18.14",
4242
"@types/sinon": "10.0.20",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"devDependencies": {
4444
"@opentelemetry/api": "^1.0.0",
4545
"@opentelemetry/contrib-test-utils": "^0.45.0",
46-
"@opentelemetry/instrumentation-http": "^0.57.0",
46+
"@opentelemetry/instrumentation-http": "^0.57.1",
4747
"@types/mocha": "8.2.3",
4848
"@types/node": "18.18.14",
4949
"@types/semver": "7.5.8",

‎detectors/node/opentelemetry-resource-detector-gcp/src/detectors/GcpDetector.ts‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import {
2424
ResourceAttributes,
2525
IResource,
2626
} from '@opentelemetry/resources';
27-
import { getEnv } from '@opentelemetry/core';
2827
import {
2928
CLOUDPROVIDERVALUES_GCP,
3029
SEMRESATTRS_CLOUD_ACCOUNT_ID,
@@ -79,7 +78,7 @@ class GcpDetector implements DetectorSync {
7978
attributes[SEMRESATTRS_CLOUD_AVAILABILITY_ZONE] = zoneId;
8079
attributes[SEMRESATTRS_CLOUD_PROVIDER] = CLOUDPROVIDERVALUES_GCP;
8180

82-
if (getEnv().KUBERNETES_SERVICE_HOST)
81+
if (process.env.KUBERNETES_SERVICE_HOST)
8382
this._addK8sAttributes(attributes, clusterName);
8483

8584
return attributes;
@@ -90,12 +89,10 @@ class GcpDetector implements DetectorSync {
9089
attributes: ResourceAttributes,
9190
clusterName: string
9291
): void {
93-
const env = getEnv();
94-
9592
attributes[SEMRESATTRS_K8S_CLUSTER_NAME] = clusterName;
96-
attributes[SEMRESATTRS_K8S_NAMESPACE_NAME] = env.NAMESPACE;
97-
attributes[SEMRESATTRS_K8S_POD_NAME] = env.HOSTNAME;
98-
attributes[SEMRESATTRS_CONTAINER_NAME] = env.CONTAINER_NAME;
93+
attributes[SEMRESATTRS_K8S_NAMESPACE_NAME] = process.env.NAMESPACE ?? '';
94+
attributes[SEMRESATTRS_K8S_POD_NAME] = process.env.HOSTNAME ?? '';
95+
attributes[SEMRESATTRS_CONTAINER_NAME] = process.env.CONTAINER_NAME ?? '';
9996
}
10097

10198
/** Gets project id from GCP project metadata. */

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
"devDependencies": {
4343
"@opentelemetry/api": "^1.3.0",
4444
"@opentelemetry/contrib-test-utils": "^0.45.0",
45-
"@opentelemetry/sdk-node": "^0.57.0",
45+
"@opentelemetry/sdk-node": "^0.57.1",
4646
"@types/mocha": "8.2.3",
4747
"@types/node": "18.18.14",
4848
"@types/semver": "7.5.8",

‎metapackages/auto-instrumentations-node/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
"typescript": "4.4.4"
4747
},
4848
"dependencies": {
49-
"@opentelemetry/instrumentation": "^0.57.0",
49+
"@opentelemetry/instrumentation": "^0.57.1",
5050
"@opentelemetry/instrumentation-amqplib": "^0.46.0",
5151
"@opentelemetry/instrumentation-aws-lambda": "^0.50.2",
5252
"@opentelemetry/instrumentation-aws-sdk": "^0.49.0",
@@ -61,9 +61,9 @@
6161
"@opentelemetry/instrumentation-fs": "^0.19.0",
6262
"@opentelemetry/instrumentation-generic-pool": "^0.43.0",
6363
"@opentelemetry/instrumentation-graphql": "^0.47.0",
64-
"@opentelemetry/instrumentation-grpc": "^0.57.0",
64+
"@opentelemetry/instrumentation-grpc": "^0.57.1",
6565
"@opentelemetry/instrumentation-hapi": "^0.45.1",
66-
"@opentelemetry/instrumentation-http": "^0.57.0",
66+
"@opentelemetry/instrumentation-http": "^0.57.1",
6767
"@opentelemetry/instrumentation-ioredis": "^0.47.0",
6868
"@opentelemetry/instrumentation-kafkajs": "^0.7.0",
6969
"@opentelemetry/instrumentation-knex": "^0.44.0",
@@ -92,7 +92,7 @@
9292
"@opentelemetry/resource-detector-container": "^0.6.0",
9393
"@opentelemetry/resource-detector-gcp": "^0.33.0",
9494
"@opentelemetry/resources": "^1.24.0",
95-
"@opentelemetry/sdk-node": "^0.57.0"
95+
"@opentelemetry/sdk-node": "^0.57.1"
9696
},
9797
"files": [
9898
"build/src/**/*.js",

‎metapackages/auto-instrumentations-node/src/register.ts‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,12 @@
1616
import * as opentelemetry from '@opentelemetry/sdk-node';
1717
import { diag, DiagConsoleLogger } from '@opentelemetry/api';
1818
import {
19+
getLogLevelFromEnv,
1920
getNodeAutoInstrumentations,
2021
getResourceDetectorsFromEnv,
2122
} from './utils';
2223

23-
diag.setLogger(
24-
new DiagConsoleLogger(),
25-
opentelemetry.core.getEnv().OTEL_LOG_LEVEL
26-
);
24+
diag.setLogger(new DiagConsoleLogger(), getLogLevelFromEnv());
2725

2826
const sdk = new opentelemetry.NodeSDK({
2927
instrumentations: getNodeAutoInstrumentations(),

0 commit comments

Comments
 (0)