Merge branch 'main' into fix-ipv6-url-credentials

Author: lzchen

.pylintrc

@@ -492,4 +492,4 @@ min-public-methods=2
 
 # Exceptions that will emit a warning when being caught. Defaults to
 # "Exception".
-overgeneral-exceptions=Exception
+overgeneral-exceptions=builtins.Exception

instrumentation/opentelemetry-instrumentation-aiopg/tests/test_aiopg_integration.py

@@ -17,6 +17,7 @@
 from unittest.mock import MagicMock
 
 import aiopg
+import psycopg2
 
 import opentelemetry.instrumentation.aiopg
 from opentelemetry import trace as trace_api
@@ -384,7 +385,9 @@ def test_span_failed(self):
             span.attributes[SpanAttributes.DB_STATEMENT], "Test query"
         )
         self.assertIs(span.status.status_code, trace_api.StatusCode.ERROR)
-        self.assertEqual(span.status.description, "Exception: Test Exception")
+        self.assertEqual(
+            span.status.description, "ProgrammingError: Test Exception"
+        )
 
     def test_executemany(self):
         db_integration = AiopgIntegration(self.tracer, "testcomponent")
@@ -570,17 +573,17 @@ class MockCursor:
     # pylint: disable=unused-argument, no-self-use
     async def execute(self, query, params=None, throw_exception=False):
         if throw_exception:
-            raise Exception("Test Exception")
+            raise psycopg2.ProgrammingError("Test Exception")
 
     # pylint: disable=unused-argument, no-self-use
     async def executemany(self, query, params=None, throw_exception=False):
         if throw_exception:
-            raise Exception("Test Exception")
+            raise psycopg2.ProgrammingError("Test Exception")
 
     # pylint: disable=unused-argument, no-self-use
     async def callproc(self, query, params=None, throw_exception=False):
         if throw_exception:
-            raise Exception("Test Exception")
+            raise psycopg2.ProgrammingError("Test Exception")
 
     def close(self):
         pass

instrumentation/opentelemetry-instrumentation-aws-lambda/tests/mocks/lambda_function.py

@@ -22,4 +22,5 @@ def rest_api_handler(event, context):
 
 
 def handler_exc(event, context):
+    # pylint: disable=broad-exception-raised
     raise Exception("500 internal server error")

instrumentation/opentelemetry-instrumentation-botocore/test-requirements.txt

@@ -28,7 +28,7 @@ jsonschema==4.21.1
 jsonschema-specifications==2023.12.1
 junit-xml==1.9
 MarkupSafe==2.0.1
-moto==2.2.20
+moto==3.1.19
 mpmath==1.3.0
 networkx==3.1
 packaging==23.2

instrumentation/opentelemetry-instrumentation-botocore/tests/test_botocore_dynamodb.py

@@ -324,14 +324,14 @@ def test_get_item(self):
             Key={"id": {"S": "1"}},
             ConsistentRead=True,
             AttributesToGet=["id"],
-            ProjectionExpression="1,2",
+            ProjectionExpression="PE",
             ReturnConsumedCapacity="TOTAL",
         )
 
         span = self.assert_span("GetItem")
         self.assert_table_names(span, self.default_table_name)
         self.assert_consistent_read(span, True)
-        self.assert_projection(span, "1,2")
+        self.assert_projection(span, "PE")
         self.assert_consumed_capacity(span, self.default_table_name)
 
     @mock_dynamodb2
@@ -390,7 +390,7 @@ def test_query(self):
                 }
             },
             ScanIndexForward=True,
-            ProjectionExpression="1,2",
+            ProjectionExpression="PE",
             ReturnConsumedCapacity="TOTAL",
         )
 
@@ -403,7 +403,7 @@ def test_query(self):
         self.assert_consistent_read(span, True)
         self.assert_index_name(span, "lsi")
         self.assert_limit(span, 42)
-        self.assert_projection(span, "1,2")
+        self.assert_projection(span, "PE")
         self.assert_select(span, "ALL_ATTRIBUTES")
         self.assert_consumed_capacity(span, self.default_table_name)
 
