Skip to content

Commit 8c89f4a

Browse files
samuelcolvinsamuelcolvin
committed
Merge branch 'main' into avoid-loosing-repeated-headers
2 parents d71e093 + 617cae9 commit 8c89f4a

File tree

73 files changed

+1036
-229
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+1036
-229
lines changed

‎.github/workflows/instrumentations_1.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
python-version: [py38, py39, py310, py311, pypy3]
2626
package:
2727
- "urllib"
28-
- "urllib3v"
28+
- "urllib3"
2929
- "wsgi"
3030
- "distro"
3131
- "richconsole"

‎CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## Unreleased
99

10-
### Fixed
1110
- `opentelemetry-instrumentation-celery` Allow Celery instrumentation to be installed multiple times
1211
([#2342](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2342))
1312
- Align gRPC span status codes to OTEL specification
1413
([#1756](https://github.com/open-telemetry/opentelemetry-python-contrib/issues/1756))
1514
- `opentelemetry-instrumentation-flask` Add importlib metadata default for deprecation warning flask version
1615
([#2297](https://github.com/open-telemetry/opentelemetry-python-contrib/issues/2297))
16+
- Ensure all http.server.duration metrics have the same description
17+
([#2151](https://github.com/open-telemetry/opentelemetry-python-contrib/issues/2298))
1718
- Avoid losing repeated HTTP headers
1819
([#2266](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2266))
1920

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,6 @@ dependencies = [
3333
instruments = [
3434
"aio_pika >= 7.2.0, < 10.0.0",
3535
]
36-
test = [
37-
"opentelemetry-instrumentation-aio-pika[instruments]",
38-
"opentelemetry-test-utils == 0.45b0.dev",
39-
"pytest",
40-
"wrapt >= 1.0.0, < 2.0.0",
41-
]
4236

4337
[project.entry-points.opentelemetry_instrumentor]
4438
aio-pika = "opentelemetry.instrumentation.aio_pika:AioPikaInstrumentor"

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

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
aio-pika==7.2.0
2+
aiormq==6.2.3
3+
asgiref==3.7.2
4+
attrs==23.2.0
5+
Deprecated==1.2.14
6+
idna==3.6
7+
importlib-metadata==6.11.0
8+
iniconfig==2.0.0
9+
multidict==6.0.5
10+
packaging==23.2
11+
pamqp==3.1.0
12+
pluggy==1.4.0
13+
py==1.11.0
14+
py-cpuinfo==9.0.0
15+
pytest==7.1.3
16+
pytest-benchmark==4.0.0
17+
tomli==2.0.1
18+
typing_extensions==4.9.0
19+
wrapt==1.16.0
20+
yarl==1.9.4
21+
zipp==3.17.0
22+
-e opentelemetry-instrumentation
23+
-e instrumentation/opentelemetry-instrumentation-aio-pika

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

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
aio-pika==8.3.0
2+
aiormq==6.6.4
3+
asgiref==3.7.2
4+
attrs==23.2.0
5+
Deprecated==1.2.14
6+
idna==3.6
7+
importlib-metadata==6.11.0
8+
iniconfig==2.0.0
9+
multidict==6.0.5
10+
packaging==23.2
11+
pamqp==3.2.1
12+
pluggy==1.4.0
13+
py==1.11.0
14+
py-cpuinfo==9.0.0
15+
pytest==7.1.3
16+
pytest-benchmark==4.0.0
17+
tomli==2.0.1
18+
typing_extensions==4.9.0
19+
wrapt==1.16.0
20+
yarl==1.9.4
21+
zipp==3.17.0
22+
-e opentelemetry-instrumentation
23+
-e instrumentation/opentelemetry-instrumentation-aio-pika

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

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
aio-pika==9.4.0
2+
aiormq==6.8.0
3+
asgiref==3.7.2
4+
attrs==23.2.0
5+
Deprecated==1.2.14
6+
idna==3.6
7+
importlib-metadata==6.11.0
8+
iniconfig==2.0.0
9+
multidict==6.0.5
10+
packaging==23.2
11+
pamqp==3.3.0
12+
pluggy==1.4.0
13+
py==1.11.0
14+
py-cpuinfo==9.0.0
15+
pytest==7.1.3
16+
pytest-benchmark==4.0.0
17+
tomli==2.0.1
18+
typing_extensions==4.9.0
19+
wrapt==1.16.0
20+
yarl==1.9.4
21+
zipp==3.17.0
22+
-e opentelemetry-instrumentation
23+
-e instrumentation/opentelemetry-instrumentation-aio-pika

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,6 @@ dependencies = [
3535
instruments = [
3636
"aiohttp ~= 3.0",
3737
]
38-
test = [
39-
"opentelemetry-instrumentation-aiohttp-client[instruments]",
40-
"http-server-mock"
41-
]
4238

4339
[project.entry-points.opentelemetry_instrumentor]
4440
aiohttp-client = "opentelemetry.instrumentation.aiohttp_client:AioHttpClientInstrumentor"

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

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
aiohttp==3.9.3
2+
aiosignal==1.3.1
3+
asgiref==3.7.2
4+
async-timeout==4.0.3
5+
attrs==23.2.0
6+
blinker==1.7.0
7+
certifi==2024.2.2
8+
charset-normalizer==3.3.2
9+
click==8.1.7
10+
Deprecated==1.2.14
11+
Flask==3.0.2
12+
frozenlist==1.4.1
13+
http_server_mock==1.7
14+
idna==3.6
15+
importlib-metadata==6.11.0
16+
iniconfig==2.0.0
17+
itsdangerous==2.1.2
18+
Jinja2==3.1.3
19+
MarkupSafe==2.1.5
20+
multidict==6.0.5
21+
packaging==23.2
22+
pluggy==1.4.0
23+
py==1.11.0
24+
py-cpuinfo==9.0.0
25+
pytest==7.1.3
26+
pytest-benchmark==4.0.0
27+
requests==2.31.0
28+
tomli==2.0.1
29+
typing_extensions==4.10.0
30+
urllib3==2.2.1
31+
Werkzeug==3.0.1
32+
wrapt==1.16.0
33+
yarl==1.9.4
34+
zipp==3.17.0
35+
-e opentelemetry-instrumentation
36+
-e util/opentelemetry-util-http
37+
-e instrumentation/opentelemetry-instrumentation-aiohttp-client

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,6 @@ dependencies = [
3535
instruments = [
3636
"aiohttp ~= 3.0",
3737
]
38-
test = [
39-
"opentelemetry-instrumentation-aiohttp-server[instruments]",
40-
"pytest-asyncio",
41-
"pytest-aiohttp",
42-
]
4338

4439
[project.entry-points.opentelemetry_instrumentor]
4540
aiohttp-server = "opentelemetry.instrumentation.aiohttp_server:AioHttpServerInstrumentor"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ async def middleware(request, handler):
207207
duration_histogram = meter.create_histogram(
208208
name=MetricInstruments.HTTP_SERVER_DURATION,
209209
unit="ms",
210-
description="measures the duration of the inbound HTTP request",
210+
description="Duration of HTTP client requests.",
211211
)
212212

213213
active_requests_counter = meter.create_up_down_counter(

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

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
aiohttp==3.9.3
2+
aiosignal==1.3.1
3+
asgiref==3.7.2
4+
async-timeout==4.0.3
5+
attrs==23.2.0
6+
Deprecated==1.2.14
7+
frozenlist==1.4.1
8+
idna==3.6
9+
importlib-metadata==6.11.0
10+
iniconfig==2.0.0
11+
multidict==6.0.5
12+
packaging==23.2
13+
pluggy==1.4.0
14+
py==1.11.0
15+
py-cpuinfo==9.0.0
16+
pytest==7.1.3
17+
pytest-aiohttp==1.0.5
18+
pytest-asyncio==0.23.5
19+
pytest-benchmark==4.0.0
20+
tomli==2.0.1
21+
typing_extensions==4.10.0
22+
wrapt==1.16.0
23+
yarl==1.9.4
24+
zipp==3.17.0
25+
-e opentelemetry-instrumentation
26+
-e util/opentelemetry-util-http
27+
-e instrumentation/opentelemetry-instrumentation-aiohttp-server

‎instrumentation/opentelemetry-instrumentation-aiopg/pyproject.toml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,6 @@ dependencies = [
3434
instruments = [
3535
"aiopg >= 0.13.0, < 2.0.0",
3636
]
37-
test = [
38-
"opentelemetry-instrumentation-aiopg[instruments]",
39-
"opentelemetry-semantic-conventions == 0.45b0.dev",
40-
"opentelemetry-test-utils == 0.45b0.dev",
41-
]
4237

4338
[project.entry-points.opentelemetry_instrumentor]
4439
aiopg = "opentelemetry.instrumentation.aiopg:AiopgInstrumentor"

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

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
aiopg==1.4.0
2+
asgiref==3.7.2
3+
async-timeout==4.0.3
4+
attrs==23.2.0
5+
Deprecated==1.2.14
6+
importlib-metadata==6.11.0
7+
iniconfig==2.0.0
8+
install==1.3.5
9+
packaging==23.2
10+
pluggy==1.4.0
11+
psycopg2-binary==2.9.9
12+
py==1.11.0
13+
py-cpuinfo==9.0.0
14+
pytest==7.1.3
15+
pytest-benchmark==4.0.0
16+
tomli==2.0.1
17+
typing_extensions==4.10.0
18+
wrapt==1.16.0
19+
zipp==3.17.0
20+
-e opentelemetry-instrumentation
21+
-e instrumentation/opentelemetry-instrumentation-dbapi
22+
-e instrumentation/opentelemetry-instrumentation-aiopg

‎instrumentation/opentelemetry-instrumentation-asgi/pyproject.toml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,6 @@ dependencies = [
3535
instruments = [
3636
"asgiref ~= 3.0",
3737
]
38-
test = [
39-
"opentelemetry-instrumentation-asgi[instruments]",
40-
"opentelemetry-test-utils == 0.45b0.dev",
41-
]
4238

4339
[project.urls]
4440
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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -498,7 +498,7 @@ def __init__(
498498
self.duration_histogram = self.meter.create_histogram(
499499
name=MetricInstruments.HTTP_SERVER_DURATION,
500500
unit="ms",
501-
description="measures the duration of the inbound HTTP request",
501+
description="Duration of HTTP client requests.",
502502
)
503503
self.server_response_size_histogram = self.meter.create_histogram(
504504
name=MetricInstruments.HTTP_SERVER_RESPONSE_SIZE,

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
asgiref==3.7.2
2+
attrs==23.2.0
3+
Deprecated==1.2.14
4+
importlib-metadata==6.11.0
5+
iniconfig==2.0.0
6+
packaging==23.2
7+
pluggy==1.4.0
8+
py==1.11.0
9+
py-cpuinfo==9.0.0
10+
pytest==7.1.3
11+
pytest-benchmark==4.0.0
12+
tomli==2.0.1
13+
typing_extensions==4.9.0
14+
wrapt==1.16.0
15+
zipp==3.17.0
16+
-e opentelemetry-instrumentation
17+
-e util/opentelemetry-util-http
18+
-e instrumentation/opentelemetry-instrumentation-asgi

‎instrumentation/opentelemetry-instrumentation-asyncio/pyproject.toml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,6 @@ dependencies = [
3333

3434
[project.optional-dependencies]
3535
instruments = []
36-
test = [
37-
"opentelemetry-instrumentation-asyncio[instruments]",
38-
"pytest",
39-
"wrapt >= 1.0.0, < 2.0.0",
40-
"pytest-asyncio",
41-
]
4236

4337
[project.entry-points.opentelemetry_instrumentor]
4438
asyncio = "opentelemetry.instrumentation.asyncio:AsyncioInstrumentor"

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
asgiref==3.7.2
2+
attrs==23.2.0
3+
Deprecated==1.2.14
4+
importlib-metadata==6.11.0
5+
iniconfig==2.0.0
6+
packaging==23.2
7+
pluggy==1.4.0
8+
py==1.11.0
9+
py-cpuinfo==9.0.0
10+
pytest==7.1.3
11+
pytest-asyncio==0.23.5
12+
pytest-benchmark==4.0.0
13+
tomli==2.0.1
14+
typing_extensions==4.9.0
15+
wrapt==1.16.0
16+
zipp==3.17.0
17+
-e opentelemetry-instrumentation
18+
-e instrumentation/opentelemetry-instrumentation-asyncio

‎instrumentation/opentelemetry-instrumentation-django/pyproject.toml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,6 @@ asgi = [
3838
instruments = [
3939
"django >= 1.10",
4040
]
41-
test = [
42-
"opentelemetry-instrumentation-django[instruments]",
43-
"opentelemetry-test-utils == 0.45b0.dev",
44-
]
4541

4642
[project.entry-points.opentelemetry_instrumentor]
4743
django = "opentelemetry.instrumentation.django:DjangoInstrumentor"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ def _instrument(self, **kwargs):
322322
_DjangoMiddleware._duration_histogram = meter.create_histogram(
323323
name=MetricInstruments.HTTP_SERVER_DURATION,
324324
unit="ms",
325-
description="measures the duration of the inbound http request",
325+
description="Duration of HTTP client requests.",
326326
)
327327
_DjangoMiddleware._active_request_counter = meter.create_up_down_counter(
328328
name=MetricInstruments.HTTP_SERVER_ACTIVE_REQUESTS,

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

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
asgiref==3.7.2
2+
attrs==23.2.0
3+
Deprecated==1.2.14
4+
Django==2.2.28
5+
importlib-metadata==6.11.0
6+
iniconfig==2.0.0
7+
packaging==23.2
8+
pluggy==1.4.0
9+
py==1.11.0
10+
py-cpuinfo==9.0.0
11+
pytest==7.1.3
12+
pytest-benchmark==4.0.0
13+
pytz==2024.1
14+
sqlparse==0.4.4
15+
tomli==2.0.1
16+
typing_extensions==4.10.0
17+
wrapt==1.16.0
18+
zipp==3.17.0
19+
-e opentelemetry-instrumentation
20+
-e instrumentation/opentelemetry-instrumentation-wsgi
21+
-e util/opentelemetry-util-http
22+
-e instrumentation/opentelemetry-instrumentation-django

‎instrumentation/opentelemetry-instrumentation-django/test-requirements-1.txt

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
asgiref==3.7.2
2+
attrs==23.2.0
3+
Deprecated==1.2.14
4+
Django==3.2.24
5+
importlib-metadata==6.11.0
6+
iniconfig==2.0.0
7+
packaging==23.2
8+
pluggy==1.4.0
9+
py==1.11.0
10+
py-cpuinfo==9.0.0
11+
pytest==7.1.3
12+
pytest-benchmark==4.0.0
13+
pytz==2024.1
14+
sqlparse==0.4.4
15+
tomli==2.0.1
16+
typing_extensions==4.10.0
17+
wrapt==1.16.0
18+
zipp==3.17.0
19+
-e opentelemetry-instrumentation
20+
-e instrumentation/opentelemetry-instrumentation-wsgi
21+
-e instrumentation/opentelemetry-instrumentation-asgi
22+
-e util/opentelemetry-util-http
23+
-e instrumentation/opentelemetry-instrumentation-django

0 commit comments

Comments
 (0)