Skip to content

Commit b83d7ed

Browse files
GonzaloGuaschGonzaloGuasch
authored
Merge branch 'main' into feature/http-route-in-metric
2 parents 6a30b1f + 3518974 commit b83d7ed

File tree

85 files changed

+105
-91
lines changed

Some content is hidden

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

85 files changed

+105
-91
lines changed

Diff for: ‎.github/workflows/instrumentations_0.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -126,5 +126,5 @@ jobs:
126126
.tox
127127
~/.cache/pip
128128
key: v7-build-tox-cache-${{ env.RUN_MATRIX_COMBINATION }}-${{ hashFiles('tox.ini', 'gen-requirements.txt', 'dev-requirements.txt') }}
129-
- name: run tox
130-
run: tox -f ${{ matrix.python-version }}-${{ matrix.package }} -- -ra --benchmark-skip
129+
- name: run pytest without --benchmark-skip
130+
run: tox -f ${{ matrix.python-version }}-${{ matrix.package }} -- -ra

Diff for: ‎.github/workflows/instrumentations_1.yml

+3-4
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,14 @@ jobs:
2525
matrix:
2626
python-version: [py38, py39, py310, py311, py312, pypy3]
2727
package:
28+
# Only add here packages that do not have benchmark tests
2829
- "urllib"
2930
- "urllib3"
3031
- "wsgi"
3132
- "distro"
3233
- "richconsole"
3334
- "psycopg"
3435
- "prometheus-remote-write"
35-
- "sdk-extension-aws"
36-
- "propagator-aws-xray"
3736
- "propagator-ot-trace"
3837
- "resource-detector-azure"
3938
- "resource-detector-container"
@@ -59,5 +58,5 @@ jobs:
5958
.tox
6059
~/.cache/pip
6160
key: v7-build-tox-cache-${{ env.RUN_MATRIX_COMBINATION }}-${{ hashFiles('tox.ini', 'gen-requirements.txt', 'dev-requirements.txt') }}
62-
- name: run tox
63-
run: tox -f ${{ matrix.python-version }}-${{ matrix.package }} -- -ra --benchmark-skip
61+
- name: run pytest without --benchmark-skip
62+
run: tox -f ${{ matrix.python-version }}-${{ matrix.package }} -- -ra

Diff for: ‎.github/workflows/instrumentations_2.yml

+50
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
name: Contrib Repo Tests
2+
3+
on:
4+
push:
5+
branches-ignore:
6+
- 'release/*'
7+
pull_request:
8+
env:
9+
CORE_REPO_SHA: 141a6a2e473ef7f0ec4915dfb71e3c0fa595283e
10+
11+
jobs:
12+
instrumentations-2:
13+
env:
14+
# We use these variables to convert between tox and GHA version literals
15+
py38: 3.8
16+
py39: 3.9
17+
py310: "3.10"
18+
py311: "3.11"
19+
py312: "3.12"
20+
pypy3: pypy-3.8
21+
RUN_MATRIX_COMBINATION: ${{ matrix.python-version }}-${{ matrix.package }}-${{ matrix.os }}
22+
runs-on: ${{ matrix.os }}
23+
strategy:
24+
fail-fast: false # ensures the entire test matrix is run, even if one permutation fails
25+
matrix:
26+
python-version: [py38, py39, py310, py311, py312, pypy3]
27+
package:
28+
# Only add here packages that have benchmark tests
29+
- "sdk-extension-aws"
30+
- "propagator-aws-xray"
31+
os: [ubuntu-20.04]
32+
steps:
33+
- name: Checkout Contrib Repo @ SHA - ${{ github.sha }}
34+
uses: actions/checkout@v4
35+
- name: Set up Python ${{ env[matrix.python-version] }}
36+
uses: actions/setup-python@v5
37+
with:
38+
python-version: ${{ env[matrix.python-version] }}
39+
- name: Install tox
40+
run: pip install tox
41+
- name: Cache tox environment
42+
# Preserves .tox directory between runs for faster installs
43+
uses: actions/cache@v4
44+
with:
45+
path: |
46+
.tox
47+
~/.cache/pip
48+
key: v7-build-tox-cache-${{ env.RUN_MATRIX_COMBINATION }}-${{ hashFiles('tox.ini', 'gen-requirements.txt', 'dev-requirements.txt') }}
49+
- name: run pytest with --benchmark-skip
50+
run: tox -f ${{ matrix.python-version }}-${{ matrix.package }} -- -ra --benchmark-skip

Diff for: ‎CHANGELOG.md

+2

Diff for: ‎exporter/opentelemetry-exporter-prometheus-remote-write/test-requirements.txt

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ pluggy==1.5.0
1111
protobuf==4.25.3
1212
py-cpuinfo==9.0.0
1313
pytest==7.4.4
14-
pytest-benchmark==4.0.0
1514
python-snappy==0.7.1
1615
requests==2.32.3
1716
tomli==2.0.1