@@ -419,7 +419,7 @@ def test_scan(self):
             Select="ALL_ATTRIBUTES",
             TotalSegments=17,
             Segment=21,
-            ProjectionExpression="1,2",
+            ProjectionExpression="PE",
             ConsistentRead=True,
             ReturnConsumedCapacity="TOTAL",
         )
@@ -440,7 +440,7 @@ def test_scan(self):
         self.assert_consistent_read(span, True)
         self.assert_index_name(span, "lsi")
         self.assert_limit(span, 42)
-        self.assert_projection(span, "1,2")
+        self.assert_projection(span, "PE")
         self.assert_select(span, "ALL_ATTRIBUTES")
         self.assert_consumed_capacity(span, self.default_table_name)
 

instrumentation/opentelemetry-instrumentation-dbapi/tests/test_dbapi_integration.py

@@ -419,16 +419,19 @@ def __init__(self) -> None:
     # pylint: disable=unused-argument, no-self-use
     def execute(self, query, params=None, throw_exception=False):
         if throw_exception:
+            # pylint: disable=broad-exception-raised
             raise Exception("Test Exception")
 
     # pylint: disable=unused-argument, no-self-use
     def executemany(self, query, params=None, throw_exception=False):
         if throw_exception:
+            # pylint: disable=broad-exception-raised
             raise Exception("Test Exception")
         self.query = query
         self.params = params
 
     # pylint: disable=unused-argument, no-self-use
     def callproc(self, query, params=None, throw_exception=False):
         if throw_exception:
+            # pylint: disable=broad-exception-raised
             raise Exception("Test Exception")

instrumentation/opentelemetry-instrumentation-grpc/tests/test_aio_client_interceptor_hooks.py

@@ -47,11 +47,11 @@ def response_hook(span, response):
 
 
 def request_hook_with_exception(_span, _request):
-    raise Exception()
+    raise Exception()  # pylint: disable=broad-exception-raised
 
 
 def response_hook_with_exception(_span, _response):
-    raise Exception()
+    raise Exception()  # pylint: disable=broad-exception-raised
 
 
 @pytest.mark.asyncio

instrumentation/opentelemetry-instrumentation-grpc/tests/test_client_interceptor_hooks.py

@@ -73,11 +73,11 @@ def response_hook(span, response):
 
 
 def request_hook_with_exception(_span, _request):
-    raise Exception()
+    raise Exception()  # pylint: disable=broad-exception-raised
 
 
 def response_hook_with_exception(_span, _response):
-    raise Exception()
+    raise Exception()  # pylint: disable=broad-exception-raised
 
 
 class TestHooks(TestBase):

instrumentation/opentelemetry-instrumentation-pika/tests/test_utils.py

@@ -558,7 +558,7 @@ def test_decorate_deque_proxy(
         self.assertEqual(res, evt)
         generator_info.pending_events.popleft.assert_called_once()
         extract.assert_not_called()
-        context_get_current.not_called()
+        context_get_current.assert_not_called()
         context_detach.assert_called_once()
         context_attach.assert_not_called()
         get_span.assert_not_called()

instrumentation/opentelemetry-instrumentation-psycopg/tests/test_psycopg_integration.py

@@ -53,17 +53,17 @@ def __init__(self, *args, **kwargs):
     # pylint: disable=unused-argument, no-self-use
     async def execute(self, query, params=None, throw_exception=False):
         if throw_exception:
-            raise Exception("Test Exception")
+            raise psycopg.Error("Test Exception")
 
     # pylint: disable=unused-argument, no-self-use
     async def executemany(self, query, params=None, throw_exception=False):
         if throw_exception:
-            raise Exception("Test Exception")
+            raise psycopg.Error("Test Exception")
 
     # pylint: disable=unused-argument, no-self-use
     async def callproc(self, query, params=None, throw_exception=False):
         if throw_exception:
-            raise Exception("Test Exception")
+            raise psycopg.Error("Test Exception")
 
     async def __aenter__(self, *args, **kwargs):
         return self