From 8dbbb813fe677555b3720b3f11ab300a1692a2ed Mon Sep 17 00:00:00 2001 From: Marc Pichler Date: Tue, 11 Feb 2025 15:23:50 +0100 Subject: [PATCH 1/2] refactor(resource-detector-aws): migrate away from getEnv() --- .../src/detectors/AwsEcsDetectorSync.ts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/detectors/node/opentelemetry-resource-detector-aws/src/detectors/AwsEcsDetectorSync.ts b/detectors/node/opentelemetry-resource-detector-aws/src/detectors/AwsEcsDetectorSync.ts index 16910928b5..0c67cf853b 100644 --- a/detectors/node/opentelemetry-resource-detector-aws/src/detectors/AwsEcsDetectorSync.ts +++ b/detectors/node/opentelemetry-resource-detector-aws/src/detectors/AwsEcsDetectorSync.ts @@ -48,7 +48,6 @@ import * as http from 'http'; import * as util from 'util'; import * as fs from 'fs'; import * as os from 'os'; -import { getEnv } from '@opentelemetry/core'; const HTTP_TIMEOUT_IN_MS = 1000; @@ -77,8 +76,7 @@ export class AwsEcsDetectorSync implements DetectorSync { } private async _getAttributes(): Promise { - const env = getEnv(); - if (!env.ECS_CONTAINER_METADATA_URI_V4 && !env.ECS_CONTAINER_METADATA_URI) { + if (!process.env.ECS_CONTAINER_METADATA_URI_V4 && !process.env.ECS_CONTAINER_METADATA_URI) { diag.debug('AwsEcsDetector failed: Process is not on ECS'); return {}; } @@ -89,7 +87,7 @@ export class AwsEcsDetectorSync implements DetectorSync { [ATTR_CLOUD_PLATFORM]: CLOUD_PLATFORM_VALUE_AWS_ECS, }).merge(await AwsEcsDetectorSync._getContainerIdAndHostnameResource()); - const metadataUrl = getEnv().ECS_CONTAINER_METADATA_URI_V4; + const metadataUrl = process.env.ECS_CONTAINER_METADATA_URI_V4; if (metadataUrl) { const [containerMetadata, taskMetadata] = await Promise.all([ AwsEcsDetectorSync._getUrlAsJson(metadataUrl), From 639f7206caea03748015315620a79d171c199b0c Mon Sep 17 00:00:00 2001 From: Marc Pichler Date: Tue, 11 Feb 2025 16:07:33 +0100 Subject: [PATCH 2/2] fixup! refactor(resource-detector-aws): migrate away from getEnv() --- .../src/detectors/AwsEcsDetectorSync.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/detectors/node/opentelemetry-resource-detector-aws/src/detectors/AwsEcsDetectorSync.ts b/detectors/node/opentelemetry-resource-detector-aws/src/detectors/AwsEcsDetectorSync.ts index 0c67cf853b..a6244a5e2d 100644 --- a/detectors/node/opentelemetry-resource-detector-aws/src/detectors/AwsEcsDetectorSync.ts +++ b/detectors/node/opentelemetry-resource-detector-aws/src/detectors/AwsEcsDetectorSync.ts @@ -76,7 +76,10 @@ export class AwsEcsDetectorSync implements DetectorSync { } private async _getAttributes(): Promise { - if (!process.env.ECS_CONTAINER_METADATA_URI_V4 && !process.env.ECS_CONTAINER_METADATA_URI) { + if ( + !process.env.ECS_CONTAINER_METADATA_URI_V4 && + !process.env.ECS_CONTAINER_METADATA_URI + ) { diag.debug('AwsEcsDetector failed: Process is not on ECS'); return {}; }