Merge branch 'main' into instrumentation-meta-package

CHANGELOG.md

@@ -7,12 +7,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased](https://github.com/open-telemetry/opentelemetry-python/compare/v1.9.1-0.28b1...HEAD)
 
+- `opentelemetry-instrumentation-wsgi` Capture custom request/response headers in span attributes
+  ([#925])(https://github.com/open-telemetry/opentelemetry-python-contrib/pull/925)
+
 ### Added
 
 - `opentelemetry-contrib-instrumentations` added new meta-package that installs all contrib instrumentations.
   ([#681](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/681))
+- `opentelemetry-instrumentation-sqlalchemy` added experimental sql commenter capability
+   ([#924](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/924))
 - `opentelemetry-instrumentation-dbapi` add experimental sql commenter capability
   ([#908](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/908))
+- `opentelemetry-instrumentation-requests` make span attribute available to samplers
+  ([#931](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/931))
 
 ### Fixed
 

dev-requirements.txt

@@ -13,3 +13,4 @@ readme-renderer~=24.0
 grpcio-tools==1.29.0
 mypy-protobuf>=1.23
 protobuf>=3.13.0
+markupsafe==2.0.1

docs-requirements.txt

@@ -39,4 +39,5 @@ ddtrace>=0.34.0
 httpx>=0.18.0
 
 # pin to compatible versions
+markupsafe==2.0.1
 itsdangerous==2.0.1

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

@@ -28,8 +28,8 @@
 config.read("setup.cfg")
 
 # We provide extras_require parameter to setuptools.setup later which
-# overwrites the extra_require section from setup.cfg. To support extra_require
-# secion in setup.cfg, we load it here and merge it with the extra_require param.
+# overwrites the extras_require section from setup.cfg. To support extras_require
+# section in setup.cfg, we load it here and merge it with the extras_require param.
 extras_require = {}
 if "options.extras_require" in config:
     for key, value in config["options.extras_require"].items():

instrumentation/opentelemetry-instrumentation-aiopg/setup.py

@@ -28,8 +28,8 @@
 config.read("setup.cfg")
 
 # We provide extras_require parameter to setuptools.setup later which
-# overwrites the extra_require section from setup.cfg. To support extra_require
-# secion in setup.cfg, we load it here and merge it with the extra_require param.
+# overwrites the extras_require section from setup.cfg. To support extras_require
+# section in setup.cfg, we load it here and merge it with the extras_require param.
 extras_require = {}
 if "options.extras_require" in config:
     for key, value in config["options.extras_require"].items():

instrumentation/opentelemetry-instrumentation-asgi/setup.py

@@ -28,8 +28,8 @@
 config.read("setup.cfg")
 
 # We provide extras_require parameter to setuptools.setup later which
-# overwrites the extra_require section from setup.cfg. To support extra_require
-# secion in setup.cfg, we load it here and merge it with the extra_require param.
+# overwrites the extras_require section from setup.cfg. To support extras_require
+# section in setup.cfg, we load it here and merge it with the extras_require param.
 extras_require = {}
 if "options.extras_require" in config:
     for key, value in config["options.extras_require"].items():

instrumentation/opentelemetry-instrumentation-asyncpg/setup.py

@@ -28,8 +28,8 @@
 config.read("setup.cfg")
 
 # We provide extras_require parameter to setuptools.setup later which
-# overwrites the extra_require section from setup.cfg. To support extra_require
-# secion in setup.cfg, we load it here and merge it with the extra_require param.
+# overwrites the extras_require section from setup.cfg. To support extras_require
+# section in setup.cfg, we load it here and merge it with the extras_require param.
 extras_require = {}
 if "options.extras_require" in config:
     for key, value in config["options.extras_require"].items():

instrumentation/opentelemetry-instrumentation-aws-lambda/setup.py

@@ -28,8 +28,8 @@
 config.read("setup.cfg")
 
 # We provide extras_require parameter to setuptools.setup later which
-# overwrites the extra_require section from setup.cfg. To support extra_require
-# secion in setup.cfg, we load it here and merge it with the extra_require param.
+# overwrites the extras_require section from setup.cfg. To support extras_require
+# section in setup.cfg, we load it here and merge it with the extras_require param.
 extras_require = {}
 if "options.extras_require" in config:
     for key, value in config["options.extras_require"].items():

instrumentation/opentelemetry-instrumentation-boto/setup.py

@@ -28,8 +28,8 @@
 config.read("setup.cfg")
 
 # We provide extras_require parameter to setuptools.setup later which
-# overwrites the extra_require section from setup.cfg. To support extra_require
-# secion in setup.cfg, we load it here and merge it with the extra_require param.
+# overwrites the extras_require section from setup.cfg. To support extras_require
+# section in setup.cfg, we load it here and merge it with the extras_require param.
 extras_require = {}
 if "options.extras_require" in config:
     for key, value in config["options.extras_require"].items():

instrumentation/opentelemetry-instrumentation-botocore/setup.py

@@ -28,8 +28,8 @@
 config.read("setup.cfg")
 
 # We provide extras_require parameter to setuptools.setup later which
-# overwrites the extra_require section from setup.cfg. To support extra_require
-# secion in setup.cfg, we load it here and merge it with the extra_require param.
+# overwrites the extras_require section from setup.cfg. To support extras_require
+# section in setup.cfg, we load it here and merge it with the extras_require param.
 extras_require = {}
 if "options.extras_require" in config:
     for key, value in config["options.extras_require"].items():

instrumentation/opentelemetry-instrumentation-celery/setup.py

@@ -28,8 +28,8 @@
 config.read("setup.cfg")
 
 # We provide extras_require parameter to setuptools.setup later which
-# overwrites the extra_require section from setup.cfg. To support extra_require
-# secion in setup.cfg, we load it here and merge it with the extra_require param.
+# overwrites the extras_require section from setup.cfg. To support extras_require
+# section in setup.cfg, we load it here and merge it with the extras_require param.
 extras_require = {}
 if "options.extras_require" in config:
     for key, value in config["options.extras_require"].items():

instrumentation/opentelemetry-instrumentation-dbapi/setup.py

@@ -28,8 +28,8 @@
 config.read("setup.cfg")
 
 # We provide extras_require parameter to setuptools.setup later which
-# overwrites the extra_require section from setup.cfg. To support extra_require
-# secion in setup.cfg, we load it here and merge it with the extra_require param.
+# overwrites the extras_require section from setup.cfg. To support extras_require
+# section in setup.cfg, we load it here and merge it with the extras_require param.
 extras_require = {}
 if "options.extras_require" in config:
     for key, value in config["options.extras_require"].items():

instrumentation/opentelemetry-instrumentation-django/setup.py

@@ -28,8 +28,8 @@
 config.read("setup.cfg")
 
 # We provide extras_require parameter to setuptools.setup later which
-# overwrites the extra_require section from setup.cfg. To support extra_require
-# secion in setup.cfg, we load it here and merge it with the extra_require param.
+# overwrites the extras_require section from setup.cfg. To support extras_require
+# section in setup.cfg, we load it here and merge it with the extras_require param.
 extras_require = {}
 if "options.extras_require" in config:
     for key, value in config["options.extras_require"].items():

instrumentation/opentelemetry-instrumentation-django/src/opentelemetry/instrumentation/django/middleware.py

@@ -275,7 +275,7 @@ def process_response(self, request, response):
                 add_response_attributes(
                     span,
                     f"{response.status_code} {response.reason_phrase}",
-                    response,
+                    response.items(),
                 )
 
             propagator = get_global_response_propagator()

instrumentation/opentelemetry-instrumentation-elasticsearch/setup.py

@@ -28,8 +28,8 @@
 config.read("setup.cfg")
 
 # We provide extras_require parameter to setuptools.setup later which
-# overwrites the extra_require section from setup.cfg. To support extra_require
-# secion in setup.cfg, we load it here and merge it with the extra_require param.
+# overwrites the extras_require section from setup.cfg. To support extras_require
+# section in setup.cfg, we load it here and merge it with the extras_require param.
 extras_require = {}
 if "options.extras_require" in config:
     for key, value in config["options.extras_require"].items():

instrumentation/opentelemetry-instrumentation-falcon/setup.py

@@ -28,8 +28,8 @@
 config.read("setup.cfg")
 
 # We provide extras_require parameter to setuptools.setup later which
-# overwrites the extra_require section from setup.cfg. To support extra_require
-# secion in setup.cfg, we load it here and merge it with the extra_require param.
+# overwrites the extras_require section from setup.cfg. To support extras_require
+# section in setup.cfg, we load it here and merge it with the extras_require param.
 extras_require = {}
 if "options.extras_require" in config:
     for key, value in config["options.extras_require"].items():

instrumentation/opentelemetry-instrumentation-fastapi/setup.py

@@ -28,8 +28,8 @@
 config.read("setup.cfg")
 
 # We provide extras_require parameter to setuptools.setup later which
-# overwrites the extra_require section from setup.cfg. To support extra_require
-# secion in setup.cfg, we load it here and merge it with the extra_require param.
+# overwrites the extras_require section from setup.cfg. To support extras_require
+# section in setup.cfg, we load it here and merge it with the extras_require param.
 extras_require = {}
 if "options.extras_require" in config:
     for key, value in config["options.extras_require"].items():

instrumentation/opentelemetry-instrumentation-flask/setup.py

@@ -28,8 +28,8 @@
 config.read("setup.cfg")
 
 # We provide extras_require parameter to setuptools.setup later which
-# overwrites the extra_require section from setup.cfg. To support extra_require
-# secion in setup.cfg, we load it here and merge it with the extra_require param.
+# overwrites the extras_require section from setup.cfg. To support extras_require
+# section in setup.cfg, we load it here and merge it with the extras_require param.
 extras_require = {}
 if "options.extras_require" in config:
     for key, value in config["options.extras_require"].items():

instrumentation/opentelemetry-instrumentation-grpc/setup.py

@@ -28,8 +28,8 @@
 config.read("setup.cfg")
 
 # We provide extras_require parameter to setuptools.setup later which
-# overwrites the extra_require section from setup.cfg. To support extra_require
-# secion in setup.cfg, we load it here and merge it with the extra_require param.
+# overwrites the extras_require section from setup.cfg. To support extras_require
+# section in setup.cfg, we load it here and merge it with the extras_require param.
 extras_require = {}
 if "options.extras_require" in config:
     for key, value in config["options.extras_require"].items():

instrumentation/opentelemetry-instrumentation-httpx/setup.py

@@ -28,8 +28,8 @@
 config.read("setup.cfg")
 
 # We provide extras_require parameter to setuptools.setup later which
-# overwrites the extra_require section from setup.cfg. To support extra_require
-# secion in setup.cfg, we load it here and merge it with the extra_require param.
+# overwrites the extras_require section from setup.cfg. To support extras_require
+# section in setup.cfg, we load it here and merge it with the extras_require param.
 extras_require = {}
 if "options.extras_require" in config:
     for key, value in config["options.extras_require"].items():

instrumentation/opentelemetry-instrumentation-jinja2/setup.py

@@ -28,8 +28,8 @@
 config.read("setup.cfg")
 
 # We provide extras_require parameter to setuptools.setup later which
-# overwrites the extra_require section from setup.cfg. To support extra_require
-# secion in setup.cfg, we load it here and merge it with the extra_require param.
+# overwrites the extras_require section from setup.cfg. To support extras_require
+# section in setup.cfg, we load it here and merge it with the extras_require param.
 extras_require = {}
 if "options.extras_require" in config:
     for key, value in config["options.extras_require"].items():

instrumentation/opentelemetry-instrumentation-kafka-python/setup.py

@@ -28,8 +28,8 @@
 config.read("setup.cfg")
 
 # We provide extras_require parameter to setuptools.setup later which
-# overwrites the extra_require section from setup.cfg. To support extra_require
-# secion in setup.cfg, we load it here and merge it with the extra_require param.
+# overwrites the extras_require section from setup.cfg. To support extras_require
+# section in setup.cfg, we load it here and merge it with the extras_require param.
 extras_require = {}
 if "options.extras_require" in config:
     for key, value in config["options.extras_require"].items():

instrumentation/opentelemetry-instrumentation-logging/setup.py

@@ -28,8 +28,8 @@
 config.read("setup.cfg")
 
 # We provide extras_require parameter to setuptools.setup later which
-# overwrites the extra_require section from setup.cfg. To support extra_require
-# secion in setup.cfg, we load it here and merge it with the extra_require param.
+# overwrites the extras_require section from setup.cfg. To support extras_require
+# section in setup.cfg, we load it here and merge it with the extras_require param.
 extras_require = {}
 if "options.extras_require" in config:
     for key, value in config["options.extras_require"].items():

instrumentation/opentelemetry-instrumentation-mysql/setup.py

@@ -28,8 +28,8 @@
 config.read("setup.cfg")
 
 # We provide extras_require parameter to setuptools.setup later which
-# overwrites the extra_require section from setup.cfg. To support extra_require
-# secion in setup.cfg, we load it here and merge it with the extra_require param.
+# overwrites the extras_require section from setup.cfg. To support extras_require
+# section in setup.cfg, we load it here and merge it with the extras_require param.
 extras_require = {}
 if "options.extras_require" in config:
     for key, value in config["options.extras_require"].items():

instrumentation/opentelemetry-instrumentation-pika/setup.py

@@ -28,8 +28,8 @@
 config.read("setup.cfg")
 
 # We provide extras_require parameter to setuptools.setup later which
-# overwrites the extra_require section from setup.cfg. To support extra_require
-# secion in setup.cfg, we load it here and merge it with the extra_require param.
+# overwrites the extras_require section from setup.cfg. To support extras_require
+# section in setup.cfg, we load it here and merge it with the extras_require param.
 extras_require = {}
 if "options.extras_require" in config:
     for key, value in config["options.extras_require"].items():

instrumentation/opentelemetry-instrumentation-psycopg2/setup.py

@@ -28,8 +28,8 @@
 config.read("setup.cfg")
 
 # We provide extras_require parameter to setuptools.setup later which
-# overwrites the extra_require section from setup.cfg. To support extra_require
-# secion in setup.cfg, we load it here and merge it with the extra_require param.
+# overwrites the extras_require section from setup.cfg. To support extras_require
+# section in setup.cfg, we load it here and merge it with the extras_require param.
 extras_require = {}
 if "options.extras_require" in config:
     for key, value in config["options.extras_require"].items():

instrumentation/opentelemetry-instrumentation-pymemcache/setup.py

@@ -28,8 +28,8 @@
 config.read("setup.cfg")
 
 # We provide extras_require parameter to setuptools.setup later which
-# overwrites the extra_require section from setup.cfg. To support extra_require
-# secion in setup.cfg, we load it here and merge it with the extra_require param.
+# overwrites the extras_require section from setup.cfg. To support extras_require
+# section in setup.cfg, we load it here and merge it with the extras_require param.
 extras_require = {}
 if "options.extras_require" in config:
     for key, value in config["options.extras_require"].items():

instrumentation/opentelemetry-instrumentation-pymongo/setup.py

@@ -28,8 +28,8 @@
 config.read("setup.cfg")
 
 # We provide extras_require parameter to setuptools.setup later which
-# overwrites the extra_require section from setup.cfg. To support extra_require
-# secion in setup.cfg, we load it here and merge it with the extra_require param.
+# overwrites the extras_require section from setup.cfg. To support extras_require
+# section in setup.cfg, we load it here and merge it with the extras_require param.
 extras_require = {}
 if "options.extras_require" in config:
     for key, value in config["options.extras_require"].items():

instrumentation/opentelemetry-instrumentation-pymysql/setup.py

@@ -28,8 +28,8 @@
 config.read("setup.cfg")
 
 # We provide extras_require parameter to setuptools.setup later which
-# overwrites the extra_require section from setup.cfg. To support extra_require
-# secion in setup.cfg, we load it here and merge it with the extra_require param.
+# overwrites the extras_require section from setup.cfg. To support extras_require
+# section in setup.cfg, we load it here and merge it with the extras_require param.
 extras_require = {}
 if "options.extras_require" in config:
     for key, value in config["options.extras_require"].items():

instrumentation/opentelemetry-instrumentation-pyramid/setup.py

@@ -28,8 +28,8 @@
 config.read("setup.cfg")
 
 # We provide extras_require parameter to setuptools.setup later which
-# overwrites the extra_require section from setup.cfg. To support extra_require
-# secion in setup.cfg, we load it here and merge it with the extra_require param.
+# overwrites the extras_require section from setup.cfg. To support extras_require
+# section in setup.cfg, we load it here and merge it with the extras_require param.
 extras_require = {}
 if "options.extras_require" in config:
     for key, value in config["options.extras_require"].items():

instrumentation/opentelemetry-instrumentation-pyramid/src/opentelemetry/instrumentation/pyramid/callbacks.py

@@ -161,7 +161,7 @@ def trace_tween(request):
                 otel_wsgi.add_response_attributes(
                     span,
                     response_or_exception.status,
-                    response_or_exception.headers,
+                    response_or_exception.headerlist,
                 )
 
                 propagator = get_global_response_propagator()

instrumentation/opentelemetry-instrumentation-redis/setup.py

@@ -28,8 +28,8 @@
 config.read("setup.cfg")
 
 # We provide extras_require parameter to setuptools.setup later which
-# overwrites the extra_require section from setup.cfg. To support extra_require
-# secion in setup.cfg, we load it here and merge it with the extra_require param.
+# overwrites the extras_require section from setup.cfg. To support extras_require
+# section in setup.cfg, we load it here and merge it with the extras_require param.
 extras_require = {}
 if "options.extras_require" in config:
     for key, value in config["options.extras_require"].items():

instrumentation/opentelemetry-instrumentation-requests/setup.py

@@ -28,8 +28,8 @@
 config.read("setup.cfg")
 
 # We provide extras_require parameter to setuptools.setup later which
-# overwrites the extra_require section from setup.cfg. To support extra_require
-# secion in setup.cfg, we load it here and merge it with the extra_require param.
+# overwrites the extras_require section from setup.cfg. To support extras_require
+# section in setup.cfg, we load it here and merge it with the extras_require param.
 extras_require = {}
 if "options.extras_require" in config:
     for key, value in config["options.extras_require"].items():

instrumentation/opentelemetry-instrumentation-requests/src/opentelemetry/instrumentation/requests/__init__.py

@@ -162,13 +162,15 @@ def _instrumented_requests_call(
 
         url = remove_url_credentials(url)
 
+        span_attributes = {
+            SpanAttributes.HTTP_METHOD: method,
+            SpanAttributes.HTTP_URL: url,
+        }
+
         with tracer.start_as_current_span(
-            span_name, kind=SpanKind.CLIENT
+            span_name, kind=SpanKind.CLIENT, attributes=span_attributes
         ) as span, set_ip_on_next_http_connection(span):
             exception = None
-            if span.is_recording():
-                span.set_attribute(SpanAttributes.HTTP_METHOD, method)
-                span.set_attribute(SpanAttributes.HTTP_URL, url)
 
             headers = get_or_create_headers()
             inject(headers)

instrumentation/opentelemetry-instrumentation-sklearn/setup.py

@@ -28,8 +28,8 @@
 config.read("setup.cfg")
 
 # We provide extras_require parameter to setuptools.setup later which
-# overwrites the extra_require section from setup.cfg. To support extra_require
-# secion in setup.cfg, we load it here and merge it with the extra_require param.
+# overwrites the extras_require section from setup.cfg. To support extras_require
+# section in setup.cfg, we load it here and merge it with the extras_require param.
 extras_require = {}
 if "options.extras_require" in config:
     for key, value in config["options.extras_require"].items():

instrumentation/opentelemetry-instrumentation-sqlalchemy/setup.py

@@ -28,8 +28,8 @@
 config.read("setup.cfg")
 
 # We provide extras_require parameter to setuptools.setup later which
-# overwrites the extra_require section from setup.cfg. To support extra_require
-# secion in setup.cfg, we load it here and merge it with the extra_require param.
+# overwrites the extras_require section from setup.cfg. To support extras_require
+# section in setup.cfg, we load it here and merge it with the extras_require param.
 extras_require = {}
 if "options.extras_require" in config:
     for key, value in config["options.extras_require"].items():