Merge branch 'main' into django-asgi

Author: owais

.github/workflows/publish.yml

@@ -2,7 +2,7 @@ name: Publish
 
 on:
   release:
-    types: [created]
+    types: [published]
 
 jobs:
   publish:

.github/workflows/test.yml

@@ -6,7 +6,7 @@ on:
     - 'release/*'
   pull_request:
 env:
-  CORE_REPO_SHA: c4cdffd0c8bd47b2e5c4f4a823722ca514f10db3
+  CORE_REPO_SHA: 1c8449dee58b702b2505e2aefeb3c4106d1e33cf
 
 jobs:
   build:

CHANGELOG.md

@@ -5,11 +5,24 @@ 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/compare/v1.3.0-0.22b0...HEAD)
-- `opentelemetry-sdk-extension-aws` Update AWS entry points to match spec
-  ([#566](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/566))
-- Include Flask 2.0 as compatible with existing flask instrumentation
-  ([#545](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/545))
+## [Unreleased](https://github.com/open-telemetry/opentelemetry-python/compare/v1.4.0-0.23b0...HEAD)
+
+### Added
+- `opentelemetry-sdk-extension-aws` Add AWS resource detectors to extension package
+  ([#586](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/586))
+- `opentelemetry-instrumentation-asgi`, `opentelemetry-instrumentation-aiohttp-client`, `openetelemetry-instrumentation-fastapi`,        
+  `opentelemetry-instrumentation-starlette`, `opentelemetry-instrumentation-urllib`, `opentelemetry-instrumentation-urllib3` Added `request_hook` and `response_hook` callbacks 
+  ([#576](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/576))
+
+### Changed
+- Enable explicit `excluded_urls` argument in `opentelemetry-instrumentation-flask`
+  ([#604](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/604))
+
+## [1.4.0-0.23b0](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v1.4.0-0.23b0) - 2021-07-21
+
+### Removed
+- Move `opentelemetry-instrumentation` to the core repo.
+  ([#595](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/595))
 
 ### Changed
 - `opentelemetry-instrumentation-tornado` properly instrument work done in tornado on_finish method.
@@ -23,10 +36,38 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#538](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/538))
 - Changed the psycopg2-binary to psycopg2 as dependency in production
   ([#543](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/543))
+- Implement consistent way of checking if instrumentation is already active
+  ([#549](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/549))
 - Require aiopg to be less than 1.3.0
   ([#560](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/560))
 - `opentelemetry-instrumentation-django` Migrated Django middleware to new-style.
   ([#533](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/533))
+- Updating dependency for opentelemetry api/sdk packages to support major version instead
+  of pinning to specific versions.
+  ([#567](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/567))
+- `opentelemetry-instrumentation-grpc` Respect the suppress instrumentation in gRPC client instrumentor
+  ([#559](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/559))
+- `opentelemetry-instrumentation-grpc` Fixed asynchonous unary call traces
+  ([#536](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/536))
+- `opentelemetry-sdk-extension-aws` Update AWS entry points to match spec
+  ([#566](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/566))
+- Include Flask 2.0 as compatible with existing flask instrumentation
+  ([#545](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/545))
+- `openelemetry-sdk-extension-aws` Take a dependency on `opentelemetry-sdk`
+  ([#558](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/558))
+- Change `opentelemetry-instrumentation-httpx` to replace `client` classes with instrumented versions.
+  ([#577](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/577))
+- `opentelemetry-instrumentation-requests` Fix potential `AttributeError` when `requests`
+  is used with a custom transport adapter.
+  ([#562](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/562))
+- `opentelemetry-instrumentation-django` Fix AttributeError: ResolverMatch object has no attribute route
+  ([#581](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/581))
+- `opentelemetry-instrumentation-botocore` Suppress botocore downstream instrumentation like urllib3
+  ([#563](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/563))
+- `opentelemetry-exporter-datadog` Datadog exporter should not use `unknown_service` as fallback resource service name.
+  ([#570](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/570))
+- Add support for the async extension of SQLAlchemy (>= 1.4)
+  ([#568](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/568))
 
 ### Added
 - `opentelemetry-instrumentation-httpx` Add `httpx` instrumentation

README.md

@@ -72,22 +72,24 @@ See [CONTRIBUTING.md](CONTRIBUTING.md)
 
 We meet weekly on Thursday, and the time of the meeting alternates between 9AM PT and 4PM PT. The meeting is subject to change depending on contributors' availability. Check the [OpenTelemetry community calendar](https://calendar.google.com/calendar/embed?src=google.com_b79e3e90j7bbsa2n2p5an5lf60%40group.calendar.google.com) for specific dates.
 
-Meetings take place via [Zoom video conference](https://zoom.us/j/6729396170). The passcode is _77777_.
+Meetings take place via [Zoom video conference](https://zoom.us/j/8287234601?pwd=YjN2MURycXc4cEZlYTRtYjJaM0grZz09). The passcode is _77777_.
 
 Meeting notes are available as a public [Google doc](https://docs.google.com/document/d/1CIMGoIOZ-c3-igzbd6_Pnxx1SjAkjwqoYSUWxPY8XIs/edit). For edit access, get in touch on [GitHub Discussions](https://github.com/open-telemetry/opentelemetry-python/discussions).
 
 Approvers ([@open-telemetry/python-approvers](https://github.com/orgs/open-telemetry/teams/python-approvers)):
 
 - [Aaron Abbott](https://github.com/aabmass), Google
-- [Diego Hurtado](https://github.com/ocelotl), Lightstep
-- [Owais Lone](https://github.com/owais), Splunk
+- [Alex Boten](https://github.com/codeboten), Lightstep
+- [Nathaniel Ruiz Nowell](https://github.com/NathanielRN), AWS
+- [Srikanth Chekuri](https://github.com/lonewolf3739)
 
 *Find more about the approver role in [community repository](https://github.com/open-telemetry/community/blob/main/community-membership.md#approver).*
 
 Maintainers ([@open-telemetry/python-maintainers](https://github.com/orgs/open-telemetry/teams/python-maintainers)):
 
-- [Alex Boten](https://github.com/codeboten), Lightstep
+- [Diego Hurtado](https://github.com/ocelotl), Lightstep
 - [Leighton Chen](https://github.com/lzchen), Microsoft
+- [Owais Lone](https://github.com/owais), Splunk
 
 *Find more about the maintainer role in [community repository](https://github.com/open-telemetry/community/blob/main/community-membership.md#maintainer).*
 

_template/setup.cfg

@@ -45,7 +45,7 @@ package_dir=
 packages=find_namespace:
 
 install_requires =
-    opentelemetry-api == 1.4.0.dev0
+    opentelemetry-api ~= 1.3
 
 [options.extras_require]
 test =

_template/version.py

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

docs-requirements.txt

@@ -6,7 +6,7 @@ sphinx-autodoc-typehints
 # doesn't work for pkg_resources.
 -e "git+https://github.com/open-telemetry/opentelemetry-python.git#egg=opentelemetry-api&subdirectory=opentelemetry-api"
 -e "git+https://github.com/open-telemetry/opentelemetry-python.git#egg=opentelemetry-semantic-conventions&subdirectory=opentelemetry-semantic-conventions"
--e "git+https://github.com/open-telemetry/opentelemetry-python-contrib.git#egg=opentelemetry-instrumentation&subdirectory=opentelemetry-instrumentation"
+-e "git+https://github.com/open-telemetry/opentelemetry-python.git#egg=opentelemetry-instrumentation&subdirectory=opentelemetry-instrumentation"
 -e "git+https://github.com/open-telemetry/opentelemetry-python.git#egg=opentelemetry-sdk&subdirectory=opentelemetry-sdk"
 -e "git+https://github.com/open-telemetry/opentelemetry-python-contrib.git#egg=opentelemetry-util-http&subdirectory=util/opentelemetry-util-http"
 

docs/conf.py

@@ -25,7 +25,9 @@
 settings.configure()
 
 source_dirs = [
-    os.path.abspath("../opentelemetry-instrumentation/src/"),
+    os.path.abspath(
+        "../opentelemetry-python-core/opentelemetry-instrumentation/src/"
+    ),
 ]
 
 exp = "../exporter"

eachdist.ini

@@ -17,7 +17,7 @@ sortfirst=
     ext/*
 
 [stable]
-version=1.4.0.dev0
+version=1.4.0
 
 packages=
     opentelemetry-sdk
@@ -35,7 +35,7 @@ packages=
     opentelemetry-api
 
 [prerelease]
-version=0.23.dev0
+version=0.24.dev0
 
 packages=
     all

exporter/opentelemetry-exporter-datadog/setup.cfg

@@ -39,9 +39,9 @@ package_dir=
 packages=find_namespace:
 install_requires =
     ddtrace>=0.34.0,<0.47.0
-    opentelemetry-api == 1.4.0.dev0
-    opentelemetry-sdk == 1.4.0.dev0
-    opentelemetry-semantic-conventions == 0.23.dev0
+    opentelemetry-api ~= 1.3
+    opentelemetry-sdk ~= 1.3
+    opentelemetry-semantic-conventions == 0.24.dev0
 
 [options.packages.find]
 where = src

exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/exporter.py

@@ -135,12 +135,12 @@ def _translate_to_datadog(self, spans):
             [
                 resource_tags,
                 resource_service_name,
-            ] = _extract_tags_from_resource(span.resource)
+            ] = _extract_tags_from_resource(span.resource, self.service)
 
             datadog_span = DatadogSpan(
                 tracer,
                 _get_span_name(span),
-                service=resource_service_name or self.service,
+                service=resource_service_name,
                 resource=_get_resource(span),
                 span_type=_get_span_type(span),
                 trace_id=trace_id,
@@ -312,19 +312,23 @@ def _parse_tags_str(tags_str):
     return parsed_tags
 
 
-def _extract_tags_from_resource(resource):
+def _extract_tags_from_resource(resource, fallback_service_name):
     """Parse tags from resource.attributes, except service.name which
     has special significance within datadog"""
     tags = {}
-    service_name = None
     if not (resource and getattr(resource, "attributes", None)):
-        return [tags, service_name]
+        return [tags, fallback_service_name]
 
+    service_name = None
     for attribute_key, attribute_value in resource.attributes.items():
         if attribute_key == SERVICE_NAME_TAG:
             service_name = attribute_value
         else:
             tags[attribute_key] = attribute_value
+
+    if service_name is None or service_name == "unknown_service":
+        service_name = fallback_service_name
+
     return [tags, service_name]
 
 

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.23.dev0"
+__version__ = "0.24.dev0"

exporter/opentelemetry-exporter-datadog/tests/test_datadog_exporter.py

@@ -612,3 +612,41 @@ def test_sampling_rate(self):
         ]
         expected = [0.5]
         self.assertListEqual(actual, expected)
+
+    def test_service_name_fallback(self):
+        context = trace_api.SpanContext(
+            trace_id=0x000000000000000000000000DEADBEEF,
+            span_id=0x34BF92DEEFC58C92,
+            is_remote=False,
+            trace_flags=trace_api.TraceFlags(trace_api.TraceFlags.SAMPLED),
+        )
+        trace_api.get_tracer_provider().sampler = sampling.TraceIdRatioBased(
+            0.5
+        )
+
+        resource_with_default_name = Resource(
+            attributes={
+                "key_resource": "some_resource",
+                "service.name": "unknown_service",
+            }
+        )
+
+        span = trace._Span(
+            name="sampled",
+            context=context,
+            parent=None,
+            resource=resource_with_default_name,
+        )
+        span.start()
+        span.end()
+
+        # pylint: disable=protected-access
+        exporter = datadog.DatadogSpanExporter(service="fallback_service_name")
+        datadog_spans = [
+            span.to_dict() for span in exporter._translate_to_datadog([span])
+        ]
+
+        self.assertEqual(len(datadog_spans), 1)
+
+        span = datadog_spans[0]
+        self.assertEqual(span["service"], "fallback_service_name")

instrumentation/opentelemetry-instrumentation-aiohttp-client/setup.cfg

@@ -38,10 +38,10 @@ package_dir=
     =src
 packages=find_namespace:
 install_requires =
-    opentelemetry-api == 1.4.0.dev0
-    opentelemetry-semantic-conventions == 0.23.dev0
-    opentelemetry-instrumentation == 0.23.dev0
-    opentelemetry-util-http == 0.23.dev0
+    opentelemetry-api ~= 1.3
+    opentelemetry-semantic-conventions == 0.24.dev0
+    opentelemetry-instrumentation == 0.24.dev0
+    opentelemetry-util-http == 0.24.dev0
     wrapt >= 1.0.0, < 2.0.0
 
 [options.packages.find]