Skip to content

Commit 9ec3227

Browse files
chancancodechancancode
authored
Merge branch 'main' into rm-browser-extension-autoinjection
2 parents 4c62420 + c67a8c3 commit 9ec3227

File tree

42 files changed

+1966
-1093
lines changed

Some content is hidden

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

42 files changed

+1966
-1093
lines changed

‎.release-please-manifest.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
2-
"detectors/node/opentelemetry-resource-detector-alibaba-cloud": "0.29.7",
3-
"detectors/node/opentelemetry-resource-detector-aws": "1.10.0",
4-
"detectors/node/opentelemetry-resource-detector-azure": "0.5.0",
5-
"detectors/node/opentelemetry-resource-detector-container": "0.5.3",
6-
"detectors/node/opentelemetry-resource-detector-gcp": "0.32.0",
7-
"detectors/node/opentelemetry-resource-detector-github": "0.29.0",
8-
"detectors/node/opentelemetry-resource-detector-instana": "0.17.0",
2+
"detectors/node/opentelemetry-resource-detector-alibaba-cloud": "0.30.0",
3+
"detectors/node/opentelemetry-resource-detector-aws": "1.11.0",
4+
"detectors/node/opentelemetry-resource-detector-azure": "0.6.0",
5+
"detectors/node/opentelemetry-resource-detector-container": "0.6.0",
6+
"detectors/node/opentelemetry-resource-detector-gcp": "0.33.0",
7+
"detectors/node/opentelemetry-resource-detector-github": "0.30.0",
8+
"detectors/node/opentelemetry-resource-detector-instana": "0.18.0",
99
"metapackages/auto-configuration-propagators": "0.3.2",
10-
"metapackages/auto-instrumentations-node": "0.55.2",
10+
"metapackages/auto-instrumentations-node": "0.55.3",
1111
"metapackages/auto-instrumentations-web": "0.45.0",
1212
"packages/baggage-span-processor": "0.3.1",
1313
"packages/opentelemetry-host-metrics": "0.35.5",
@@ -28,14 +28,14 @@
2828
"plugins/node/instrumentation-socket.io": "0.46.0",
2929
"plugins/node/instrumentation-tedious": "0.18.0",
3030
"plugins/node/instrumentation-undici": "0.10.0",
31-
"plugins/node/opentelemetry-instrumentation-aws-lambda": "0.50.1",
31+
"plugins/node/opentelemetry-instrumentation-aws-lambda": "0.50.2",
3232
"plugins/node/opentelemetry-instrumentation-aws-sdk": "0.49.0",
3333
"plugins/node/opentelemetry-instrumentation-bunyan": "0.45.0",
3434
"plugins/node/opentelemetry-instrumentation-cassandra": "0.45.0",
3535
"plugins/node/opentelemetry-instrumentation-connect": "0.43.0",
3636
"plugins/node/opentelemetry-instrumentation-dns": "0.43.0",
3737
"plugins/node/opentelemetry-instrumentation-express": "0.47.0",
38-
"plugins/node/opentelemetry-instrumentation-fastify": "0.44.0",
38+
"plugins/node/opentelemetry-instrumentation-fastify": "0.44.1",
3939
"plugins/node/opentelemetry-instrumentation-generic-pool": "0.43.0",
4040
"plugins/node/opentelemetry-instrumentation-graphql": "0.47.0",
4141
"plugins/node/opentelemetry-instrumentation-hapi": "0.45.1",

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
# Changelog
22

3+
## [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)
4+
5+
6+
### Features
7+
8+
* **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))
9+
* **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))
10+
311
## [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)
412

513

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@opentelemetry/resource-detector-alibaba-cloud",
3-
"version": "0.29.7",
3+
"version": "0.30.0",
44
"description": "OpenTelemetry resource detector for Alibaba Cloud",
55
"main": "build/src/index.js",
66
"module": "build/esm/index.js",
@@ -61,5 +61,6 @@
6161
"@opentelemetry/resources": "^1.10.0",
6262
"@opentelemetry/semantic-conventions": "^1.27.0"
6363
},
64-
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/detectors/node/opentelemetry-resource-detector-alibaba-cloud#readme"
64+
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/detectors/node/opentelemetry-resource-detector-alibaba-cloud#readme",
65+
"sideEffects": false
6566
}

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,19 @@
11
# Changelog
22

