|
40 | 40 | OTEL_BLRP_MAX_QUEUE_SIZE, |
41 | 41 | OTEL_BLRP_SCHEDULE_DELAY, |
42 | 42 | ) |
43 | | -from opentelemetry.sdk.resources import Resource |
44 | 43 | from opentelemetry.sdk.resources import Resource as SDKResource |
45 | 44 | from opentelemetry.sdk.util.instrumentation import InstrumentationScope |
46 | 45 | from opentelemetry.trace import TraceFlags |
@@ -343,26 +342,28 @@ def test_emit_call_log_record(self): |
343 | 342 | logger.error("error") |
344 | 343 | self.assertEqual(log_record_processor.emit.call_count, 1) |
345 | 344 |
|
346 | | - def test_logging_lib_not_invoked_in_batch_log_record_emit(self): |
| 345 | + def test_logging_lib_not_invoked_in_batch_log_record_emit(self): # pylint: disable=no-self-use |
347 | 346 | exporter = Mock() |
348 | 347 | processor = BatchLogRecordProcessor(exporter) |
349 | 348 | logger_provider = LoggerProvider( |
350 | | - resource=Resource.create( |
| 349 | + resource=SDKResource.create( |
351 | 350 | { |
352 | 351 | "service.name": "shoppingcart", |
353 | 352 | "service.instance.id": "instance-12", |
354 | 353 | } |
355 | 354 | ), |
356 | 355 | ) |
357 | 356 | logger_provider.add_log_record_processor(processor) |
358 | | - # Attach OTLP handler to root logger |
359 | | - logging.getLogger().addHandler( |
360 | | - LoggingHandler(level=logging.INFO, logger_provider=logger_provider) |
| 357 | + handler = LoggingHandler( |
| 358 | + level=logging.INFO, logger_provider=logger_provider |
361 | 359 | ) |
| 360 | + # Attach OTLP handler to SDK logger |
| 361 | + logging.getLogger("opentelemetry.sdk").addHandler(handler) |
362 | 362 | # If `emit` calls logging.log then this test will throw a maximum recursion depth exceeded exception and fail. |
363 | 363 | processor.emit(EMPTY_LOG) |
364 | 364 | processor.shutdown() |
365 | 365 | processor.emit(EMPTY_LOG) |
| 366 | + logging.getLogger("opentelemetry.sdk").removeHandler(handler) |
366 | 367 |
|
367 | 368 | def test_args(self): |
368 | 369 | exporter = InMemoryLogExporter() |
|
0 commit comments