Skip to content

Commit 7546092

Browse files
committed
Run precommit
1 parent 5cc1fc4 commit 7546092

File tree

2 files changed

+77
-26
lines changed

2 files changed

+77
-26
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@
2121
import threading
2222
import weakref
2323
from typing import (
24+
Generic,
2425
Optional,
26+
TypeVar,
2527
)
2628

2729
from opentelemetry.context import (
@@ -30,7 +32,6 @@
3032
detach,
3133
set_value,
3234
)
33-
from typing import TypeVar, Generic
3435
from opentelemetry.util._once import Once
3536

3637

opentelemetry-sdk/tests/logs/test_export.py

Lines changed: 75 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -351,11 +351,21 @@ def test_args(self):
351351
max_export_batch_size=256,
352352
export_timeout_millis=15000,
353353
)
354-
self.assertEqual(log_record_processor._batch_processor._exporter, exporter)
355-
self.assertEqual(log_record_processor._batch_processor._max_queue_size, 1024)
356-
self.assertEqual(log_record_processor._batch_processor._schedule_delay, 2.5)
357-
self.assertEqual(log_record_processor._batch_processor._max_export_batch_size, 256)
358-
self.assertEqual(log_record_processor._batch_processor._export_timeout_millis, 15000)
354+
self.assertEqual(
355+
log_record_processor._batch_processor._exporter, exporter
356+
)
357+
self.assertEqual(
358+
log_record_processor._batch_processor._max_queue_size, 1024
359+
)
360+
self.assertEqual(
361+
log_record_processor._batch_processor._schedule_delay, 2.5
362+
)
363+
self.assertEqual(
364+
log_record_processor._batch_processor._max_export_batch_size, 256
365+
)
366+
self.assertEqual(
367+
log_record_processor._batch_processor._export_timeout_millis, 15000
368+
)
359369

360370
@patch.dict(
361371
"os.environ",
@@ -369,20 +379,40 @@ def test_args(self):
369379
def test_env_vars(self):
370380
exporter = InMemoryLogExporter()
371381
log_record_processor = BatchLogRecordProcessor(exporter)
372-
self.assertEqual(log_record_processor._batch_processor._exporter, exporter)
373-
self.assertEqual(log_record_processor._batch_processor._max_queue_size, 1024)
374-
self.assertEqual(log_record_processor._batch_processor._schedule_delay, 2.5)
375-
self.assertEqual(log_record_processor._batch_processor._max_export_batch_size, 256)
376-
self.assertEqual(log_record_processor._batch_processor._export_timeout_millis, 15000)
382+
self.assertEqual(
383+
log_record_processor._batch_processor._exporter, exporter
384+
)
385+
self.assertEqual(
386+
log_record_processor._batch_processor._max_queue_size, 1024
387+
)
388+
self.assertEqual(
389+
log_record_processor._batch_processor._schedule_delay, 2.5
390+
)
391+
self.assertEqual(
392+
log_record_processor._batch_processor._max_export_batch_size, 256
393+
)
394+
self.assertEqual(
395+
log_record_processor._batch_processor._export_timeout_millis, 15000
396+
)
377397

378398
def test_args_defaults(self):
379399
exporter = InMemoryLogExporter()
380400
log_record_processor = BatchLogRecordProcessor(exporter)
381-
self.assertEqual(log_record_processor._batch_processor._exporter, exporter)
382-
self.assertEqual(log_record_processor._batch_processor._max_queue_size, 2048)
383-
self.assertEqual(log_record_processor._batch_processor._schedule_delay, 5)
384-
self.assertEqual(log_record_processor._batch_processor._max_export_batch_size, 512)
385-
self.assertEqual(log_record_processor._batch_processor._export_timeout_millis, 30000)
401+
self.assertEqual(
402+
log_record_processor._batch_processor._exporter, exporter
403+
)
404+
self.assertEqual(
405+
log_record_processor._batch_processor._max_queue_size, 2048
406+
)
407+
self.assertEqual(
408+
log_record_processor._batch_processor._schedule_delay, 5
409+
)
410+
self.assertEqual(
411+
log_record_processor._batch_processor._max_export_batch_size, 512
412+
)
413+
self.assertEqual(
414+
log_record_processor._batch_processor._export_timeout_millis, 30000
415+
)
386416

387417
@patch.dict(
388418
"os.environ",
@@ -398,11 +428,21 @@ def test_args_env_var_value_error(self):
398428
_logger.disabled = True
399429
log_record_processor = BatchLogRecordProcessor(exporter)
400430
_logger.disabled = False
401-
self.assertEqual(log_record_processor._batch_processor._exporter, exporter)
402-
self.assertEqual(log_record_processor._batch_processor._max_queue_size, 2048)
403-
self.assertEqual(log_record_processor._batch_processor._schedule_delay, 5)
404-
self.assertEqual(log_record_processor._batch_processor._max_export_batch_size, 512)
405-
self.assertEqual(log_record_processor._batch_processor._export_timeout_millis, 30000)
431+
self.assertEqual(
432+
log_record_processor._batch_processor._exporter, exporter
433+
)
434+
self.assertEqual(
435+
log_record_processor._batch_processor._max_queue_size, 2048
436+
)
437+
self.assertEqual(
438+
log_record_processor._batch_processor._schedule_delay, 5
439+
)
440+
self.assertEqual(
441+
log_record_processor._batch_processor._max_export_batch_size, 512
442+
)
443+
self.assertEqual(
444+
log_record_processor._batch_processor._export_timeout_millis, 30000
445+
)
406446

407447
def test_args_none_defaults(self):
408448
exporter = InMemoryLogExporter()
@@ -413,11 +453,21 @@ def test_args_none_defaults(self):
413453
max_export_batch_size=None,
414454
export_timeout_millis=None,
415455
)
416-
self.assertEqual(log_record_processor._batch_processor._exporter, exporter)
417-
self.assertEqual(log_record_processor._batch_processor._max_queue_size, 2048)
418-
self.assertEqual(log_record_processor._batch_processor._schedule_delay, 5)
419-
self.assertEqual(log_record_processor._batch_processor._max_export_batch_size, 512)
420-
self.assertEqual(log_record_processor._batch_processor._export_timeout_millis, 30000)
456+
self.assertEqual(
457+
log_record_processor._batch_processor._exporter, exporter
458+
)
459+
self.assertEqual(
460+
log_record_processor._batch_processor._max_queue_size, 2048
461+
)
462+
self.assertEqual(
463+
log_record_processor._batch_processor._schedule_delay, 5
464+
)
465+
self.assertEqual(
466+
log_record_processor._batch_processor._max_export_batch_size, 512
467+
)
468+
self.assertEqual(
469+
log_record_processor._batch_processor._export_timeout_millis, 30000
470+
)
421471

422472
def test_validation_negative_max_queue_size(self):
423473
exporter = InMemoryLogExporter()

0 commit comments

Comments
 (0)