Skip to content

Commit 017f9b6

Browse files
authored
Merge branch 'main' into rken-asgi-header-decoding
2 parents 09befa0 + 97c3664 commit 017f9b6

File tree

23 files changed

+1328
-3
lines changed

23 files changed

+1328
-3
lines changed

.github/workflows/generate_workflows_lib/src/generate_workflows_lib/misc.yml.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
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 %}

.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

.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

CHANGELOG.md

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

88
## Unreleased
99

10+
### Added
11+
1012
- `opentelemetry-instrumentation-fastapi` Add autoinstrumentation mechanism tests.
1113
([#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))
1216

1317
## Version 1.27.0/0.48b0 ()
1418

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
+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:

instrumentation/README.md

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
| [opentelemetry-instrumentation-aio-pika](./opentelemetry-instrumentation-aio-pika) | aio_pika >= 7.2.0, < 10.0.0 | No | experimental
55
| [opentelemetry-instrumentation-aiohttp-client](./opentelemetry-instrumentation-aiohttp-client) | aiohttp ~= 3.0 | No | migration
66
| [opentelemetry-instrumentation-aiohttp-server](./opentelemetry-instrumentation-aiohttp-server) | aiohttp ~= 3.0 | No | experimental
7+
| [opentelemetry-instrumentation-aiokafka](./opentelemetry-instrumentation-aiokafka) | aiokafka >= 0.8, < 1.0 | No | experimental
78
| [opentelemetry-instrumentation-aiopg](./opentelemetry-instrumentation-aiopg) | aiopg >= 0.13.0, < 2.0.0 | No | experimental
89
| [opentelemetry-instrumentation-asgi](./opentelemetry-instrumentation-asgi) | asgiref ~= 3.0 | Yes | migration
910
| [opentelemetry-instrumentation-asyncio](./opentelemetry-instrumentation-asyncio) | asyncio | No | experimental
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,201 @@
1+
Apache License
2+
Version 2.0, January 2004
3+
http://www.apache.org/licenses/
4+
5+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6+
7+
1. Definitions.
8+
9+
"License" shall mean the terms and conditions for use, reproduction,
10+
and distribution as defined by Sections 1 through 9 of this document.
11+
12+
"Licensor" shall mean the copyright owner or entity authorized by
13+
the copyright owner that is granting the License.
14+
15+
"Legal Entity" shall mean the union of the acting entity and all
16+
other entities that control, are controlled by, or are under common
17+
control with that entity. For the purposes of this definition,
18+
"control" means (i) the power, direct or indirect, to cause the
19+
direction or management of such entity, whether by contract or
20+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
21+
outstanding shares, or (iii) beneficial ownership of such entity.
22+
23+
"You" (or "Your") shall mean an individual or Legal Entity
24+
exercising permissions granted by this License.
25+
26+
"Source" form shall mean the preferred form for making modifications,
27+
including but not limited to software source code, documentation
28+
source, and configuration files.
29+
30+
"Object" form shall mean any form resulting from mechanical
31+
transformation or translation of a Source form, including but
32+
not limited to compiled object code, generated documentation,
33+
and conversions to other media types.
34+
35+
"Work" shall mean the work of authorship, whether in Source or
36+
Object form, made available under the License, as indicated by a
37+
copyright notice that is included in or attached to the work
38+
(an example is provided in the Appendix below).
39+
40+
"Derivative Works" shall mean any work, whether in Source or Object
41+
form, that is based on (or derived from) the Work and for which the
42+
editorial revisions, annotations, elaborations, or other modifications
43+
represent, as a whole, an original work of authorship. For the purposes
44+
of this License, Derivative Works shall not include works that remain
45+
separable from, or merely link (or bind by name) to the interfaces of,
46+
the Work and Derivative Works thereof.
47+
48+
"Contribution" shall mean any work of authorship, including
49+
the original version of the Work and any modifications or additions
50+
to that Work or Derivative Works thereof, that is intentionally
51+
submitted to Licensor for inclusion in the Work by the copyright owner
52+
or by an individual or Legal Entity authorized to submit on behalf of
53+
the copyright owner. For the purposes of this definition, "submitted"
54+
means any form of electronic, verbal, or written communication sent
55+
to the Licensor or its representatives, including but not limited to
56+
communication on electronic mailing lists, source code control systems,
57+
and issue tracking systems that are managed by, or on behalf of, the
58+
Licensor for the purpose of discussing and improving the Work, but
59+
excluding communication that is conspicuously marked or otherwise
60+
designated in writing by the copyright owner as "Not a Contribution."
61+
62+
"Contributor" shall mean Licensor and any individual or Legal Entity
63+
on behalf of whom a Contribution has been received by Licensor and
64+
subsequently incorporated within the Work.
65+
66+
2. Grant of Copyright License. Subject to the terms and conditions of
67+
this License, each Contributor hereby grants to You a perpetual,
68+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69+
copyright license to reproduce, prepare Derivative Works of,
70+
publicly display, publicly perform, sublicense, and distribute the
71+
Work and such Derivative Works in Source or Object form.
72+
73+
3. Grant of Patent License. Subject to the terms and conditions of
74+
this License, each Contributor hereby grants to You a perpetual,
75+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76+
(except as stated in this section) patent license to make, have made,
77+
use, offer to sell, sell, import, and otherwise transfer the Work,
78+
where such license applies only to those patent claims licensable
79+
by such Contributor that are necessarily infringed by their
80+
Contribution(s) alone or by combination of their Contribution(s)
81+
with the Work to which such Contribution(s) was submitted. If You
82+
institute patent litigation against any entity (including a
83+
cross-claim or counterclaim in a lawsuit) alleging that the Work
84+
or a Contribution incorporated within the Work constitutes direct
85+
or contributory patent infringement, then any patent licenses
86+
granted to You under this License for that Work shall terminate
87+
as of the date such litigation is filed.
88+
89+
4. Redistribution. You may reproduce and distribute copies of the
90+
Work or Derivative Works thereof in any medium, with or without
91+
modifications, and in Source or Object form, provided that You
92+
meet the following conditions:
93+
94+
(a) You must give any other recipients of the Work or
95+
Derivative Works a copy of this License; and
96+
97+
(b) You must cause any modified files to carry prominent notices
98+
stating that You changed the files; and
99+
100+
(c) You must retain, in the Source form of any Derivative Works
101+
that You distribute, all copyright, patent, trademark, and
102+
attribution notices from the Source form of the Work,
103+
excluding those notices that do not pertain to any part of
104+
the Derivative Works; and
105+
106+
(d) If the Work includes a "NOTICE" text file as part of its
107+
distribution, then any Derivative Works that You distribute must
108+
include a readable copy of the attribution notices contained
109+
within such NOTICE file, excluding those notices that do not
110+
pertain to any part of the Derivative Works, in at least one
111+
of the following places: within a NOTICE text file distributed
112+
as part of the Derivative Works; within the Source form or
113+
documentation, if provided along with the Derivative Works; or,
114+
within a display generated by the Derivative Works, if and
115+
wherever such third-party notices normally appear. The contents
116+
of the NOTICE file are for informational purposes only and
117+
do not modify the License. You may add Your own attribution
118+
notices within Derivative Works that You distribute, alongside
119+
or as an addendum to the NOTICE text from the Work, provided
120+
that such additional attribution notices cannot be construed
121+
as modifying the License.
122+
123+
You may add Your own copyright statement to Your modifications and
124+
may provide additional or different license terms and conditions
125+
for use, reproduction, or distribution of Your modifications, or
126+
for any such Derivative Works as a whole, provided Your use,
127+
reproduction, and distribution of the Work otherwise complies with
128+
the conditions stated in this License.
129+
130+
5. Submission of Contributions. Unless You explicitly state otherwise,
131+
any Contribution intentionally submitted for inclusion in the Work
132+
by You to the Licensor shall be under the terms and conditions of
133+
this License, without any additional terms or conditions.
134+
Notwithstanding the above, nothing herein shall supersede or modify
135+
the terms of any separate license agreement you may have executed
136+
with Licensor regarding such Contributions.
137+
138+
6. Trademarks. This License does not grant permission to use the trade
139+
names, trademarks, service marks, or product names of the Licensor,
140+
except as required for reasonable and customary use in describing the
141+
origin of the Work and reproducing the content of the NOTICE file.
142+
143+
7. Disclaimer of Warranty. Unless required by applicable law or
144+
agreed to in writing, Licensor provides the Work (and each
145+
Contributor provides its Contributions) on an "AS IS" BASIS,
146+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147+
implied, including, without limitation, any warranties or conditions
148+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149+
PARTICULAR PURPOSE. You are solely responsible for determining the
150+
appropriateness of using or redistributing the Work and assume any
151+
risks associated with Your exercise of permissions under this License.
152+
153+
8. Limitation of Liability. In no event and under no legal theory,
154+
whether in tort (including negligence), contract, or otherwise,
155+
unless required by applicable law (such as deliberate and grossly
156+
negligent acts) or agreed to in writing, shall any Contributor be
157+
liable to You for damages, including any direct, indirect, special,
158+
incidental, or consequential damages of any character arising as a
159+
result of this License or out of the use or inability to use the
160+
Work (including but not limited to damages for loss of goodwill,
161+
work stoppage, computer failure or malfunction, or any and all
162+
other commercial damages or losses), even if such Contributor
163+
has been advised of the possibility of such damages.
164+
165+
9. Accepting Warranty or Additional Liability. While redistributing
166+
the Work or Derivative Works thereof, You may choose to offer,
167+
and charge a fee for, acceptance of support, warranty, indemnity,
168+
or other liability obligations and/or rights consistent with this
169+
License. However, in accepting such obligations, You may act only
170+
on Your own behalf and on Your sole responsibility, not on behalf
171+
of any other Contributor, and only if You agree to indemnify,
172+
defend, and hold each Contributor harmless for any liability
173+
incurred by, or claims asserted against, such Contributor by reason
174+
of your accepting any such warranty or additional liability.
175+
176+
END OF TERMS AND CONDITIONS
177+
178+
APPENDIX: How to apply the Apache License to your work.
179+
180+
To apply the Apache License to your work, attach the following
181+
boilerplate notice, with the fields enclosed by brackets "[]"
182+
replaced with your own identifying information. (Don't include
183+
the brackets!) The text should be enclosed in the appropriate
184+
comment syntax for the file format. We also recommend that a
185+
file or class name and description of purpose be included on the
186+
same "printed page" as the copyright notice for easier
187+
identification within third-party archives.
188+
189+
Copyright [yyyy] [name of copyright owner]
190+
191+
Licensed under the Apache License, Version 2.0 (the "License");
192+
you may not use this file except in compliance with the License.
193+
You may obtain a copy of the License at
194+
195+
http://www.apache.org/licenses/LICENSE-2.0
196+
197+
Unless required by applicable law or agreed to in writing, software
198+
distributed under the License is distributed on an "AS IS" BASIS,
199+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200+
See the License for the specific language governing permissions and
201+
limitations under the License.

0 commit comments

Comments
 (0)