Skip to content

Commit 7b70474

Browse files
ocelotlocelotl
committed
Fix lint: remove unused import and apply ruff format
1 parent 765ed86 commit 7b70474

5 files changed

Lines changed: 19 additions & 62 deletions

File tree

‎opentelemetry-configuration/src/opentelemetry/configuration/_logger_provider.py‎

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -241,20 +241,14 @@ def _create_log_record_limits(
241241

242242
attribute_value_length_limit = config.attribute_value_length_limit
243243
if attribute_value_length_limit is None and global_limits is not None:
244-
attribute_value_length_limit = (
245-
global_limits.attribute_value_length_limit
246-
)
244+
attribute_value_length_limit = global_limits.attribute_value_length_limit
247245

248246
return LogRecordLimits(
249247
max_attributes=(
250-
attribute_count_limit
251-
if attribute_count_limit is not None
252-
else _DEFAULT_OTEL_LOG_ATTRIBUTE_COUNT_LIMIT
248+
attribute_count_limit if attribute_count_limit is not None else _DEFAULT_OTEL_LOG_ATTRIBUTE_COUNT_LIMIT
253249
),
254250
max_attribute_length=(
255-
attribute_value_length_limit
256-
if attribute_value_length_limit is not None
257-
else LogRecordLimits.UNSET
251+
attribute_value_length_limit if attribute_value_length_limit is not None else LogRecordLimits.UNSET
258252
),
259253
)
260254

@@ -279,20 +273,14 @@ def create_logger_provider(
279273
A configured LoggerProvider.
280274
"""
281275
if config is not None and config.limits is not None:
282-
283276
limits = config.limits
284277

285278
else:
286-
287279
limits = LogRecordLimitsConfig()
288280

289-
log_record_limits = _create_log_record_limits(
290-
limits, global_attribute_limits
291-
)
281+
log_record_limits = _create_log_record_limits(limits, global_attribute_limits)
292282

293-
provider = LoggerProvider(
294-
resource=resource, log_record_limits=log_record_limits
295-
)
283+
provider = LoggerProvider(resource=resource, log_record_limits=log_record_limits)
296284

297285
if config is None:
298286
return provider
@@ -321,6 +309,4 @@ def configure_logger_provider(
321309
"""
322310
if config is None:
323311
return
324-
set_logger_provider(
325-
create_logger_provider(config, resource, global_attribute_limits)
326-
)
312+
set_logger_provider(create_logger_provider(config, resource, global_attribute_limits))

‎opentelemetry-configuration/src/opentelemetry/configuration/_sdk.py‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
configure_instrumentation,
2828
)
2929
from opentelemetry.configuration.models import (
30-
AttributeLimits,
3130
OpenTelemetryConfiguration,
3231
SeverityNumber,
3332
)
@@ -102,12 +101,8 @@ def configure_sdk(config: OpenTelemetryConfiguration) -> None:
102101

103102
global_attribute_limits = config.attribute_limits
104103
resource = create_resource(config.resource)
105-
configure_tracer_provider(
106-
config.tracer_provider, resource, global_attribute_limits
107-
)
104+
configure_tracer_provider(config.tracer_provider, resource, global_attribute_limits)
108105
configure_meter_provider(config.meter_provider, resource)
109-
configure_logger_provider(
110-
config.logger_provider, resource, global_attribute_limits
111-
)
106+
configure_logger_provider(config.logger_provider, resource, global_attribute_limits)
112107
configure_propagator(config.propagator)
113108
configure_instrumentation(config.instrumentation_development)

‎opentelemetry-configuration/src/opentelemetry/configuration/_tracer_provider.py‎

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -376,15 +376,11 @@ def _create_span_limits(
376376

377377
attribute_value_length_limit = config.attribute_value_length_limit
378378
if attribute_value_length_limit is None and global_limits is not None:
379-
attribute_value_length_limit = (
380-
global_limits.attribute_value_length_limit
381-
)
379+
attribute_value_length_limit = global_limits.attribute_value_length_limit
382380

383381
return SpanLimits(
384382
max_span_attributes=(
385-
attribute_count_limit
386-
if attribute_count_limit is not None
387-
else _DEFAULT_OTEL_SPAN_ATTRIBUTE_COUNT_LIMIT
383+
attribute_count_limit if attribute_count_limit is not None else _DEFAULT_OTEL_SPAN_ATTRIBUTE_COUNT_LIMIT
388384
),
389385
max_events=(
390386
config.event_count_limit if config.event_count_limit is not None else _DEFAULT_OTEL_SPAN_EVENT_COUNT_LIMIT
@@ -403,14 +399,10 @@ def _create_span_limits(
403399
else _DEFAULT_OTEL_LINK_ATTRIBUTE_COUNT_LIMIT
404400
),
405401
max_attribute_length=(
406-
attribute_value_length_limit
407-
if attribute_value_length_limit is not None
408-
else SpanLimits.UNSET
402+
attribute_value_length_limit if attribute_value_length_limit is not None else SpanLimits.UNSET
409403
),
410404
max_span_attribute_length=(
411-
attribute_value_length_limit
412-
if attribute_value_length_limit is not None
413-
else SpanLimits.UNSET
405+
attribute_value_length_limit if attribute_value_length_limit is not None else SpanLimits.UNSET
414406
),
415407
)
416408

@@ -440,16 +432,12 @@ def create_tracer_provider(
440432
_create_id_generator(config.id_generator) if config is not None and config.id_generator is not None else None
441433
)
442434
if config is not None and config.limits is not None:
443-
444435
limits = config.limits
445436

446437
else:
447-
448438
limits = SpanLimitsConfig()
449439

450-
span_limits = _create_span_limits(
451-
limits, global_attribute_limits
452-
)
440+
span_limits = _create_span_limits(limits, global_attribute_limits)
453441

454442
provider = TracerProvider(
455443
resource=resource,
@@ -484,6 +472,4 @@ def configure_tracer_provider(
484472
"""
485473
if config is None:
486474
return
487-
trace.set_tracer_provider(
488-
create_tracer_provider(config, resource, global_attribute_limits)
489-
)
475+
trace.set_tracer_provider(create_tracer_provider(config, resource, global_attribute_limits))

‎opentelemetry-configuration/tests/test_logger_provider.py‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -449,34 +449,26 @@ def test_no_limits_no_warning():
449449

450450
def test_global_attribute_count_limit_used_when_no_per_signal_limits(self):
451451
global_limits = AttributeLimits(attribute_count_limit=42)
452-
provider = create_logger_provider(
453-
None, global_attribute_limits=global_limits
454-
)
452+
provider = create_logger_provider(None, global_attribute_limits=global_limits)
455453
self.assertEqual(provider._log_record_limits.max_attributes, 42)
456454

457455
def test_global_attribute_value_length_limit_used_when_no_per_signal_limits(
458456
self,
459457
):
460458
global_limits = AttributeLimits(attribute_value_length_limit=64)
461-
provider = create_logger_provider(
462-
None, global_attribute_limits=global_limits
463-
)
459+
provider = create_logger_provider(None, global_attribute_limits=global_limits)
464460
self.assertEqual(provider._log_record_limits.max_attribute_length, 64)
465461

466462
def test_per_signal_limits_override_global(self):
467-
global_limits = AttributeLimits(
468-
attribute_count_limit=100, attribute_value_length_limit=200
469-
)
463+
global_limits = AttributeLimits(attribute_count_limit=100, attribute_value_length_limit=200)
470464
config = LoggerProviderConfig(
471465
processors=[],
472466
limits=LogRecordLimitsConfig(
473467
attribute_count_limit=7,
474468
attribute_value_length_limit=16,
475469
),
476470
)
477-
provider = create_logger_provider(
478-
config, global_attribute_limits=global_limits
479-
)
471+
provider = create_logger_provider(config, global_attribute_limits=global_limits)
480472
self.assertEqual(provider._log_record_limits.max_attributes, 7)
481473
self.assertEqual(provider._log_record_limits.max_attribute_length, 16)
482474

‎opentelemetry-configuration/tests/test_sdk.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,7 @@ def test_calls_each_signal_with_resource(
7070
configure_sdk(config)
7171

7272
mock_create_resource.assert_called_once_with(resource_cfg)
73-
mock_tracer.assert_called_once_with(
74-
tracer_cfg, sentinel_resource, None
75-
)
73+
mock_tracer.assert_called_once_with(tracer_cfg, sentinel_resource, None)
7674
mock_meter.assert_called_once_with(None, sentinel_resource)
7775
mock_logger.assert_called_once_with(None, sentinel_resource, None)
7876
mock_propagator.assert_called_once_with(propagator_cfg)

0 commit comments

Comments
 (0)