Merge branch 'master' into falcon-instrumentation

Author: alrex

docs/api/api.rst

@@ -6,8 +6,8 @@ OpenTelemetry Python API
 .. toctree::
     :maxdepth: 1
 
+    baggage
     configuration
     context
-    correlationcontext
     metrics
     trace

docs/api/baggage.propagation.rst

@@ -0,0 +1,7 @@
+opentelemetry.baggage.propagation package
+====================================================
+
+Module contents
+---------------
+
+.. automodule:: opentelemetry.baggage.propagation

docs/api/baggage.rst

@@ -0,0 +1,14 @@
+opentelemetry.baggage package
+========================================
+
+Subpackages
+-----------
+
+.. toctree::
+
+   baggage.propagation
+
+Module contents
+---------------
+
+.. automodule:: opentelemetry.baggage

docs/api/correlationcontext.propagation.rst

@@ -174,7 +174,7 @@ Now run the above script, hit the root url (http://localhost:5000/) a few times,
    python flask_example.py
 
 
-Configure Your HTTP Propagator (b3, CorrelationContext)
+Configure Your HTTP Propagator (b3, Baggage)
 -------------------------------------------------------
 
 A major feature of distributed tracing is the ability to correlate a trace across

docs/api/correlationcontext.rst

@@ -18,6 +18,8 @@
 from time import sleep
 
 import requests
+from requests.adapters import HTTPAdapter
+from requests.packages.urllib3.util.retry import Retry
 
 
 class TestFlask(unittest.TestCase):
@@ -27,10 +29,13 @@ def test_flask(self):
         server = subprocess.Popen(
             [sys.executable, server_script], stdout=subprocess.PIPE,
         )
-        sleep(1)
+        retry_strategy = Retry(total=10, backoff_factor=1)
+        adapter = HTTPAdapter(max_retries=retry_strategy)
+        http = requests.Session()
+        http.mount("http://", adapter)
 
         try:
-            result = requests.get("http://localhost:5000")
+            result = http.get("http://localhost:5000")
             self.assertEqual(result.status_code, 200)
 
             sleep(0.1)

docs/getting-started.rst

@@ -2,6 +2,9 @@
 
 ## Unreleased
 
+- bugfix: cursors and connections now produce spans when used with context managers
+  ([#1028](https://github.com/open-telemetry/opentelemetry-python/pull/1028))
+
 ## Version 0.12b0
 
 Released 2020-08-14
@@ -19,4 +22,4 @@ Released 2020-05-12
 
 Released 2020-02-21
 
-- Initial release
+- Initial release

docs/getting_started/tests/test_flask.py

@@ -294,6 +294,13 @@ def cursor(self, *args, **kwargs):
                 self.__wrapped__.cursor(*args, **kwargs), db_api_integration
             )
 
+        def __enter__(self):
+            self.__wrapped__.__enter__()
+            return self
+
+        def __exit__(self, *args, **kwargs):
+            self.__wrapped__.__exit__(*args, **kwargs)
+
     return TracedConnectionProxy(connection, *args, **kwargs)
 
 
@@ -366,4 +373,11 @@ def callproc(self, *args, **kwargs):
                 self.__wrapped__.callproc, *args, **kwargs
             )
 
+        def __enter__(self):
+            self.__wrapped__.__enter__()
+            return self
+
+        def __exit__(self, *args, **kwargs):
+            self.__wrapped__.__exit__(*args, **kwargs)
+
     return TracedCursorProxy(cursor, *args, **kwargs)

instrumentation/opentelemetry-instrumentation-dbapi/CHANGELOG.md

@@ -100,8 +100,8 @@
 )
 
 from opentelemetry import propagators
+from opentelemetry.baggage import get_baggage, set_baggage
 from opentelemetry.context import Context, attach, detach, get_value, set_value
-from opentelemetry.correlationcontext import get_correlation, set_correlation
 from opentelemetry.instrumentation.opentracing_shim import util
 from opentelemetry.instrumentation.opentracing_shim.version import __version__
 from opentelemetry.trace import INVALID_SPAN_CONTEXT, DefaultSpan, Link
@@ -290,7 +290,7 @@ def set_baggage_item(self, key: str, value: str):
             value: A tag value.
         """
         # pylint: disable=protected-access
-        self._context._baggage = set_correlation(
+        self._context._baggage = set_baggage(
             key, value, context=self._context._baggage
         )
 
@@ -303,7 +303,7 @@ def get_baggage_item(self, key: str) -> Optional[object]:
             Returns this :class:`SpanShim` instance to allow call chaining.
         """
         # pylint: disable=protected-access
-        return get_correlation(key, context=self._context._baggage)
+        return get_baggage(key, context=self._context._baggage)
 
 
 class ScopeShim(Scope):