Skip to content

Commit 381ce2b

Browse files
committed
code cleanup
1 parent f259298 commit 381ce2b

File tree

1 file changed

+1
-49
lines changed
  • instrumentation/opentelemetry-instrumentation-threading/src/opentelemetry/instrumentation/threading

1 file changed

+1
-49
lines changed

instrumentation/opentelemetry-instrumentation-threading/src/opentelemetry/instrumentation/threading/__init__.py

Lines changed: 1 addition & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
from os import environ
1919
from typing import Collection
2020
from opentelemetry import context
21-
from wrapt import wrap_function_wrapper as _wrap
22-
from opentelemetry.instrumentation.utils import unwrap
2321

2422
from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
2523

@@ -28,57 +26,11 @@
2826

2927
from opentelemetry import trace
3028
from opentelemetry.trace import (
31-
INVALID_SPAN,
32-
INVALID_SPAN_CONTEXT,
3329
get_current_span,
3430
get_tracer_provider,
35-
get_tracer,
36-
SpanKind
31+
get_tracer
3732
)
3833

39-
ATTRIBUTE_THREAD_NAME = "currentthread.name"
40-
DEFAULT_THREAD_NAME = "thread"
41-
ATTRIBUTE_TARGET_NAME = "currenttarget.name"
42-
DEFAULT_TARGET_NAME = "None"
43-
44-
def _with_tracer_wrapper(func):
45-
"""Helper for providing tracer for wrapper functions."""
46-
47-
def _with_tracer(tracer):
48-
def wrapper(wrapped, instance, args, kwargs):
49-
return func(tracer, wrapped, instance, args, kwargs)
50-
51-
return wrapper
52-
53-
return _with_tracer
54-
55-
def _wrap_target(ctx, target_func, tracer):
56-
"""Helper for providing tracer for wrapper functions."""
57-
context.attach(ctx)
58-
with tracer.start_as_current_span(
59-
"threading.Thread.target",
60-
kind=SpanKind.INTERNAL,
61-
) as span:
62-
if span.is_recording():
63-
span.set_attribute(ATTRIBUTE_TARGET_NAME, target_func.__name__)
64-
return target_func
65-
66-
@_with_tracer_wrapper
67-
def _wrap_thread(tracer, wrapped, instance, args, kwargs):
68-
"""Wrap `Threading.thread`"""
69-
70-
target_func = kwargs.get("target")
71-
72-
with tracer.start_as_current_span(
73-
"threading.Thread",
74-
kind=SpanKind.INTERNAL,
75-
) as span:
76-
if span.is_recording():
77-
ctx = context.get_current()
78-
kwargs["target"] = _wrap_target(ctx, target_func, tracer)
79-
span.set_attribute(ATTRIBUTE_THREAD_NAME, wrapped.__name__)
80-
return wrapped(*args, **kwargs)
81-
8234
class _InstrumentedThread(threading.Thread):
8335
def __init__(self, *args, **kwargs):
8436
super().__init__(*args, **kwargs)

0 commit comments

Comments
 (0)