Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 @@ -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
Expand Down
1 change: 1 addition & 0 deletions experimental/packages/configuration/src/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ export function getGrpcTlsConfig(
export function initializeDefaultConfiguration(): ConfigurationModel {
return {
disabled: false,
log_level: 'info',
resource: {},
attribute_limits: {
attribute_count_limit: 128,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import {

const defaultConfig: ConfigurationModel = {
disabled: false,
log_level: 'info',
resource: {},
attribute_limits: {
attribute_count_limit: 128,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import { parseConfigFile } from '../src/FileConfigFactory';

const defaultConfig: ConfigurationModel = {
disabled: false,
log_level: 'info',
resource: {},
attribute_limits: {
attribute_count_limit: 128,
Expand Down
5 changes: 4 additions & 1 deletion experimental/packages/opentelemetry-sdk-node/src/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
})
);
Expand Down
Loading