Skip to content

Commit 5dfe2f0

Browse files
authored
Merge branch 'main' into kludex/types-wsgi
2 parents 285c01c + b7e7d0c commit 5dfe2f0

File tree

23 files changed

+1001
-243
lines changed

23 files changed

+1001
-243
lines changed

.github/workflows/misc_0.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,3 +152,21 @@ jobs:
152152

153153
- name: Run tests
154154
run: tox -e ruff
155+
156+
typecheck:
157+
name: typecheck
158+
runs-on: ubuntu-latest
159+
steps:
160+
- name: Checkout repo @ SHA - ${{ github.sha }}
161+
uses: actions/checkout@v4
162+
163+
- name: Set up Python 3.11
164+
uses: actions/setup-python@v5
165+
with:
166+
python-version: "3.11"
167+
168+
- name: Install tox
169+
run: pip install tox
170+
171+
- name: Run tests
172+
run: tox -e typecheck

CHANGELOG.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1717
([#3100](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3100))
1818
- Add support to database stability opt-in in `_semconv` utilities and add tests
1919
([#3111](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3111))
20+
- `opentelemetry-opentelemetry-pymongo` Add `py.typed` file to enable PEP 561
21+
([#3136](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3136))
22+
- `opentelemetry-opentelemetry-requests` Add `py.typed` file to enable PEP 561
23+
([#3135](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3135))
2024
- `opentelemetry-instrumentation-system-metrics` Add `py.typed` file to enable PEP 561
2125
([#3132](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3132))
2226
- `opentelemetry-opentelemetry-sqlite3` Add `py.typed` file to enable PEP 561
2327
([#3133](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3133))
2428
- `opentelemetry-instrumentation-falcon` add support version to v4
2529
([#3086](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3086))
30+
- `opentelemetry-instrumentation-falcon` Implement new HTTP semantic convention opt-in for Falcon
31+
([#2790](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2790))
2632
- `opentelemetry-instrumentation-wsgi` always record span status code to have it available in metrics
2733
([#3148](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3148))
2834
- add support to Python 3.13
@@ -36,6 +42,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
3642

3743
- `opentelemetry-instrumentation-httpx` Fix `RequestInfo`/`ResponseInfo` type hints
3844
([#3105](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3105))
45+
- `opentelemetry-instrumentation-dbapi` Move `TracedCursorProxy` and `TracedConnectionProxy` to the module level
46+
([#3068](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3068))
3947
- `opentelemetry-instrumentation-click` Disable tracing of well-known server click commands
4048
([#3174](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3174))
4149
- `opentelemetry-instrumentation` Fix `get_dist_dependency_conflicts` if no distribution requires
@@ -52,6 +60,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
5260
([#3115](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3115))
5361

5462

63+
### Breaking changes
64+
65+
- `opentelemetry-instrumentation-dbapi` including sqlcomment in `db.statement` span attribute value is now opt-in
66+
([#3115](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3115))
67+
- `opentelemetry-instrumentation-psycopg2`, `opentelemetry-instrumentation-psycopg`, `opentelemetry-instrumentation-mysqlclient`, `opentelemetry-instrumentation-pymysql`: including sqlcomment in `db.statement` span attribute value is now opt-in
68+
([#3121](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3121))
69+
70+
5571
## Version 1.29.0/0.50b0 (2024-12-11)
5672

5773
### Added

dev-requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
pylint==3.0.2
22
httpretty==1.1.4
3-
mypy==0.931
3+
pyright==v1.1.390
44
sphinx==7.1.2
55
sphinx-rtd-theme==2.0.0rc4
66
sphinx-autodoc-typehints==1.25.2

docs/nitpick-exceptions.ini

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ py-class=
4141
callable
4242
Consumer
4343
confluent_kafka.Message
44+
ObjectProxy
4445

4546
any=
4647
; API
@@ -68,6 +69,8 @@ any=
6869

6970
py-obj=
7071
opentelemetry.propagators.textmap.CarrierT
72+
opentelemetry.instrumentation.dbapi.ConnectionT
73+
opentelemetry.instrumentation.dbapi.CursorT
7174

7275
py-func=
7376
poll

instrumentation/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
| [opentelemetry-instrumentation-dbapi](./opentelemetry-instrumentation-dbapi) | dbapi | No | experimental
2121
| [opentelemetry-instrumentation-django](./opentelemetry-instrumentation-django) | django >= 1.10 | Yes | experimental
2222
| [opentelemetry-instrumentation-elasticsearch](./opentelemetry-instrumentation-elasticsearch) | elasticsearch >= 6.0 | No | experimental
23-
| [opentelemetry-instrumentation-falcon](./opentelemetry-instrumentation-falcon) | falcon >= 1.4.1, < 5.0.0 | Yes | experimental
23+
| [opentelemetry-instrumentation-falcon](./opentelemetry-instrumentation-falcon) | falcon >= 1.4.1, < 5.0.0 | Yes | migration
2424
| [opentelemetry-instrumentation-fastapi](./opentelemetry-instrumentation-fastapi) | fastapi ~= 0.58 | Yes | migration
2525
| [opentelemetry-instrumentation-flask](./opentelemetry-instrumentation-flask) | flask >= 1.0 | Yes | migration
2626
| [opentelemetry-instrumentation-grpc](./opentelemetry-instrumentation-grpc) | grpcio >= 1.42.0 | No | experimental

0 commit comments

Comments
 (0)