Diff for: ‎exporter/opentelemetry-exporter-richconsole/test-requirements.txt

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ pluggy==1.5.0
1010
py-cpuinfo==9.0.0
1111
Pygments==2.17.2
1212
pytest==7.4.4
13-
pytest-benchmark==4.0.0
1413
rich==13.7.1
1514
tomli==2.0.1
1615
typing_extensions==4.10.0

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

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ pamqp==3.1.0
1111
pluggy==1.5.0
1212
py-cpuinfo==9.0.0
1313
pytest==7.4.4
14-
pytest-benchmark==4.0.0
1514
tomli==2.0.1
1615
typing_extensions==4.9.0
1716
wrapt==1.16.0

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

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ pamqp==3.2.1
1111
pluggy==1.5.0
1212
py-cpuinfo==9.0.0
1313
pytest==7.4.4
14-
pytest-benchmark==4.0.0
1514
tomli==2.0.1
1615
typing_extensions==4.9.0
1716
wrapt==1.16.0

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

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ pamqp==3.2.1
1111
pluggy==1.5.0
1212
py-cpuinfo==9.0.0
1313
pytest==7.4.4
14-
pytest-benchmark==4.0.0
1514
tomli==2.0.1
1615
typing_extensions==4.9.0
1716
wrapt==1.16.0

Diff for: ‎instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-3.txt

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ pamqp==3.3.0
1111
pluggy==1.5.0
1212
py-cpuinfo==9.0.0
1313
pytest==7.4.4
14-
pytest-benchmark==4.0.0
1514
tomli==2.0.1
1615
typing_extensions==4.9.0
1716
wrapt==1.16.0

Diff for: ‎instrumentation/opentelemetry-instrumentation-aiohttp-client/test-requirements.txt

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ packaging==24.0
2121
pluggy==1.5.0
2222
py-cpuinfo==9.0.0
2323
pytest==7.4.4
24-
pytest-benchmark==4.0.0
2524
requests==2.32.3
2625
tomli==2.0.1
2726
typing_extensions==4.10.0

Diff for: ‎instrumentation/opentelemetry-instrumentation-aiohttp-server/test-requirements.txt

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ py-cpuinfo==9.0.0
1414
pytest==7.4.4
1515
pytest-aiohttp==1.0.5
1616
pytest-asyncio==0.23.5
17-
pytest-benchmark==4.0.0
1817
tomli==2.0.1
1918
typing_extensions==4.10.0
2019
wrapt==1.16.0

Diff for: ‎instrumentation/opentelemetry-instrumentation-aiopg/test-requirements.txt

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ pluggy==1.5.0
1010
psycopg2-binary==2.9.9
1111
py-cpuinfo==9.0.0
1212
pytest==7.4.4
13-
pytest-benchmark==4.0.0
1413
tomli==2.0.1
1514
typing_extensions==4.10.0
1615
wrapt==1.16.0

Diff for: ‎instrumentation/opentelemetry-instrumentation-asgi/test-requirements.txt

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ packaging==24.0
66
pluggy==1.5.0
77
py-cpuinfo==9.0.0
88
pytest==7.4.4
9-
pytest-benchmark==4.0.0
109
tomli==2.0.1
1110
typing_extensions==4.9.0
1211
wrapt==1.16.0

Diff for: ‎instrumentation/opentelemetry-instrumentation-asyncio/test-requirements.txt

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ pluggy==1.5.0
77
py-cpuinfo==9.0.0
88
pytest==7.4.4
99
pytest-asyncio==0.23.5
10-
pytest-benchmark==4.0.0
1110
tomli==2.0.1
1211
typing_extensions==4.9.0
1312
wrapt==1.16.0

Diff for: ‎instrumentation/opentelemetry-instrumentation-asyncpg/test-requirements.txt

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ packaging==24.0
88
pluggy==1.5.0
99
py-cpuinfo==9.0.0
1010
pytest==7.4.4
11-
pytest-benchmark==4.0.0
1211
tomli==2.0.1
1312
typing_extensions==4.9.0
1413
wrapt==1.16.0

Diff for: ‎instrumentation/opentelemetry-instrumentation-aws-lambda/test-requirements.txt

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ packaging==24.0
66
pluggy==1.5.0
77
py-cpuinfo==9.0.0
88
pytest==7.4.4
9-
pytest-benchmark==4.0.0
109
tomli==2.0.1
1110
typing_extensions==4.9.0
1211
wrapt==1.16.0

Diff for: ‎instrumentation/opentelemetry-instrumentation-boto/test-requirements.txt

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ pluggy==1.5.0
2020
py-cpuinfo==9.0.0
2121
pycparser==2.21
2222
pytest==7.4.4
23-
pytest-benchmark==4.0.0
2423
python-dateutil==2.8.2
2524
pytz==2024.1
2625
PyYAML==6.0.1

