Skip to content

Commit 7ba5167

Browse files
committed
mocking
1 parent 75ce28b commit 7ba5167

File tree

2 files changed

+18
-7
lines changed

2 files changed

+18
-7
lines changed

aws-opentelemetry-distro/src/amazon/opentelemetry/distro/aws_opentelemetry_configurator.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,8 +179,8 @@ def _init_logging(
179179

180180
# Provides a default OTLP log exporter when none is specified.
181181
# This is the behavior for the logs exporters for other languages.
182-
# if not exporters:
183-
# exporters = {"otlp": OTLPLogExporter}
182+
if not exporters:
183+
exporters = {"otlp": OTLPLogExporter}
184184

185185
provider = LoggerProvider(resource=resource)
186186
set_logger_provider(provider)

aws-opentelemetry-distro/tests/amazon/opentelemetry/distro/test_aws_opentelementry_configurator.py

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -492,8 +492,19 @@ def test_customize_logs_exporter_sigv4(self):
492492
_customize_logs_exporter(OTLPGrpcLogExporter(), Resource.get_empty()), OTLPGrpcLogExporter
493493
)
494494

495-
def test_init_logging(self):
495+
@patch('amazon.opentelemetry.distro.aws_opentelemetry_configurator.LoggingHandler')
496+
@patch('amazon.opentelemetry.distro.aws_opentelemetry_configurator.getLogger')
497+
@patch(
498+
"amazon.opentelemetry.distro.aws_opentelemetry_configurator._customize_logs_exporter"
499+
)
500+
def test_init_logging(self, mock_get_logger, mock_logging_handler):
496501
captured_exporter = None
502+
503+
mock_logger_instance = MagicMock()
504+
mock_get_logger.return_value = mock_logger_instance
505+
506+
mock_handler_instance = MagicMock()
507+
mock_logging_handler.return_value = mock_handler_instance
497508

498509
def capture_exporter(*args, **kwargs):
499510
nonlocal captured_exporter
@@ -502,9 +513,9 @@ def capture_exporter(*args, **kwargs):
502513
return result
503514

504515
test_cases = [
505-
# [{"otlp": OTLPLogExporter}, OTLPLogExporter],
506-
[{}, None],
507-
# [{"grpc": OTLPGrpcLogExporter}, OTLPGrpcLogExporter],
516+
[{"otlp": OTLPLogExporter}, OTLPLogExporter],
517+
[{}, OTLPLogExporter],
518+
[{"grpc": OTLPGrpcLogExporter}, OTLPGrpcLogExporter],
508519
]
509520

510521
os.environ[OTEL_EXPORTER_OTLP_LOGS_ENDPOINT] = "https://logs.us-east-1.amazonaws.com/v1/logs"
@@ -520,7 +531,7 @@ def capture_exporter(*args, **kwargs):
520531
expected_exporter = tc[1]
521532
_init_logging(exporter_dict, Resource.get_empty())
522533

523-
# self.assertIsInstance(captured_exporter, expected_exporter)
534+
self.assertIsInstance(captured_exporter, expected_exporter)
524535

525536
os.environ.pop(OTEL_EXPORTER_OTLP_LOGS_ENDPOINT)
526537

0 commit comments

Comments
 (0)