Merge branch 'main' into issue_321

Author: alrex

Diff for: .github/workflows/close-stale-issues.yml

@@ -0,0 +1,18 @@
+name: "Close stale issues"
+on:
+  schedule:
+    - cron: "12 3 * * *" # arbitrary time not to DDOS GitHub
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/stale@v3
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        stale-issue-message: 'This issue was marked stale due to lack of activity. It will be closed in 30 days.'
+        close-issue-message: 'Closed as inactive. Feel free to reopen if this issue needs resolving.'
+        exempt-issue-labels: 'feature-request'
+        stale-issue-label: 'backlog'
+        days-before-stale: 30
+        days-before-close: 60

Diff for: .github/workflows/test.yml

@@ -6,13 +6,12 @@ on:
     - 'release/*'
   pull_request:
 env:
-  CORE_REPO_SHA: d3694fc520f8542b232fd1065133286f4591dcec
+  CORE_REPO_SHA: 94bf80f3870bceefa72d9a61353eaf5d7dd30993
 
 jobs:
   build:
     env:
       # We use these variables to convert between tox and GHA version literals
-      py35: 3.5
       py36: 3.6
       py37: 3.7
       py38: 3.8
@@ -22,18 +21,9 @@ jobs:
     strategy:
       fail-fast: false  # ensures the entire test matrix is run, even if one permutation fails
       matrix:
-        python-version: [ py35, py36, py37, py38, pypy3 ]
+        python-version: [ py36, py37, py38, pypy3 ]
         package: ["instrumentation", "exporter", "sdkextension", "propagator"]
         os: [ ubuntu-latest ]
-        include:
-          # py35-instrumentation segfaults on 18.04 so we instead run on 20.04
-          - python-version: py35
-            package: instrumentation
-            os: ubuntu-20.04
-        exclude:
-          - os: ubuntu-latest
-            python-version: py35
-            package: instrumentation
     steps:
       - name: Checkout Contrib Repo @ SHA - ${{ github.sha }}
         uses: actions/checkout@v2

Diff for: CHANGELOG.md

