Fix to run the auto-instrumentation example successfully

open-telemetry · Nov 29, 2020 · 207502b · 207502b
1 parent c8580b2
commit 207502b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/docs/examples/auto-instrumentation/README.rst b/docs/examples/auto-instrumentation/README.rst
@@ -37,9 +37,8 @@ Manually instrumented server
     def server_request():
         with tracer.start_as_current_span(
             "server_request",
-            parent=propagators.extract(
-                lambda dict_, key: dict_.get(key, []), request.headers
-            )["current-span"],
+            context=propagators.extract(DictGetter(), request.headers
+            ),
         ):
             print(request.args.get("param"))
             return "served"
@@ -148,7 +147,7 @@ and run the following command instead:
 
 .. code:: sh
 
-    $ opentelemetry-instrument python server_uninstrumented.py
+    $ opentelemetry-instrument -e console_span python server_uninstrumented.py
 
 In the console where you previously executed ``client.py``, run the following
 command again:

diff --git a/docs/examples/auto-instrumentation/server_instrumented.py b/docs/examples/auto-instrumentation/server_instrumented.py
@@ -21,6 +21,7 @@
     ConsoleSpanExporter,
     SimpleExportSpanProcessor,
 )
+from opentelemetry.trace.propagation.textmap import DictGetter
 
 app = Flask(__name__)
 
@@ -36,9 +37,7 @@
 def server_request():
     with tracer.start_as_current_span(
         "server_request",
-        parent=propagators.extract(
-            lambda dict_, key: dict_.get(key, []), request.headers
-        )["current-span"],
+        context=propagators.extract(DictGetter(), request.headers),
         kind=trace.SpanKind.SERVER,
         attributes=collect_request_attributes(request.environ),
     ):

diff --git a/opentelemetry-sdk/setup.cfg b/opentelemetry-sdk/setup.cfg
@@ -53,6 +53,8 @@ opentelemetry_tracer_provider =
     sdk_tracer_provider = opentelemetry.sdk.trace:TracerProvider
 opentelemetry_propagator =
     b3 = opentelemetry.sdk.trace.propagation.b3_format:B3Format
+opentelemetry_exporter =
+    console_span = opentelemetry.sdk.trace.export:ConsoleSpanExporter
 
 [options.extras_require]
 test =
diff --git a/opentelemetry-sdk/src/opentelemetry/sdk/trace/export/__init__.py b/opentelemetry-sdk/src/opentelemetry/sdk/trace/export/__init__.py
@@ -373,6 +373,7 @@ def __init__(
         out: typing.IO = sys.stdout,
         formatter: typing.Callable[[Span], str] = lambda span: span.to_json()
         + os.linesep,
+        **kwargs
     ):
         self.out = out
         self.formatter = formatter