Merge branch 'main' into datadog-propagator-bugfix

.github/workflows/test.yml

@@ -6,7 +6,7 @@ on:
     - 'release/*'
   pull_request:
 env:
-  CORE_REPO_SHA: e71106fd8e5fe5ae11c5b393c2da3cda05cd55c2
+  CORE_REPO_SHA: bcf15a417c3f029e1e75ec824925bc02808d21eb
 
 jobs:
   build:

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

@@ -21,7 +21,7 @@
 from opentelemetry.sdk.trace import Span, SpanProcessor
 from opentelemetry.sdk.trace.export import SpanExporter
 from opentelemetry.trace import INVALID_TRACE_ID
-from opentelemetry.util import time_ns
+from opentelemetry.util.providers import time_ns
 
 logger = logging.getLogger(__name__)
 

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

@@ -57,8 +57,8 @@ def on_get(self, req, resp):
     http_status_to_status_code,
 )
 from opentelemetry.trace.status import Status
-from opentelemetry.util import time_ns
 from opentelemetry.util.http import get_excluded_urls, get_traced_request_attrs
+from opentelemetry.util.providers import time_ns
 
 _logger = getLogger(__name__)
 

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

@@ -55,8 +55,8 @@ def hello():
 from opentelemetry import context, propagators, trace
 from opentelemetry.instrumentation.flask.version import __version__
 from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
-from opentelemetry.util import time_ns
 from opentelemetry.util.http import get_excluded_urls
+from opentelemetry.util.providers import time_ns
 
 _logger = getLogger(__name__)
 

instrumentation/opentelemetry-instrumentation-pyramid/src/opentelemetry/instrumentation/pyramid/callbacks.py

@@ -8,8 +8,8 @@
 import opentelemetry.instrumentation.wsgi as otel_wsgi
 from opentelemetry import context, propagators, trace
 from opentelemetry.instrumentation.pyramid.version import __version__
-from opentelemetry.util import time_ns
 from opentelemetry.util.http import get_excluded_urls
+from opentelemetry.util.providers import time_ns
 
 TWEEN_NAME = "opentelemetry.instrumentation.pyramid.trace_tween_factory"
 SETTING_TRACE_ENABLED = "opentelemetry-pyramid.trace_enabled"

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

@@ -53,8 +53,8 @@ def get(self):
 )
 from opentelemetry.trace.propagation.textmap import DictGetter
 from opentelemetry.trace.status import Status
-from opentelemetry.util import time_ns
 from opentelemetry.util.http import get_excluded_urls, get_traced_request_attrs
+from opentelemetry.util.providers import time_ns
 
 from .client import fetch_async  # pylint: disable=E0401
 

instrumentation/opentelemetry-instrumentation-tornado/src/opentelemetry/instrumentation/tornado/client.py

@@ -5,7 +5,7 @@
 from opentelemetry import propagators, trace
 from opentelemetry.instrumentation.utils import http_status_to_status_code
 from opentelemetry.trace.status import Status
-from opentelemetry.util import time_ns
+from opentelemetry.util.providers import time_ns
 
 
 def _normalize_request(args, kwargs):