fix lint checks

Author: yiyuan-he

aws-opentelemetry-distro/src/amazon/opentelemetry/distro/_utils.py

@@ -49,12 +49,12 @@ def get_aws_region() -> str:
     # This will automatically check AWS CLI config, instance metadata, etc.
     if is_installed("botocore"):
         try:
-            from botocore import session
+            from botocore import session  # pylint: disable=import-outside-toplevel
 
             botocore_session = session.Session()
-            if botocore_session.region_name:
+            if hasattr(botocore_session, "region_name") and botocore_session.region_name:
                 return botocore_session.region_name
-        except Exception:
+        except (ImportError, AttributeError):
             # botocore failed to determine region
             pass
 

aws-opentelemetry-distro/src/amazon/opentelemetry/distro/aws_opentelemetry_distro.py

@@ -107,7 +107,8 @@ def _configure(self, **kwargs):
             # Set disabled instrumentations default
             os.environ.setdefault(
                 OTEL_PYTHON_DISABLED_INSTRUMENTATIONS,
-                "http,sqlalchemy,psycopg2,pymysql,sqlite3,aiopg,asyncpg,mysql_connector,botocore,boto3,urllib3,requests,starlette",
+                "http,sqlalchemy,psycopg2,pymysql,sqlite3,aiopg,asyncpg,mysql_connector,"
+                "botocore,boto3,urllib3,requests,starlette",
             )
 
             # Set logging auto instrumentation default

aws-opentelemetry-distro/tests/amazon/opentelemetry/distro/test_aws_opentelemetry_distro.py

@@ -6,6 +6,8 @@
 
 from pkg_resources import DistributionNotFound, require
 
+from amazon.opentelemetry.distro.aws_opentelemetry_distro import AwsOpenTelemetryDistro
+
 
 class TestAwsOpenTelemetryDistro(TestCase):
     def test_package_available(self):
@@ -41,8 +43,6 @@ def test_agent_observability_sets_new_defaults(self):
         os.environ["AGENT_OBSERVABILITY_ENABLED"] = "true"
 
         # Import and configure
-        from amazon.opentelemetry.distro.aws_opentelemetry_distro import AwsOpenTelemetryDistro
-
         with patch("amazon.opentelemetry.distro.aws_opentelemetry_distro.apply_instrumentation_patches"):
             with patch("amazon.opentelemetry.distro.aws_opentelemetry_distro.get_aws_region", return_value="us-west-2"):
                 # We need to mock the parent class to avoid its side effects
@@ -54,7 +54,8 @@ def test_agent_observability_sets_new_defaults(self):
         self.assertEqual(os.environ.get("OTEL_TRACES_SAMPLER"), "parentbased_always_on")
         self.assertEqual(
             os.environ.get("OTEL_PYTHON_DISABLED_INSTRUMENTATIONS"),
-            "http,sqlalchemy,psycopg2,pymysql,sqlite3,aiopg,asyncpg,mysql_connector,botocore,boto3,urllib3,requests,starlette",
+            "http,sqlalchemy,psycopg2,pymysql,sqlite3,aiopg,asyncpg,mysql_connector,"
+            "botocore,boto3,urllib3,requests,starlette",
         )
         self.assertEqual(os.environ.get("OTEL_PYTHON_LOGGING_AUTO_INSTRUMENTATION_ENABLED"), "true")
         self.assertEqual(os.environ.get("OTEL_AWS_APPLICATION_SIGNALS_ENABLED"), "false")
@@ -63,8 +64,6 @@ def test_new_defaults_not_set_when_agent_observability_disabled(self):
         # Don't set AGENT_OBSERVABILITY_ENABLED or set it to false
         os.environ.pop("AGENT_OBSERVABILITY_ENABLED", None)
 
-        from amazon.opentelemetry.distro.aws_opentelemetry_distro import AwsOpenTelemetryDistro
-
         with patch("amazon.opentelemetry.distro.aws_opentelemetry_distro.apply_instrumentation_patches"):
             with patch("opentelemetry.distro.OpenTelemetryDistro._configure"):
                 distro = AwsOpenTelemetryDistro()