|
1 | 1 | # Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. |
2 | 2 | # SPDX-License-Identifier: Apache-2.0 |
3 | | -import logging |
4 | 3 | import os |
5 | 4 | import time |
6 | 5 | from unittest import TestCase |
@@ -88,18 +87,6 @@ def setUpClass(cls): |
88 | 87 | def tearDown(self): |
89 | 88 | os.environ.pop("OTEL_AWS_APPLICATION_SIGNALS_ENABLED", None) |
90 | 89 | os.environ.pop("OTEL_AWS_APPLICATION_SIGNALS_RUNTIME_ENABLED", None) |
91 | | - root_logger = logging.getLogger() |
92 | | - for handler in root_logger.handlers[:]: |
93 | | - handler.close() |
94 | | - root_logger.removeHandler(handler) |
95 | | - |
96 | | - # Shut down any active exporters |
97 | | - try: |
98 | | - from opentelemetry.sdk._logs import _internal |
99 | | - |
100 | | - _internal.get_log_provider().shutdown() |
101 | | - except (ImportError, AttributeError): |
102 | | - pass |
103 | 90 |
|
104 | 91 | # The probability of this passing once without correct IDs is low, 20 times is inconceivable. |
105 | 92 | def test_provide_generate_xray_ids(self): |
@@ -524,9 +511,18 @@ def capture_exporter(*args, **kwargs): |
524 | 511 |
|
525 | 512 | with patch( |
526 | 513 | "amazon.opentelemetry.distro.aws_opentelemetry_configurator._customize_logs_exporter" |
527 | | - ) as mock_customize_logs_exporter: |
| 514 | + ) as mock_customize_logs_exporter, patch( |
| 515 | + "opentelemetry.sdk._logs.LoggerProvider" |
| 516 | + ) as mock_logger_provider, patch( |
| 517 | + "opentelemetry.sdk._logs.export.BatchLogRecordProcessor" |
| 518 | + ) as mock_batch_processor: |
528 | 519 |
|
| 520 | + # Set up the mocks |
529 | 521 | mock_customize_logs_exporter.side_effect = capture_exporter |
| 522 | + mock_provider_instance = MagicMock() |
| 523 | + mock_logger_provider.return_value = mock_provider_instance |
| 524 | + mock_batch_processor_instance = MagicMock() |
| 525 | + mock_batch_processor.return_value = mock_batch_processor_instance |
530 | 526 |
|
531 | 527 | for tc in test_cases: |
532 | 528 | exporter_dict = tc[0] |
|
0 commit comments