Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit e3638a9

Browse files
authoredSep 25, 2024··
Merge branch 'main' into rken-asgi-header-decoding
2 parents 017f9b6 + 3deb6b9 commit e3638a9

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed
 

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ pip install opentelemetry-instrumentation-{integration}
7373

7474
To install the development versions of these packages instead, clone or fork
7575
this repo and do an [editable
76-
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):
7777

7878
```sh
7979
pip install -e ./instrumentation/opentelemetry-instrumentation-{integration}

‎instrumentation/opentelemetry-instrumentation-flask/tests/test_programmatic.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -520,7 +520,7 @@ def test_flask_metrics_new_semconv(self):
520520
if isinstance(point, HistogramDataPoint):
521521
self.assertEqual(point.count, 3)
522522
self.assertAlmostEqual(
523-
duration_s, point.sum, places=2
523+
duration_s, point.sum, places=1
524524
)
525525
histogram_data_point_seen = True
526526
if isinstance(point, NumberDataPoint):

‎tests/opentelemetry-docker-tests/tests/docker-compose.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ services:
5151
- "14268:14268"
5252
- "9411:9411"
5353
otmssql:
54-
image: mcr.microsoft.com/mssql/server:2017-CU23-ubuntu-16.04
54+
image: mcr.microsoft.com/mssql/server:2022-CU14-ubuntu-22.04
5555
ports:
5656
- "1433:1433"
5757
environment:

‎tox.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -1257,7 +1257,7 @@ deps =
12571257
PyMySQL==0.10.1
12581258
PyNaCl==1.5.0
12591259
# prerequisite: install unixodbc
1260-
pyodbc==4.0.39
1260+
pyodbc==5.0.1
12611261
pyrsistent==0.20.0
12621262
pytest==8.0.2
12631263
pytest-celery==0.0.0

0 commit comments

Comments
 (0)
Please sign in to comment.