Skip to content

Commit a89034d

Browse files
committed
Pass schema_url and version to NoOpMeter and NoOpLogger, implement comments from review
1 parent bfd45e1 commit a89034d

File tree

5 files changed

+9
-13
lines changed

5 files changed

+9
-13
lines changed

opentelemetry-sdk/src/opentelemetry/sdk/_logs/_internal/__init__.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -608,9 +608,7 @@ def __init__(
608608
self._multi_log_record_processor = (
609609
multi_log_record_processor or SynchronousMultiLogRecordProcessor()
610610
)
611-
disabled = environ.get(OTEL_SDK_DISABLED)
612-
if disabled is None:
613-
disabled = "false"
611+
disabled = environ.get(OTEL_SDK_DISABLED, "")
614612
self._disabled = disabled.lower().strip() == "true"
615613
self._at_exit_handler = None
616614
if shutdown_on_exit:
@@ -628,7 +626,7 @@ def get_logger(
628626
) -> Logger:
629627
if self._disabled:
630628
_logger.warning("SDK is disabled.")
631-
return NoOpLogger(name)
629+
return NoOpLogger(name, version=version, schema_url=schema_url)
632630
return Logger(
633631
self._resource,
634632
self._multi_log_record_processor,

opentelemetry-sdk/src/opentelemetry/sdk/metrics/_internal/__init__.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -396,9 +396,7 @@ def __init__(
396396
self._measurement_consumer = SynchronousMeasurementConsumer(
397397
sdk_config=self._sdk_config
398398
)
399-
disabled = environ.get(OTEL_SDK_DISABLED)
400-
if disabled is None:
401-
disabled = "false"
399+
disabled = environ.get(OTEL_SDK_DISABLED, "")
402400
self._disabled = disabled.lower().strip() == "true"
403401

404402
if shutdown_on_exit:
@@ -520,7 +518,7 @@ def get_meter(
520518

521519
if self._disabled:
522520
_logger.warning("SDK is disabled.")
523-
return NoOpMeter(name)
521+
return NoOpMeter(name, version=version, schema_url=schema_url)
524522

525523
if self._shutdown:
526524
_logger.warning(

opentelemetry-sdk/src/opentelemetry/sdk/trace/__init__.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1177,9 +1177,7 @@ def __init__(
11771177
sampler = sampling._get_from_env_or_default()
11781178
self.sampler = sampler
11791179
self._span_limits = span_limits or SpanLimits()
1180-
disabled = environ.get(OTEL_SDK_DISABLED)
1181-
if disabled is None:
1182-
disabled = "false"
1180+
disabled = environ.get(OTEL_SDK_DISABLED, "")
11831181
self._disabled = disabled.lower().strip() == "true"
11841182
self._atexit_handler = None
11851183

opentelemetry-sdk/tests/metrics/test_metrics.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -465,7 +465,7 @@ def test_create_observable_up_down_counter(self):
465465
observable_up_down_counter, ObservableUpDownCounter
466466
)
467467
self.assertEqual(observable_up_down_counter.name, "name")
468-
468+
469469
@patch.dict("os.environ", {OTEL_SDK_DISABLED: "true"})
470470
def test_get_meter_with_sdk_disabled(self):
471471
meter_provider = MeterProvider()

opentelemetry-sdk/tests/trace/test_trace.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,9 @@ def test_tracer_provider_accepts_concurrent_multi_span_processor(self):
166166
@mock.patch.dict("os.environ", {OTEL_SDK_DISABLED: "true"})
167167
def test_get_tracer_with_sdk_disabled(self):
168168
tracer_provider = trace.TracerProvider()
169-
self.assertIsInstance(tracer_provider.get_tracer(Mock()), trace_api.NoOpTracer)
169+
self.assertIsInstance(
170+
tracer_provider.get_tracer(Mock()), trace_api.NoOpTracer
171+
)
170172

171173

172174
class TestTracerSampling(unittest.TestCase):

0 commit comments

Comments
 (0)