Merge branch 'main' into psycopg3-instrumentation

.github/workflows/instrumentations_1.yml

@@ -25,7 +25,7 @@ jobs:
         python-version: [py38, py39, py310, py311, pypy3]
         package:
           - "urllib"
-          - "urllib3v"
+          - "urllib3"
           - "wsgi"
           - "distro"
           - "richconsole"

CHANGELOG.md

@@ -17,6 +17,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#1756](https://github.com/open-telemetry/opentelemetry-python-contrib/issues/1756))
 - `opentelemetry-instrumentation-flask` Add importlib metadata default for deprecation warning flask version
   ([#2297](https://github.com/open-telemetry/opentelemetry-python-contrib/issues/2297))
+- Ensure all http.server.duration metrics have the same description
+  ([#2151](https://github.com/open-telemetry/opentelemetry-python-contrib/issues/2298))
 
 ## Version 1.23.0/0.44b0 (2024-02-23)
 

instrumentation/opentelemetry-instrumentation-aio-pika/pyproject.toml

@@ -33,12 +33,6 @@ dependencies = [
 instruments = [
   "aio_pika >= 7.2.0, < 10.0.0",
 ]
-test = [
-  "opentelemetry-instrumentation-aio-pika[instruments]",
-  "opentelemetry-test-utils == 0.45b0.dev",
-  "pytest",
-  "wrapt >= 1.0.0, < 2.0.0",
-]
 
 [project.entry-points.opentelemetry_instrumentor]
 aio-pika = "opentelemetry.instrumentation.aio_pika:AioPikaInstrumentor"

instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-0.txt

@@ -0,0 +1,23 @@
+aio-pika==7.2.0
+aiormq==6.2.3
+asgiref==3.7.2
+attrs==23.2.0
+Deprecated==1.2.14
+idna==3.6
+importlib-metadata==6.11.0
+iniconfig==2.0.0
+multidict==6.0.5
+packaging==23.2
+pamqp==3.1.0
+pluggy==1.4.0
+py==1.11.0
+py-cpuinfo==9.0.0
+pytest==7.1.3
+pytest-benchmark==4.0.0
+tomli==2.0.1
+typing_extensions==4.9.0
+wrapt==1.16.0
+yarl==1.9.4
+zipp==3.17.0
+-e opentelemetry-instrumentation
+-e instrumentation/opentelemetry-instrumentation-aio-pika

instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-1.txt

@@ -0,0 +1,23 @@
+aio-pika==8.3.0
+aiormq==6.6.4
+asgiref==3.7.2
+attrs==23.2.0
+Deprecated==1.2.14
+idna==3.6
+importlib-metadata==6.11.0
+iniconfig==2.0.0
+multidict==6.0.5
+packaging==23.2
+pamqp==3.2.1
+pluggy==1.4.0
+py==1.11.0
+py-cpuinfo==9.0.0
+pytest==7.1.3
+pytest-benchmark==4.0.0
+tomli==2.0.1
+typing_extensions==4.9.0
+wrapt==1.16.0
+yarl==1.9.4
+zipp==3.17.0
+-e opentelemetry-instrumentation
+-e instrumentation/opentelemetry-instrumentation-aio-pika

instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-2.txt

@@ -0,0 +1,23 @@
+aio-pika==9.4.0
+aiormq==6.8.0
+asgiref==3.7.2
+attrs==23.2.0
+Deprecated==1.2.14
+idna==3.6
+importlib-metadata==6.11.0
+iniconfig==2.0.0
+multidict==6.0.5
+packaging==23.2
+pamqp==3.3.0
+pluggy==1.4.0
+py==1.11.0
+py-cpuinfo==9.0.0
+pytest==7.1.3
+pytest-benchmark==4.0.0
+tomli==2.0.1
+typing_extensions==4.9.0
+wrapt==1.16.0
+yarl==1.9.4
+zipp==3.17.0
+-e opentelemetry-instrumentation
+-e instrumentation/opentelemetry-instrumentation-aio-pika

instrumentation/opentelemetry-instrumentation-aiohttp-client/pyproject.toml

@@ -35,10 +35,6 @@ dependencies = [
 instruments = [
   "aiohttp ~= 3.0",
 ]
-test = [
-  "opentelemetry-instrumentation-aiohttp-client[instruments]",
-  "http-server-mock"
-]
 
 [project.entry-points.opentelemetry_instrumentor]
 aiohttp-client = "opentelemetry.instrumentation.aiohttp_client:AioHttpClientInstrumentor"

instrumentation/opentelemetry-instrumentation-aiohttp-client/test-requirements.txt

@@ -0,0 +1,37 @@
+aiohttp==3.9.3
+aiosignal==1.3.1
+asgiref==3.7.2
+async-timeout==4.0.3
+attrs==23.2.0
+blinker==1.7.0
+certifi==2024.2.2
+charset-normalizer==3.3.2
+click==8.1.7
+Deprecated==1.2.14
+Flask==3.0.2
+frozenlist==1.4.1
+http_server_mock==1.7
+idna==3.6
+importlib-metadata==6.11.0
+iniconfig==2.0.0
+itsdangerous==2.1.2
+Jinja2==3.1.3
+MarkupSafe==2.1.5
+multidict==6.0.5
+packaging==23.2
+pluggy==1.4.0
+py==1.11.0
+py-cpuinfo==9.0.0
+pytest==7.1.3
+pytest-benchmark==4.0.0
+requests==2.31.0
+tomli==2.0.1
+typing_extensions==4.10.0
+urllib3==2.2.1
+Werkzeug==3.0.1
+wrapt==1.16.0
+yarl==1.9.4
+zipp==3.17.0
+-e opentelemetry-instrumentation
+-e util/opentelemetry-util-http
+-e instrumentation/opentelemetry-instrumentation-aiohttp-client

instrumentation/opentelemetry-instrumentation-aiohttp-server/pyproject.toml

@@ -35,11 +35,6 @@ dependencies = [
 instruments = [
     "aiohttp ~= 3.0",
 ]
-test = [
-  "opentelemetry-instrumentation-aiohttp-server[instruments]",
-  "pytest-asyncio",
-  "pytest-aiohttp",
-]
 
 [project.entry-points.opentelemetry_instrumentor]
 aiohttp-server = "opentelemetry.instrumentation.aiohttp_server:AioHttpServerInstrumentor"

instrumentation/opentelemetry-instrumentation-aiohttp-server/src/opentelemetry/instrumentation/aiohttp_server/__init__.py

@@ -207,7 +207,7 @@ async def middleware(request, handler):
     duration_histogram = meter.create_histogram(
         name=MetricInstruments.HTTP_SERVER_DURATION,
         unit="ms",
-        description="measures the duration of the inbound HTTP request",
+        description="Duration of HTTP client requests.",
     )
 
     active_requests_counter = meter.create_up_down_counter(

instrumentation/opentelemetry-instrumentation-aiohttp-server/test-requirements.txt

@@ -0,0 +1,27 @@
+aiohttp==3.9.3
+aiosignal==1.3.1
+asgiref==3.7.2
+async-timeout==4.0.3
+attrs==23.2.0
+Deprecated==1.2.14
+frozenlist==1.4.1
+idna==3.6
+importlib-metadata==6.11.0
+iniconfig==2.0.0
+multidict==6.0.5
+packaging==23.2
+pluggy==1.4.0
+py==1.11.0
+py-cpuinfo==9.0.0
+pytest==7.1.3
+pytest-aiohttp==1.0.5
+pytest-asyncio==0.23.5
+pytest-benchmark==4.0.0
+tomli==2.0.1
+typing_extensions==4.10.0
+wrapt==1.16.0
+yarl==1.9.4
+zipp==3.17.0
+-e opentelemetry-instrumentation
+-e util/opentelemetry-util-http
+-e instrumentation/opentelemetry-instrumentation-aiohttp-server

instrumentation/opentelemetry-instrumentation-aiopg/pyproject.toml

@@ -34,11 +34,6 @@ dependencies = [
 instruments = [
   "aiopg >= 0.13.0, < 2.0.0",
 ]
-test = [
-  "opentelemetry-instrumentation-aiopg[instruments]",
-  "opentelemetry-semantic-conventions == 0.45b0.dev",
-  "opentelemetry-test-utils == 0.45b0.dev",
-]
 
 [project.entry-points.opentelemetry_instrumentor]
 aiopg = "opentelemetry.instrumentation.aiopg:AiopgInstrumentor"

instrumentation/opentelemetry-instrumentation-aiopg/test-requirements.txt

@@ -0,0 +1,22 @@
+aiopg==1.4.0
+asgiref==3.7.2
+async-timeout==4.0.3
+attrs==23.2.0
+Deprecated==1.2.14
+importlib-metadata==6.11.0
+iniconfig==2.0.0
+install==1.3.5
+packaging==23.2
+pluggy==1.4.0
+psycopg2-binary==2.9.9
+py==1.11.0
+py-cpuinfo==9.0.0
+pytest==7.1.3
+pytest-benchmark==4.0.0
+tomli==2.0.1
+typing_extensions==4.10.0
+wrapt==1.16.0
+zipp==3.17.0
+-e opentelemetry-instrumentation
+-e instrumentation/opentelemetry-instrumentation-dbapi
+-e instrumentation/opentelemetry-instrumentation-aiopg

instrumentation/opentelemetry-instrumentation-asgi/pyproject.toml

@@ -35,10 +35,6 @@ dependencies = [
 instruments = [
   "asgiref ~= 3.0",
 ]
-test = [
-  "opentelemetry-instrumentation-asgi[instruments]",
-  "opentelemetry-test-utils == 0.45b0.dev",
-]
 
 [project.urls]
 Homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-asgi"

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

@@ -492,7 +492,7 @@ def __init__(
         self.duration_histogram = self.meter.create_histogram(
             name=MetricInstruments.HTTP_SERVER_DURATION,
             unit="ms",
-            description="measures the duration of the inbound HTTP request",
+            description="Duration of HTTP client requests.",
         )
         self.server_response_size_histogram = self.meter.create_histogram(
             name=MetricInstruments.HTTP_SERVER_RESPONSE_SIZE,

instrumentation/opentelemetry-instrumentation-asgi/test-requirements.txt

@@ -0,0 +1,18 @@
+asgiref==3.7.2
+attrs==23.2.0
+Deprecated==1.2.14
+importlib-metadata==6.11.0
+iniconfig==2.0.0
+packaging==23.2
+pluggy==1.4.0
+py==1.11.0
+py-cpuinfo==9.0.0
+pytest==7.1.3
+pytest-benchmark==4.0.0
+tomli==2.0.1
+typing_extensions==4.9.0
+wrapt==1.16.0
+zipp==3.17.0
+-e opentelemetry-instrumentation
+-e util/opentelemetry-util-http
+-e instrumentation/opentelemetry-instrumentation-asgi

instrumentation/opentelemetry-instrumentation-asyncio/pyproject.toml

@@ -33,12 +33,6 @@ dependencies = [
 
 [project.optional-dependencies]
 instruments = []
-test = [
-  "opentelemetry-instrumentation-asyncio[instruments]",
-  "pytest",
-  "wrapt >= 1.0.0, < 2.0.0",
-  "pytest-asyncio",
-]
 
 [project.entry-points.opentelemetry_instrumentor]
 asyncio = "opentelemetry.instrumentation.asyncio:AsyncioInstrumentor"

instrumentation/opentelemetry-instrumentation-asyncio/test-requirements.txt

@@ -0,0 +1,18 @@
+asgiref==3.7.2
+attrs==23.2.0
+Deprecated==1.2.14
+importlib-metadata==6.11.0
+iniconfig==2.0.0
+packaging==23.2
+pluggy==1.4.0
+py==1.11.0
+py-cpuinfo==9.0.0
+pytest==7.1.3
+pytest-asyncio==0.23.5
+pytest-benchmark==4.0.0
+tomli==2.0.1
+typing_extensions==4.9.0
+wrapt==1.16.0
+zipp==3.17.0
+-e opentelemetry-instrumentation
+-e instrumentation/opentelemetry-instrumentation-asyncio

instrumentation/opentelemetry-instrumentation-dbapi/pyproject.toml

@@ -32,9 +32,6 @@ dependencies = [
 
 [project.optional-dependencies]
 instruments = []
-test = [
-  "opentelemetry-test-utils == 0.45b0.dev",
-]
 
 [project.urls]
 Homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-dbapi"

instrumentation/opentelemetry-instrumentation-dbapi/test-requirements.txt

@@ -0,0 +1,17 @@
+asgiref==3.7.2
+attrs==23.2.0
+Deprecated==1.2.14
+importlib-metadata==6.11.0
+iniconfig==2.0.0
+packaging==23.2
+pluggy==1.4.0
+py==1.11.0
+py-cpuinfo==9.0.0
+pytest==7.1.3
+pytest-benchmark==4.0.0
+tomli==2.0.1
+typing_extensions==4.9.0
+wrapt==1.16.0
+zipp==3.17.0
+-e opentelemetry-instrumentation
+-e instrumentation/opentelemetry-instrumentation-dbapi

instrumentation/opentelemetry-instrumentation-django/pyproject.toml

@@ -38,10 +38,6 @@ asgi = [
 instruments = [
   "django >= 1.10",
 ]
-test = [
-  "opentelemetry-instrumentation-django[instruments]",
-  "opentelemetry-test-utils == 0.45b0.dev",
-]
 
 [project.entry-points.opentelemetry_instrumentor]
 django = "opentelemetry.instrumentation.django:DjangoInstrumentor"

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

@@ -322,7 +322,7 @@ def _instrument(self, **kwargs):
         _DjangoMiddleware._duration_histogram = meter.create_histogram(
             name=MetricInstruments.HTTP_SERVER_DURATION,
             unit="ms",
-            description="measures the duration of the inbound http request",
+            description="Duration of HTTP client requests.",
         )
         _DjangoMiddleware._active_request_counter = meter.create_up_down_counter(
             name=MetricInstruments.HTTP_SERVER_ACTIVE_REQUESTS,

instrumentation/opentelemetry-instrumentation-django/test-requirements-0.txt

@@ -0,0 +1,22 @@
+asgiref==3.7.2
+attrs==23.2.0
+Deprecated==1.2.14
+Django==2.2.28
+importlib-metadata==6.11.0
+iniconfig==2.0.0
+packaging==23.2
+pluggy==1.4.0
+py==1.11.0
+py-cpuinfo==9.0.0
+pytest==7.1.3
+pytest-benchmark==4.0.0
+pytz==2024.1
+sqlparse==0.4.4
+tomli==2.0.1
+typing_extensions==4.10.0
+wrapt==1.16.0
+zipp==3.17.0
+-e opentelemetry-instrumentation
+-e instrumentation/opentelemetry-instrumentation-wsgi
+-e util/opentelemetry-util-http
+-e instrumentation/opentelemetry-instrumentation-django