Skip to content

Commit bdd972d

Browse files
committed
Fix util-genai tests and pre-commit formatting
1 parent 798f93b commit bdd972d

File tree

4 files changed

+25
-18
lines changed

4 files changed

+25
-18
lines changed

instrumentation/opentelemetry-instrumentation-asyncio/tests/test_asyncio_run_coroutine_threadsafe.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,12 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414
import asyncio
15-
import threading
15+
1616
# from concurrent.futures import ( # pylint: disable=no-name-in-module; TODO #4199
1717
# ThreadPoolExecutor,
1818
# )
1919
import concurrent.futures
20+
import threading
2021
from unittest.mock import patch
2122

2223
# pylint: disable=no-name-in-module

instrumentation/opentelemetry-instrumentation-threading/tests/test_threading.py

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,19 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
import threading
16-
# from concurrent.futures import ( # pylint: disable=no-name-in-module; TODO #4199
17-
# ThreadPoolExecutor,
18-
# )
19-
2015
import concurrent.futures
16+
import threading
2117
from typing import List
2218
from unittest.mock import MagicMock, patch
2319

2420
from opentelemetry import trace
2521
from opentelemetry.instrumentation.threading import ThreadingInstrumentor
2622
from opentelemetry.test.test_base import TestBase
2723

24+
# from concurrent.futures import ( # pylint: disable=no-name-in-module; TODO #4199
25+
# ThreadPoolExecutor,
26+
# )
27+
2828

2929
# pylint: disable=too-many-public-methods
3030
class TestThreading(TestBase):
@@ -65,7 +65,9 @@ def test_trace_context_propagation_in_thread_pool_with_multiple_workers(
6565
self,
6666
):
6767
max_workers = 10
68-
executor = concurrent.futures.ThreadPoolExecutor(max_workers=max_workers)
68+
executor = concurrent.futures.ThreadPoolExecutor(
69+
max_workers=max_workers
70+
)
6971

7072
expected_span_contexts: List[trace.SpanContext] = []
7173
futures_list = []
@@ -85,7 +87,9 @@ def test_trace_context_propagation_in_thread_pool_with_multiple_workers(
8587

8688
def test_trace_context_propagation_in_thread_pool_with_single_worker(self):
8789
max_workers = 1
88-
with concurrent.futures.ThreadPoolExecutor(max_workers=max_workers) as executor:
90+
with concurrent.futures.ThreadPoolExecutor(
91+
max_workers=max_workers
92+
) as executor:
8993
# test propagation of the same trace context across multiple tasks
9094
with self._tracer.start_as_current_span("task") as task_span:
9195
expected_task_context = task_span.get_span_context()

util/opentelemetry-util-genai/src/opentelemetry/util/genai/_upload/completion_hook.py

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,18 @@
1515

1616
from __future__ import annotations
1717

18+
# from concurrent.futures import ( # pylint: disable=no-name-in-module; TODO #4199
19+
# Future,
20+
# ThreadPoolExecutor,
21+
# )
22+
import concurrent.futures
1823
import dataclasses
1924
import hashlib
2025
import json
2126
import logging
2227
import posixpath
2328
import threading
2429
from collections import OrderedDict
25-
# from concurrent.futures import ( # pylint: disable=no-name-in-module; TODO #4199
26-
# Future,
27-
# ThreadPoolExecutor,
28-
# )
29-
import concurrent.futures
3030
from contextlib import ExitStack
3131
from dataclasses import asdict, dataclass
3232
from functools import partial
@@ -314,10 +314,12 @@ def on_completion(
314314
)
315315

316316
def to_dict(
317-
dataclass_list: list[types.InputMessage]
318-
| list[types.OutputMessage]
319-
| list[types.MessagePart]
320-
| list[types.ToolDefinition],
317+
dataclass_list: (
318+
list[types.InputMessage]
319+
| list[types.OutputMessage]
320+
| list[types.MessagePart]
321+
| list[types.ToolDefinition]
322+
),
321323
) -> JsonEncodeable:
322324
return [asdict(dc) for dc in dataclass_list]
323325

util/opentelemetry-util-genai/tests/test_upload.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ def test_upload_after_shutdown_logs(self):
307307
def test_threadpool_max_workers(self):
308308
for max_queue_size, expect_threadpool_workers in ((10, 10), (100, 64)):
309309
with patch(
310-
"opentelemetry.util.genai._upload.completion_hook.ThreadPoolExecutor"
310+
"opentelemetry.util.genai._upload.completion_hook.concurrent.futures.ThreadPoolExecutor"
311311
) as mock:
312312
hook = UploadCompletionHook(
313313
base_path=BASE_PATH, max_queue_size=max_queue_size

0 commit comments

Comments
 (0)