Fix examples and documentation (open-telemetry#1793)

Fixes open-telemetry#1792

Author: ocelotl

docs/examples/auto-instrumentation/README.rst

@@ -37,7 +37,9 @@ Manually instrumented server
     def server_request():
         with tracer.start_as_current_span(
             "server_request",
-            context=propagators.extract(request.headers),
+            context=extract(request.headers),
+            kind=trace.SpanKind.SERVER,
+            attributes=collect_request_attributes(request.environ),
         ):
             print(request.args.get("param"))
             return "served"

docs/examples/auto-instrumentation/client.py

@@ -16,7 +16,8 @@
 
 from requests import get
 
-from opentelemetry import propagators, trace
+from opentelemetry import trace
+from opentelemetry.propagate import inject
 from opentelemetry.sdk.trace import TracerProvider
 from opentelemetry.sdk.trace.export import (
     ConsoleSpanExporter,
@@ -37,7 +38,7 @@
 
     with tracer.start_as_current_span("client-server"):
         headers = {}
-        propagators.inject(headers)
+        inject(headers)
         requested = get(
             "http://localhost:8082/server_request",
             params={"param": argv[1]},