Skip to content

Commit 588cffb

Browse files
euniceekeuniceek
committed
Refactor suppress instrumentation key
1 parent 26851cb commit 588cffb

File tree

12 files changed

+15
-26
lines changed

12 files changed

+15
-26
lines changed

‎.github/workflows/test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- 'release/*'
77
pull_request:
88
env:
9-
CORE_REPO_SHA: 1f59f5b85dac7f67b4bc0af775e283aad31a2abd
9+
CORE_REPO_SHA: daa0de2cf3f2ca2d1037b52013d08227443aa2ce
1010

1111
jobs:
1212
build:

‎exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/spanprocessor.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,11 @@
2525
set_value,
2626
)
2727
from opentelemetry.sdk.trace import Span, SpanProcessor
28-
from opentelemetry.sdk.trace.export import SpanExporter
28+
from opentelemetry.sdk.trace.export import _SUPPRESS_INSTRUMENTATION_KEY, SpanExporter
2929
from opentelemetry.trace import INVALID_TRACE_ID
3030
from opentelemetry.util._time import _time_ns
3131

3232
logger = logging.getLogger(__name__)
33-
_SUPPRESS_INSTRUMENTATION_KEY = create_key("suppress_instrumentation")
3433

3534

3635
class DatadogExportSpanProcessor(SpanProcessor):

‎instrumentation/opentelemetry-instrumentation-aiohttp-client/src/opentelemetry/instrumentation/aiohttp_client/__init__.py

+1-3
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ def strip_query_params(url: yarl.URL) -> str:
7777
unwrap,
7878
)
7979
from opentelemetry.propagate import inject
80+
from opentelemetry.sdk.trace.export import _SUPPRESS_INSTRUMENTATION_KEY
8081
from opentelemetry.semconv.trace import SpanAttributes
8182
from opentelemetry.trace import SpanKind, TracerProvider, get_tracer
8283
from opentelemetry.trace.status import Status, StatusCode
@@ -85,9 +86,6 @@ def strip_query_params(url: yarl.URL) -> str:
8586
_SpanNameT = typing.Optional[
8687
typing.Union[typing.Callable[[aiohttp.TraceRequestStartParams], str], str]
8788
]
88-
_SUPPRESS_INSTRUMENTATION_KEY = context_api.create_key(
89-
"suppress_instrumentation"
90-
)
9189

9290

9391
def url_path_span_name(params: aiohttp.TraceRequestStartParams) -> str:

‎instrumentation/opentelemetry-instrumentation-aiohttp-client/tests/test_aiohttp_client_integration.py

+2-4
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,8 @@
2727

2828
from opentelemetry import context
2929
from opentelemetry.instrumentation import aiohttp_client
30-
from opentelemetry.instrumentation.aiohttp_client import (
31-
_SUPPRESS_INSTRUMENTATION_KEY,
32-
AioHttpClientInstrumentor,
33-
)
30+
from opentelemetry.instrumentation.aiohttp_client import AioHttpClientInstrumentor
31+
from opentelemetry.sdk.trace.export import _SUPPRESS_INSTRUMENTATION_KEY
3432
from opentelemetry.semconv.trace import SpanAttributes
3533
from opentelemetry.test.test_base import TestBase
3634
from opentelemetry.trace import StatusCode

‎instrumentation/opentelemetry-instrumentation-botocore/src/opentelemetry/instrumentation/botocore/__init__.py

+1-3
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,11 @@
5858
from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
5959
from opentelemetry.instrumentation.utils import unwrap
6060
from opentelemetry.propagate import inject
61+
from opentelemetry.sdk.trace.export import _SUPPRESS_INSTRUMENTATION_KEY
6162
from opentelemetry.semconv.trace import SpanAttributes
6263
from opentelemetry.trace import SpanKind, get_tracer
6364

6465
logger = logging.getLogger(__name__)
65-
_SUPPRESS_INSTRUMENTATION_KEY = context_api.create_key(
66-
"suppress_instrumentation"
67-
)
6866

6967

7068
# pylint: disable=unused-argument

‎instrumentation/opentelemetry-instrumentation-botocore/tests/test_botocore_instrumentation.py

+2-4
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,9 @@
3333

3434
from opentelemetry import trace as trace_api
3535
from opentelemetry.context import attach, detach, set_value
36-
from opentelemetry.instrumentation.botocore import (
37-
_SUPPRESS_INSTRUMENTATION_KEY,
38-
BotocoreInstrumentor,
39-
)
36+
from opentelemetry.instrumentation.botocore import BotocoreInstrumentor
4037
from opentelemetry.propagate import get_global_textmap, set_global_textmap
38+
from opentelemetry.sdk.trace.export import _SUPPRESS_INSTRUMENTATION_KEY
4139
from opentelemetry.semconv.trace import SpanAttributes
4240
from opentelemetry.test.mock_textmap import MockTextMapPropagator
4341
from opentelemetry.test.test_base import TestBase

