Skip to content

feat(configuration): parse config for rc 3 #6304

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

Merged
maryliag merged 18 commits into from
Jan 28, 2026
Merged

feat(configuration): parse config for rc 3 #6304

Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
4524125
changelog
maryliag Jan 15, 2026
53fbfcf
update env parsing
maryliag Jan 15, 2026
d12c2d0
update file parsgin
maryliag Jan 15, 2026
fd49773
update commom model
maryliag Jan 15, 2026
4e29a32
update logger model
maryliag Jan 15, 2026
351ca26
update meter model
maryliag Jan 15, 2026
b0a7f2d
update resource model
maryliag Jan 15, 2026
9fd0c1a
update tracer model
maryliag Jan 15, 2026
ad49510
update tests
maryliag Jan 15, 2026
5ebfa57
update fixtures
maryliag Jan 15, 2026
b55cb75
update fixture
maryliag Jan 15, 2026
6b2d7eb
update fixture
maryliag Jan 15, 2026
2f6d5f8
update fixture
maryliag Jan 15, 2026
6292e5b
new fixture
maryliag Jan 15, 2026
7c75bc3
changelog
maryliag Jan 15, 2026
c68779b
improvements
maryliag Jan 22, 2026
180efa7
Merge branch 'main' of github.com:open-telemetry/opentelemetry-js int…
maryliag Jan 22, 2026
40ed8b2
lint
maryliag Jan 22, 2026
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ For notes on migrating to 2.x / 0.200.x see [the upgrade guide](doc/upgrade-to-2

### :rocket: Features

feat(configuration): parse config for rc 3 [#6304](https://github.com/open-telemetry/opentelemetry-js/pull/6304) @maryliag

### :bug: Bug Fixes

* fix(sdk-logs): allow AnyValue attributes for logs and handle circular references [#6210](https://github.com/open-telemetry/opentelemetry-js/pull/6210) @david-luna
Expand Down
158 changes: 78 additions & 80 deletions experimental/packages/configuration/src/EnvironmentConfigFactory.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,47 +173,44 @@ export function setTracerProvider(config: ConfigurationModel): void {
}
config.tracer_provider = initializeDefaultTracerProviderConfiguration();

if (config.tracer_provider.limits == null) {
config.tracer_provider.limits = {};
}
const attributeValueLengthLimit = getNumberFromEnv(
'OTEL_SPAN_ATTRIBUTE_VALUE_LENGTH_LIMIT'
);
if (attributeValueLengthLimit) {
config.tracer_provider.limits.attribute_value_length_limit =
config.tracer_provider.limits!.attribute_value_length_limit =
Comment thread
maryliag marked this conversation as resolved.
attributeValueLengthLimit;
}

const attributeCountLimit = getNumberFromEnv(
'OTEL_SPAN_ATTRIBUTE_COUNT_LIMIT'
);
if (attributeCountLimit) {
config.tracer_provider.limits.attribute_count_limit = attributeCountLimit;
config.tracer_provider.limits!.attribute_count_limit = attributeCountLimit;
}

const eventCountLimit = getNumberFromEnv('OTEL_SPAN_EVENT_COUNT_LIMIT');
if (eventCountLimit) {
config.tracer_provider.limits.event_count_limit = eventCountLimit;
config.tracer_provider.limits!.event_count_limit = eventCountLimit;
}

const linkCountLimit = getNumberFromEnv('OTEL_SPAN_LINK_COUNT_LIMIT');
if (linkCountLimit) {
config.tracer_provider.limits.link_count_limit = linkCountLimit;
config.tracer_provider.limits!.link_count_limit = linkCountLimit;
}

const eventAttributeCountLimit = getNumberFromEnv(
'OTEL_EVENT_ATTRIBUTE_COUNT_LIMIT'
);
if (eventAttributeCountLimit) {
config.tracer_provider.limits.event_attribute_count_limit =
config.tracer_provider.limits!.event_attribute_count_limit =
eventAttributeCountLimit;
}

const linkAttributeCountLimit = getNumberFromEnv(
'OTEL_LINK_ATTRIBUTE_COUNT_LIMIT'
);
if (linkAttributeCountLimit) {
config.tracer_provider.limits.link_attribute_count_limit =
config.tracer_provider.limits!.link_attribute_count_limit =
linkAttributeCountLimit;
}

Expand Down Expand Up @@ -246,16 +243,6 @@ export function setTracerProvider(config: ConfigurationModel): void {
config.tracer_provider.processors.push({
simple: { exporter: { console: {} } },
});
} else if (exporterType === 'zipkin') {
batchInfo.exporter = {
zipkin: {
endpoint:
getStringFromEnv('OTEL_EXPORTER_ZIPKIN_ENDPOINT') ??
'http://localhost:9411/api/v2/spans',
timeout: getNumberFromEnv('OTEL_EXPORTER_ZIPKIN_TIMEOUT') ?? 10000,
},
};
config.tracer_provider.processors.push({ batch: batchInfo });
} else {
// 'otlp' and default
const protocol =
Expand Down Expand Up @@ -292,16 +279,19 @@ export function setTracerProvider(config: ConfigurationModel): void {
if (endpoint) {
batchInfo.exporter.otlp_grpc.endpoint = endpoint;
}
if (certificateFile) {
batchInfo.exporter.otlp_grpc.certificate_file = certificateFile;
}
if (clientKeyFile) {
batchInfo.exporter.otlp_grpc.client_key_file = clientKeyFile;
}
if (clientCertificateFile) {
batchInfo.exporter.otlp_grpc.client_certificate_file =
clientCertificateFile;
if (certificateFile || clientKeyFile || clientCertificateFile) {
batchInfo.exporter.otlp_grpc.tls = {};
if (certificateFile) {
batchInfo.exporter.otlp_grpc.tls.ca_file = certificateFile;
}
if (clientKeyFile) {
batchInfo.exporter.otlp_grpc.tls.key_file = clientKeyFile;
}
if (clientCertificateFile) {
batchInfo.exporter.otlp_grpc.tls.cert_file = clientCertificateFile;
}
}
Comment thread
maryliag marked this conversation as resolved.

if (compression) {
batchInfo.exporter.otlp_grpc.compression = compression;
}
Expand All @@ -323,15 +313,17 @@ export function setTracerProvider(config: ConfigurationModel): void {
if (endpoint) {
batchInfo.exporter.otlp_http.endpoint = endpoint;
}
if (certificateFile) {
batchInfo.exporter.otlp_http.certificate_file = certificateFile;
}
if (clientKeyFile) {
batchInfo.exporter.otlp_http.client_key_file = clientKeyFile;
}
if (clientCertificateFile) {
batchInfo.exporter.otlp_http.client_certificate_file =
clientCertificateFile;
if (certificateFile || clientKeyFile || clientCertificateFile) {
batchInfo.exporter.otlp_http.tls = {};
if (certificateFile) {
batchInfo.exporter.otlp_http.tls.ca_file = certificateFile;
}
if (clientKeyFile) {
batchInfo.exporter.otlp_http.tls.key_file = clientKeyFile;
}
if (clientCertificateFile) {
batchInfo.exporter.otlp_http.tls.cert_file = clientCertificateFile;
}
}
if (compression) {
batchInfo.exporter.otlp_http.compression = compression;
Expand Down Expand Up @@ -428,16 +420,18 @@ export function setMeterProvider(config: ConfigurationModel): void {
if (endpoint) {
readerPeriodicInfo.exporter.otlp_grpc.endpoint = endpoint;
}
if (certificateFile) {
readerPeriodicInfo.exporter.otlp_grpc.certificate_file =
certificateFile;
}
if (clientKeyFile) {
readerPeriodicInfo.exporter.otlp_grpc.client_key_file = clientKeyFile;
}
if (clientCertificateFile) {
readerPeriodicInfo.exporter.otlp_grpc.client_certificate_file =
clientCertificateFile;
if (certificateFile || clientKeyFile || clientCertificateFile) {
readerPeriodicInfo.exporter.otlp_grpc.tls = {};
if (certificateFile) {
readerPeriodicInfo.exporter.otlp_grpc.tls.ca_file = certificateFile;
}
if (clientKeyFile) {
readerPeriodicInfo.exporter.otlp_grpc.tls.key_file = clientKeyFile;
}
if (clientCertificateFile) {
readerPeriodicInfo.exporter.otlp_grpc.tls.cert_file =
clientCertificateFile;
}
}
if (compression) {
readerPeriodicInfo.exporter.otlp_grpc.compression = compression;
Expand Down Expand Up @@ -496,16 +490,18 @@ export function setMeterProvider(config: ConfigurationModel): void {
if (endpoint) {
readerPeriodicInfo.exporter.otlp_http.endpoint = endpoint;
}
if (certificateFile) {
readerPeriodicInfo.exporter.otlp_http.certificate_file =
certificateFile;
}
if (clientKeyFile) {
readerPeriodicInfo.exporter.otlp_http.client_key_file = clientKeyFile;
}
if (clientCertificateFile) {
readerPeriodicInfo.exporter.otlp_http.client_certificate_file =
clientCertificateFile;
if (certificateFile || clientKeyFile || clientCertificateFile) {
readerPeriodicInfo.exporter.otlp_http.tls = {};
if (certificateFile) {
readerPeriodicInfo.exporter.otlp_http.tls.ca_file = certificateFile;
}
if (clientKeyFile) {
readerPeriodicInfo.exporter.otlp_http.tls.key_file = clientKeyFile;
}
if (clientCertificateFile) {
readerPeriodicInfo.exporter.otlp_http.tls.cert_file =
clientCertificateFile;
}
}
if (compression) {
readerPeriodicInfo.exporter.otlp_http.compression = compression;
Expand Down Expand Up @@ -606,16 +602,14 @@ export function setLoggerProvider(config: ConfigurationModel): void {
'OTEL_LOGRECORD_ATTRIBUTE_COUNT_LIMIT'
);
if (attributeValueLengthLimit || attributeCountLimit) {
if (config.logger_provider.limits == null) {
config.logger_provider.limits = { attribute_count_limit: 128 };
}
if (attributeValueLengthLimit) {
config.logger_provider.limits.attribute_value_length_limit =
config.logger_provider.limits!.attribute_value_length_limit =
attributeValueLengthLimit;
}

if (attributeCountLimit) {
config.logger_provider.limits.attribute_count_limit = attributeCountLimit;
config.logger_provider.limits!.attribute_count_limit =
attributeCountLimit;
}
}

Expand Down Expand Up @@ -684,15 +678,17 @@ export function setLoggerProvider(config: ConfigurationModel): void {
if (endpoint) {
batchInfo.exporter.otlp_grpc.endpoint = endpoint;
}
if (certificateFile) {
batchInfo.exporter.otlp_grpc.certificate_file = certificateFile;
}
if (clientKeyFile) {
batchInfo.exporter.otlp_grpc.client_key_file = clientKeyFile;
}
if (clientCertificateFile) {
batchInfo.exporter.otlp_grpc.client_certificate_file =
clientCertificateFile;
if (certificateFile || clientKeyFile || clientCertificateFile) {
batchInfo.exporter.otlp_grpc.tls = {};
if (certificateFile) {
batchInfo.exporter.otlp_grpc.tls.ca_file = certificateFile;
}
if (clientKeyFile) {
batchInfo.exporter.otlp_grpc.tls.key_file = clientKeyFile;
}
if (clientCertificateFile) {
batchInfo.exporter.otlp_grpc.tls.cert_file = clientCertificateFile;
}
}
if (compression) {
batchInfo.exporter.otlp_grpc.compression = compression;
Expand All @@ -715,15 +711,17 @@ export function setLoggerProvider(config: ConfigurationModel): void {
if (endpoint) {
batchInfo.exporter.otlp_http.endpoint = endpoint;
}
if (certificateFile) {
batchInfo.exporter.otlp_http.certificate_file = certificateFile;
}
if (clientKeyFile) {
batchInfo.exporter.otlp_http.client_key_file = clientKeyFile;
}
if (clientCertificateFile) {
batchInfo.exporter.otlp_http.client_certificate_file =
clientCertificateFile;
if (certificateFile || clientKeyFile || clientCertificateFile) {
batchInfo.exporter.otlp_http.tls = {};
if (certificateFile) {
batchInfo.exporter.otlp_http.tls.ca_file = certificateFile;
}
if (clientKeyFile) {
batchInfo.exporter.otlp_http.tls.key_file = clientKeyFile;
}
if (clientCertificateFile) {
batchInfo.exporter.otlp_http.tls.cert_file = clientCertificateFile;
}
}
if (compression) {
batchInfo.exporter.otlp_http.compression = compression;
Expand Down
Loading