Skip to content

Commit 4d4e2de

Browse files
committed
Increase minimal version of starlette to 0.37.2 to have functional 'oldest' tests.
1 parent b6ac320 commit 4d4e2de

File tree

7 files changed

+35
-23
lines changed

7 files changed

+35
-23
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
2828
([#3380](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3381))
2929
- `opentelemetry-instrumentation-[asynclick/click]` Add missing opentelemetry-instrumentation dep
3030
([#3447](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3447))
31-
- `opentelemetry-instrumentation-starlette` Remove max version constraint on starlete ([#3456](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3456))
31+
- `opentelemetry-instrumentation-starlette` Remove max version constraint on starlete, increase min version ([#3456](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3456))
3232

3333
## Version 1.32.0/0.53b0 (2025-04-10)
3434

instrumentation/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
| [opentelemetry-instrumentation-requests](./opentelemetry-instrumentation-requests) | requests ~= 2.0 | Yes | migration
4545
| [opentelemetry-instrumentation-sqlalchemy](./opentelemetry-instrumentation-sqlalchemy) | sqlalchemy >= 1.0.0, < 2.1.0 | Yes | development
4646
| [opentelemetry-instrumentation-sqlite3](./opentelemetry-instrumentation-sqlite3) | sqlite3 | No | development
47-
| [opentelemetry-instrumentation-starlette](./opentelemetry-instrumentation-starlette) | starlette >= 0.13 | Yes | development
47+
| [opentelemetry-instrumentation-starlette](./opentelemetry-instrumentation-starlette) | starlette >= 0.37.2 | Yes | development
4848
| [opentelemetry-instrumentation-system-metrics](./opentelemetry-instrumentation-system-metrics) | psutil >= 5 | No | development
4949
| [opentelemetry-instrumentation-threading](./opentelemetry-instrumentation-threading) | threading | No | development
5050
| [opentelemetry-instrumentation-tornado](./opentelemetry-instrumentation-tornado) | tornado >= 5.1.1 | Yes | development

instrumentation/opentelemetry-instrumentation-starlette/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ dependencies = [
3434
]
3535

3636
[project.optional-dependencies]
37-
instruments = ["starlette >= 0.13"]
37+
instruments = ["starlette >= 0.37.2"]
3838

3939
[project.entry-points.opentelemetry_instrumentor]
4040
starlette = "opentelemetry.instrumentation.starlette:StarletteInstrumentor"

instrumentation/opentelemetry-instrumentation-starlette/src/opentelemetry/instrumentation/starlette/package.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@
1313
# limitations under the License.
1414

1515

16-
_instruments = ("starlette >= 0.13",)
16+
_instruments = ("starlette >= 0.37.2",)
1717

1818
_supports_metrics = True

instrumentation/opentelemetry-instrumentation-starlette/test-requirements.oldest.txt

Lines changed: 28 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,31 +17,37 @@
1717
# opentelemetry-instrumentation-asgi
1818
# opentelemetry-instrumentation-starlette
1919
anyio==4.5.2 ; python_full_version < '3.9'
20-
# via httpx
21-
anyio==4.8.0 ; python_full_version >= '3.9'
22-
# via httpx
23-
asgiref==3.8.1
20+
# via
21+
# httpx
22+
# starlette
23+
anyio==4.9.0 ; python_full_version >= '3.9'
24+
# via
25+
# httpx
26+
# starlette
27+
asgiref==3.0.0
2428
# via opentelemetry-instrumentation-asgi
25-
certifi==2025.1.31
29+
async-timeout==3.0.1
30+
# via asgiref
31+
certifi==2025.4.26
2632
# via
2733
# httpcore
2834
# httpx
2935
# requests
30-
charset-normalizer==3.4.1
36+
charset-normalizer==3.4.2
3137
# via requests
3238
colorama==0.4.6 ; sys_platform == 'win32'
3339
# via pytest
34-
deprecated==1.2.14
40+
deprecated==1.2.18
3541
# via
3642
# opentelemetry-api
3743
# opentelemetry-semantic-conventions
3844
exceptiongroup==1.2.2 ; python_full_version < '3.11'
3945
# via
4046
# anyio
4147
# pytest
42-
h11==0.14.0
48+
h11==0.16.0
4349
# via httpcore
44-
httpcore==1.0.7
50+
httpcore==1.0.9
4551
# via httpx
4652
httpx==0.28.0
4753
# via -r instrumentation/opentelemetry-instrumentation-starlette/test-requirements.in
@@ -54,14 +60,18 @@ importlib-metadata==8.5.0 ; python_full_version < '3.9'
5460
# via opentelemetry-api
5561
importlib-metadata==8.6.1 ; python_full_version >= '3.9'
5662
# via opentelemetry-api
57-
iniconfig==2.0.0
63+
iniconfig==2.1.0
5864
# via pytest
59-
packaging==24.0
65+
packaging==18.0
6066
# via
6167
# opentelemetry-instrumentation
6268
# pytest
6369
pluggy==1.5.0
6470
# via pytest
71+
pyparsing==3.1.4 ; python_full_version < '3.9'
72+
# via packaging
73+
pyparsing==3.2.3 ; python_full_version >= '3.9'
74+
# via packaging
6575
pytest==7.4.4
6676
# via
6777
# -c dev-requirements.txt
@@ -70,21 +80,23 @@ requests==2.32.3
7080
# via
7181
# -c dev-requirements.txt
7282
# -r instrumentation/opentelemetry-instrumentation-starlette/test-requirements.in
83+
six==1.17.0
84+
# via packaging
7385
sniffio==1.3.1
7486
# via anyio
75-
starlette==0.13.8
87+
starlette==0.37.2
7688
# via opentelemetry-instrumentation-starlette
7789
tomli==2.2.1 ; python_full_version < '3.11'
7890
# via pytest
79-
typing-extensions==4.12.2 ; python_full_version < '3.13'
91+
typing-extensions==4.13.2 ; python_full_version < '3.13'
8092
# via
8193
# anyio
82-
# asgiref
94+
# starlette
8395
urllib3==2.2.3 ; python_full_version < '3.9'
8496
# via requests
85-
urllib3==2.3.0 ; python_full_version >= '3.9'
97+
urllib3==2.4.0 ; python_full_version >= '3.9'
8698
# via requests
87-
wrapt==1.16.0
99+
wrapt==1.10.0
88100
# via
89101
# deprecated
90102
# opentelemetry-instrumentation

instrumentation/opentelemetry-instrumentation-starlette/tests/test_starlette_instrumentation.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -800,7 +800,6 @@ def test_custom_response_headers_not_in_span_attributes(self):
800800

801801
class TestWebSocketAppWithCustomHeaders(TestBaseWithCustomHeaders):
802802
def setUp(self):
803-
super().setUp()
804803
self.test_env_patch = patch.dict(
805804
"os.environ",
806805
{
@@ -810,10 +809,11 @@ def setUp(self):
810809
},
811810
)
812811
self.test_env_patch.start()
812+
super().setUp()
813813

814814
def tearDown(self):
815-
self.test_env_patch.stop()
816815
super().tearDown()
816+
self.test_env_patch.stop()
817817

818818
def test_custom_request_headers_in_span_attributes(self):
819819
expected = {

opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap_gen.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@
189189
"instrumentation": "opentelemetry-instrumentation-sqlalchemy==0.54b0.dev",
190190
},
191191
{
192-
"library": "starlette >= 0.13",
192+
"library": "starlette >= 0.37.2",
193193
"instrumentation": "opentelemetry-instrumentation-starlette==0.54b0.dev",
194194
},
195195
{

0 commit comments

Comments
 (0)