diff --git a/experimental/CHANGELOG.md b/experimental/CHANGELOG.md index 59fbff59a54..9a0c8cda2dd 100644 --- a/experimental/CHANGELOG.md +++ b/experimental/CHANGELOG.md @@ -21,6 +21,8 @@ For notes on migrating to 2.x / 0.200.x see [the upgrade guide](doc/upgrade-to-2 ### :bug: Bug Fixes +* fix(sdk-node): apply spec-defined `schedule_delay: 1000` default for BatchLogRecordProcessor from declarative config (SDK defaults to 5000) [#6788](https://github.com/open-telemetry/opentelemetry-js/pull/6788) @MikeGoldsmith +* fix(configuration): default `log_level` to `info` in env-based config initialization for consistency with file-based config [#6788](https://github.com/open-telemetry/opentelemetry-js/pull/6788) @MikeGoldsmith * fix(sdk-node): pass all config properties to log record exporters in declarative config [#6708](https://github.com/open-telemetry/opentelemetry-js/pull/6708) @MikeGoldsmith * fix(sdk-node): warn and ignore zero exporter timeout in declarative config [#6711](https://github.com/open-telemetry/opentelemetry-js/pull/6711) @MikeGoldsmith * fix(sdk-node): pass gRPC credentials and headers to span exporter in declarative config [#6705](https://github.com/open-telemetry/opentelemetry-js/pull/6705) @MikeGoldsmith diff --git a/experimental/packages/configuration/src/utils.ts b/experimental/packages/configuration/src/utils.ts index 6d3adeb3426..324fe0d986c 100644 --- a/experimental/packages/configuration/src/utils.ts +++ b/experimental/packages/configuration/src/utils.ts @@ -58,6 +58,7 @@ export function getGrpcTlsConfig( export function initializeDefaultConfiguration(): ConfigurationModel { return { disabled: false, + log_level: 'info', resource: {}, attribute_limits: { attribute_count_limit: 128, diff --git a/experimental/packages/configuration/test/EnvironmentConfigFactory.test.ts b/experimental/packages/configuration/test/EnvironmentConfigFactory.test.ts index 47f301d89d8..4ccba82fb94 100644 --- a/experimental/packages/configuration/test/EnvironmentConfigFactory.test.ts +++ b/experimental/packages/configuration/test/EnvironmentConfigFactory.test.ts @@ -17,6 +17,7 @@ import { const defaultConfig: ConfigurationModel = { disabled: false, + log_level: 'info', resource: {}, attribute_limits: { attribute_count_limit: 128, diff --git a/experimental/packages/configuration/test/FileConfigFactory.test.ts b/experimental/packages/configuration/test/FileConfigFactory.test.ts index 7c2e0f59396..4dd190ffbde 100644 --- a/experimental/packages/configuration/test/FileConfigFactory.test.ts +++ b/experimental/packages/configuration/test/FileConfigFactory.test.ts @@ -11,6 +11,7 @@ import { parseConfigFile } from '../src/FileConfigFactory'; const defaultConfig: ConfigurationModel = { disabled: false, + log_level: 'info', resource: {}, attribute_limits: { attribute_count_limit: 128, diff --git a/experimental/packages/opentelemetry-sdk-node/src/utils.ts b/experimental/packages/opentelemetry-sdk-node/src/utils.ts index c40873fb0e9..a63cc15722e 100644 --- a/experimental/packages/opentelemetry-sdk-node/src/utils.ts +++ b/experimental/packages/opentelemetry-sdk-node/src/utils.ts @@ -708,7 +708,10 @@ export function getLogRecordProcessorsFromConfiguration( maxQueueSize: processor.batch.max_queue_size ?? undefined, maxExportBatchSize: processor.batch.max_export_batch_size ?? undefined, - scheduledDelayMillis: processor.batch.schedule_delay ?? undefined, + // The SDK's BatchLogRecordProcessor defaults schedule_delay to + // 5000ms (same as BSP), but the OTel config spec says BLRP + // defaults to 1000ms. Apply the spec-defined default here. + scheduledDelayMillis: processor.batch.schedule_delay ?? 1000, exportTimeoutMillis: processor.batch.export_timeout ?? undefined, }) );