Skip to content

Commit 49f885b

Browse files
Merge branch 'main' into issue_5361
2 parents 5f5deb4 + 08322fd commit 49f885b

20 files changed

Lines changed: 43 additions & 749 deletions

File tree

.changelog/5293.removed

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
`opentelemetry-api`, `opentelemetry-sdk`: Removed deprecated Events API/SDK. Use `LogRecord` with the `event_name` field set instead.
2+

.changelog/5296.added

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
`opentelemetry-sdk`: Make it possible to limit the size of stored spans in InMemorySpanExporter

dev-requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ pytest==7.4.4
99
pytest-cov==4.1.0
1010
readme-renderer==42.0
1111
markupsafe==2.1.3
12-
bleach==4.1.0 # This dependency was updated to a breaking version.
12+
bleach==6.4.0 # This dependency was updated to a breaking version.
1313
codespell==2.1.0
1414
requests==2.32.3
1515
ruamel.yaml==0.17.21

docs/examples/fork-process-model/flask-gunicorn/requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
click==8.1.7
2-
Flask==2.3.3
2+
Flask==3.1.3
33
googleapis-common-protos==1.52.0
44
grpcio==1.56.2
55
gunicorn==22.0.0
@@ -16,5 +16,5 @@ protobuf==3.20.3
1616
six==1.15.0
1717
thrift==0.13.0
1818
uWSGI==2.0.22
19-
Werkzeug==3.0.6
19+
Werkzeug==3.1.5
2020
wrapt==1.16.0

docs/examples/fork-process-model/flask-uwsgi/requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
click==8.1.7
2-
Flask==2.3.3
2+
Flask==3.1.3
33
googleapis-common-protos==1.52.0
44
grpcio==1.56.2
55
itsdangerous==2.1.2
@@ -15,5 +15,5 @@ protobuf==3.20.3
1515
six==1.15.0
1616
thrift==0.13.0
1717
uWSGI==2.0.22
18-
Werkzeug==3.0.6
18+
Werkzeug==3.1.5
1919
wrapt==1.16.0

opentelemetry-api/src/opentelemetry/_events/__init__.py

Lines changed: 0 additions & 257 deletions
This file was deleted.

opentelemetry-api/src/opentelemetry/_events/py.typed

Whitespace-only changes.

opentelemetry-api/src/opentelemetry/environment_variables/__init__.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,3 @@
7070
"""
7171
.. envvar:: OTEL_PYTHON_LOGGER_PROVIDER
7272
"""
73-
74-
_OTEL_PYTHON_EVENT_LOGGER_PROVIDER = "OTEL_PYTHON_EVENT_LOGGER_PROVIDER"
75-
"""
76-
.. envvar:: OTEL_PYTHON_EVENT_LOGGER_PROVIDER
77-
"""

opentelemetry-api/tests/events/test_event.py

Lines changed: 0 additions & 24 deletions
This file was deleted.

opentelemetry-api/tests/events/test_event_logger_provider.py

Lines changed: 0 additions & 64 deletions
This file was deleted.

0 commit comments

Comments
 (0)