Skip to content

Commit b339ca7

Browse files
authored
Fix log message (#2414)
Fixes #2413
1 parent 5cd7a74 commit b339ca7

File tree

2 files changed

+14
-4
lines changed

2 files changed

+14
-4
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ def shutdown(self):
205205

206206
if not metric_reader_result:
207207
_logger.warning(
208-
"MetricReader {metric_reader} failed to shutdown"
208+
"MetricReader %s failed to shutdown", metric_reader
209209
)
210210

211211
overall_result = overall_result and metric_reader_result

opentelemetry-sdk/tests/metrics/test_metrics.py

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
from logging import WARNING
1717
from unittest import TestCase
18-
from unittest.mock import Mock, patch
18+
from unittest.mock import MagicMock, Mock, patch
1919

2020
from opentelemetry.sdk._metrics import Meter, MeterProvider
2121
from opentelemetry.sdk._metrics.instrument import (
@@ -92,14 +92,24 @@ def test_get_meter_duplicate(self):
9292

9393
def test_shutdown(self):
9494

95-
mock_metric_reader_0 = Mock(**{"shutdown.return_value": False})
95+
mock_metric_reader_0 = MagicMock(
96+
**{
97+
"shutdown.return_value": False,
98+
"__str__.return_value": "mock_metric_reader_0",
99+
}
100+
)
96101
mock_metric_reader_1 = Mock(**{"shutdown.return_value": True})
97102

98103
meter_provider = MeterProvider(
99104
metric_readers=[mock_metric_reader_0, mock_metric_reader_1]
100105
)
101106

102-
self.assertFalse(meter_provider.shutdown())
107+
with self.assertLogs(level=WARNING) as log:
108+
self.assertFalse(meter_provider.shutdown())
109+
self.assertEqual(
110+
log.records[0].getMessage(),
111+
"MetricReader mock_metric_reader_0 failed to shutdown",
112+
)
103113
mock_metric_reader_0.shutdown.assert_called_once()
104114
mock_metric_reader_1.shutdown.assert_called_once()
105115

0 commit comments

Comments
 (0)