@@ -4,9 +4,23 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased](https://github.com/open-telemetry/opentelemetry-python-contrib/compare/v0.18b0...HEAD)
-- Updated instrumentations to use `opentelemetry.trace.use_span` instead of `Tracer.use_span()`
-  ([#364](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/364))
+## [Unreleased](https://github.com/open-telemetry/opentelemetry-python-contrib/compare/v0.19b0...HEAD)
+
+### Changed
+- Restrict DataDog exporter's `ddtrace` dependency to known working versions.
+  ([#400](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/400))
+- GRPC instrumentation now correctly injects trace context into outgoing requests.
+  ([#392](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/39))
+- Publish `opentelemetry-propagator-ot-trace` package as a part of the release process
+  ([#387](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/387))
+- Update redis instrumentation to follow semantic conventions
+  ([#403](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/403))
+
+### Added
+- `opentelemetry-instrumentation-urllib3` Add urllib3 instrumentation
+  ([#299](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/299))
+
+## [0.19b0](https://github.com/open-telemetry/opentelemetry-python-contrib/releases/tag/v0.19b0) - 2021-03-26
 
 - Implement context methods for `_InterceptorChannel`
   ([#363](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/363))
@@ -16,6 +30,23 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#350](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/350))
 - `opentelemetry-exporter-datadog` Fix warning when DatadogFormat encounters a request with
   no DD_ORIGIN headers ([#368](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/368)).
+- `opentelemetry-instrumentation-aiopg` Fix multiple nested spans when
+  `aiopg.pool` is used
+  ([#336](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/381)).
+- Updated instrumentations to use `opentelemetry.trace.use_span` instead of `Tracer.use_span()`
+  ([#364](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/364))
+- `opentelemetry-propagator-ot-trace` Do not throw an exception when headers are not present
+  ([#378](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/378))
+- `opentelemetry-instrumentation-wsgi` Reimplement `keys` method to return actual keys from the carrier instead of an empty list.
+  ([#379](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/379))
+- `opentelemetry-instrumentation-sqlalchemy` Fix multithreading issues in recording spans from SQLAlchemy
+  ([#315](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/315))
+- Make getters and setters optional
+  ([#372](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/372))
+
+### Removed
+- Removing support for Python 3.5
+  ([#374](https://github.com/open-telemetry/opentelemetry-python/pull/374))
 
 ## [0.18b0](https://github.com/open-telemetry/opentelemetry-python-contrib/releases/tag/v0.18b0) - 2021-02-16
 
@@ -77,6 +108,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#273](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/273))
 
 ### Changed
+- Fix broken links to project ([#413](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/413))
 - `opentelemetry-instrumentation-asgi`, `opentelemetry-instrumentation-wsgi` Return `None` for `CarrierGetter` if key not found
   ([#233](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/233))
 - `opentelemetry-instrumentation-grpc` Comply with updated spec, rework tests
@@ -142,7 +174,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `opentelemetry-instrumentation-botocore` Make botocore instrumentation check if instrumentation has been suppressed
   ([#182](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/182))
 - `opentelemetry-instrumentation-botocore` Botocore SpanKind as CLIENT and modify existing traced attributes
-  ([#150])(https://github.com/open-telemetry/opentelemetry-python-contrib/pull/150)
+  ([#150](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/150))
 - `opentelemetry-instrumentation-dbapi` Update dbapi and its dependant instrumentations to follow semantic conventions
   ([#195](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/195))
 - `opentelemetry-instrumentation-dbapi` Stop capturing query parameters by default

Diff for: README.md

@@ -82,7 +82,6 @@ Approvers ([@open-telemetry/python-approvers](https://github.com/orgs/open-telem
 - [Diego Hurtado](https://github.com/ocelotl)
 - [Hector Hernandez](https://github.com/hectorhdzg), Microsoft
 - [Owais Lone](https://github.com/owais), Splunk
-- [Yusuke Tsutsumi](https://github.com/toumorokoshi), Google
 
 *Find more about the approver role in [community repository](https://github.com/open-telemetry/community/blob/main/community-membership.md#approver).*
 

Diff for: _template/setup.cfg

@@ -34,19 +34,18 @@ classifiers =
     License :: OSI Approved :: Apache Software License
     Programming Language :: Python
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.5
     Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
 
 [options]
-python_requires = >=3.5
+python_requires = >=3.6
 package_dir=
     =src
 packages=find_namespace:
 
 install_requires =
-    opentelemetry-api == 1.0.0.dev0
+    opentelemetry-api == 1.0.1.dev0
 
 [options.extras_require]
 test =

Diff for: _template/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.19.dev0"
+__version__ = "0.20.dev0"

Diff for: docs/instrumentation/urllib3/urllib3.rst

@@ -0,0 +1,7 @@
+OpenTelemetry urllib3 Instrumentation
+============================================
+
+.. automodule:: opentelemetry.instrumentation.urllib3
+    :members:
+    :undoc-members:
+    :show-inheritance:

Diff for: docs/nitpick-exceptions.ini

@@ -1,16 +1,22 @@
 [default]
 class_references=
     ; TODO: Understand why sphinx is not able to find this local class
+    opentelemetry.propagators.textmap.CarrierT
+    opentelemetry.propagators.textmap.Setter
+    opentelemetry.propagators.textmap.Getter
     opentelemetry.propagators.textmap.TextMapPropagator
     ; - AwsXRayFormat
-    opentelemetry.propagators.textmap.DictGetter
+    opentelemetry.propagators.textmap.DefaultGetter
     ; API
     opentelemetry.propagators.textmap.Getter
     ; - DatadogFormat
     ; - AWSXRayFormat
     opentelemetry.sdk.trace.id_generator.IdGenerator
     ; - AwsXRayIdGenerator
-    TextMapPropagatorT
+    TextMapPropagator
+    CarrierT
+    Setter
+    Getter
     ; - AwsXRayFormat.extract
 
 anys=
@@ -29,3 +35,4 @@ anys=
     ; Instrumentation
     BaseInstrumentor
     ; - instrumentation.*
+    Setter

Diff for: exporter/opentelemetry-exporter-datadog/setup.cfg

@@ -28,20 +28,19 @@ classifiers =
     License :: OSI Approved :: Apache Software License
     Programming Language :: Python
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.5
     Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
 
 [options]
-python_requires = >=3.5
+python_requires = >=3.6
 package_dir=
     =src
 packages=find_namespace:
 install_requires =
-    ddtrace>=0.34.0
-    opentelemetry-api == 1.0.0.dev0
-    opentelemetry-sdk == 1.0.0.dev0
+    ddtrace>=0.34.0,<0.47.0
+    opentelemetry-api == 1.0.1.dev0
+    opentelemetry-sdk == 1.0.1.dev0
 
 [options.packages.find]
 where = src

Diff for: exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/propagator.py

@@ -18,10 +18,12 @@
 from opentelemetry.context import Context
 from opentelemetry.exporter.datadog import constants
 from opentelemetry.propagators.textmap import (
+    CarrierT,
     Getter,
     Setter,
     TextMapPropagator,
-    TextMapPropagatorT,
+    default_getter,
+    default_setter,
 )
 from opentelemetry.trace import get_current_span, set_span_in_context
 
@@ -36,9 +38,9 @@ class DatadogFormat(TextMapPropagator):
 
     def extract(
         self,
-        getter: Getter[TextMapPropagatorT],
-        carrier: TextMapPropagatorT,
+        carrier: CarrierT,
         context: typing.Optional[Context] = None,
+        getter: Getter = default_getter,
     ) -> Context:
         trace_id = extract_first_element(
             getter.get(carrier, self.TRACE_ID_KEY)
@@ -81,28 +83,28 @@ def extract(
 
     def inject(
         self,
-        set_in_carrier: Setter[TextMapPropagatorT],
-        carrier: TextMapPropagatorT,
+        carrier: CarrierT,
         context: typing.Optional[Context] = None,
+        setter: Setter = default_setter,
     ) -> None:
         span = get_current_span(context)
         span_context = span.get_span_context()
         if span_context == trace.INVALID_SPAN_CONTEXT:
             return
         sampled = (trace.TraceFlags.SAMPLED & span.context.trace_flags) != 0
-        set_in_carrier(
+        setter.set(
             carrier, self.TRACE_ID_KEY, format_trace_id(span.context.trace_id),
         )
-        set_in_carrier(
+        setter.set(
             carrier, self.PARENT_ID_KEY, format_span_id(span.context.span_id)
         )
-        set_in_carrier(
+        setter.set(
             carrier,
             self.SAMPLING_PRIORITY_KEY,
             str(constants.AUTO_KEEP if sampled else constants.AUTO_REJECT),
         )
         if constants.DD_ORIGIN in span.context.trace_state:
-            set_in_carrier(
+            setter.set(
                 carrier,
                 self.ORIGIN_KEY,
                 span.context.trace_state[constants.DD_ORIGIN],
@@ -134,8 +136,8 @@ def format_span_id(span_id: int) -> str:
 
 
 def extract_first_element(
-    items: typing.Iterable[TextMapPropagatorT],
-) -> typing.Optional[TextMapPropagatorT]:
+    items: typing.Iterable[CarrierT],
+) -> typing.Optional[CarrierT]:
     if items is None:
         return None
     return next(iter(items), None)

Diff for: exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.19.dev0"
+__version__ = "0.20.dev0"

Diff for: exporter/opentelemetry-exporter-datadog/tests/test_datadog_format.py

@@ -17,15 +17,12 @@
 
 from opentelemetry import trace as trace_api
 from opentelemetry.exporter.datadog import constants, propagator
-from opentelemetry.propagators.textmap import DictGetter
 from opentelemetry.sdk import trace
 from opentelemetry.sdk.trace.id_generator import RandomIdGenerator
 from opentelemetry.trace import get_current_span, set_span_in_context
 
 FORMAT = propagator.DatadogFormat()
 
-carrier_getter = DictGetter()
-
 
 class TestDatadogFormat(unittest.TestCase):
     @classmethod
@@ -45,7 +42,6 @@ def test_malformed_headers(self):
         malformed_parent_id_key = FORMAT.PARENT_ID_KEY + "-x"
         context = get_current_span(
             FORMAT.extract(
-                carrier_getter,
                 {
                     malformed_trace_id_key: self.serialized_trace_id,
                     malformed_parent_id_key: self.serialized_parent_id,
@@ -63,7 +59,7 @@ def test_missing_trace_id(self):
             FORMAT.PARENT_ID_KEY: self.serialized_parent_id,
         }
 
-        ctx = FORMAT.extract(carrier_getter, carrier)
+        ctx = FORMAT.extract(carrier)
         span_context = get_current_span(ctx).get_span_context()
         self.assertEqual(span_context.trace_id, trace_api.INVALID_TRACE_ID)
 
@@ -73,15 +69,14 @@ def test_missing_parent_id(self):
             FORMAT.TRACE_ID_KEY: self.serialized_trace_id,
         }
 
-        ctx = FORMAT.extract(carrier_getter, carrier)
+        ctx = FORMAT.extract(carrier)
         span_context = get_current_span(ctx).get_span_context()
         self.assertEqual(span_context.span_id, trace_api.INVALID_SPAN_ID)
 
     def test_context_propagation(self):
         """Test the propagation of Datadog headers."""
         parent_span_context = get_current_span(
             FORMAT.extract(
-                carrier_getter,
                 {
                     FORMAT.TRACE_ID_KEY: self.serialized_trace_id,
                     FORMAT.PARENT_ID_KEY: self.serialized_parent_id,
@@ -118,7 +113,7 @@ def test_context_propagation(self):
 
         child_carrier = {}
         child_context = set_span_in_context(child)
-        FORMAT.inject(dict.__setitem__, child_carrier, context=child_context)
+        FORMAT.inject(child_carrier, context=child_context)
 
         self.assertEqual(
             child_carrier[FORMAT.TRACE_ID_KEY], self.serialized_trace_id
@@ -138,7 +133,6 @@ def test_sampling_priority_auto_reject(self):
         """Test sampling priority rejected."""
         parent_span_context = get_current_span(
             FORMAT.extract(
-                carrier_getter,
                 {
                     FORMAT.TRACE_ID_KEY: self.serialized_trace_id,
                     FORMAT.PARENT_ID_KEY: self.serialized_parent_id,
@@ -165,7 +159,7 @@ def test_sampling_priority_auto_reject(self):
 
         child_carrier = {}
         child_context = set_span_in_context(child)
-        FORMAT.inject(dict.__setitem__, child_carrier, context=child_context)
+        FORMAT.inject(child_carrier, context=child_context)
 
         self.assertEqual(
             child_carrier[FORMAT.SAMPLING_PRIORITY_KEY],
@@ -178,7 +172,7 @@ def test_fields(self, mock_get_current_span):
 
         tracer = trace.TracerProvider().get_tracer("sdk_tracer_provider")
 
-        mock_set_in_carrier = Mock()
+        mock_setter = Mock()
 
         mock_get_current_span.configure_mock(
             **{
@@ -195,11 +189,11 @@ def test_fields(self, mock_get_current_span):
 
         with tracer.start_as_current_span("parent"):
             with tracer.start_as_current_span("child"):
-                FORMAT.inject(mock_set_in_carrier, {})
+                FORMAT.inject({}, setter=mock_setter)
 
         inject_fields = set()
 
-        for call in mock_set_in_carrier.mock_calls:
+        for call in mock_setter.mock_calls:
             inject_fields.add(call[1][1])
 
         self.assertEqual(FORMAT.fields, inject_fields)