Skip to content

Commit 385715c

Browse files
feat!: Add OTEL_LOGRECORD_ATTRIBUTE_* env vars. Remove OTEL_LOG_RECORD_ATTRIBUTE_* env vars. (#1895)
* feat: Add OTEL_LOGRECORD_ATTRIBUTE_* env vars Previously, the configuration option for managing log record attributes spelled log record with an underscore, `LOG_RECORD`. However, the spec does not use an underscore, `LOGRECORD`. Now, both spellings will be checked to set the value, with `LOGRECORD` taking precedence. * feat!: Remove LOG_RECORD_ATTRIBUTES_* env vars Leave only the spec-compliant var, that uses LOGRECORD
1 parent 14d1b61 commit 385715c

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

logs_sdk/lib/opentelemetry/sdk/logs/log_record_limits.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ class LogRecordLimits
2020
# @return [LogRecordLimits] with the desired values.
2121
# @raise [ArgumentError] if any of the max numbers are not positive.
2222
def initialize(attribute_count_limit: Integer(OpenTelemetry::Common::Utilities.config_opt(
23-
'OTEL_LOG_RECORD_ATTRIBUTE_COUNT_LIMIT',
23+
'OTEL_LOGRECORD_ATTRIBUTE_COUNT_LIMIT',
2424
'OTEL_ATTRIBUTE_COUNT_LIMIT',
2525
default: 128
2626
)),
2727
attribute_length_limit: OpenTelemetry::Common::Utilities.config_opt(
28-
'OTEL_LOG_RECORD_ATTRIBUTE_VALUE_LENGTH_LIMIT',
28+
'OTEL_LOGRECORD_ATTRIBUTE_VALUE_LENGTH_LIMIT',
2929
'OTEL_ATTRIBUTE_VALUE_LENGTH_LIMIT'
3030
))
3131
raise ArgumentError, 'attribute_count_limit must be positive' unless attribute_count_limit.positive?

logs_sdk/test/opentelemetry/sdk/logs/log_record_limits_test.rb

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
_(log_record_limits.attribute_length_limit).must_be_nil
1616
end
1717

18-
it 'prioritizes specific environment varibles for attribute value length limits' do
18+
it 'prioritizes specific environment variables for attribute value length limits' do
1919
OpenTelemetry::TestHelpers.with_env('OTEL_ATTRIBUTE_VALUE_LENGTH_LIMIT' => '35',
20-
'OTEL_LOG_RECORD_ATTRIBUTE_VALUE_LENGTH_LIMIT' => '33') do
20+
'OTEL_LOGRECORD_ATTRIBUTE_VALUE_LENGTH_LIMIT' => '33') do
2121
_(log_record_limits.attribute_length_limit).must_equal 33
2222
end
2323
end
@@ -29,16 +29,16 @@
2929
end
3030

3131
it 'reflects environment variables' do
32-
OpenTelemetry::TestHelpers.with_env('OTEL_LOG_RECORD_ATTRIBUTE_COUNT_LIMIT' => '1',
33-
'OTEL_LOG_RECORD_ATTRIBUTE_VALUE_LENGTH_LIMIT' => '32') do
32+
OpenTelemetry::TestHelpers.with_env('OTEL_LOGRECORD_ATTRIBUTE_COUNT_LIMIT' => '1',
33+
'OTEL_LOGRECORD_ATTRIBUTE_VALUE_LENGTH_LIMIT' => '32') do
3434
_(log_record_limits.attribute_count_limit).must_equal 1
3535
_(log_record_limits.attribute_length_limit).must_equal 32
3636
end
3737
end
3838

3939
it 'reflects explicit overrides' do
40-
OpenTelemetry::TestHelpers.with_env('OTEL_LOG_RECORD_ATTRIBUTE_COUNT_LIMIT' => '1',
41-
'OTEL_LOG_RECORD_ATTRIBUTE_VALUE_LENGTH_LIMIT' => '4') do
40+
OpenTelemetry::TestHelpers.with_env('OTEL_LOGRECORD_ATTRIBUTE_COUNT_LIMIT' => '1',
41+
'OTEL_LOGRECORD_ATTRIBUTE_VALUE_LENGTH_LIMIT' => '4') do
4242
log_record_limits = OpenTelemetry::SDK::Logs::LogRecordLimits.new(attribute_count_limit: 10,
4343
attribute_length_limit: 32)
4444
_(log_record_limits.attribute_count_limit).must_equal 10
@@ -55,9 +55,9 @@
5555
end
5656

5757
it 'prefers model-specific attribute env vars over generic attribute env vars' do
58-
OpenTelemetry::TestHelpers.with_env('OTEL_LOG_RECORD_ATTRIBUTE_COUNT_LIMIT' => '1',
58+
OpenTelemetry::TestHelpers.with_env('OTEL_LOGRECORD_ATTRIBUTE_COUNT_LIMIT' => '1',
5959
'OTEL_ATTRIBUTE_COUNT_LIMIT' => '2',
60-
'OTEL_LOG_RECORD_ATTRIBUTE_VALUE_LENGTH_LIMIT' => '32',
60+
'OTEL_LOGRECORD_ATTRIBUTE_VALUE_LENGTH_LIMIT' => '32',
6161
'OTEL_ATTRIBUTE_VALUE_LENGTH_LIMIT' => '33') do
6262
_(log_record_limits.attribute_count_limit).must_equal 1
6363
_(log_record_limits.attribute_length_limit).must_equal 32

0 commit comments

Comments
 (0)