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: 1 addition & 1 deletion experimental/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ For notes on migrating to 2.x / 0.200.x see [the upgrade guide](doc/upgrade-to-2

### :boom: Breaking Changes

* feat(sdk-logs)!: move environment variable configuration to `@opentelemetry/sdk-node` [#????](https://github.com/open-telemetry/opentelemetry-js/pull/????) @pichlermarc
* feat(sdk-logs)!: move environment variable configuration to `@opentelemetry/sdk-node` [#6325](https://github.com/open-telemetry/opentelemetry-js/pull/6325) @pichlermarc
* (user-facing): environment variable configuration is no longer applied automatically when instantiating SDK components
(`LoggerProvider`, `BatchLogRecordProcessor`) directly from `@opentelemetry/sdk-logs`. Please migrate to using
`NodeSDK` from `@opentelemetry/sdk-node` to get automatic environment variable configuration.
Expand Down
4 changes: 2 additions & 2 deletions experimental/packages/opentelemetry-sdk-node/src/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -475,10 +475,10 @@ export function getBatchLogRecordProcessorConfigFromEnv(): BufferConfig {
return {
maxQueueSize: getNonNegativeNumberFromEnv('OTEL_BLRP_MAX_QUEUE_SIZE'),
scheduledDelayMillis: getNonNegativeNumberFromEnv(
'OTEL_BLRP_SCHEDULED_DELAY_MILLIS'
'OTEL_BLRP_SCHEDULE_DELAY'
),
exportTimeoutMillis: getNonNegativeNumberFromEnv(
'OTEL_BLRP_EXPORT_TIMEOUT_MILLIS'
'OTEL_BLRP_EXPORT_TIMEOUT'
),
maxExportBatchSize: getNonNegativeNumberFromEnv(
'OTEL_BLRP_MAX_EXPORT_BATCH_SIZE'
Expand Down
20 changes: 10 additions & 10 deletions experimental/packages/opentelemetry-sdk-node/test/utils.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -291,8 +291,8 @@ describe('getLoggerProviderConfigFromEnv', function () {
describe('getBatchLogRecordProcessorConfigFromEnv', function () {
afterEach(function () {
delete process.env.OTEL_BLRP_MAX_QUEUE_SIZE;
delete process.env.OTEL_BLRP_SCHEDULED_DELAY_MILLIS;
delete process.env.OTEL_BLRP_EXPORT_TIMEOUT_MILLIS;
delete process.env.OTEL_BLRP_SCHEDULE_DELAY;
delete process.env.OTEL_BLRP_EXPORT_TIMEOUT;
delete process.env.OTEL_BLRP_MAX_EXPORT_BATCH_SIZE;

sinon.restore();
Expand Down Expand Up @@ -322,7 +322,7 @@ describe('getBatchLogRecordProcessorConfigFromEnv', function () {
});

it('should configure scheduled delay based on env var', function () {
process.env.OTEL_BLRP_SCHEDULED_DELAY_MILLIS = '10000';
process.env.OTEL_BLRP_SCHEDULE_DELAY = '10000';
const config = getBatchLogRecordProcessorConfigFromEnv();

assert.deepStrictEqual(config, {
Expand All @@ -334,7 +334,7 @@ describe('getBatchLogRecordProcessorConfigFromEnv', function () {
});

it('should configure export timeout based on env var', function () {
process.env.OTEL_BLRP_EXPORT_TIMEOUT_MILLIS = '60000';
process.env.OTEL_BLRP_EXPORT_TIMEOUT = '60000';
const config = getBatchLogRecordProcessorConfigFromEnv();

assert.deepStrictEqual(config, {
Expand All @@ -359,8 +359,8 @@ describe('getBatchLogRecordProcessorConfigFromEnv', function () {

it('should configure all values based on env vars', function () {
process.env.OTEL_BLRP_MAX_QUEUE_SIZE = '8192';
process.env.OTEL_BLRP_SCHEDULED_DELAY_MILLIS = '15000';
process.env.OTEL_BLRP_EXPORT_TIMEOUT_MILLIS = '45000';
process.env.OTEL_BLRP_SCHEDULE_DELAY = '15000';
process.env.OTEL_BLRP_EXPORT_TIMEOUT = '45000';
process.env.OTEL_BLRP_MAX_EXPORT_BATCH_SIZE = '2048';
const config = getBatchLogRecordProcessorConfigFromEnv();

Expand All @@ -375,8 +375,8 @@ describe('getBatchLogRecordProcessorConfigFromEnv', function () {
it('should warn and return undefined for negative values from env vars', function () {
const warnStub = sinon.stub(diag, 'warn');
process.env.OTEL_BLRP_MAX_QUEUE_SIZE = '-1';
process.env.OTEL_BLRP_SCHEDULED_DELAY_MILLIS = '-1';
process.env.OTEL_BLRP_EXPORT_TIMEOUT_MILLIS = '-1';
process.env.OTEL_BLRP_SCHEDULE_DELAY = '-1';
process.env.OTEL_BLRP_EXPORT_TIMEOUT = '-1';
process.env.OTEL_BLRP_MAX_EXPORT_BATCH_SIZE = '-1';

const config = getBatchLogRecordProcessorConfigFromEnv();
Expand All @@ -397,8 +397,8 @@ describe('getBatchLogRecordProcessorConfigFromEnv', function () {
it('should return undefined for string values in env vars', function () {
const warnStub = sinon.stub(diag, 'warn');
process.env.OTEL_BLRP_MAX_QUEUE_SIZE = 'not a number';
process.env.OTEL_BLRP_SCHEDULED_DELAY_MILLIS = 'also not a number';
process.env.OTEL_BLRP_EXPORT_TIMEOUT_MILLIS = 'still not a number';
process.env.OTEL_BLRP_SCHEDULE_DELAY = 'also not a number';
process.env.OTEL_BLRP_EXPORT_TIMEOUT = 'still not a number';
process.env.OTEL_BLRP_MAX_EXPORT_BATCH_SIZE = 'definitely not a number';

const config = getBatchLogRecordProcessorConfigFromEnv();
Expand Down