3+
## [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)
4+
5+
6+
### Features
7+
8+
* **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))
9+
* **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))
10+
11+
12+
### Bug Fixes
13+
14+
* **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))
15+
* **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))
16+
317
## [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)
418

519

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@opentelemetry/resource-detector-aws",
3-
"version": "1.10.0",
3+
"version": "1.11.0",
44
"description": "OpenTelemetry SDK resource detector for AWS",
55
"main": "build/src/index.js",
66
"module": "build/esm/index.js",
@@ -62,5 +62,6 @@
6262
"@opentelemetry/resources": "^1.10.0",
6363
"@opentelemetry/semantic-conventions": "^1.27.0"
6464
},
65-
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/detectors/node/opentelemetry-resource-detector-aws#readme"
65+
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/detectors/node/opentelemetry-resource-detector-aws#readme",
66+
"sideEffects": false
6667
}

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

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,17 @@ import {
2525
ResourceDetectionConfig,
2626
} from '@opentelemetry/resources';
2727
import {
28-
SEMRESATTRS_CLOUD_PROVIDER,
29-
SEMRESATTRS_CLOUD_PLATFORM,
30-
SEMRESATTRS_SERVICE_NAME,
31-
SEMRESATTRS_SERVICE_NAMESPACE,
32-
SEMRESATTRS_SERVICE_VERSION,
33-
SEMRESATTRS_SERVICE_INSTANCE_ID,
34-
CLOUDPROVIDERVALUES_AWS,
35-
CLOUDPLATFORMVALUES_AWS_ELASTIC_BEANSTALK,
28+
ATTR_SERVICE_NAME,
29+
ATTR_SERVICE_VERSION,
3630
} from '@opentelemetry/semantic-conventions';
31+
import {
32+
ATTR_CLOUD_PROVIDER,
33+
ATTR_CLOUD_PLATFORM,
34+
ATTR_SERVICE_NAMESPACE,
35+
ATTR_SERVICE_INSTANCE_ID,
36+
CLOUD_PROVIDER_VALUE_AWS,
37+
CLOUD_PLATFORM_VALUE_AWS_ELASTIC_BEANSTALK,
38+
} from '../semconv';
3739
import * as fs from 'fs';
3840
import * as util from 'util';
3941

@@ -95,12 +97,12 @@ export class AwsBeanstalkDetectorSync implements DetectorSync {
9597
const parsedData = JSON.parse(rawData);
9698

9799
return {
98-
[SEMRESATTRS_CLOUD_PROVIDER]: CLOUDPROVIDERVALUES_AWS,
99-
[SEMRESATTRS_CLOUD_PLATFORM]: CLOUDPLATFORMVALUES_AWS_ELASTIC_BEANSTALK,
100-
[SEMRESATTRS_SERVICE_NAME]: CLOUDPLATFORMVALUES_AWS_ELASTIC_BEANSTALK,
101-
[SEMRESATTRS_SERVICE_NAMESPACE]: parsedData.environment_name,
102-
[SEMRESATTRS_SERVICE_VERSION]: parsedData.version_label,
103-
[SEMRESATTRS_SERVICE_INSTANCE_ID]: parsedData.deployment_id,
100+
[ATTR_CLOUD_PROVIDER]: CLOUD_PROVIDER_VALUE_AWS,
101+
[ATTR_CLOUD_PLATFORM]: CLOUD_PLATFORM_VALUE_AWS_ELASTIC_BEANSTALK,
102+
[ATTR_SERVICE_NAME]: CLOUD_PLATFORM_VALUE_AWS_ELASTIC_BEANSTALK,
103+
[ATTR_SERVICE_NAMESPACE]: parsedData.environment_name,
104+
[ATTR_SERVICE_VERSION]: parsedData.version_label,
105+
[ATTR_SERVICE_INSTANCE_ID]: parsedData.deployment_id,
104106
};
105107
} catch (e: any) {
106108
diag.debug(`AwsBeanstalkDetectorSync failed: ${e.message}`);

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

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,17 @@ import {
2424
ResourceDetectionConfig,
2525
} from '@opentelemetry/resources';
2626
import {
27-
SEMRESATTRS_CLOUD_PROVIDER,
28-
SEMRESATTRS_CLOUD_PLATFORM,
29-
SEMRESATTRS_CLOUD_REGION,
30-
SEMRESATTRS_CLOUD_ACCOUNT_ID,
31-
SEMRESATTRS_CLOUD_AVAILABILITY_ZONE,
32-
SEMRESATTRS_HOST_ID,
33-
SEMRESATTRS_HOST_TYPE,
34-
SEMRESATTRS_HOST_NAME,
35-
CLOUDPROVIDERVALUES_AWS,
36-
CLOUDPLATFORMVALUES_AWS_EC2,
37-
} from '@opentelemetry/semantic-conventions';
27+
ATTR_CLOUD_PROVIDER,
28+
ATTR_CLOUD_PLATFORM,
29+
ATTR_CLOUD_REGION,
30+
ATTR_CLOUD_ACCOUNT_ID,
31+
ATTR_CLOUD_AVAILABILITY_ZONE,
32+
ATTR_HOST_ID,
33+
ATTR_HOST_TYPE,
34+
ATTR_HOST_NAME,
35+
CLOUD_PROVIDER_VALUE_AWS,
36+
CLOUD_PLATFORM_VALUE_AWS_EC2,
37+
} from '../semconv';
3838
import * as http from 'http';
3939