Diff for: ‎instrumentation/opentelemetry-instrumentation-boto3sqs/test-requirements.txt

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ packaging==24.0
99
pluggy==1.5.0
1010
py-cpuinfo==9.0.0
1111
pytest==7.4.4
12-
pytest-benchmark==4.0.0
1312
python-dateutil==2.8.2
1413
s3transfer==0.10.0
1514
six==1.16.0

Diff for: ‎instrumentation/opentelemetry-instrumentation-botocore/test-requirements.txt

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ pluggy==1.5.0
2020
py-cpuinfo==9.0.0
2121
pycparser==2.21
2222
pytest==7.4.4
23-
pytest-benchmark==4.0.0
2423
python-dateutil==2.8.2
2524
pytz==2024.1
2625
PyYAML==6.0.1

Diff for: ‎instrumentation/opentelemetry-instrumentation-cassandra/test-requirements.txt

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ packaging==24.0
99
pluggy==1.5.0
1010
py-cpuinfo==9.0.0
1111
pytest==7.4.4
12-
pytest-benchmark==4.0.0
1312
PyYAML==6.0.1
1413
scylla-driver==3.26.6
1514
six==1.16.0

Diff for: ‎instrumentation/opentelemetry-instrumentation-celery/test-requirements-0.txt

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ pluggy==1.5.0
1616
prompt-toolkit==3.0.43
1717
py-cpuinfo==9.0.0
1818
pytest==7.4.4
19-
pytest-benchmark==4.0.0
2019
python-dateutil==2.8.2
2120
six==1.16.0
2221
tomli==2.0.1

Diff for: ‎instrumentation/opentelemetry-instrumentation-celery/test-requirements-1.txt

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ pluggy==1.5.0
1515
prompt-toolkit==3.0.43
1616
py-cpuinfo==9.0.0
1717
pytest==7.4.4
18-
pytest-benchmark==4.0.0
1918
python-dateutil==2.8.2
2019
six==1.16.0
2120
tomli==2.0.1

Diff for: ‎instrumentation/opentelemetry-instrumentation-confluent-kafka/test-requirements.txt

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ packaging==24.0
77
pluggy==1.5.0
88
py-cpuinfo==9.0.0
99
pytest==7.4.4
10-
pytest-benchmark==4.0.0
1110
tomli==2.0.1
1211
typing_extensions==4.9.0
1312
wrapt==1.16.0

Diff for: ‎instrumentation/opentelemetry-instrumentation-dbapi/test-requirements.txt

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ packaging==24.0
66
pluggy==1.5.0
77
py-cpuinfo==9.0.0
88
pytest==7.4.4
9-
pytest-benchmark==4.0.0
109
tomli==2.0.1
1110
typing_extensions==4.9.0
1211
wrapt==1.16.0

Diff for: ‎instrumentation/opentelemetry-instrumentation-django/test-requirements-0.txt

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ packaging==24.0
77
pluggy==1.5.0
88
py-cpuinfo==9.0.0
99
pytest==7.4.4
10-
pytest-benchmark==4.0.0
1110
pytz==2024.1
1211
sqlparse==0.5.0
1312
tomli==2.0.1

Diff for: ‎instrumentation/opentelemetry-instrumentation-django/test-requirements-1.txt

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ packaging==24.0
77
pluggy==1.5.0
88
py-cpuinfo==9.0.0
99
pytest==7.4.4
10-
pytest-benchmark==4.0.0
1110
pytz==2024.1
1211
sqlparse==0.5.0
1312
tomli==2.0.1

Diff for: ‎instrumentation/opentelemetry-instrumentation-django/test-requirements-2.txt

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ packaging==24.0
88
pluggy==1.5.0
99
py-cpuinfo==9.0.0
1010
pytest==7.4.4
11-
pytest-benchmark==4.0.0
1211
sqlparse==0.5.0
1312
tomli==2.0.1
1413
typing_extensions==4.10.0

Diff for: ‎instrumentation/opentelemetry-instrumentation-django/test-requirements-3.txt

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ packaging==24.0
77
pluggy==1.5.0
88
py-cpuinfo==9.0.0
99
pytest==7.4.4
10-
pytest-benchmark==4.0.0
1110
sqlparse==0.5.0
1211
tomli==2.0.1
1312
typing_extensions==4.10.0

Diff for: ‎instrumentation/opentelemetry-instrumentation-elasticsearch/test-requirements-0.txt

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ packaging==24.0
88
pluggy==1.5.0
99
py-cpuinfo==9.0.0
1010
pytest==7.4.4
11-
pytest-benchmark==4.0.0
1211
python-dateutil==2.8.2
1312
six==1.16.0
1413
tomli==2.0.1

