diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 4c460286a7..8a3f2fb33f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -6,7 +6,7 @@ on: - 'release/*' pull_request: env: - CORE_REPO_SHA: 1f59f5b85dac7f67b4bc0af775e283aad31a2abd + CORE_REPO_SHA: daa0de2cf3f2ca2d1037b52013d08227443aa2ce jobs: build: diff --git a/exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/spanprocessor.py b/exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/spanprocessor.py index c9c2c64f21..18d5223c5c 100644 --- a/exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/spanprocessor.py +++ b/exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/spanprocessor.py @@ -25,12 +25,11 @@ set_value, ) from opentelemetry.sdk.trace import Span, SpanProcessor -from opentelemetry.sdk.trace.export import SpanExporter +from opentelemetry.sdk.trace.export import _SUPPRESS_INSTRUMENTATION_KEY, SpanExporter from opentelemetry.trace import INVALID_TRACE_ID from opentelemetry.util._time import _time_ns logger = logging.getLogger(__name__) -_SUPPRESS_INSTRUMENTATION_KEY = create_key("suppress_instrumentation") class DatadogExportSpanProcessor(SpanProcessor): diff --git a/instrumentation/opentelemetry-instrumentation-aiohttp-client/src/opentelemetry/instrumentation/aiohttp_client/__init__.py b/instrumentation/opentelemetry-instrumentation-aiohttp-client/src/opentelemetry/instrumentation/aiohttp_client/__init__.py index c2173cfef0..dd1aed71f3 100644 --- a/instrumentation/opentelemetry-instrumentation-aiohttp-client/src/opentelemetry/instrumentation/aiohttp_client/__init__.py +++ b/instrumentation/opentelemetry-instrumentation-aiohttp-client/src/opentelemetry/instrumentation/aiohttp_client/__init__.py @@ -77,6 +77,7 @@ def strip_query_params(url: yarl.URL) -> str: unwrap, ) from opentelemetry.propagate import inject +from opentelemetry.sdk.trace.export import _SUPPRESS_INSTRUMENTATION_KEY from opentelemetry.semconv.trace import SpanAttributes from opentelemetry.trace import SpanKind, TracerProvider, get_tracer from opentelemetry.trace.status import Status, StatusCode @@ -85,9 +86,6 @@ def strip_query_params(url: yarl.URL) -> str: _SpanNameT = typing.Optional[ typing.Union[typing.Callable[[aiohttp.TraceRequestStartParams], str], str] ] -_SUPPRESS_INSTRUMENTATION_KEY = context_api.create_key( - "suppress_instrumentation" -) def url_path_span_name(params: aiohttp.TraceRequestStartParams) -> str: diff --git a/instrumentation/opentelemetry-instrumentation-aiohttp-client/tests/test_aiohttp_client_integration.py b/instrumentation/opentelemetry-instrumentation-aiohttp-client/tests/test_aiohttp_client_integration.py index fbfa0d9c7c..9482fa07f3 100644 --- a/instrumentation/opentelemetry-instrumentation-aiohttp-client/tests/test_aiohttp_client_integration.py +++ b/instrumentation/opentelemetry-instrumentation-aiohttp-client/tests/test_aiohttp_client_integration.py @@ -27,10 +27,8 @@ from opentelemetry import context from opentelemetry.instrumentation import aiohttp_client -from opentelemetry.instrumentation.aiohttp_client import ( - _SUPPRESS_INSTRUMENTATION_KEY, - AioHttpClientInstrumentor, -) +from opentelemetry.instrumentation.aiohttp_client import AioHttpClientInstrumentor +from opentelemetry.sdk.trace.export import _SUPPRESS_INSTRUMENTATION_KEY from opentelemetry.semconv.trace import SpanAttributes from opentelemetry.test.test_base import TestBase from opentelemetry.trace import StatusCode diff --git a/instrumentation/opentelemetry-instrumentation-botocore/src/opentelemetry/instrumentation/botocore/__init__.py b/instrumentation/opentelemetry-instrumentation-botocore/src/opentelemetry/instrumentation/botocore/__init__.py index 9493e647f7..ba8b11a217 100644 --- a/instrumentation/opentelemetry-instrumentation-botocore/src/opentelemetry/instrumentation/botocore/__init__.py +++ b/instrumentation/opentelemetry-instrumentation-botocore/src/opentelemetry/instrumentation/botocore/__init__.py @@ -58,13 +58,11 @@ from opentelemetry.instrumentation.instrumentor import BaseInstrumentor from opentelemetry.instrumentation.utils import unwrap from opentelemetry.propagate import inject +from opentelemetry.sdk.trace.export import _SUPPRESS_INSTRUMENTATION_KEY from opentelemetry.semconv.trace import SpanAttributes from opentelemetry.trace import SpanKind, get_tracer logger = logging.getLogger(__name__) -_SUPPRESS_INSTRUMENTATION_KEY = context_api.create_key( - "suppress_instrumentation" -) # pylint: disable=unused-argument diff --git a/instrumentation/opentelemetry-instrumentation-botocore/tests/test_botocore_instrumentation.py b/instrumentation/opentelemetry-instrumentation-botocore/tests/test_botocore_instrumentation.py index b6eeafdef9..90333934c7 100644 --- a/instrumentation/opentelemetry-instrumentation-botocore/tests/test_botocore_instrumentation.py +++ b/instrumentation/opentelemetry-instrumentation-botocore/tests/test_botocore_instrumentation.py @@ -33,11 +33,9 @@ from opentelemetry import trace as trace_api from opentelemetry.context import attach, detach, set_value -from opentelemetry.instrumentation.botocore import ( - _SUPPRESS_INSTRUMENTATION_KEY, - BotocoreInstrumentor, -) +from opentelemetry.instrumentation.botocore import BotocoreInstrumentor from opentelemetry.propagate import get_global_textmap, set_global_textmap +from opentelemetry.sdk.trace.export import _SUPPRESS_INSTRUMENTATION_KEY from opentelemetry.semconv.trace import SpanAttributes from opentelemetry.test.mock_textmap import MockTextMapPropagator from opentelemetry.test.test_base import TestBase diff --git a/instrumentation/opentelemetry-instrumentation-requests/src/opentelemetry/instrumentation/requests/__init__.py b/instrumentation/opentelemetry-instrumentation-requests/src/opentelemetry/instrumentation/requests/__init__.py index 6700c41767..30a58edeaa 100644 --- a/instrumentation/opentelemetry-instrumentation-requests/src/opentelemetry/instrumentation/requests/__init__.py +++ b/instrumentation/opentelemetry-instrumentation-requests/src/opentelemetry/instrumentation/requests/__init__.py @@ -45,6 +45,7 @@ from opentelemetry.instrumentation.requests.version import __version__ from opentelemetry.instrumentation.utils import http_status_to_status_code from opentelemetry.propagate import inject +from opentelemetry.sdk.trace.export import _SUPPRESS_INSTRUMENTATION_KEY from opentelemetry.semconv.trace import SpanAttributes from opentelemetry.trace import SpanKind, get_tracer from opentelemetry.trace.status import Status @@ -54,7 +55,6 @@ _SUPPRESS_HTTP_INSTRUMENTATION_KEY = context.create_key( "suppress_http_instrumentation" ) -_SUPPRESS_INSTRUMENTATION_KEY = context.create_key("suppress_instrumentation") # pylint: disable=unused-argument diff --git a/instrumentation/opentelemetry-instrumentation-requests/tests/test_requests_integration.py b/instrumentation/opentelemetry-instrumentation-requests/tests/test_requests_integration.py index 0f078a37c7..dbb36b5ef0 100644 --- a/instrumentation/opentelemetry-instrumentation-requests/tests/test_requests_integration.py +++ b/instrumentation/opentelemetry-instrumentation-requests/tests/test_requests_integration.py @@ -20,12 +20,10 @@ import opentelemetry.instrumentation.requests from opentelemetry import context, trace -from opentelemetry.instrumentation.requests import ( - _SUPPRESS_INSTRUMENTATION_KEY, - RequestsInstrumentor, -) +from opentelemetry.instrumentation.requests import RequestsInstrumentor from opentelemetry.propagate import get_global_textmap, set_global_textmap from opentelemetry.sdk import resources +from opentelemetry.sdk.trace.export import _SUPPRESS_INSTRUMENTATION_KEY from opentelemetry.semconv.trace import SpanAttributes from opentelemetry.test.mock_textmap import MockTextMapPropagator from opentelemetry.test.test_base import TestBase diff --git a/instrumentation/opentelemetry-instrumentation-urllib/src/opentelemetry/instrumentation/urllib/__init__.py b/instrumentation/opentelemetry-instrumentation-urllib/src/opentelemetry/instrumentation/urllib/__init__.py index 840eab78ed..e044afbfed 100644 --- a/instrumentation/opentelemetry-instrumentation-urllib/src/opentelemetry/instrumentation/urllib/__init__.py +++ b/instrumentation/opentelemetry-instrumentation-urllib/src/opentelemetry/instrumentation/urllib/__init__.py @@ -50,6 +50,7 @@ ) from opentelemetry.instrumentation.utils import http_status_to_status_code from opentelemetry.propagate import inject +from opentelemetry.sdk.trace.export import _SUPPRESS_INSTRUMENTATION_KEY from opentelemetry.semconv.trace import SpanAttributes from opentelemetry.trace import SpanKind, get_tracer from opentelemetry.trace.status import Status @@ -59,7 +60,6 @@ _SUPPRESS_HTTP_INSTRUMENTATION_KEY = context.create_key( "suppress_http_instrumentation" ) -_SUPPRESS_INSTRUMENTATION_KEY = context.create_key("suppress_instrumentation") class URLLibInstrumentor(BaseInstrumentor): diff --git a/instrumentation/opentelemetry-instrumentation-urllib/tests/test_urllib_integration.py b/instrumentation/opentelemetry-instrumentation-urllib/tests/test_urllib_integration.py index 43c3773245..cf6efe5e61 100644 --- a/instrumentation/opentelemetry-instrumentation-urllib/tests/test_urllib_integration.py +++ b/instrumentation/opentelemetry-instrumentation-urllib/tests/test_urllib_integration.py @@ -26,11 +26,11 @@ import opentelemetry.instrumentation.urllib # pylint: disable=no-name-in-module,import-error from opentelemetry import context, trace from opentelemetry.instrumentation.urllib import ( # pylint: disable=no-name-in-module,import-error - _SUPPRESS_INSTRUMENTATION_KEY, URLLibInstrumentor, ) from opentelemetry.propagate import get_global_textmap, set_global_textmap from opentelemetry.sdk import resources +from opentelemetry.sdk.trace.export import _SUPPRESS_INSTRUMENTATION_KEY from opentelemetry.semconv.trace import SpanAttributes from opentelemetry.test.mock_textmap import MockTextMapPropagator from opentelemetry.test.test_base import TestBase diff --git a/instrumentation/opentelemetry-instrumentation-urllib3/src/opentelemetry/instrumentation/urllib3/__init__.py b/instrumentation/opentelemetry-instrumentation-urllib3/src/opentelemetry/instrumentation/urllib3/__init__.py index db858cfe14..f8195e8aa8 100644 --- a/instrumentation/opentelemetry-instrumentation-urllib3/src/opentelemetry/instrumentation/urllib3/__init__.py +++ b/instrumentation/opentelemetry-instrumentation-urllib3/src/opentelemetry/instrumentation/urllib3/__init__.py @@ -58,6 +58,7 @@ def span_name_callback(method: str, url: str, headers): unwrap, ) from opentelemetry.propagate import inject +from opentelemetry.sdk.trace.export import _SUPPRESS_INSTRUMENTATION_KEY from opentelemetry.semconv.trace import SpanAttributes from opentelemetry.trace import Span, SpanKind, TracerProvider, get_tracer from opentelemetry.trace.status import Status @@ -67,7 +68,6 @@ def span_name_callback(method: str, url: str, headers): _SUPPRESS_HTTP_INSTRUMENTATION_KEY = context.create_key( "suppress_http_instrumentation" ) -_SUPPRESS_INSTRUMENTATION_KEY = context.create_key("suppress_instrumentation") _UrlFilterT = typing.Optional[typing.Callable[[str], str]] _SpanNameT = typing.Optional[ diff --git a/instrumentation/opentelemetry-instrumentation-urllib3/tests/test_urllib3_integration.py b/instrumentation/opentelemetry-instrumentation-urllib3/tests/test_urllib3_integration.py index 57dde952c8..3172300253 100644 --- a/instrumentation/opentelemetry-instrumentation-urllib3/tests/test_urllib3_integration.py +++ b/instrumentation/opentelemetry-instrumentation-urllib3/tests/test_urllib3_integration.py @@ -22,10 +22,10 @@ from opentelemetry import context, trace from opentelemetry.instrumentation.urllib3 import ( _SUPPRESS_HTTP_INSTRUMENTATION_KEY, - _SUPPRESS_INSTRUMENTATION_KEY, URLLib3Instrumentor, ) from opentelemetry.propagate import get_global_textmap, set_global_textmap +from opentelemetry.sdk.trace.export import _SUPPRESS_INSTRUMENTATION_KEY from opentelemetry.semconv.trace import SpanAttributes from opentelemetry.test.mock_textmap import MockTextMapPropagator from opentelemetry.test.test_base import TestBase