diff --git a/opentelemetry-api/src/opentelemetry/trace/__init__.py b/opentelemetry-api/src/opentelemetry/trace/__init__.py index b8573e58852..b141e466aa7 100644 --- a/opentelemetry-api/src/opentelemetry/trace/__init__.py +++ b/opentelemetry-api/src/opentelemetry/trace/__init__.py @@ -57,8 +57,8 @@ finally: child.end() -Applications should generally use a single global tracer source, and use either -implicit or explicit context propagation consistently throughout. +Applications should generally use a single global TracerProvider, and use +either implicit or explicit context propagation consistently throughout. .. versionadded:: 0.1.0 .. versionchanged:: 0.3.0 @@ -680,7 +680,7 @@ def tracer_provider() -> TracerProvider: # if we raised an exception trying to instantiate an # abstract class, default to no-op tracer impl logger.warning( - "Unable to instantiate TracerProvider from tracer source factory.", + "Unable to instantiate TracerProvider from factory.", exc_info=True, ) _TRACER_PROVIDER = DefaultTracerProvider() @@ -692,7 +692,7 @@ def tracer_provider() -> TracerProvider: def set_preferred_tracer_provider_implementation( factory: ImplementationFactory, ) -> None: - """Set the factory to be used to create the tracer source. + """Set the factory to be used to create the global TracerProvider. See :mod:`opentelemetry.util.loader` for details. diff --git a/opentelemetry-api/tests/trace/test_globals.py b/opentelemetry-api/tests/trace/test_globals.py index 6971810d173..7c4d8e3549b 100644 --- a/opentelemetry-api/tests/trace/test_globals.py +++ b/opentelemetry-api/tests/trace/test_globals.py @@ -8,15 +8,14 @@ class TestGlobals(unittest.TestCase): def setUp(self): importlib.reload(trace) - # this class has to be declared after the importlib - # reload, or else it will inherit from an old - # TracerProvider, rather than the new TraceSource ABC. - # created from reload. + # This class has to be declared after the importlib reload, or else it + # will inherit from an old TracerProvider, rather than the new + # TracerProvider ABC created from reload. static_tracer = trace.DefaultTracer() class DummyTracerProvider(trace.TracerProvider): - """TraceSource used for testing""" + """TracerProvider used for testing""" def get_tracer( self, @@ -35,7 +34,7 @@ def tearDown() -> None: importlib.reload(trace) def test_get_tracer(self): - """trace.get_tracer should proxy to the global tracer source.""" + """trace.get_tracer should proxy to the global tracer provider.""" from_global_api = trace.get_tracer("foo") from_tracer_api = trace.tracer_provider().get_tracer("foo") self.assertIs(from_global_api, from_tracer_api)