Merge branch 'main' into aiokafka

open-telemetry · Sep 25, 2024 · 11ca543 · 11ca543
2 parents fcce000 + 3deb6b9
commit 11ca543
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -73,7 +73,7 @@ pip install opentelemetry-instrumentation-{integration}
 
 To install the development versions of these packages instead, clone or fork
 this repo and do an [editable
-install](https://pip.pypa.io/en/stable/reference/pip_install/#editable-installs):
+install](https://pip.pypa.io/en/stable/topics/local-project-installs/#editable-installs):
 
 ```sh
 pip install -e ./instrumentation/opentelemetry-instrumentation-{integration}

diff --git a/instrumentation/opentelemetry-instrumentation-flask/tests/test_programmatic.py b/instrumentation/opentelemetry-instrumentation-flask/tests/test_programmatic.py
@@ -520,7 +520,7 @@ def test_flask_metrics_new_semconv(self):
                         if isinstance(point, HistogramDataPoint):
                             self.assertEqual(point.count, 3)
                             self.assertAlmostEqual(
-                                duration_s, point.sum, places=2
+                                duration_s, point.sum, places=1
                             )
                             histogram_data_point_seen = True
                         if isinstance(point, NumberDataPoint):

diff --git a/tests/opentelemetry-docker-tests/tests/docker-compose.yml b/tests/opentelemetry-docker-tests/tests/docker-compose.yml
@@ -51,7 +51,7 @@ services:
         - "14268:14268"
         - "9411:9411"
   otmssql:
-    image: mcr.microsoft.com/mssql/server:2017-CU23-ubuntu-16.04
+    image: mcr.microsoft.com/mssql/server:2022-CU14-ubuntu-22.04
     ports:
       - "1433:1433"
     environment:

diff --git a/tox.ini b/tox.ini
@@ -1258,7 +1258,7 @@ deps =
   PyMySQL==0.10.1
   PyNaCl==1.5.0
   # prerequisite: install unixodbc
-  pyodbc==4.0.39
+  pyodbc==5.0.1
   pyrsistent==0.20.0
   pytest==8.0.2
   pytest-celery==0.0.0