Merge branch 'main' into aiohttp-server-instrumentation

Author: decko

.github/CODEOWNERS

@@ -1,26 +1,12 @@
-# Code owners file.
-# This file controls who is tagged for review for any given pull request.
-#
-# What is a "CODEOWNER"?
-#
-# A CODEOWNER lends their expertise to a specific package hosted by an OpenTelemetry repository.
-#
-# A CODEOWNER MUST:
-# - introduce themselves on the CNCF OTel Python channel: https://cloud-native.slack.com/archives/C01PD4HUVBL
-# - have enough knowledge of the corresponding instrumented library
-# - respond to issues
-# - fix failing unit tests or any other blockers to the CI/CD workflow
-# - update usage of `opentelemetry-python-core` APIs upon the introduction of breaking changes
-# - be a member of the OpenTelemetry community so that the `component-owners.yml` action to automatically assign CODEOWNERS to PRs works correctly.
-#
+# This file is only used as a way to assign any change to the approvers team
+# except for a change in any of the instrumentations. The actual codeowners
+# of the instrumentations are in .github/component_owners.yml.
 
-
-# For anything not explicitly taken by someone else:
+# Assigns any change to the approvers team...
 * @open-telemetry/opentelemetry-python-contrib-approvers
 
+# ...except for changes in any instrumentation.
+/instrumentation
+
 # Learn about CODEOWNERS file format:
 # https://help.github.com/en/articles/about-code-owners
-#
-# Learn about membership in OpenTelemetry community:
-# https://github.com/open-telemetry/community/blob/main/community-membership.md
-#

.github/component_owners.yml

@@ -43,9 +43,23 @@ components:
 
   instrumentation/opentelemetry-instrumentation-urllib:
     - shalevr
+    - ocelotl
 
   instrumentation/opentelemetry-instrumentation-urllib3:
     - shalevr
+    - ocelotl
 
   instrumentation/opentelemetry-instrumentation-sqlalchemy:
     - shalevr
+
+  instrumentation/opentelemetry-instrumentation-flask:
+    - ocelotl
+
+  instrumentation/opentelemetry-instrumentation-jinja2:
+    - ocelotl
+
+  instrumentation/opentelemetry-instrumentation-logging:
+    - ocelotl
+
+  instrumentation/opentelemetry-instrumentation-requests:
+    - ocelotl

.github/workflows/test.yml

@@ -6,7 +6,7 @@ on:
     - 'release/*'
   pull_request:
 env:
-  CORE_REPO_SHA: 2387b4465d930b020df79692a8097e1d54b66ec1
+  CORE_REPO_SHA: e9530c5c548d08a6aaa56268d103f9beb00cd002
 
 jobs:
   build:
@@ -24,7 +24,7 @@ jobs:
       fail-fast: false  # ensures the entire test matrix is run, even if one permutation fails
       matrix:
         python-version: [ py37, py38, py39, py310, py311, pypy3 ]
-        package: ["instrumentation", "distro", "exporter", "sdkextension", "propagator"]
+        package: ["instrumentation", "distro", "exporter", "sdkextension", "propagator", "resource"]
         os: [ ubuntu-20.04 ]
     steps:
       - name: Checkout Contrib Repo @ SHA - ${{ github.sha }}

CHANGELOG.md

