Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor(core): drop unnecessary assignment of HOSTNAME #4421

Merged
merged 5 commits into from
Jan 18, 2024
Merged

refactor(core): drop unnecessary assignment of HOSTNAME #4421

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d2eb260
fix(core): drop unnecessary assignemnt of HOSTNAME
pichlermarc Jan 16, 2024
88840a3
fix(changelog): add changelog entry
pichlermarc Jan 16, 2024
4f1914e
Update CHANGELOG.md
pichlermarc Jan 17, 2024
0431b98
Merge branch 'main' into fix/4405
pichlermarc Jan 17, 2024
3141a92
fix(changelog): move entry to internal
pichlermarc Jan 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
* refactor(core): drop unnecessary assignment of HOSTNAME [#4421](https://github.com/open-telemetry/opentelemetry-js/pull/4421) @pichlermarc
pichlermarc marked this conversation as resolved.
Show resolved Hide resolved

### :books: (Refine Doc)

Expand Down
9 changes: 1 addition & 8 deletions packages/opentelemetry-core/src/platform/node/environment.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
* limitations under the License.
*/

import * as os from 'os';
import {
DEFAULT_ENVIRONMENT,
ENVIRONMENT,
Expand All @@ -27,11 +26,5 @@ import {
*/
export function getEnv(): Required<ENVIRONMENT> {
const processEnv = parseEnvironment(process.env as RAW_ENVIRONMENT);
return Object.assign(
{
HOSTNAME: os.hostname(),
},
DEFAULT_ENVIRONMENT,
processEnv
);
return Object.assign({}, DEFAULT_ENVIRONMENT, processEnv);
}