Skip to content

Commit 8e0ba23

Browse files
authored
Merge branch 'main' into fix-sqlalchemy-engine-from-config-monkeypatching
2 parents c446d2e + d52f42f commit 8e0ba23

File tree

244 files changed

+2740
-808
lines changed

Some content is hidden

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

244 files changed

+2740
-808
lines changed

Diff for: .github/component_owners.yml

+3-14
Original file line numberDiff line numberDiff line change
@@ -45,27 +45,13 @@ components:
4545

4646
instrumentation/opentelemetry-instrumentation-urllib:
4747
- shalevr
48-
- ocelotl
4948

5049
instrumentation/opentelemetry-instrumentation-urllib3:
5150
- shalevr
52-
- ocelotl
5351

5452
instrumentation/opentelemetry-instrumentation-sqlalchemy:
5553
- shalevr
5654

57-
instrumentation/opentelemetry-instrumentation-flask:
58-
- ocelotl
59-
60-
instrumentation/opentelemetry-instrumentation-jinja2:
61-
- ocelotl
62-
63-
instrumentation/opentelemetry-instrumentation-logging:
64-
- ocelotl
65-
66-
instrumentation/opentelemetry-instrumentation-requests:
67-
- ocelotl
68-
6955
instrumentation/opentelemetry-instrumentation-cassandra:
7056
- mattcontinisio
7157

@@ -75,5 +61,8 @@ components:
7561
instrumentation/opentelemetry-instrumentation-psycopg:
7662
- federicobond
7763

64+
instrumentation/opentelemetry-instrumentation-aiokafka:
65+
- dimastbk
66+
7867
processor/opentelemetry-processor-baggage:
7968
- codeboten

Diff for: .github/workflows/generate_workflows_lib/src/generate_workflows_lib/misc.yml.j2

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ jobs:
2323
{%- if job_data == "generate-workflows" %}
2424
if: |
2525
!contains(github.event.pull_request.labels.*.name, 'Skip generate-workflows')
26-
&& github.actor != 'opentelemetrybot'
26+
&& github.actor != 'opentelemetrybot' && github.event_name == 'pull_request'
2727
{%- endif %}
2828
{%- if job_data == "public-symbols-check" %}
2929
if: |
3030
!contains(github.event.pull_request.labels.*.name, 'Approve Public API check')
31-
&& github.actor != 'opentelemetrybot'
31+
&& github.actor != 'opentelemetrybot' && github.event_name == 'pull_request'
3232
{%- endif %}
3333
steps:
3434
- name: Checkout repo @ SHA - ${% raw %}{{ github.sha }}{% endraw %}

Diff for: .github/workflows/lint_0.yml

+18
Original file line numberDiff line numberDiff line change
@@ -970,6 +970,24 @@ jobs:
970970
- name: Run tests
971971
run: tox -e lint-instrumentation-aio-pika
972972

973+
lint-instrumentation-aiokafka:
974+
name: instrumentation-aiokafka
975+
runs-on: ubuntu-latest
976+
steps:
977+
- name: Checkout repo @ SHA - ${{ github.sha }}
978+
uses: actions/checkout@v4
979+
980+
- name: Set up Python 3.12
981+
uses: actions/setup-python@v5
982+
with:
983+
python-version: "3.12"
984+
985+
- name: Install tox
986+
run: pip install tox
987+
988+
- name: Run tests
989+
run: tox -e lint-instrumentation-aiokafka
990+
973991
lint-instrumentation-kafka-python:
974992
name: instrumentation-kafka-python
975993
runs-on: ubuntu-latest

Diff for: .github/workflows/misc_0.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ jobs:
9696
runs-on: ubuntu-latest
9797
if: |
9898
!contains(github.event.pull_request.labels.*.name, 'Skip generate-workflows')
99-
&& github.actor != 'opentelemetrybot'
99+
&& github.actor != 'opentelemetrybot' && github.event_name == 'pull_request'
100100
steps:
101101
- name: Checkout repo @ SHA - ${{ github.sha }}
102102
uses: actions/checkout@v4

Diff for: .github/workflows/test_1.yml

+108
Original file line numberDiff line numberDiff line change
@@ -3094,6 +3094,114 @@ jobs:
30943094
- name: Run tests
30953095
run: tox -e pypy3-test-instrumentation-aio-pika-3 -- -ra
30963096

