Merge remote-tracking branch 'origin/master' into codeboten/issue_303

Author: Alex Boten

.flake8

@@ -3,6 +3,7 @@ ignore =
   E501  # line too long, defer to black
   F401  # unused import, defer to pylint
   W503  # allow line breaks after binary ops, not after
+  E203  # allow whitespace before ':' (https://github.com/psf/black#slices) 
 exclude =
   .bzr
   .git

.github/CODEOWNERS

@@ -2,4 +2,4 @@
 # This file controls who is tagged for review for any given pull request.
 
 # For anything not explicitly taken by someone else:
-*               @a-feld @c24t @carlosalberto @lzchen @Oberon00 @reyang @toumorokoshi
+*               @open-telemetry/python-approvers

.isort.cfg

@@ -14,3 +14,4 @@ line_length=79
 multi_line_output=3
 skip=target
 skip_glob=ext/opentelemetry-ext-jaeger/src/opentelemetry/ext/jaeger/gen/*
+known_first_party=opentelemetry

examples/basic_tracer/tests/test_tracer.py

@@ -13,14 +13,17 @@
 # limitations under the License.
 import os
 import subprocess
+import sys
 import unittest
 
 
 class TestBasicTracerExample(unittest.TestCase):
     def test_basic_tracer(self):
         dirpath = os.path.dirname(os.path.realpath(__file__))
         test_script = "{}/../tracer.py".format(dirpath)
-        output = subprocess.check_output(test_script).decode()
+        output = subprocess.check_output(
+            (sys.executable, test_script)
+        ).decode()
 
         self.assertIn('name="foo"', output)
         self.assertIn('name="bar"', output)

examples/basic_tracer/tracer.py

@@ -48,5 +48,3 @@
     with tracer.start_as_current_span("bar"):
         with tracer.start_as_current_span("baz"):
             print(Context)
-
-span_processor.shutdown()

examples/http/server.py

@@ -65,4 +65,3 @@ def hello():
 
 if __name__ == "__main__":
     app.run(debug=True)
-    span_processor.shutdown()

examples/http/tests/test_http.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 import os
 import subprocess
+import sys
 import unittest
 from time import sleep
 
@@ -22,13 +23,15 @@ class TestHttpExample(unittest.TestCase):
     def setup_class(cls):
         dirpath = os.path.dirname(os.path.realpath(__file__))
         server_script = "{}/../server.py".format(dirpath)
-        cls.server = subprocess.Popen([server_script])
+        cls.server = subprocess.Popen([sys.executable, server_script])
         sleep(1)
 
     def test_http(self):
         dirpath = os.path.dirname(os.path.realpath(__file__))
         test_script = "{}/../tracer_client.py".format(dirpath)
-        output = subprocess.check_output(test_script).decode()
+        output = subprocess.check_output(
+            (sys.executable, test_script)
+        ).decode()
         self.assertIn('name="/"', output)
 
     @classmethod

examples/http/tracer_client.py

@@ -51,4 +51,3 @@
 # Spans and propagating context as appropriate.
 http_requests.enable(tracer)
 response = requests.get(url="http://127.0.0.1:5000/")
-span_processor.shutdown()

examples/opentelemetry-example-app/src/opentelemetry_example_app/metrics_example.py

@@ -30,17 +30,17 @@
     ("environment",),
 )
 
-label_values = ("staging",)
+label_set = meter.get_label_set({"environment": "staging"})
 
 # Direct metric usage
-counter.add(label_values, 25)
+counter.add(label_set, 25)
 
 # Handle usage
-counter_handle = counter.get_handle(label_values)
+counter_handle = counter.get_handle(label_set)
 counter_handle.add(100)
 
 # Record batch usage
-meter.record_batch(label_values, [(counter, 50)])
+meter.record_batch(label_set, [(counter, 50)])
 print(counter_handle.data)
 
 # TODO: exporters

ext/opentelemetry-ext-flask/src/opentelemetry/ext/flask/__init__.py

@@ -62,20 +62,21 @@ def _before_flask_request():
 
     tracer = trace.tracer()
 
+    attributes = otel_wsgi.collect_request_attributes(environ)
+    if flask_request.url_rule:
+        # For 404 that result from no route found, etc, we don't have a url_rule.
+        attributes["http.route"] = flask_request.url_rule.rule
     span = tracer.start_span(
         span_name,
         parent_span,
         kind=trace.SpanKind.SERVER,
+        attributes=attributes,
         start_time=environ.get(_ENVIRON_STARTTIME_KEY),
     )
     activation = tracer.use_span(span, end_on_exit=True)
     activation.__enter__()
     environ[_ENVIRON_ACTIVATION_KEY] = activation
     environ[_ENVIRON_SPAN_KEY] = span
-    otel_wsgi.add_request_attributes(span, environ)
-    if flask_request.url_rule:
-        # For 404 that result from no route found, etc, we don't have a url_rule.
-        span.set_attribute("http.route", flask_request.url_rule.rule)
 
 
 def _teardown_flask_request(exc):

ext/opentelemetry-ext-flask/tests/test_flask_integration.py

@@ -21,6 +21,8 @@
 import opentelemetry.ext.flask as otel_flask
 from opentelemetry import trace as trace_api
 from opentelemetry.ext.testutil.wsgitestutil import WsgiTestBase
+from opentelemetry.sdk.trace import MAX_NUM_ATTRIBUTES
+from opentelemetry.sdk.util import BoundedDict
 
 
 class TestFlaskIntegration(WsgiTestBase):
@@ -40,15 +42,22 @@ def hello_endpoint(helloid):
         self.client = Client(self.app, BaseResponse)
 
     def test_simple(self):
-        expected_attrs = {
-            "component": "http",
-            "http.method": "GET",
-            "http.host": "localhost",
-            "http.url": "http://localhost/hello/123",
-            "http.route": "/hello/<int:helloid>",
-            "http.status_code": 200,
-            "http.status_text": "OK",
-        }
+        expected_attrs = BoundedDict.from_map(
+            MAX_NUM_ATTRIBUTES,
+            {
+                "component": "http",
+                "http.method": "GET",
+                "http.server_name": "localhost",
+                "http.scheme": "http",
+                "host.port": 80,
+                "http.host": "localhost",
+                "http.target": "/hello/123",
+                "http.flavor": "1.1",
+                "http.route": "/hello/<int:helloid>",
+                "http.status_text": "OK",
+                "http.status_code": 200,
+            },
+        )
         resp = self.client.get("/hello/123")
         self.assertEqual(200, resp.status_code)
         self.assertEqual([b"Hello: 123"], list(resp.response))
@@ -59,14 +68,21 @@ def test_simple(self):
         self.assertEqual(span_list[0].attributes, expected_attrs)
 
     def test_404(self):
-        expected_attrs = {
-            "component": "http",
-            "http.method": "POST",
-            "http.host": "localhost",
-            "http.url": "http://localhost/bye",
-            "http.status_code": 404,
-            "http.status_text": "NOT FOUND",
-        }
+        expected_attrs = BoundedDict.from_map(
+            MAX_NUM_ATTRIBUTES,
+            {
+                "component": "http",
+                "http.method": "POST",
+                "http.server_name": "localhost",
+                "http.scheme": "http",
+                "host.port": 80,
+                "http.host": "localhost",
+                "http.target": "/bye",
+                "http.flavor": "1.1",
+                "http.status_text": "NOT FOUND",
+                "http.status_code": 404,
+            },
+        )
         resp = self.client.post("/bye")
         self.assertEqual(404, resp.status_code)
         resp.close()
@@ -77,15 +93,22 @@ def test_404(self):
         self.assertEqual(span_list[0].attributes, expected_attrs)
 
     def test_internal_error(self):
-        expected_attrs = {
-            "component": "http",
-            "http.method": "GET",
-            "http.host": "localhost",
-            "http.url": "http://localhost/hello/500",
-            "http.route": "/hello/<int:helloid>",
-            "http.status_code": 500,
-            "http.status_text": "INTERNAL SERVER ERROR",
-        }
+        expected_attrs = BoundedDict.from_map(
+            MAX_NUM_ATTRIBUTES,
+            {
+                "component": "http",
+                "http.method": "GET",
+                "http.server_name": "localhost",
+                "http.scheme": "http",
+                "host.port": 80,
+                "http.host": "localhost",
+                "http.target": "/hello/500",
+                "http.flavor": "1.1",
+                "http.route": "/hello/<int:helloid>",
+                "http.status_text": "INTERNAL SERVER ERROR",
+                "http.status_code": 500,
+            },
+        )
         resp = self.client.get("/hello/500")
         self.assertEqual(500, resp.status_code)
         resp.close()

ext/opentelemetry-ext-jaeger/README.rst

@@ -61,10 +61,6 @@ gRPC is still not supported by this implementation.
     with tracer.start_as_current_span('foo'):
         print('Hello world!')
 
-    # shutdown the span processor
-    # TODO: this has to be improved so user doesn't need to call it manually
-    span_processor.shutdown()
-
 The `examples <./examples>`_ folder contains more elaborated examples.
 
 References

ext/opentelemetry-ext-jaeger/examples/jaeger_exporter_example.py

@@ -46,7 +46,3 @@
         time.sleep(0.2)
 
     time.sleep(0.1)
-
-# shutdown the span processor
-# TODO: this has to be improved so user doesn't need to call it manually
-span_processor.shutdown()

ext/opentelemetry-ext-opentracing-shim/tests/test_shim.py

@@ -132,8 +132,8 @@ def test_explicit_start_time(self):
         now = time.time()
         with self.shim.start_active_span("TestSpan", start_time=now) as scope:
             result = util.time_seconds_from_ns(scope.span.unwrap().start_time)
-            # Tolerate inaccuracies of less than a microsecond.
-            # TODO: Put a link to an explanation in the docs.
+            # Tolerate inaccuracies of less than a microsecond. See Note:
+            # https://open-telemetry.github.io/opentelemetry-python/opentelemetry.ext.opentracing_shim.html
             # TODO: This seems to work consistently, but we should find out the
             # biggest possible loss of precision.
             self.assertAlmostEqual(result, now, places=6)
@@ -146,8 +146,8 @@ def test_explicit_end_time(self):
         span.finish(now)
 
         end_time = util.time_seconds_from_ns(span.unwrap().end_time)
-        # Tolerate inaccuracies of less than a microsecond.
-        # TODO: Put a link to an explanation in the docs.
+        # Tolerate inaccuracies of less than a microsecond. See Note:
+        # https://open-telemetry.github.io/opentelemetry-python/opentelemetry.ext.opentracing_shim.html
         # TODO: This seems to work consistently, but we should find out the
         # biggest possible loss of precision.
         self.assertAlmostEqual(end_time, now, places=6)
@@ -412,8 +412,8 @@ def test_log_kv(self):
                 span.unwrap().events[1].timestamp
             )
             self.assertEqual(span.unwrap().events[1].attributes["foo"], "bar")
-            # Tolerate inaccuracies of less than a microsecond.
-            # TODO: Put a link to an explanation in the docs.
+            # Tolerate inaccuracies of less than a microsecond. See Note:
+            # https://open-telemetry.github.io/opentelemetry-python/opentelemetry.ext.opentracing_shim.html
             # TODO: This seems to work consistently, but we should find out the
             # biggest possible loss of precision.
             self.assertAlmostEqual(result, now, places=6)