From d2eb260de9f1bafa356db02a6d74c69ebb67032c Mon Sep 17 00:00:00 2001 From: Marc Pichler Date: Tue, 16 Jan 2024 16:26:25 +0100 Subject: [PATCH 1/4] fix(core): drop unnecessary assignemnt of HOSTNAME --- .../opentelemetry-core/src/platform/node/environment.ts | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/packages/opentelemetry-core/src/platform/node/environment.ts b/packages/opentelemetry-core/src/platform/node/environment.ts index 749633f08b..48658693fe 100644 --- a/packages/opentelemetry-core/src/platform/node/environment.ts +++ b/packages/opentelemetry-core/src/platform/node/environment.ts @@ -14,7 +14,6 @@ * limitations under the License. */ -import * as os from 'os'; import { DEFAULT_ENVIRONMENT, ENVIRONMENT, @@ -27,11 +26,5 @@ import { */ export function getEnv(): Required { const processEnv = parseEnvironment(process.env as RAW_ENVIRONMENT); - return Object.assign( - { - HOSTNAME: os.hostname(), - }, - DEFAULT_ENVIRONMENT, - processEnv - ); + return Object.assign({}, DEFAULT_ENVIRONMENT, processEnv); } From 88840a3870f92d643ade4b25c117aba4f4d02fc1 Mon Sep 17 00:00:00 2001 From: Marc Pichler Date: Tue, 16 Jan 2024 16:36:41 +0100 Subject: [PATCH 2/4] fix(changelog): add changelog entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index fc065fe434..8bdf2f8d23 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ For experimental package changes, see the [experimental CHANGELOG](experimental/ ### :bug: (Bug Fix) * fix(sdk-trace-base): ensure attribute value length limit is enforced on span creation [#4417](https://github.com/open-telemetry/opentelemetry-js/pull/4417) @pichlermarc +* fix(core): drop unnecessary assignment of HOSTNAME [#4421](https://github.com/open-telemetry/opentelemetry-js/pull/4421) @pichlermarc ### :books: (Refine Doc) From 4f1914e9de4cf78a9db6a7d8976d68ab6fd16abe Mon Sep 17 00:00:00 2001 From: Marc Pichler Date: Wed, 17 Jan 2024 08:40:59 +0100 Subject: [PATCH 3/4] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8bdf2f8d23..601819c225 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ For experimental package changes, see the [experimental CHANGELOG](experimental/ ### :bug: (Bug Fix) * fix(sdk-trace-base): ensure attribute value length limit is enforced on span creation [#4417](https://github.com/open-telemetry/opentelemetry-js/pull/4417) @pichlermarc -* fix(core): drop unnecessary assignment of HOSTNAME [#4421](https://github.com/open-telemetry/opentelemetry-js/pull/4421) @pichlermarc +* refactor(core): drop unnecessary assignment of HOSTNAME [#4421](https://github.com/open-telemetry/opentelemetry-js/pull/4421) @pichlermarc ### :books: (Refine Doc) From 3141a924271508c25e35e5ecdc446e4b76203f89 Mon Sep 17 00:00:00 2001 From: Marc Pichler Date: Wed, 17 Jan 2024 13:41:49 +0100 Subject: [PATCH 4/4] fix(changelog): move entry to internal --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f632cc900c..1df51ee2e3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,13 +14,13 @@ For experimental package changes, see the [experimental CHANGELOG](experimental/ ### :bug: (Bug Fix) * fix(sdk-trace-base): ensure attribute value length limit is enforced on span creation [#4417](https://github.com/open-telemetry/opentelemetry-js/pull/4417) @pichlermarc -* refactor(core): drop unnecessary assignment of HOSTNAME [#4421](https://github.com/open-telemetry/opentelemetry-js/pull/4421) @pichlermarc ### :books: (Refine Doc) ### :house: (Internal) * chore(opentelemetry-context-zone-peer-dep): support zone.js ^v0.13.0 [#4320](https://github.com/open-telemetry/opentelemetry-js/pull/4320) +* refactor(core): drop unnecessary assignment of HOSTNAME [#4421](https://github.com/open-telemetry/opentelemetry-js/pull/4421) @pichlermarc ## 1.20.0