Diff for: ‎instrumentation/opentelemetry-instrumentation-elasticsearch/test-requirements-1.txt

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ packaging==24.0
88
pluggy==1.5.0
99
py-cpuinfo==9.0.0
1010
pytest==7.4.4
11-
pytest-benchmark==4.0.0
1211
python-dateutil==2.8.2
1312
six==1.16.0
1413
tomli==2.0.1

Diff for: ‎instrumentation/opentelemetry-instrumentation-elasticsearch/test-requirements-2.txt

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ packaging==24.0
99
pluggy==1.5.0
1010
py-cpuinfo==9.0.0
1111
pytest==7.4.4
12-
pytest-benchmark==4.0.0
1312
python-dateutil==2.8.2
1413
six==1.16.0
1514
tomli==2.0.1

Diff for: ‎instrumentation/opentelemetry-instrumentation-falcon/test-requirements-0.txt

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ packaging==24.0
77
pluggy==1.5.0
88
py-cpuinfo==9.0.0
99
pytest==7.4.4
10-
pytest-benchmark==4.0.0
1110
python-mimeparse==1.6.0
1211
six==1.16.0
1312
tomli==2.0.1

Diff for: ‎instrumentation/opentelemetry-instrumentation-falcon/test-requirements-1.txt

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ packaging==24.0
77
pluggy==1.5.0
88
py-cpuinfo==9.0.0
99
pytest==7.4.4
10-
pytest-benchmark==4.0.0
1110
tomli==2.0.1
1211
typing_extensions==4.10.0
1312
wrapt==1.16.0

Diff for: ‎instrumentation/opentelemetry-instrumentation-falcon/test-requirements-2.txt

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ packaging==24.0
77
pluggy==1.5.0
88
py-cpuinfo==9.0.0
99
pytest==7.4.4
10-
pytest-benchmark==4.0.0
1110
tomli==2.0.1
1211
typing_extensions==4.10.0
1312
wrapt==1.16.0

Diff for: ‎instrumentation/opentelemetry-instrumentation-fastapi/test-requirements.txt

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ py-cpuinfo==9.0.0
1818
pydantic==2.6.2
1919
pydantic_core==2.16.3
2020
pytest==7.4.4
21-
pytest-benchmark==4.0.0
2221
requests==2.32.3
2322
sniffio==1.3.0
2423
starlette==0.36.3

Diff for: ‎instrumentation/opentelemetry-instrumentation-flask/test-requirements-0.txt

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ packaging==24.0
1111
pluggy==1.5.0
1212
py-cpuinfo==9.0.0
1313
pytest==7.4.4
14-
pytest-benchmark==4.0.0
1514
tomli==2.0.1
1615
typing_extensions==4.9.0
1716
Werkzeug==2.3.8

Diff for: ‎instrumentation/opentelemetry-instrumentation-flask/test-requirements-1.txt

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ packaging==24.0
1111
pluggy==1.5.0
1212
py-cpuinfo==9.0.0
1313
pytest==7.4.4
14-
pytest-benchmark==4.0.0
1514
tomli==2.0.1
1615
typing_extensions==4.9.0
1716
Werkzeug==2.3.8

Diff for: ‎instrumentation/opentelemetry-instrumentation-flask/test-requirements-2.txt

-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ packaging==24.0
1212
pluggy==1.5.0
1313
py-cpuinfo==9.0.0
1414
pytest==7.4.4
15-
pytest-benchmark==4.0.0
1615
tomli==2.0.1
1716
typing_extensions==4.9.0
1817
Werkzeug==3.0.3

Diff for: ‎instrumentation/opentelemetry-instrumentation-grpc/test-requirements.txt

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ pluggy==1.5.0
88
protobuf==3.20.3
99
py-cpuinfo==9.0.0
1010
pytest==7.4.4
11-
pytest-benchmark==4.0.0
1211
tomli==2.0.1
1312
typing_extensions==4.9.0
1413
wrapt==1.16.0

Diff for: ‎instrumentation/opentelemetry-instrumentation-httpx/test-requirements-0.txt

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ packaging==24.0
1313
pluggy==1.5.0
1414
py-cpuinfo==9.0.0
1515
pytest==7.4.4
16-
pytest-benchmark==4.0.0
1716
respx==0.17.1
1817
rfc3986==1.5.0
1918
sniffio==1.3.1

Diff for: ‎instrumentation/opentelemetry-instrumentation-httpx/test-requirements-1.txt

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ packaging==24.0
1313
pluggy==1.5.0
1414
py-cpuinfo==9.0.0
1515
pytest==7.4.4
16-
pytest-benchmark==4.0.0
1716
respx==0.20.2
1817
sniffio==1.3.1
1918
tomli==2.0.1

0 commit comments

Comments
 (0)