@@ -7,36 +7,72 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+### Fixed
+
+- Update falcon instrumentation to follow semantic conventions
+  ([#1824](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1824))
+
+### Added
+
+- Make Flask request span attributes available for `start_span`. 
+  ([#1784](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1784))
+- Fix falcon instrumentation's usage of Span Status to only set the description if the status code is ERROR.
+  ([#1840](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1840))
+- Instrument all httpx versions >= 0.18. ([#1748](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1748))
+- Fix `Invalid type NoneType for attribute X  (opentelemetry-instrumentation-aws-lambda)` error when some attributes do not exist
+  ([#1780](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1780))
+- Add metric instrumentation for celery
+  ([#1679](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1679))
+- `opentelemetry-instrumentation-asgi` Add `http.server.response.size` metric
+  ([#1789](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1789))
+
+## Version 1.18.0/0.39b0 (2023-05-10)
+
 - `opentelemetry-instrumentation-system-metrics` Add `process.` prefix to `runtime.memory`, `runtime.cpu.time`, and `runtime.gc_count`. Change `runtime.memory` from count to UpDownCounter. ([#1735](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1735))
 - Add request and response hooks for GRPC instrumentation (client only)
   ([#1706](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1706))
 - `opentelemetry-instrumentation-pymemcache` Update instrumentation to support pymemcache >4
   ([#1764](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1764))
+- `opentelemetry-instrumentation-confluent-kafka` Add support for higher versions of confluent_kafka
+  ([#1815](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1815))
 
 ### Added
 
 - Expand sqlalchemy pool.name to follow the semantic conventions
   ([#1778](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1778))
 - Add `excluded_urls` functionality to `urllib` and `urllib3` instrumentations
   ([#1733](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1733))
-- Make Django request span attributes available for `start_span`. 
+- Make Django request span attributes available for `start_span`.
   ([#1730](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1730))
-- Make ASGI request span attributes available for `start_span`. 
+- Make ASGI request span attributes available for `start_span`.
   ([#1762](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1762))
 - `opentelemetry-instrumentation-celery` Add support for anonymous tasks.
   ([#1407](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1407))
 - `opentelemetry-instrumentation-logging` Add `otelTraceSampled` to instrumetation-logging
   ([#1773](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1773))
 
+### Changed
+
+- `opentelemetry-instrumentation-botocore` now uses the AWS X-Ray propagator by
+  default
+  ([#1741](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1741))
 
 ### Fixed
 
+- Fix redis db.statements to be sanitized by default
+  ([#1778](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1778))
 - Fix elasticsearch db.statement attribute to be sanitized by default
   ([#1758](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1758))
 - Fix `AttributeError` when AWS Lambda handler receives a list event
   ([#1738](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1738))
 - Fix `None does not implement middleware` error when there are no middlewares registered
   ([#1766](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1766))
+- Fix Flask instrumentation to only close the span if it was created by the same request context.
+  ([#1692](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1692))
+
+### Changed
+- Update HTTP server/client instrumentation span names to comply with spec
+  ([#1759](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1759)
 
 ## Version 1.17.0/0.38b0 (2023-03-22)
 
@@ -125,6 +161,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+- `opentelemetry-resource-detector-container` Add support resource detection of container properties.
+  ([#1584](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1584))
 - `opentelemetry-instrumentation-pymysql` Add tests for commit() and rollback().
   ([#1424](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1424))
 - `opentelemetry-instrumentation-fastapi` Add support for regular expression matching and sanitization of HTTP headers.

CONTRIBUTING.md

@@ -124,6 +124,17 @@ Open a pull request against the main `opentelemetry-python-contrib` repo.
   as `work-in-progress`, or mark it as [`draft`](https://github.blog/2019-02-14-introducing-draft-pull-requests/).
 * Make sure CLA is signed and CI is clear.
 
+### How to Get PRs Reviewed
+
+The maintainers and approvers of this repo are not experts in every instrumentation there is here.
+In fact each one of us knows enough about them to only review a few. Unfortunately it can be hard
+to find enough experts in every instrumentation to quickly review every instrumentation PR. The
+instrumentation experts are listed in `.github/component_owners.yml` with their corresponding files
+or directories that they own. The owners listed there will be notified when PRs that modify their
+files are opened.
+
+If you are not getting reviews, please contact the respective owners directly.
+
 ### How to Get PRs Merged
 
 A PR is considered to be **ready to merge** when:

README.md

@@ -95,12 +95,13 @@ Meeting notes are available as a public [Google doc](https://docs.google.com/doc
 Approvers ([@open-telemetry/python-approvers](https://github.com/orgs/open-telemetry/teams/python-approvers)):
 
 - [Aaron Abbott](https://github.com/aabmass), Google
+- [Jeremy Voss](https://github.com/jeremydvoss), Microsoft
 - [Sanket Mehta](https://github.com/sanketmehta28), Cisco
 - [Shalev Roda](https://github.com/shalevr), Cisco
 
 Emeritus Approvers:
 
-- [Hector Hernandez](https://github.com/hectorhdzg), Microsoft
+- [Héctor Hernández](https://github.com/hectorhdzg), Microsoft
 - [Yusuke Tsutsumi](https://github.com/toumorokoshi), Google
 - [Nathaniel Ruiz Nowell](https://github.com/NathanielRN), AWS
 - [Ashutosh Goel](https://github.com/ashu658), Cisco
@@ -111,12 +112,12 @@ Maintainers ([@open-telemetry/python-maintainers](https://github.com/orgs/open-t
 
 - [Diego Hurtado](https://github.com/ocelotl), Lightstep
 - [Leighton Chen](https://github.com/lzchen), Microsoft
-- [Srikanth Chekuri](https://github.com/srikanthccv), signoz.io
 
 Emeritus Maintainers:
 
 - [Alex Boten](https://github.com/codeboten), Lightstep
 - [Owais Lone](https://github.com/owais), Splunk
+- [Srikanth Chekuri](https://github.com/srikanthccv), signoz.io
 
 *Find more about the maintainer role in [community repository](https://github.com/open-telemetry/community/blob/main/community-membership.md#maintainer).*
 

_template/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.39b0.dev"
+__version__ = "0.40b0.dev"

dev-requirements.txt

@@ -14,7 +14,7 @@ bleach==4.1.0 # transient dependency for readme-renderer
 grpcio-tools==1.29.0
 mypy-protobuf>=1.23
 protobuf~=3.13
-markupsafe==2.0.1
+markupsafe>=2.0.1
 codespell==2.1.0
-requests==2.28.1
+requests==2.31.0
 ruamel.yaml==0.17.21

docs-requirements.txt

@@ -26,7 +26,7 @@ boto~=2.0
 botocore~=1.0
 boto3~=1.0
 celery>=4.0
-confluent-kafka>= 1.8.2,< 2.0.0
+confluent-kafka>= 1.8.2,<= 2.2.0
 elasticsearch>=2.0,<9.0
 flask~=2.0
 falcon~=2.0

docs/conf.py

@@ -54,7 +54,13 @@
     if isdir(join(sdk_ext, f))
 ]
 
-sys.path[:0] = exp_dirs + instr_dirs + sdk_ext_dirs + prop_dirs
+resource = "../resource"
+resource_dirs = [
+    os.path.abspath("/".join(["../resource", f, "src"]))
+    for f in listdir(resource)
+    if isdir(join(resource, f))
+]
+sys.path[:0] = exp_dirs + instr_dirs + sdk_ext_dirs + prop_dirs + resource_dirs
 
 # -- Project information -----------------------------------------------------