Revert "add check if the app is starlette app"

This reverts commit 65d1818.

Author: liustve

aws-opentelemetry-distro/src/amazon/opentelemetry/distro/patches/_starlette_patches.py

@@ -4,8 +4,6 @@
 from logging import Logger, getLogger
 from typing import Collection
 
-from starlette import applications
-
 from amazon.opentelemetry.distro._utils import is_agent_observability_enabled
 
 _logger: Logger = getLogger(__name__)
@@ -33,20 +31,17 @@ def patched_instrumentation_dependencies(self) -> Collection[str]:
         # Apply the patch
         StarletteInstrumentor.instrumentation_dependencies = patched_instrumentation_dependencies
 
-        # Patch to exclude http receive/send ASGI event spans from Bedrock AgentCore Starlette applications,
+        # Patch to exclude http receive/send ASGI event spans from Bedrock AgentCore,
         # this Middleware instrumentation is injected internally by Starlette Instrumentor, see:
         # https://github.com/open-telemetry/opentelemetry-python-contrib/blob/51da0a766e5d3cbc746189e10c9573163198cfcd/instrumentation/opentelemetry-instrumentation-asgi/src/opentelemetry/instrumentation/asgi/__init__.py#L573
         if is_agent_observability_enabled():
             original_init = OpenTelemetryMiddleware.__init__
 
             def patched_init(self, app, **kwargs):
                 original_init(self, app, **kwargs)
-                # See: https://github.com/encode/starlette/blob/cb8f84f5284dc301ca7a31eb732b9e140769dd48/starlette/applications.py#L77-L78
-                is_starlette_app = hasattr(app, "user_middleware") and hasattr(app, "middleware_stack")
-
-                # Only apply exclude_spans for Starlette apps
-                if is_starlette_app and hasattr(self, "exclude_receive_span") and hasattr(self, "exclude_send_span"):
+                if hasattr(self, "exclude_receive_span"):
                     self.exclude_receive_span = True
+                if hasattr(self, "exclude_send_span"):
                     self.exclude_send_span = True
 
             OpenTelemetryMiddleware.__init__ = patched_init

aws-opentelemetry-distro/tests/amazon/opentelemetry/distro/patches/test_starlette_patches.py

@@ -1,22 +1,20 @@
 # Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
-from unittest import TestCase
+import unittest
 from unittest.mock import MagicMock, patch
 
 from amazon.opentelemetry.distro.patches._starlette_patches import _apply_starlette_instrumentation_patches
 
 
-class TestStarlettePatch(TestCase):
+class TestStarlettePatch(unittest.TestCase):
     """Test the Starlette instrumentation patches."""
 
     @patch("amazon.opentelemetry.distro.patches._starlette_patches._logger")
     def test_starlette_patch_applied_successfully(self, mock_logger):
         """Test that the Starlette instrumentation patch is applied successfully."""
-        for patched_starlette_enabled in [True, False]:
-            with self.subTest(agent_enabled=patched_starlette_enabled):
-                with patch.dict(
-                    "os.environ", {"AGENT_OBSERVABILITY_ENABLED": "true" if patched_starlette_enabled else "false"}
-                ):
+        for agent_enabled in [True, False]:
+            with self.subTest(agent_enabled=agent_enabled):
+                with patch.dict("os.environ", {"AGENT_OBSERVABILITY_ENABLED": "true" if agent_enabled else "false"}):
                     # Create a mock StarletteInstrumentor class
                     mock_instrumentor_class = MagicMock()
                     mock_instrumentor_class.__name__ = "StarletteInstrumentor"
@@ -54,18 +52,13 @@ def __init__(self, app, **kwargs):
                         result = mock_instrumentor_class.instrumentation_dependencies(mock_instance)
                         self.assertEqual(result, ("starlette >= 0.13",))
 
-                        mock_app = MagicMock()
-                        if patched_starlette_enabled:
-                            mock_app.user_middleware = []
-                            mock_app.middleware_stack = None
-
                         mock_middleware_instance = MagicMock()
                         mock_middleware_instance.exclude_receive_span = False
                         mock_middleware_instance.exclude_send_span = False
-                        mock_middleware_class.__init__(mock_middleware_instance, mock_app)
+                        mock_middleware_class.__init__(mock_middleware_instance, "app")
 
                         # Test middleware patching sets exclude flags
-                        if patched_starlette_enabled:
+                        if agent_enabled:
                             self.assertTrue(mock_middleware_instance.exclude_receive_span)
                             self.assertTrue(mock_middleware_instance.exclude_send_span)
                         else: