Merge remote-tracking branch 'upstream/master' into tracer_provider_force_flush

Author: mariojonke

.flake8

@@ -18,3 +18,4 @@ exclude =
   ext/opentelemetry-ext-jaeger/src/opentelemetry/ext/jaeger/gen/
   ext/opentelemetry-ext-jaeger/build/*
   docs/examples/opentelemetry-example-app/src/opentelemetry_example_app/grpc/gen/
+  docs/examples/opentelemetry-example-app/build/*

.isort.cfg

@@ -15,4 +15,4 @@ multi_line_output=3
 skip=target
 skip_glob=**/gen/*,.venv*/*,venv*/*
 known_first_party=opentelemetry,opentelemetry_example_app
-known_third_party=psutil,pytest
+known_third_party=psutil,pytest,redis,redis_opentracing

.travis.yml

@@ -5,12 +5,12 @@ language: python
 cache: pip
 
 python:
+  - 'pypy3'
+  - '3.8'
   - '3.4'
   - '3.5'
   - '3.6'
   - '3.7'
-  - '3.8'
-  - 'pypy3'
 
 #matrix:
 #  allow_failures:

dev-requirements.txt

@@ -1,4 +1,4 @@
-pylint~=2.3
+pylint==2.4.4
 flake8~=3.7
 isort~=4.3
 black>=19.3b0,==19.*

docs/examples/basic_tracer/tests/test_tracer.py

@@ -25,6 +25,6 @@ def test_basic_tracer(self):
             (sys.executable, test_script)
         ).decode()
 
-        self.assertIn('name="foo"', output)
-        self.assertIn('name="bar"', output)
-        self.assertIn('name="baz"', output)
+        self.assertIn('"name": "foo"', output)
+        self.assertIn('"name": "bar"', output)
+        self.assertIn('"name": "baz"', output)

docs/examples/http/client.py

@@ -28,15 +28,18 @@
 
 # The preferred tracer implementation must be set, as the opentelemetry-api
 # defines the interface with a no-op implementation.
+# It must be done before instrumenting any library.
 trace.set_tracer_provider(TracerProvider())
-tracer_provider = trace.get_tracer_provider()
 
+# Enable instrumentation in the requests library.
+http_requests.RequestsInstrumentor().instrument()
+
+# Configure a console span exporter.
 exporter = ConsoleSpanExporter()
 span_processor = BatchExportSpanProcessor(exporter)
-tracer_provider.add_span_processor(span_processor)
+trace.get_tracer_provider().add_span_processor(span_processor)
 
 # Integrations are the glue that binds the OpenTelemetry API and the
 # frameworks and libraries that are used together, automatically creating
 # Spans and propagating context as appropriate.
-http_requests.enable(tracer_provider)
 response = requests.get(url="http://127.0.0.1:5000/")

docs/examples/http/server.py

@@ -30,20 +30,23 @@
 
 # The preferred tracer implementation must be set, as the opentelemetry-api
 # defines the interface with a no-op implementation.
+# It must be done before instrumenting any library.
 trace.set_tracer_provider(TracerProvider())
-tracer = trace.get_tracer(__name__)
-
-exporter = ConsoleSpanExporter()
-span_processor = BatchExportSpanProcessor(exporter)
-trace.get_tracer_provider().add_span_processor(span_processor)
 
 # Integrations are the glue that binds the OpenTelemetry API and the
 # frameworks and libraries that are used together, automatically creating
 # Spans and propagating context as appropriate.
-http_requests.enable(trace.get_tracer_provider())
+http_requests.RequestsInstrumentor().instrument()
 app = flask.Flask(__name__)
 app.wsgi_app = OpenTelemetryMiddleware(app.wsgi_app)
 
+# Configure a console span exporter.
+exporter = ConsoleSpanExporter()
+span_processor = BatchExportSpanProcessor(exporter)
+trace.get_tracer_provider().add_span_processor(span_processor)
+
+tracer = trace.get_tracer(__name__)
+
 
 @app.route("/")
 def hello():

docs/examples/http/tests/test_http.py

@@ -32,7 +32,7 @@ def test_http(self):
         output = subprocess.check_output(
             (sys.executable, test_script)
         ).decode()
-        self.assertIn('name="/"', output)
+        self.assertIn('"name": "/"', output)
 
     @classmethod
     def teardown_class(cls):

docs/examples/opentelemetry-example-app/src/opentelemetry_example_app/flask_example.py

@@ -28,14 +28,20 @@
     SimpleExportSpanProcessor,
 )
 
+# The preferred tracer implementation must be set, as the opentelemetry-api
+# defines the interface with a no-op implementation.
+# It must be done before instrumenting any library
 trace.set_tracer_provider(TracerProvider())
+
+opentelemetry.ext.http_requests.RequestsInstrumentor().instrument()
+FlaskInstrumentor().instrument()
+
 trace.get_tracer_provider().add_span_processor(
     SimpleExportSpanProcessor(ConsoleSpanExporter())
 )
 
-FlaskInstrumentor().instrument()
+
 app = flask.Flask(__name__)
-opentelemetry.ext.http_requests.enable(trace.get_tracer_provider())
 
 
 @app.route("/")

docs/examples/opentelemetry-example-app/src/opentelemetry_example_app/grpc/hello_world_client.py

@@ -64,7 +64,6 @@
 trace.get_tracer_provider().add_span_processor(
     SimpleExportSpanProcessor(ConsoleSpanExporter())
 )
-tracer = trace.get_tracer(__name__)
 
 
 def run():
@@ -73,7 +72,7 @@ def run():
     # of the code.
     with grpc.insecure_channel("localhost:50051") as channel:
 
-        channel = intercept_channel(channel, client_interceptor(tracer))
+        channel = intercept_channel(channel, client_interceptor())
 
         stub = helloworld_pb2_grpc.GreeterStub(channel)