Skip to content

Commit 97dff5b

Browse files
authored
fix(sdk-trace-base): don't load envs top level (#5233)
1 parent 85dcbc7 commit 97dff5b

File tree

2 files changed

+11
-10
lines changed

2 files changed

+11
-10
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ For semantic convention package changes, see the [semconv CHANGELOG](packages/se
1515

1616
### :bug: (Bug Fix)
1717

18+
* fix(sdk-trace-base): do not load OTEL_ env vars on module load, but when needed [#5224](https://github.com/open-telemetry/opentelemetry-js/pull/5224)
19+
1820
### :books: (Refine Doc)
1921

2022
### :house: (Internal)

packages/opentelemetry-sdk-trace-base/src/config.ts

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import { AlwaysOnSampler } from './sampler/AlwaysOnSampler';
2222
import { ParentBasedSampler } from './sampler/ParentBasedSampler';
2323
import { TraceIdRatioBasedSampler } from './sampler/TraceIdRatioBasedSampler';
2424

25-
const env = getEnv();
2625
const FALLBACK_OTEL_TRACES_SAMPLER = TracesSamplerValues.AlwaysOn;
2726
const DEFAULT_RATIO = 1;
2827

@@ -36,23 +35,23 @@ const DEFAULT_RATIO = 1;
3635
// object needs to be wrapped in this function and called when needed otherwise
3736
// envs are parsed before tests are ran - causes tests using these envs to fail
3837
export function loadDefaultConfig() {
39-
const _env = getEnv();
38+
const env = getEnv();
4039

4140
return {
4241
sampler: buildSamplerFromEnv(env),
4342
forceFlushTimeoutMillis: 30000,
4443
generalLimits: {
45-
attributeValueLengthLimit: _env.OTEL_ATTRIBUTE_VALUE_LENGTH_LIMIT,
46-
attributeCountLimit: _env.OTEL_ATTRIBUTE_COUNT_LIMIT,
44+
attributeValueLengthLimit: env.OTEL_ATTRIBUTE_VALUE_LENGTH_LIMIT,
45+
attributeCountLimit: env.OTEL_ATTRIBUTE_COUNT_LIMIT,
4746
},
4847
spanLimits: {
49-
attributeValueLengthLimit: _env.OTEL_SPAN_ATTRIBUTE_VALUE_LENGTH_LIMIT,
50-
attributeCountLimit: _env.OTEL_SPAN_ATTRIBUTE_COUNT_LIMIT,
51-
linkCountLimit: _env.OTEL_SPAN_LINK_COUNT_LIMIT,
52-
eventCountLimit: _env.OTEL_SPAN_EVENT_COUNT_LIMIT,
48+
attributeValueLengthLimit: env.OTEL_SPAN_ATTRIBUTE_VALUE_LENGTH_LIMIT,
49+
attributeCountLimit: env.OTEL_SPAN_ATTRIBUTE_COUNT_LIMIT,
50+
linkCountLimit: env.OTEL_SPAN_LINK_COUNT_LIMIT,
51+
eventCountLimit: env.OTEL_SPAN_EVENT_COUNT_LIMIT,
5352
attributePerEventCountLimit:
54-
_env.OTEL_SPAN_ATTRIBUTE_PER_EVENT_COUNT_LIMIT,
55-
attributePerLinkCountLimit: _env.OTEL_SPAN_ATTRIBUTE_PER_LINK_COUNT_LIMIT,
53+
env.OTEL_SPAN_ATTRIBUTE_PER_EVENT_COUNT_LIMIT,
54+
attributePerLinkCountLimit: env.OTEL_SPAN_ATTRIBUTE_PER_LINK_COUNT_LIMIT,
5655
},
5756
mergeResourceWithDefaults: true,
5857
};

0 commit comments

Comments
 (0)