3097+
py38-test-instrumentation-aiokafka_ubuntu-latest:
3098+
name: instrumentation-aiokafka 3.8 Ubuntu
3099+
runs-on: ubuntu-latest
3100+
steps:
3101+
- name: Checkout repo @ SHA - ${{ github.sha }}
3102+
uses: actions/checkout@v4
3103+
3104+
- name: Set up Python 3.8
3105+
uses: actions/setup-python@v5
3106+
with:
3107+
python-version: "3.8"
3108+
3109+
- name: Install tox
3110+
run: pip install tox
3111+
3112+
- name: Run tests
3113+
run: tox -e py38-test-instrumentation-aiokafka -- -ra
3114+
3115+
py39-test-instrumentation-aiokafka_ubuntu-latest:
3116+
name: instrumentation-aiokafka 3.9 Ubuntu
3117+
runs-on: ubuntu-latest
3118+
steps:
3119+
- name: Checkout repo @ SHA - ${{ github.sha }}
3120+
uses: actions/checkout@v4
3121+
3122+
- name: Set up Python 3.9
3123+
uses: actions/setup-python@v5
3124+
with:
3125+
python-version: "3.9"
3126+
3127+
- name: Install tox
3128+
run: pip install tox
3129+
3130+
- name: Run tests
3131+
run: tox -e py39-test-instrumentation-aiokafka -- -ra
3132+
3133+
py310-test-instrumentation-aiokafka_ubuntu-latest:
3134+
name: instrumentation-aiokafka 3.10 Ubuntu
3135+
runs-on: ubuntu-latest
3136+
steps:
3137+
- name: Checkout repo @ SHA - ${{ github.sha }}
3138+
uses: actions/checkout@v4
3139+
3140+
- name: Set up Python 3.10
3141+
uses: actions/setup-python@v5
3142+
with:
3143+
python-version: "3.10"
3144+
3145+
- name: Install tox
3146+
run: pip install tox
3147+
3148+
- name: Run tests
3149+
run: tox -e py310-test-instrumentation-aiokafka -- -ra
3150+
3151+
py311-test-instrumentation-aiokafka_ubuntu-latest:
3152+
name: instrumentation-aiokafka 3.11 Ubuntu
3153+
runs-on: ubuntu-latest
3154+
steps:
3155+
- name: Checkout repo @ SHA - ${{ github.sha }}
3156+
uses: actions/checkout@v4
3157+
3158+
- name: Set up Python 3.11
3159+
uses: actions/setup-python@v5
3160+
with:
3161+
python-version: "3.11"
3162+
3163+
- name: Install tox
3164+
run: pip install tox
3165+
3166+
- name: Run tests
3167+
run: tox -e py311-test-instrumentation-aiokafka -- -ra
3168+
3169+
py312-test-instrumentation-aiokafka_ubuntu-latest:
3170+
name: instrumentation-aiokafka 3.12 Ubuntu
3171+
runs-on: ubuntu-latest
3172+
steps:
3173+
- name: Checkout repo @ SHA - ${{ github.sha }}
3174+
uses: actions/checkout@v4
3175+
3176+
- name: Set up Python 3.12
3177+
uses: actions/setup-python@v5
3178+
with:
3179+
python-version: "3.12"
3180+
3181+
- name: Install tox
3182+
run: pip install tox
3183+
3184+
- name: Run tests
3185+
run: tox -e py312-test-instrumentation-aiokafka -- -ra
3186+
3187+
pypy3-test-instrumentation-aiokafka_ubuntu-latest:
3188+
name: instrumentation-aiokafka pypy-3.8 Ubuntu
3189+
runs-on: ubuntu-latest
3190+
steps:
3191+
- name: Checkout repo @ SHA - ${{ github.sha }}
3192+
uses: actions/checkout@v4
3193+
3194+
- name: Set up Python pypy-3.8
3195+
uses: actions/setup-python@v5
3196+
with:
3197+
python-version: "pypy-3.8"
3198+
3199+
- name: Install tox
3200+
run: pip install tox
3201+
3202+
- name: Run tests
3203+
run: tox -e pypy3-test-instrumentation-aiokafka -- -ra
3204+
30973205
py38-test-instrumentation-kafka-python_ubuntu-latest:
30983206
name: instrumentation-kafka-python 3.8 Ubuntu
30993207
runs-on: ubuntu-latest

Diff for: CHANGELOG.md

+32-5
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,44 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## Unreleased
99

