Merge branch 'main' into fix-jinja2-template

shijiadong2022 · web-flow · commit 331d6a71bd24 · 2024-08-14T06:52:19.000+08:00
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/instrumentation/opentelemetry-instrumentation-aiohttp-client/tests/test_aiohttp_client_integration.py b/instrumentation/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

Original file line number	Diff line number	Diff line change
`@@ -468,7 +468,7 @@ async def request_handler(request):`
`468`	`468`	`[`
`469`	`469`	`(`
`470`	`470`	`"GET",`
`471`		`- (StatusCode.ERROR, "ServerTimeoutError"),`
	`471`	`+ (StatusCode.ERROR, "SocketTimeoutError"),`
`472`	`472`	`{`
`473`	`473`	`SpanAttributes.HTTP_METHOD: "GET",`
`474`	`474`	`SpanAttributes.HTTP_URL: f"http://{host}:{port}/test_timeout",`