‎instrumentation/opentelemetry-instrumentation-requests/src/opentelemetry/instrumentation/requests/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
from opentelemetry.instrumentation.requests.version import __version__
4646
from opentelemetry.instrumentation.utils import http_status_to_status_code
4747
from opentelemetry.propagate import inject
48+
from opentelemetry.sdk.trace.export import _SUPPRESS_INSTRUMENTATION_KEY
4849
from opentelemetry.semconv.trace import SpanAttributes
4950
from opentelemetry.trace import SpanKind, get_tracer
5051
from opentelemetry.trace.status import Status
@@ -54,7 +55,6 @@
5455
_SUPPRESS_HTTP_INSTRUMENTATION_KEY = context.create_key(
5556
"suppress_http_instrumentation"
5657
)
57-
_SUPPRESS_INSTRUMENTATION_KEY = context.create_key("suppress_instrumentation")
5858

5959

6060
# pylint: disable=unused-argument

‎instrumentation/opentelemetry-instrumentation-requests/tests/test_requests_integration.py

+2-4
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,10 @@
2020

2121
import opentelemetry.instrumentation.requests
2222
from opentelemetry import context, trace
23-
from opentelemetry.instrumentation.requests import (
24-
_SUPPRESS_INSTRUMENTATION_KEY,
25-
RequestsInstrumentor,
26-
)
23+
from opentelemetry.instrumentation.requests import RequestsInstrumentor
2724
from opentelemetry.propagate import get_global_textmap, set_global_textmap
2825
from opentelemetry.sdk import resources
26+
from opentelemetry.sdk.trace.export import _SUPPRESS_INSTRUMENTATION_KEY
2927
from opentelemetry.semconv.trace import SpanAttributes
3028
from opentelemetry.test.mock_textmap import MockTextMapPropagator
3129
from opentelemetry.test.test_base import TestBase

‎instrumentation/opentelemetry-instrumentation-urllib/src/opentelemetry/instrumentation/urllib/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
)
5151
from opentelemetry.instrumentation.utils import http_status_to_status_code
5252
from opentelemetry.propagate import inject
53+
from opentelemetry.sdk.trace.export import _SUPPRESS_INSTRUMENTATION_KEY
5354
from opentelemetry.semconv.trace import SpanAttributes
5455
from opentelemetry.trace import SpanKind, get_tracer
5556
from opentelemetry.trace.status import Status
@@ -59,7 +60,6 @@
5960
_SUPPRESS_HTTP_INSTRUMENTATION_KEY = context.create_key(
6061
"suppress_http_instrumentation"
6162
)
62-
_SUPPRESS_INSTRUMENTATION_KEY = context.create_key("suppress_instrumentation")
6363

6464

6565
class URLLibInstrumentor(BaseInstrumentor):

‎instrumentation/opentelemetry-instrumentation-urllib/tests/test_urllib_integration.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@
2626
import opentelemetry.instrumentation.urllib # pylint: disable=no-name-in-module,import-error
2727
from opentelemetry import context, trace
2828
from opentelemetry.instrumentation.urllib import ( # pylint: disable=no-name-in-module,import-error
29-
_SUPPRESS_INSTRUMENTATION_KEY,
3029
URLLibInstrumentor,
3130
)
3231
from opentelemetry.propagate import get_global_textmap, set_global_textmap
3332
from opentelemetry.sdk import resources
33+
from opentelemetry.sdk.trace.export import _SUPPRESS_INSTRUMENTATION_KEY
3434
from opentelemetry.semconv.trace import SpanAttributes
3535
from opentelemetry.test.mock_textmap import MockTextMapPropagator
3636
from opentelemetry.test.test_base import TestBase

‎instrumentation/opentelemetry-instrumentation-urllib3/src/opentelemetry/instrumentation/urllib3/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ def span_name_callback(method: str, url: str, headers):
5858
unwrap,
5959
)
6060
from opentelemetry.propagate import inject
61+
from opentelemetry.sdk.trace.export import _SUPPRESS_INSTRUMENTATION_KEY
6162
from opentelemetry.semconv.trace import SpanAttributes
6263
from opentelemetry.trace import Span, SpanKind, TracerProvider, get_tracer
6364
from opentelemetry.trace.status import Status
@@ -67,7 +68,6 @@ def span_name_callback(method: str, url: str, headers):
6768
_SUPPRESS_HTTP_INSTRUMENTATION_KEY = context.create_key(
6869
"suppress_http_instrumentation"
6970
)
70-
_SUPPRESS_INSTRUMENTATION_KEY = context.create_key("suppress_instrumentation")
7171

7272
_UrlFilterT = typing.Optional[typing.Callable[[str], str]]
7373
_SpanNameT = typing.Optional[

‎instrumentation/opentelemetry-instrumentation-urllib3/tests/test_urllib3_integration.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
from opentelemetry import context, trace
2323
from opentelemetry.instrumentation.urllib3 import (
2424
_SUPPRESS_HTTP_INSTRUMENTATION_KEY,
25-
_SUPPRESS_INSTRUMENTATION_KEY,
2625
URLLib3Instrumentor,
2726
)
2827
from opentelemetry.propagate import get_global_textmap, set_global_textmap
28+
from opentelemetry.sdk.trace.export import _SUPPRESS_INSTRUMENTATION_KEY
2929
from opentelemetry.semconv.trace import SpanAttributes
3030
from opentelemetry.test.mock_textmap import MockTextMapPropagator
3131
from opentelemetry.test.test_base import TestBase

0 commit comments

Comments
 (0)