10-
## Added
10+
### Added
11+
12+
- `opentelemetry-instrumentation-fastapi` Add autoinstrumentation mechanism tests.
13+
([#2860](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2860))
14+
- `opentelemetry-instrumentation-aiokafka` Add instrumentor and auto instrumentation support for aiokafka
15+
([#2082](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2082))
16+
17+
18+
### Fixed
19+
20+
- `opentelemetry-instrumentation-aiokafka` Wrap `AIOKafkaConsumer.getone()` instead of `AIOKafkaConsumer.__anext__`
21+
([#2874](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2874))
22+
23+
## Version 1.27.0/0.48b0 ()
24+
25+
### Added
1126

1227
- `opentelemetry-instrumentation-kafka-python` Instrument temporary fork, kafka-python-ng
1328
inside kafka-python's instrumentation
1429
([#2537](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2537))
30+
- `opentelemetry-instrumentation-asgi`, `opentelemetry-instrumentation-fastapi` Add ability to disable internal HTTP send and receive spans
31+
([#2802](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2802))
32+
- `opentelemetry-instrumentation-asgi` Add fallback decoding for ASGI headers
33+
([#2837](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2837))
1534

16-
## Breaking changes
35+
### Breaking changes
1736

1837
- `opentelemetry-bootstrap` Remove `opentelemetry-instrumentation-aws-lambda` from the defaults instrumentations
1938
([#2786](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2786))
2039

21-
## Fixed
40+
### Fixed
2241

42+
- `opentelemetry-instrumentation-httpx` fix handling of async hooks
43+
([#2823](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2823))
2344
- `opentelemetry-instrumentation-system-metrics` fix `process.runtime.cpu.utilization` values to be shown in range of 0 to 1
24-
([2812](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2812))
45+
([#2812](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2812))
2546
- `opentelemetry-instrumentation-fastapi` fix `fastapi` auto-instrumentation by removing `fastapi-slim` support, `fastapi-slim` itself is discontinued from maintainers
26-
([2783](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2783))
47+
([#2783](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2783))
2748
- `opentelemetry-instrumentation-aws-lambda` Avoid exception when a handler is not present.
2849
([#2750](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2750))
2950
- `opentelemetry-instrumentation-django` Fix regression - `http.target` re-added back to old semconv duration metrics
@@ -42,6 +63,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
4263
([#2563](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2563))
4364
- `opentelemetry-instrumentation-sqlalchemy` Fixes engines from `sqlalchemy.engine_from_config` not being fully instrumented
4465
([#2816](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2816))
66+
- `opentelemetry-instrumentation` fix `http.host` new http semantic convention mapping to depend on `kind` of span
67+
([#2814](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2814))
68+
- `opentelemetry-instrumentation` Fix the description of `http.server.duration` and `http.server.request.duration`
69+
([#2753](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2753))
70+
- `opentelemetry-instrumentation-grpc` Fix grpc supported version
71+
([#2845](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2845))
4572

4673
## Version 1.26.0/0.47b0 (2024-07-23)
4774

Diff for: CONTRIBUTING.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ Some of the tox targets install packages from the [OpenTelemetry Python Core Rep
235235
CORE_REPO_SHA=c49ad57bfe35cfc69bfa863d74058ca9bec55fc3 tox
236236
```
237237

238-
The continuous integration overrides that environment variable with as per the configuration [here](https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/.github/workflows/test.yml#L9).
238+
The continuous integration overrides that environment variable with as per the configuration [here](https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/.github/workflows/test_0.yml#L14).
239239

240240
## Style Guide
241241

@@ -275,6 +275,7 @@ Below is a checklist of things to be mindful of when implementing a new instrume
275275
- Isolate sync and async test
276276
- For synchronous tests, the typical test case class is inherited from `opentelemetry.test.test_base.TestBase`. However, if you want to write asynchronous tests, the test case class should inherit also from `IsolatedAsyncioTestCase`. Adding asynchronous tests to a common test class can lead to tests passing without actually running, which can be misleading.
277277
- ex. <https://github.com/open-telemetry/opentelemetry-python-contrib/blob/60fb936b7e5371b3e5587074906c49fb873cbd76/instrumentation/opentelemetry-instrumentation-grpc/tests/test_aio_server_interceptor.py#L84>
278+
- All instrumentations have the same version. If you are going to develop a new instrumentation it would probably have `X.Y.dev` version and depends on `opentelemetry-instrumentation` and `opentelemetry-semantic-conventions` for the same version. That means that if you want to install your instrumentation you need to install its dependencies from this repo and the core repo also from git.
278279

279280
## Expectations from contributors
280281

Diff for: README.md

+8-5
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,11 @@
2020
<img alt="license" src="https://img.shields.io/badge/license-Apache_2.0-green.svg?style=for-the-badge">
2121
</a>
2222
<br/>
23-
<a href="https://github.com/open-telemetry/opentelemetry-python-contrib/actions?query=workflow%3ATest+branch%3Amaster">
24-
<img alt="Build Status" src="https://github.com/open-telemetry/opentelemetry-python-contrib/workflows/Test/badge.svg">
23+
<a href="https://github.com/open-telemetry/opentelemetry-python-contrib/actions/workflows/test_0.yml">
24+
<img alt="Build Status 0" src="https://github.com/open-telemetry/opentelemetry-python-contrib/actions/workflows/test_0.yml/badge.svg?branch=main">
25+
</a>
26+
<a href="https://github.com/open-telemetry/opentelemetry-python-contrib/actions/workflows/test_1.yml">
27+
<img alt="Build Status 1" src="https://github.com/open-telemetry/opentelemetry-python-contrib/actions/workflows/test_1.yml/badge.svg?branch=main">
2528
</a>
2629
<img alt="Beta" src="https://img.shields.io/badge/status-beta-informational?logo=data:image/png;base64,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">
2730
</p>
@@ -70,7 +73,7 @@ pip install opentelemetry-instrumentation-{integration}
7073

7174
To install the development versions of these packages instead, clone or fork
7275
this repo and do an [editable
73-
install](https://pip.pypa.io/en/stable/reference/pip_install/#editable-installs):
76+
install](https://pip.pypa.io/en/stable/topics/local-project-installs/#editable-installs):
7477

7578
```sh
7679
pip install -e ./instrumentation/opentelemetry-instrumentation-{integration}
@@ -109,12 +112,10 @@ Meeting notes are available as a public [Google doc](https://docs.google.com/doc
109112

110113
Approvers ([@open-telemetry/python-approvers](https://github.com/orgs/open-telemetry/teams/python-approvers)):
111114

112-
- [Aaron Abbott](https://github.com/aabmass), Google
113115
- [Emídio Neto](https://github.com/emdneto), Zenvia
114116
- [Jeremy Voss](https://github.com/jeremydvoss), Microsoft
115117
- [Owais Lone](https://github.com/owais), Splunk
116118
- [Pablo Collins](https://github.com/pmcollins), Splunk
117-
- [Riccardo Magliocchetti](https://github.com/xrmx), Elastic
118119
- [Sanket Mehta](https://github.com/sanketmehta28), Cisco
119120
- [Srikanth Chekuri](https://github.com/srikanthccv), signoz.io
120121
- [Tammy Baylis](https://github.com/tammy-baylis-swi), SolarWinds
@@ -131,8 +132,10 @@ Emeritus Approvers:
131132

132133
Maintainers ([@open-telemetry/python-maintainers](https://github.com/orgs/open-telemetry/teams/python-maintainers)):
133134

135+
- [Aaron Abbott](https://github.com/aabmass), Google
134136
- [Diego Hurtado](https://github.com/ocelotl), Lightstep
135137
- [Leighton Chen](https://github.com/lzchen), Microsoft
138+
- [Riccardo Magliocchetti](https://github.com/xrmx), Elastic
136139
- [Shalev Roda](https://github.com/shalevr), Cisco
137140

138141
Emeritus Maintainers:

Diff for: _template/version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
__version__ = "0.48b0.dev"
15+
__version__ = "0.49b0.dev"

Diff for: docs-requirements.txt

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ django>=2.2
2020
# Required by instrumentation and exporter packages
2121
aio_pika~=7.2.0
2222
aiohttp~=3.0
23+
aiokafka~=0.11.0
2324
aiopg>=0.13.0,<1.3.0
2425
asyncpg>=0.12.0
2526
boto~=2.0

Diff for: docs/instrumentation/aiokafka/aiokafka.rst

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
.. include:: ../../../instrumentation/opentelemetry-instrumentation-aiokafka/README.rst
2+
:end-before: References
3+
4+
API
5+
---
6+
7+
.. automodule:: opentelemetry.instrumentation.aiokafka
8+
:members:
9+
:undoc-members:
10+
:show-inheritance:

Diff for: eachdist.ini

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ sortfirst=
1616
ext/*
1717

1818
[stable]
19-
version=1.27.0.dev
19+
version=1.28.0.dev
2020

2121
packages=
2222
opentelemetry-sdk
@@ -34,7 +34,7 @@ packages=
3434
opentelemetry-api
3535

3636
[prerelease]
37-
version=0.48b0.dev
37+
version=0.49b0.dev
3838

3939
packages=
4040
all

Diff for: exporter/opentelemetry-exporter-prometheus-remote-write/src/opentelemetry/exporter/prometheus_remote_write/version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
__version__ = "0.48b0.dev"
15+
__version__ = "0.49b0.dev"

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
asgiref==3.7.2
1+
asgiref==3.8.1
22
certifi==2024.7.4
33
charset-normalizer==3.3.2
44
# We can drop this after bumping baseline to pypy-39
@@ -16,7 +16,7 @@ pytest==7.4.4
1616
python-snappy==0.7.1
1717
requests==2.32.3
1818
tomli==2.0.1
19-
typing_extensions==4.10.0
19+
typing_extensions==4.12.2
2020
urllib3==2.2.2
2121
wrapt==1.16.0
2222
zipp==3.19.2

0 commit comments

Comments
 (0)