Merge branch 'merge_main_3' into metrics_new

Author: ocelotl

.github/pull_request_template.md

@@ -23,7 +23,6 @@ Please describe the tests that you ran to verify your changes. Provide instructi
 
 Answer the following question based on these examples of changes that would require a Contrib Repo Change:
 - [The OTel specification](https://github.com/open-telemetry/opentelemetry-specification) has changed which prompted this PR to update the method interfaces of `opentelemetry-api/` or `opentelemetry-sdk/`
-- The method interfaces of `opentelemetry-instrumentation/` have changed
 - The method interfaces of `test/util` have changed
 - Scripts in `scripts/` that were copied over to the Contrib repo have changed
 - Configuration files that were copied over to the Contrib repo have changed (when consistency between repositories is applicable) such as in

.github/workflows/test.yml

@@ -10,7 +10,7 @@ env:
   # Otherwise, set variable to the commit of your branch on
   # opentelemetry-python-contrib which is compatible with these Core repo
   # changes.
-  CONTRIB_REPO_SHA: 4a4d889b1876323d7f70507b5e4d079f454fe0d6
+  CONTRIB_REPO_SHA: c2e674983a265e54c5eb14e376459a992498aae6
   # This is needed because we do not clone the core repo in contrib builds anymore.
   # When running contrib builds as part of core builds, we use actions/checkout@v2 which
   # does not set an environment variable (simply just runs tox), which is different when
@@ -34,7 +34,7 @@ jobs:
       fail-fast: false  # ensures the entire test matrix is run, even if one permutation fails
       matrix:
         python-version: [ py36, py37, py38, py39, pypy3 ]
-        package: ["api", "sdk", "instrumentation", "semantic", "getting", "distro" , "shim", "exporter", "protobuf", "propagator"]
+        package: ["api", "sdk", "semantic", "getting", "shim", "exporter", "protobuf", "propagator"]
         os: [ ubuntu-20.04, windows-2019 ]
     steps:
       - name: Checkout Core Repo @ SHA - ${{ github.sha }}

CHANGELOG.md

@@ -6,8 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased](https://github.com/open-telemetry/opentelemetry-python/compare/v1.6.0-0.25b0...HEAD)
 
+- Upgrade GRPC/protobuf related dependency and regenerate otlp protobufs
+  ([#2201](https://github.com/open-telemetry/opentelemetry-python/pull/2201))
+- Propagation: only warn about oversized baggage headers when headers exist
+  ([#2212](https://github.com/open-telemetry/opentelemetry-python/pull/2212))
 - Return proxy instruments from ProxyMeter
-  [[#2169](https://github.com/open-telemetry/opentelemetry-python/pull/2169)]
+  ([#2169](https://github.com/open-telemetry/opentelemetry-python/pull/2169))
 - Make Measurement a concrete class
   ([#2153](https://github.com/open-telemetry/opentelemetry-python/pull/2153))
 - Add metrics API

dev-requirements.txt

@@ -6,10 +6,10 @@ httpretty~=1.0
 mypy==0.812
 sphinx~=3.5.4
 sphinx-rtd-theme~=0.5
-sphinx-autodoc-typehints
+sphinx-autodoc-typehints~=1.12.0
 pytest>=6.0
 pytest-cov>=2.8
 readme-renderer~=24.0
-grpcio-tools==1.29.0
-mypy-protobuf>=1.23
-protobuf>=3.13.0
+grpcio-tools~=1.41.0
+mypy-protobuf~=3.0.0
+protobuf~=3.18.1

docs-requirements.txt

@@ -8,9 +8,7 @@ sphinx-jekyll-builder
 # doesn't work for pkg_resources.
 ./opentelemetry-api
 ./opentelemetry-semantic-conventions
-./opentelemetry-instrumentation
 ./opentelemetry-sdk
-./opentelemetry-instrumentation
 
 # Required by instrumentation and exporter packages
 ddtrace>=0.34.0

docs/examples/django/README.rst

@@ -113,7 +113,7 @@ Auto Instrumentation
 --------------------
 
 This same example can be run using auto instrumentation. Comment out the call
-to ``DjangoInstrumento().instrument()`` in ``main``, then Run the django app
+to ``DjangoInstrumentor().instrument()`` in ``main``, then Run the django app
 with ``opentelemetry-instrument python manage.py runserver --noreload``.
 Repeat the steps with the client, the result should be the same.
 

eachdist.ini

@@ -5,7 +5,6 @@
 sortfirst=
     opentelemetry-api
     opentelemetry-sdk
-    opentelemetry-instrumentation
     opentelemetry-proto
     opentelemetry-distro
     tests/util
@@ -39,7 +38,6 @@ packages=
     opentelemetry-distro
     opentelemetry-semantic-conventions
     opentelemetry-test
-    opentelemetry-instrumentation
     tests
 
 [experimental]

opentelemetry-api/src/opentelemetry/baggage/propagation/__init__.py

@@ -53,7 +53,10 @@ def extract(
             getter.get(carrier, self._BAGGAGE_HEADER_NAME)
         )
 
-        if not header or len(header) > self._MAX_HEADER_LENGTH:
+        if not header:
+            return context
+
+        if len(header) > self._MAX_HEADER_LENGTH:
             _logger.warning(
                 "Baggage header `%s` exceeded the maximum number of bytes per baggage-string",
                 header,