diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1433576aa4..6882086c26 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -6,7 +6,7 @@ on: - 'release/*' pull_request: env: - CORE_REPO_SHA: 91ae6fc6226ddfbbe9f92da286470cf65aa834a4 + CORE_REPO_SHA: 834462941942229e308117220e1fa1fad7cb06e3 jobs: build: diff --git a/docs/nitpick-exceptions.ini b/docs/nitpick-exceptions.ini index 87d90a5d9e..e4ac50dfab 100644 --- a/docs/nitpick-exceptions.ini +++ b/docs/nitpick-exceptions.ini @@ -1,11 +1,11 @@ [default] class_references= ; TODO: Understand why sphinx is not able to find this local class - opentelemetry.trace.propagation.textmap.TextMapPropagator + opentelemetry.propagators.textmap.TextMapPropagator ; - AwsXRayFormat - opentelemetry.trace.propagation.textmap.DictGetter + opentelemetry.propagators.textmap.DictGetter ; API - opentelemetry.trace.propagation.textmap.Getter + opentelemetry.propagators.textmap.Getter ; - DatadogFormat ; - AWSXRayFormat opentelemetry.sdk.trace.id_generator.IdGenerator @@ -15,7 +15,7 @@ class_references= anys= ; API - opentelemetry.trace.propagation.textmap.TextMapPropagator.fields + opentelemetry.propagators.textmap.TextMapPropagator.fields ; - AWSXRayFormat TraceId ; - AwsXRayIdGenerator diff --git a/exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/propagator.py b/exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/propagator.py index 0f8e60617d..9e28398579 100644 --- a/exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/propagator.py +++ b/exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/propagator.py @@ -17,13 +17,13 @@ from opentelemetry import trace from opentelemetry.context import Context from opentelemetry.exporter.datadog import constants -from opentelemetry.trace import get_current_span, set_span_in_context -from opentelemetry.trace.propagation.textmap import ( +from opentelemetry.propagators.textmap import ( Getter, Setter, TextMapPropagator, TextMapPropagatorT, ) +from opentelemetry.trace import get_current_span, set_span_in_context class DatadogFormat(TextMapPropagator): @@ -111,7 +111,7 @@ def fields(self): """Returns a set with the fields set in `inject`. See - `opentelemetry.trace.propagation.textmap.TextMapPropagator.fields` + `opentelemetry.propagators.textmap.TextMapPropagator.fields` """ return { self.TRACE_ID_KEY, diff --git a/exporter/opentelemetry-exporter-datadog/tests/test_datadog_format.py b/exporter/opentelemetry-exporter-datadog/tests/test_datadog_format.py index 3eb1667036..fe3493a062 100644 --- a/exporter/opentelemetry-exporter-datadog/tests/test_datadog_format.py +++ b/exporter/opentelemetry-exporter-datadog/tests/test_datadog_format.py @@ -17,10 +17,10 @@ from opentelemetry import trace as trace_api from opentelemetry.exporter.datadog import constants, propagator +from opentelemetry.propagators.textmap import DictGetter from opentelemetry.sdk import trace from opentelemetry.sdk.trace.id_generator import RandomIdGenerator from opentelemetry.trace import get_current_span, set_span_in_context -from opentelemetry.trace.propagation.textmap import DictGetter FORMAT = propagator.DatadogFormat() diff --git a/instrumentation/opentelemetry-instrumentation-asgi/src/opentelemetry/instrumentation/asgi/__init__.py b/instrumentation/opentelemetry-instrumentation-asgi/src/opentelemetry/instrumentation/asgi/__init__.py index e0bcf00d94..7122ae63ba 100644 --- a/instrumentation/opentelemetry-instrumentation-asgi/src/opentelemetry/instrumentation/asgi/__init__.py +++ b/instrumentation/opentelemetry-instrumentation-asgi/src/opentelemetry/instrumentation/asgi/__init__.py @@ -29,7 +29,7 @@ from opentelemetry.instrumentation.asgi.version import __version__ # noqa from opentelemetry.instrumentation.utils import http_status_to_status_code from opentelemetry.propagate import extract -from opentelemetry.trace.propagation.textmap import DictGetter +from opentelemetry.propagators.textmap import DictGetter from opentelemetry.trace.status import Status, StatusCode diff --git a/instrumentation/opentelemetry-instrumentation-celery/src/opentelemetry/instrumentation/celery/__init__.py b/instrumentation/opentelemetry-instrumentation-celery/src/opentelemetry/instrumentation/celery/__init__.py index d542950af3..8de52e02a2 100644 --- a/instrumentation/opentelemetry-instrumentation-celery/src/opentelemetry/instrumentation/celery/__init__.py +++ b/instrumentation/opentelemetry-instrumentation-celery/src/opentelemetry/instrumentation/celery/__init__.py @@ -61,7 +61,7 @@ def add(x, y): from opentelemetry.instrumentation.celery.version import __version__ from opentelemetry.instrumentation.instrumentor import BaseInstrumentor from opentelemetry.propagate import extract, inject -from opentelemetry.trace.propagation.textmap import DictGetter +from opentelemetry.propagators.textmap import DictGetter from opentelemetry.trace.status import Status, StatusCode logger = logging.getLogger(__name__) diff --git a/instrumentation/opentelemetry-instrumentation-grpc/src/opentelemetry/instrumentation/grpc/_server.py b/instrumentation/opentelemetry-instrumentation-grpc/src/opentelemetry/instrumentation/grpc/_server.py index 3be03e03dc..c3396d9c9e 100644 --- a/instrumentation/opentelemetry-instrumentation-grpc/src/opentelemetry/instrumentation/grpc/_server.py +++ b/instrumentation/opentelemetry-instrumentation-grpc/src/opentelemetry/instrumentation/grpc/_server.py @@ -29,7 +29,7 @@ from opentelemetry import trace from opentelemetry.context import attach, detach from opentelemetry.propagate import extract -from opentelemetry.trace.propagation.textmap import DictGetter +from opentelemetry.propagators.textmap import DictGetter from opentelemetry.trace.status import Status, StatusCode logger = logging.getLogger(__name__) diff --git a/instrumentation/opentelemetry-instrumentation-tornado/src/opentelemetry/instrumentation/tornado/__init__.py b/instrumentation/opentelemetry-instrumentation-tornado/src/opentelemetry/instrumentation/tornado/__init__.py index 03f0cbaf40..493c41171c 100644 --- a/instrumentation/opentelemetry-instrumentation-tornado/src/opentelemetry/instrumentation/tornado/__init__.py +++ b/instrumentation/opentelemetry-instrumentation-tornado/src/opentelemetry/instrumentation/tornado/__init__.py @@ -52,7 +52,7 @@ def get(self): unwrap, ) from opentelemetry.propagate import extract -from opentelemetry.trace.propagation.textmap import DictGetter +from opentelemetry.propagators.textmap import DictGetter from opentelemetry.trace.status import Status from opentelemetry.util.http import get_excluded_urls, get_traced_request_attrs from opentelemetry.util.time import time_ns diff --git a/instrumentation/opentelemetry-instrumentation-wsgi/src/opentelemetry/instrumentation/wsgi/__init__.py b/instrumentation/opentelemetry-instrumentation-wsgi/src/opentelemetry/instrumentation/wsgi/__init__.py index 0f81f3e9a0..b51479e25d 100644 --- a/instrumentation/opentelemetry-instrumentation-wsgi/src/opentelemetry/instrumentation/wsgi/__init__.py +++ b/instrumentation/opentelemetry-instrumentation-wsgi/src/opentelemetry/instrumentation/wsgi/__init__.py @@ -62,7 +62,7 @@ def hello(): from opentelemetry.instrumentation.utils import http_status_to_status_code from opentelemetry.instrumentation.wsgi.version import __version__ from opentelemetry.propagate import extract -from opentelemetry.trace.propagation.textmap import DictGetter +from opentelemetry.propagators.textmap import DictGetter from opentelemetry.trace.status import Status, StatusCode _HTTP_VERSION_PREFIX = "HTTP/" diff --git a/propagator/opentelemetry-propagator-ot-trace/src/opentelemetry/propagators/ot_trace/__init__.py b/propagator/opentelemetry-propagator-ot-trace/src/opentelemetry/propagators/ot_trace/__init__.py index 6e8c27d3db..3aef2cfcb0 100644 --- a/propagator/opentelemetry-propagator-ot-trace/src/opentelemetry/propagators/ot_trace/__init__.py +++ b/propagator/opentelemetry-propagator-ot-trace/src/opentelemetry/propagators/ot_trace/__init__.py @@ -17,6 +17,12 @@ from opentelemetry.baggage import get_all, set_baggage from opentelemetry.context import Context +from opentelemetry.propagators.textmap import ( + Getter, + Setter, + TextMapPropagator, + TextMapPropagatorT, +) from opentelemetry.trace import ( INVALID_SPAN_ID, INVALID_TRACE_ID, @@ -26,12 +32,6 @@ get_current_span, set_span_in_context, ) -from opentelemetry.trace.propagation.textmap import ( - Getter, - Setter, - TextMapPropagator, - TextMapPropagatorT, -) OT_TRACE_ID_HEADER = "ot-tracer-traceid" OT_SPAN_ID_HEADER = "ot-tracer-spanid" @@ -153,7 +153,7 @@ def fields(self): """Returns a set with the fields set in `inject`. See - `opentelemetry.trace.propagation.textmap.TextMapPropagator.fields` + `opentelemetry.propagators.textmap.TextMapPropagator.fields` """ return { OT_TRACE_ID_HEADER, diff --git a/propagator/opentelemetry-propagator-ot-trace/tests/test_ot_trace_propagator.py b/propagator/opentelemetry-propagator-ot-trace/tests/test_ot_trace_propagator.py index 3c4cd7c166..5af8129d7a 100644 --- a/propagator/opentelemetry-propagator-ot-trace/tests/test_ot_trace_propagator.py +++ b/propagator/opentelemetry-propagator-ot-trace/tests/test_ot_trace_propagator.py @@ -22,6 +22,7 @@ OT_TRACE_ID_HEADER, OTTracePropagator, ) +from opentelemetry.propagators.textmap import DictGetter from opentelemetry.sdk.trace import _Span from opentelemetry.trace import ( INVALID_SPAN_CONTEXT, @@ -32,7 +33,6 @@ set_span_in_context, ) from opentelemetry.trace.propagation import get_current_span -from opentelemetry.trace.propagation.textmap import DictGetter carrier_getter = DictGetter() diff --git a/sdk-extension/opentelemetry-sdk-extension-aws/src/opentelemetry/sdk/extension/aws/trace/propagation/aws_xray_format.py b/sdk-extension/opentelemetry-sdk-extension-aws/src/opentelemetry/sdk/extension/aws/trace/propagation/aws_xray_format.py index d041aea076..4bd8a08907 100644 --- a/sdk-extension/opentelemetry-sdk-extension-aws/src/opentelemetry/sdk/extension/aws/trace/propagation/aws_xray_format.py +++ b/sdk-extension/opentelemetry-sdk-extension-aws/src/opentelemetry/sdk/extension/aws/trace/propagation/aws_xray_format.py @@ -53,7 +53,7 @@ import opentelemetry.trace as trace from opentelemetry.context import Context -from opentelemetry.trace.propagation.textmap import ( +from opentelemetry.propagators.textmap import ( Getter, Setter, TextMapPropagator, @@ -316,7 +316,7 @@ def fields(self): """Returns a set with the fields set in `inject`. See - `opentelemetry.trace.propagation.textmap.TextMapPropagator.fields` + `opentelemetry.propagators.textmap.TextMapPropagator.fields` """ return {TRACE_HEADER_KEY} diff --git a/sdk-extension/opentelemetry-sdk-extension-aws/tests/performance/benchmarks/trace/propagation/test_benchmark_aws_xray_format.py b/sdk-extension/opentelemetry-sdk-extension-aws/tests/performance/benchmarks/trace/propagation/test_benchmark_aws_xray_format.py index cf4c42dcf7..df2e205cae 100644 --- a/sdk-extension/opentelemetry-sdk-extension-aws/tests/performance/benchmarks/trace/propagation/test_benchmark_aws_xray_format.py +++ b/sdk-extension/opentelemetry-sdk-extension-aws/tests/performance/benchmarks/trace/propagation/test_benchmark_aws_xray_format.py @@ -14,11 +14,11 @@ from requests.structures import CaseInsensitiveDict +from opentelemetry.propagators.textmap import DictGetter from opentelemetry.sdk.extension.aws.trace.propagation.aws_xray_format import ( TRACE_HEADER_KEY, AwsXRayFormat, ) -from opentelemetry.trace.propagation.textmap import DictGetter XRAY_PROPAGATOR = AwsXRayFormat() diff --git a/sdk-extension/opentelemetry-sdk-extension-aws/tests/trace/propagation/test_aws_xray_format.py b/sdk-extension/opentelemetry-sdk-extension-aws/tests/trace/propagation/test_aws_xray_format.py index 73aae3a93a..7248ed8c2c 100644 --- a/sdk-extension/opentelemetry-sdk-extension-aws/tests/trace/propagation/test_aws_xray_format.py +++ b/sdk-extension/opentelemetry-sdk-extension-aws/tests/trace/propagation/test_aws_xray_format.py @@ -18,6 +18,7 @@ from requests.structures import CaseInsensitiveDict import opentelemetry.trace as trace_api +from opentelemetry.propagators.textmap import DictGetter from opentelemetry.sdk.extension.aws.trace.propagation.aws_xray_format import ( TRACE_HEADER_KEY, AwsXRayFormat, @@ -31,7 +32,6 @@ TraceState, set_span_in_context, ) -from opentelemetry.trace.propagation.textmap import DictGetter TRACE_ID_BASE16 = "8a3c60f7d188f8fa79d48a391a778fa6"