4040
/**
@@ -79,14 +79,14 @@ class AwsEc2DetectorSync implements DetectorSync {
7979
const hostname = await this._fetchHost(token);
8080

8181
return {
82-
[SEMRESATTRS_CLOUD_PROVIDER]: CLOUDPROVIDERVALUES_AWS,
83-
[SEMRESATTRS_CLOUD_PLATFORM]: CLOUDPLATFORMVALUES_AWS_EC2,
84-
[SEMRESATTRS_CLOUD_ACCOUNT_ID]: accountId,
85-
[SEMRESATTRS_CLOUD_REGION]: region,
86-
[SEMRESATTRS_CLOUD_AVAILABILITY_ZONE]: availabilityZone,
87-
[SEMRESATTRS_HOST_ID]: instanceId,
88-
[SEMRESATTRS_HOST_TYPE]: instanceType,
89-
[SEMRESATTRS_HOST_NAME]: hostname,
82+
[ATTR_CLOUD_PROVIDER]: CLOUD_PROVIDER_VALUE_AWS,
83+
[ATTR_CLOUD_PLATFORM]: CLOUD_PLATFORM_VALUE_AWS_EC2,
84+
[ATTR_CLOUD_ACCOUNT_ID]: accountId,
85+
[ATTR_CLOUD_REGION]: region,
86+
[ATTR_CLOUD_AVAILABILITY_ZONE]: availabilityZone,
87+
[ATTR_HOST_ID]: instanceId,
88+
[ATTR_HOST_TYPE]: instanceType,
89+
[ATTR_HOST_NAME]: hostname,
9090
};
9191
} catch {
9292
return {};

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

Lines changed: 39 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -23,26 +23,26 @@ import {
2323
ResourceAttributes,
2424
} from '@opentelemetry/resources';
2525
import {
26-
SEMRESATTRS_CLOUD_PROVIDER,
27-
SEMRESATTRS_CLOUD_PLATFORM,
28-
SEMRESATTRS_CONTAINER_ID,
29-
SEMRESATTRS_CONTAINER_NAME,
30-
SEMRESATTRS_AWS_ECS_CONTAINER_ARN,
31-
SEMRESATTRS_AWS_ECS_CLUSTER_ARN,
32-
SEMRESATTRS_AWS_ECS_LAUNCHTYPE,
33-
SEMRESATTRS_AWS_ECS_TASK_ARN,
34-
SEMRESATTRS_AWS_ECS_TASK_FAMILY,
35-
SEMRESATTRS_AWS_ECS_TASK_REVISION,
36-
SEMRESATTRS_CLOUD_ACCOUNT_ID,
37-
SEMRESATTRS_CLOUD_REGION,
38-
SEMRESATTRS_CLOUD_AVAILABILITY_ZONE,
39-
SEMRESATTRS_AWS_LOG_GROUP_NAMES,
40-
SEMRESATTRS_AWS_LOG_GROUP_ARNS,
41-
SEMRESATTRS_AWS_LOG_STREAM_NAMES,
42-
SEMRESATTRS_AWS_LOG_STREAM_ARNS,
43-
CLOUDPROVIDERVALUES_AWS,
44-
CLOUDPLATFORMVALUES_AWS_ECS,
45-
} from '@opentelemetry/semantic-conventions';
26+
ATTR_CLOUD_PROVIDER,
27+
ATTR_CLOUD_PLATFORM,
28+
ATTR_CONTAINER_ID,
29+
ATTR_CONTAINER_NAME,
30+
ATTR_AWS_ECS_CONTAINER_ARN,
31+
ATTR_AWS_ECS_CLUSTER_ARN,
32+
ATTR_AWS_ECS_LAUNCHTYPE,
33+
ATTR_AWS_ECS_TASK_ARN,
34+
ATTR_AWS_ECS_TASK_FAMILY,
35+
ATTR_AWS_ECS_TASK_REVISION,
36+
ATTR_CLOUD_ACCOUNT_ID,
37+
ATTR_CLOUD_REGION,
38+
ATTR_CLOUD_AVAILABILITY_ZONE,
39+
ATTR_AWS_LOG_GROUP_NAMES,
40+
ATTR_AWS_LOG_GROUP_ARNS,
41+
ATTR_AWS_LOG_STREAM_NAMES,
42+
ATTR_AWS_LOG_STREAM_ARNS,
43+
CLOUD_PROVIDER_VALUE_AWS,
44+
CLOUD_PLATFORM_VALUE_AWS_ECS,
45+
} from '../semconv';
4646
// Patch until the OpenTelemetry SDK is updated to ship this attribute
4747
import { SemanticResourceAttributes as AdditionalSemanticResourceAttributes } from './SemanticResourceAttributes';
4848
import * as http from 'http';
@@ -86,8 +86,8 @@ export class AwsEcsDetectorSync implements DetectorSync {
8686

8787
try {
8888
let resource = new Resource({
89-
[SEMRESATTRS_CLOUD_PROVIDER]: CLOUDPROVIDERVALUES_AWS,
90-
[SEMRESATTRS_CLOUD_PLATFORM]: CLOUDPLATFORMVALUES_AWS_ECS,
89+
[ATTR_CLOUD_PROVIDER]: CLOUD_PROVIDER_VALUE_AWS,
90+
[ATTR_CLOUD_PLATFORM]: CLOUD_PLATFORM_VALUE_AWS_ECS,
9191
}).merge(await AwsEcsDetectorSync._getContainerIdAndHostnameResource());
9292

9393
const metadataUrl = getEnv().ECS_CONTAINER_METADATA_URI_V4;
@@ -146,8 +146,8 @@ export class AwsEcsDetectorSync implements DetectorSync {
146146

147147
if (hostName || containerId) {
148148
return new Resource({
149-
[SEMRESATTRS_CONTAINER_NAME]: hostName || '',
150-
[SEMRESATTRS_CONTAINER_ID]: containerId || '',
149+
[ATTR_CONTAINER_NAME]: hostName || '',
150+
[ATTR_CONTAINER_ID]: containerId || '',
151151
});
152152
}
153153

@@ -166,8 +166,7 @@ export class AwsEcsDetectorSync implements DetectorSync {
166166

167167
const accountId: string = AwsEcsDetectorSync._getAccountFromArn(taskArn);
168168
const region: string = AwsEcsDetectorSync._getRegionFromArn(taskArn);
169-
const availabilityZone: string | undefined =
170-
taskMetadata?.['AvailabilityZone'];
169+
const availabilityZone: string | undefined = taskMetadata?.AvailabilityZone;
171170

172171
const clusterArn = cluster.startsWith('arn:')
173172
? cluster
@@ -177,21 +176,21 @@ export class AwsEcsDetectorSync implements DetectorSync {
177176

178177
// https://github.com/open-telemetry/semantic-conventions/blob/main/semantic_conventions/resource/cloud_provider/aws/ecs.yaml
179178
const attributes: ResourceAttributes = {
180-
[SEMRESATTRS_AWS_ECS_CONTAINER_ARN]: containerArn,
181-
[SEMRESATTRS_AWS_ECS_CLUSTER_ARN]: clusterArn,
182-
[SEMRESATTRS_AWS_ECS_LAUNCHTYPE]: launchType?.toLowerCase(),
183-
[SEMRESATTRS_AWS_ECS_TASK_ARN]: taskArn,
184-
[SEMRESATTRS_AWS_ECS_TASK_FAMILY]: taskMetadata['Family'],
185-
[SEMRESATTRS_AWS_ECS_TASK_REVISION]: taskMetadata['Revision'],
186-
187-
[SEMRESATTRS_CLOUD_ACCOUNT_ID]: accountId,
188-
[SEMRESATTRS_CLOUD_REGION]: region,
179+
[ATTR_AWS_ECS_CONTAINER_ARN]: containerArn,
180+
[ATTR_AWS_ECS_CLUSTER_ARN]: clusterArn,
181+
[ATTR_AWS_ECS_LAUNCHTYPE]: launchType?.toLowerCase(),
182+
[ATTR_AWS_ECS_TASK_ARN]: taskArn,
183+
[ATTR_AWS_ECS_TASK_FAMILY]: taskMetadata['Family'],
184+
[ATTR_AWS_ECS_TASK_REVISION]: taskMetadata['Revision'],
185+
186+
[ATTR_CLOUD_ACCOUNT_ID]: accountId,
187+
[ATTR_CLOUD_REGION]: region,
189188
[AdditionalSemanticResourceAttributes.CLOUD_RESOURCE_ID]: containerArn,
190189
};
191190

192191
// The availability zone is not available in all Fargate runtimes
193192
if (availabilityZone) {
194-
attributes[SEMRESATTRS_CLOUD_AVAILABILITY_ZONE] = availabilityZone;
193+
attributes[ATTR_CLOUD_AVAILABILITY_ZONE] = availabilityZone;
195194
}
196195

197196
return new Resource(attributes);
@@ -222,10 +221,10 @@ export class AwsEcsDetectorSync implements DetectorSync {
222221
const logsStreamArn = `arn:aws:logs:${logsRegion}:${awsAccount}:log-group:${logsGroupName}:log-stream:${logsStreamName}`;
223222

224223
return new Resource({
225-
[SEMRESATTRS_AWS_LOG_GROUP_NAMES]: [logsGroupName],
226-
[SEMRESATTRS_AWS_LOG_GROUP_ARNS]: [logsGroupArn],
227-
[SEMRESATTRS_AWS_LOG_STREAM_NAMES]: [logsStreamName],
228-
[SEMRESATTRS_AWS_LOG_STREAM_ARNS]: [logsStreamArn],
224+
[ATTR_AWS_LOG_GROUP_NAMES]: [logsGroupName],
225+
[ATTR_AWS_LOG_GROUP_ARNS]: [logsGroupArn],
226+
[ATTR_AWS_LOG_STREAM_NAMES]: [logsStreamName],
227+
[ATTR_AWS_LOG_STREAM_ARNS]: [logsStreamArn],
229228
});
230229
}
231230

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ import {
2424
ResourceDetectionConfig,
2525
} from '@opentelemetry/resources';
2626
import {
27-
SEMRESATTRS_CLOUD_PROVIDER,
28-
SEMRESATTRS_CLOUD_PLATFORM,
29-
SEMRESATTRS_K8S_CLUSTER_NAME,
30-
SEMRESATTRS_CONTAINER_ID,
31-
CLOUDPROVIDERVALUES_AWS,
32-
CLOUDPLATFORMVALUES_AWS_EKS,
33-
} from '@opentelemetry/semantic-conventions';
27+
ATTR_CLOUD_PROVIDER,
28+
ATTR_CLOUD_PLATFORM,
29+
ATTR_K8S_CLUSTER_NAME,
30+
ATTR_CONTAINER_ID,
31+
CLOUD_PROVIDER_VALUE_AWS,
32+
CLOUD_PLATFORM_VALUE_AWS_EKS,
33+
} from '../semconv';
3434
import * as https from 'https';
3535
import * as fs from 'fs';
3636
import * as util from 'util';
@@ -94,10 +94,10 @@ export class AwsEksDetectorSync implements DetectorSync {
9494
return !containerId && !clusterName
9595
? {}
9696
: {
97-
[SEMRESATTRS_CLOUD_PROVIDER]: CLOUDPROVIDERVALUES_AWS,
98-
[SEMRESATTRS_CLOUD_PLATFORM]: CLOUDPLATFORMVALUES_AWS_EKS,
99-
[SEMRESATTRS_K8S_CLUSTER_NAME]: clusterName || '',
100-
[SEMRESATTRS_CONTAINER_ID]: containerId || '',
97+
[ATTR_CLOUD_PROVIDER]: CLOUD_PROVIDER_VALUE_AWS,
98+
[ATTR_CLOUD_PLATFORM]: CLOUD_PLATFORM_VALUE_AWS_EKS,
99+
[ATTR_K8S_CLUSTER_NAME]: clusterName || '',
100+
[ATTR_CONTAINER_ID]: containerId || '',
101101
};
102102
} catch (e) {
103103
diag.debug('Process is not running on K8S', e);

0 commit comments

Comments
 (0)