Reenable pylint broad exception (open-telemetry#2536)

.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-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-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

instrumentation/opentelemetry-instrumentation-urllib/tests/test_urllib_integration.py

@@ -99,7 +99,7 @@ def timeout_exception_callback(*_, **__):
 
     @staticmethod
     def base_exception_callback(*_, **__):
-        raise Exception("test")
+        raise Exception("test")  # pylint: disable=broad-exception-raised
 
     def assert_span(self, exporter=None, num_spans=1):
         if exporter is None: