Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
5df60a4
parse attribute limits
maryliag Sep 23, 2025
2381346
Merge branch 'main' of github.com:open-telemetry/opentelemetry-js int…
maryliag Sep 23, 2025
b2bfada
set propagators
maryliag Sep 23, 2025
8f60964
parse limit of tracer provider
maryliag Sep 23, 2025
6933b03
add meter and logger
maryliag Sep 23, 2025
9dec6ab
fix lint
maryliag Sep 23, 2025
01497ab
add changelog
maryliag Sep 23, 2025
aaaed79
create check for propagator
maryliag Oct 2, 2025
2d0369c
Merge branch 'main' of github.com:open-telemetry/opentelemetry-js int…
maryliag Oct 2, 2025
bb00dc8
Merge branch 'main' of github.com:open-telemetry/opentelemetry-js int…
maryliag Oct 7, 2025
0ce3289
parse trace provider
maryliag Oct 7, 2025
860aae1
add changelog
maryliag Oct 7, 2025
2e06c42
update changelog
maryliag Oct 7, 2025
4f18dd4
Merge branch 'main' of github.com:open-telemetry/opentelemetry-js int…
maryliag Oct 8, 2025
da7762d
fix post merge
maryliag Oct 8, 2025
2cd03d7
fix pos merge
maryliag Oct 8, 2025
6265f0f
parse logger provider
maryliag Oct 8, 2025
8e0420d
add changelog
maryliag Oct 8, 2025
f26c8d0
Merge branch 'main' of github.com:open-telemetry/opentelemetry-js int…
maryliag Oct 8, 2025
7d09a23
fix lint
maryliag Oct 8, 2025
d5546b7
Merge branch 'main' of github.com:open-telemetry/opentelemetry-js int…
maryliag Oct 8, 2025
bf89431
add pull reader
maryliag Oct 8, 2025
3f7027f
more parsing
maryliag Oct 8, 2025
dd229ae
separate models
maryliag Oct 9, 2025
30fffce
Merge branch 'tracer-parse' into logger-parse
maryliag Oct 9, 2025
79d6a61
updates to model
maryliag Oct 9, 2025
5154c6b
Merge branch 'logger-parse' into meter-parser
maryliag Oct 9, 2025
f473a6f
parse attributes
maryliag Oct 9, 2025
3e8249d
cleanup
maryliag Oct 9, 2025
edda04f
Merge branch 'main' of github.com:open-telemetry/opentelemetry-js int…
maryliag Oct 9, 2025
5d1e76a
update changelog
maryliag Oct 9, 2025
08ec75b
add test
maryliag Oct 9, 2025
60fafee
Merge branch 'main' of github.com:open-telemetry/opentelemetry-js int…
maryliag Oct 9, 2025
2ec2b47
Merge branch 'main' of github.com:open-telemetry/opentelemetry-js int…
maryliag Oct 9, 2025
22d89f0
update enums
maryliag Oct 10, 2025
1061b07
Merge branch 'main' of github.com:open-telemetry/opentelemetry-js int…
maryliag Oct 10, 2025
6c7f7a9
feedback from PR
maryliag Oct 10, 2025
2b48da4
fix endpoint
maryliag Oct 10, 2025
f40c414
Merge branch 'tracer-parse' into logger-parse
maryliag Oct 10, 2025
dd79438
Merge branch 'logger-parse' into meter-parser
maryliag Oct 10, 2025
b324fd4
Merge branch 'main' of github.com:open-telemetry/opentelemetry-js int…
maryliag Oct 14, 2025
2b8a2d2
fixes with messed merge
maryliag Oct 14, 2025
32199be
Merge branch 'logger-parse' into meter-parser
maryliag Oct 14, 2025
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
2 changes: 2 additions & 0 deletions experimental/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ For notes on migrating to 2.x / 0.200.x see [the upgrade guide](doc/upgrade-to-2
* feat(opentelemetry-configuration): parse more parameters from config file [#5955](https://github.com/open-telemetry/opentelemetry-js/pull/5955) @maryliag
* feat(exporter-prometheus): support withoutTargetInfo option [#5962](https://github.com/open-telemetry/opentelemetry-js/pull/5962) @cjihrig
* feat(opentelemetry-configuration): parse trace provider from config file [#5992](https://github.com/open-telemetry/opentelemetry-js/pull/5992) @maryliag
* feat(opentelemetry-configuration): parse logger provider from config file [#5995](https://github.com/open-telemetry/opentelemetry-js/pull/5995) @maryliag
* feat(opentelemetry-configuration): parse meter provider from config file [#6000](https://github.com/open-telemetry/opentelemetry-js/pull/6000) @maryliag

### :bug: Bug Fixes

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,11 @@ import {
getNumberFromEnv,
} from '@opentelemetry/core';
import { ConfigProvider } from './IConfigProvider';
import {
ExemplarFilter,
ExporterDefaultHistogramAggregation,
ExporterTemporalityPreference,
} from './models/meterProviderModel';

/**
* EnvironmentConfigProvider provides a configuration based on environment variables.
Expand Down Expand Up @@ -257,6 +262,9 @@ function setMeterProvider(config: ConfigurationModel): void {
if (timeout) {
readerPeriodic.timeout = timeout;
}
if (readerPeriodic.exporter.otlp_http == null) {
readerPeriodic.exporter.otlp_http = {};
}

const endpoint = getStringFromEnv('OTEL_EXPORTER_OTLP_METRICS_ENDPOINT');
if (endpoint) {
Expand Down Expand Up @@ -305,26 +313,45 @@ function setMeterProvider(config: ConfigurationModel): void {
const temporalityPreference = getStringFromEnv(
'OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE'
);
if (
temporalityPreference &&
(temporalityPreference === 'cumulative' ||
temporalityPreference === 'delta' ||
temporalityPreference === 'low_memory')
) {
readerPeriodic.exporter.otlp_http.temporality_preference =
temporalityPreference;
if (temporalityPreference) {
switch (temporalityPreference) {
case 'cumulative':
readerPeriodic.exporter.otlp_http.temporality_preference =
ExporterTemporalityPreference.Cumulative;
break;
case 'delta':
readerPeriodic.exporter.otlp_http.temporality_preference =
ExporterTemporalityPreference.Delta;
break;
case 'low_memory':
readerPeriodic.exporter.otlp_http.temporality_preference =
ExporterTemporalityPreference.LowMemory;
break;
default:
readerPeriodic.exporter.otlp_http.temporality_preference =
ExporterTemporalityPreference.Cumulative;
break;
}
}

const defaultHistogramAggregation = getStringFromEnv(
'OTEL_EXPORTER_OTLP_METRICS_DEFAULT_HISTOGRAM_AGGREGATION'
);
if (
defaultHistogramAggregation &&
(defaultHistogramAggregation === 'explicit_bucket_histogram' ||
defaultHistogramAggregation === 'base2_exponential_bucket_histogram')
) {
readerPeriodic.exporter.otlp_http.default_histogram_aggregation =
defaultHistogramAggregation;
if (defaultHistogramAggregation) {
switch (defaultHistogramAggregation) {
case 'explicit_bucket_histogram':
readerPeriodic.exporter.otlp_http.default_histogram_aggregation =
ExporterDefaultHistogramAggregation.ExplicitBucketHistogram;
break;
case 'base2_exponential_bucket_histogram':
readerPeriodic.exporter.otlp_http.default_histogram_aggregation =
ExporterDefaultHistogramAggregation.Base2ExponentialBucketHistogram;
break;
default:
readerPeriodic.exporter.otlp_http.default_histogram_aggregation =
ExporterDefaultHistogramAggregation.ExplicitBucketHistogram;
break;
}
}
if (config.meter_provider == null) {
config.meter_provider = { readers: [{}] };
Expand All @@ -336,16 +363,24 @@ function setMeterProvider(config: ConfigurationModel): void {
config.meter_provider.readers[0].periodic = readerPeriodic;
}
const exemplarFilter = getStringFromEnv('OTEL_METRICS_EXEMPLAR_FILTER');
if (
exemplarFilter &&
(exemplarFilter === 'trace_based' ||
exemplarFilter === 'always_on' ||
exemplarFilter === 'always_off')
) {
if (exemplarFilter) {
if (config.meter_provider == null) {
config.meter_provider = {};
config.meter_provider = { readers: [] };
}
switch (exemplarFilter) {
case 'trace_based':
config.meter_provider.exemplar_filter = ExemplarFilter.TraceBased;
break;
case 'always_on':
config.meter_provider.exemplar_filter = ExemplarFilter.AlwaysOn;
break;
case 'always_off':
config.meter_provider.exemplar_filter = ExemplarFilter.AlwaysOff;
break;
default:
config.meter_provider.exemplar_filter = ExemplarFilter.TraceBased;
break;
}
config.meter_provider.exemplar_filter = exemplarFilter;
}
}

Expand All @@ -358,7 +393,7 @@ function setLoggerProvider(config: ConfigurationModel): void {
);
if (attributeValueLengthLimit || attributeCountLimit) {
if (config.logger_provider == null) {
config.logger_provider = {};
config.logger_provider = { processors: [] };
}
if (config.logger_provider.limits == null) {
config.logger_provider.limits = { attribute_count_limit: 128 };
Expand Down
Loading