Merge branch 'main' into fix-jinja2-template

open-telemetry · Aug 13, 2024 · 331d6a7 · 331d6a7
2 parents 14b0bc5 + 9c327ea
commit 331d6a7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/instrumentation/opentelemetry-instrumentation-aiohttp-client/test-requirements.txt b/instrumentation/opentelemetry-instrumentation-aiohttp-client/test-requirements.txt
@@ -1,4 +1,4 @@
-aiohttp==3.9.4
+aiohttp==3.10.2
 aiosignal==1.3.1
 asgiref==3.7.2
 async-timeout==4.0.3

diff --git a/...ion/opentelemetry-instrumentation-aiohttp-client/tests/test_aiohttp_client_integration.py b/...ion/opentelemetry-instrumentation-aiohttp-client/tests/test_aiohttp_client_integration.py
@@ -468,7 +468,7 @@ async def request_handler(request):
             [
                 (
                     "GET",
-                    (StatusCode.ERROR, "ServerTimeoutError"),
+                    (StatusCode.ERROR, "SocketTimeoutError"),
                     {
                         SpanAttributes.HTTP_METHOD: "GET",
                         SpanAttributes.HTTP_URL: f"http://{host}:{port}/test_timeout",

diff --git a/instrumentation/opentelemetry-instrumentation-aiohttp-server/test-requirements.txt b/instrumentation/opentelemetry-instrumentation-aiohttp-server/test-requirements.txt
@@ -1,4 +1,4 @@
-aiohttp==3.9.4
+aiohttp==3.10.2
 aiosignal==1.3.1
 asgiref==3.7.2
 async-timeout==4.0.3