From bec3f5675b1cfa0977229c5adaa6153db6efba5c Mon Sep 17 00:00:00 2001 From: Rakshith Bhyravabhotla Date: Fri, 6 Mar 2020 12:28:08 -0800 Subject: [PATCH] Update Version of opentelemetry (#10046) * Update Version * tracer * update shared reqs * trace_source * some changes * fix test * readme * changelog * Delete opentelemetry_span * typo * minor change * pin version * fix rebase --- sdk/core/azure-core-tracing-opentelemetry/CHANGELOG.md | 4 ++-- sdk/core/azure-core-tracing-opentelemetry/README.md | 8 ++++---- .../core/tracing/ext/opentelemetry_span/__init__.py | 9 +++++---- .../dev_requirements.txt | 2 +- sdk/core/azure-core-tracing-opentelemetry/setup.py | 2 +- .../azure-core-tracing-opentelemetry/tests/conftest.py | 6 +++--- .../tests/test_tracing_implementations.py | 2 +- sdk/core/azure-core/azure/core/tracing/__init__.py | 2 +- shared_requirements.txt | 2 +- 9 files changed, 19 insertions(+), 18 deletions(-) diff --git a/sdk/core/azure-core-tracing-opentelemetry/CHANGELOG.md b/sdk/core/azure-core-tracing-opentelemetry/CHANGELOG.md index bc9e9eef7de08..5c1752a4524b4 100644 --- a/sdk/core/azure-core-tracing-opentelemetry/CHANGELOG.md +++ b/sdk/core/azure-core-tracing-opentelemetry/CHANGELOG.md @@ -7,9 +7,9 @@ ### Features -- Pinned opentelemetry-api to version 0.3a0 +- Pinned opentelemetry-api to version 0.4a0 -## 1.0.0b1 Unreleased +## 1.0.0b1 ### Features diff --git a/sdk/core/azure-core-tracing-opentelemetry/README.md b/sdk/core/azure-core-tracing-opentelemetry/README.md index f3370a9a8506a..a01717faf091b 100644 --- a/sdk/core/azure-core-tracing-opentelemetry/README.md +++ b/sdk/core/azure-core-tracing-opentelemetry/README.md @@ -47,16 +47,16 @@ exporter = AzureMonitorSpanExporter( # Regular open telemetry usage from here, see https://github.com/open-telemetry/opentelemetry-python # for details from opentelemetry import trace -from opentelemetry.sdk.trace import Tracer +from opentelemetry.sdk.trace import TracerSource from opentelemetry.sdk.trace.export import ConsoleSpanExporter from opentelemetry.sdk.trace.export import SimpleExportSpanProcessor # Simple console exporter exporter = ConsoleSpanExporter() -trace.set_preferred_tracer_implementation(lambda T: Tracer()) -tracer = trace.tracer() -tracer.add_span_processor( +trace.set_preferred_tracer_implementation(lambda T: TracerSource()) +tracer = trace.get_tracer(__name__) +tracer.tracer_source().add_span_processor( SimpleExportSpanProcessor(exporter) ) diff --git a/sdk/core/azure-core-tracing-opentelemetry/azure/core/tracing/ext/opentelemetry_span/__init__.py b/sdk/core/azure-core-tracing-opentelemetry/azure/core/tracing/ext/opentelemetry_span/__init__.py index 851c33b3f62df..06cb53fb20df6 100644 --- a/sdk/core/azure-core-tracing-opentelemetry/azure/core/tracing/ext/opentelemetry_span/__init__.py +++ b/sdk/core/azure-core-tracing-opentelemetry/azure/core/tracing/ext/opentelemetry_span/__init__.py @@ -4,8 +4,9 @@ # ------------------------------------ """Implements azure.core.tracing.AbstractSpan to wrap OpenTelemetry spans.""" -from opentelemetry.trace import Span, Link, Tracer, SpanKind as OpenTelemetrySpanKind, tracer -from opentelemetry.context import Context +from opentelemetry import trace +from opentelemetry.trace import Span, Link, Tracer, SpanKind as OpenTelemetrySpanKind +from opentelemetry.context import with_current_context from opentelemetry.propagators import extract, inject from azure.core.tracing import SpanKind, HttpSpanMixin # pylint: disable=no-name-in-module @@ -208,7 +209,7 @@ def get_current_tracer(cls): """ Get the current tracer from the execution context. Return None otherwise. """ - return tracer() + return trace.get_tracer(__name__, __version__) @classmethod def change_context(cls, span): @@ -244,4 +245,4 @@ def with_current_context(cls, func): :param func: The function that will be run in the new context :return: The target the pass in instead of the function """ - return Context.with_current_context(func) + return with_current_context(func) diff --git a/sdk/core/azure-core-tracing-opentelemetry/dev_requirements.txt b/sdk/core/azure-core-tracing-opentelemetry/dev_requirements.txt index bca770257cbc2..b74853fe7e778 100644 --- a/sdk/core/azure-core-tracing-opentelemetry/dev_requirements.txt +++ b/sdk/core/azure-core-tracing-opentelemetry/dev_requirements.txt @@ -1,3 +1,3 @@ -e ../../../tools/azure-sdk-tools ../azure-core -opentelemetry-sdk==0.3a0 \ No newline at end of file +opentelemetry-sdk==0.4a0 \ No newline at end of file diff --git a/sdk/core/azure-core-tracing-opentelemetry/setup.py b/sdk/core/azure-core-tracing-opentelemetry/setup.py index bd9c9b0df5c51..c6517c03f00e2 100644 --- a/sdk/core/azure-core-tracing-opentelemetry/setup.py +++ b/sdk/core/azure-core-tracing-opentelemetry/setup.py @@ -58,7 +58,7 @@ ], python_requires=">=3.5.0", install_requires=[ - 'opentelemetry-api==0.3a0', + 'opentelemetry-api==0.4a0', 'azure-core<2.0.0,>=1.0.0', ], extras_require={ diff --git a/sdk/core/azure-core-tracing-opentelemetry/tests/conftest.py b/sdk/core/azure-core-tracing-opentelemetry/tests/conftest.py index a834f86a40f62..fd281420e1706 100644 --- a/sdk/core/azure-core-tracing-opentelemetry/tests/conftest.py +++ b/sdk/core/azure-core-tracing-opentelemetry/tests/conftest.py @@ -3,12 +3,12 @@ # Licensed under the MIT License. # ------------------------------------ from opentelemetry import trace -from opentelemetry.sdk.trace import Tracer +from opentelemetry.sdk.trace import TracerSource import pytest @pytest.fixture(scope="session") def tracer(): - trace.set_preferred_tracer_implementation(lambda T: Tracer()) - return trace.tracer() + trace.set_preferred_tracer_source_implementation(lambda T: TracerSource()) + return trace.get_tracer(__name__) diff --git a/sdk/core/azure-core-tracing-opentelemetry/tests/test_tracing_implementations.py b/sdk/core/azure-core-tracing-opentelemetry/tests/test_tracing_implementations.py index b7a1297aec346..3c1b9042d796a 100644 --- a/sdk/core/azure-core-tracing-opentelemetry/tests/test_tracing_implementations.py +++ b/sdk/core/azure-core-tracing-opentelemetry/tests/test_tracing_implementations.py @@ -43,7 +43,7 @@ def test_no_span_passed_in_with_no_environ(self, tracer): def test_span(self, tracer): with tracer.start_as_current_span("Root") as parent: - assert OpenTelemetrySpan.get_current_tracer() is tracer + assert OpenTelemetrySpan.get_current_tracer().source is tracer.source with OpenTelemetrySpan() as wrapped_span: assert wrapped_span.span_instance is tracer.get_current_span() diff --git a/sdk/core/azure-core/azure/core/tracing/__init__.py b/sdk/core/azure-core/azure/core/tracing/__init__.py index 098fceb8802d8..d084cc5793209 100644 --- a/sdk/core/azure-core/azure/core/tracing/__init__.py +++ b/sdk/core/azure-core/azure/core/tracing/__init__.py @@ -2,7 +2,7 @@ # Copyright (c) Microsoft Corporation. # Licensed under the MIT License. # ------------------------------------ -from ._abstract_span import AbstractSpan, SpanKind, HttpSpanMixin +from azure.core.tracing._abstract_span import AbstractSpan, SpanKind, HttpSpanMixin __all__ = [ "AbstractSpan", "SpanKind", "HttpSpanMixin" diff --git a/shared_requirements.txt b/shared_requirements.txt index 8716dd65e0a60..b8d6c4eea7426 100644 --- a/shared_requirements.txt +++ b/shared_requirements.txt @@ -124,7 +124,7 @@ six>=1.6 opencensus>=0.6.0 opencensus-ext-threading opencensus-ext-azure>=0.3.1 -opentelemetry-api==0.3a0 +opentelemetry-api==0.4a0 #override azure-eventhub-checkpointstoreblob msrest>=0.6.10 #override azure-eventhub-checkpointstoreblob azure-core<2.0.0,>=1.2.2 #override azure-eventhub-checkpointstoreblob-aio msrest>=0.6.10