add debug log

Author: bjrara

contract-tests/images/mock-collector/mock_collector_client.py

@@ -115,7 +115,11 @@ def wait_condition(
             if exact_match:
                 return 0 < len(exported) == len(current) and present_metrics_lower.issubset(received_metrics)
             else:
-                return present_metrics_lower.issubset(received_metrics)
+                matched = present_metrics_lower.issubset(received_metrics)
+                if not matched:
+                    value = json.dumps(received_metrics)
+                    _logger.error(f"metrics not matched, actual {value}")
+                return matched
 
         exported_metrics: List[ExportMetricsServiceRequest] = _wait_for_content(get_export, wait_condition)
         metrics: List[ResourceScopeMetric] = []
@@ -144,6 +148,4 @@ def _wait_for_content(get_export: Callable[[], List[T]], wait_condition: Callabl
         except Exception:
             _logger.exception("Error while reading content")
 
-    actual_exported: List[T] = get_export()
-    actual_exported_value = json.dumps(actual_exported)
-    raise RuntimeError(f"Timeout waiting for content {actual_exported_value}")
+    raise RuntimeError("Timeout waiting for content")

contract-tests/tests/test/amazon/runtime/runtime_metrics_test.py

@@ -4,14 +4,27 @@
 
 from mock_collector_client import ResourceScopeMetric
 from requests import Response
+from typing_extensions import override
 
 import amazon.utils.application_signals_constants as constants
-from amazon.django.django_test import DjangoTest
+from amazon.base.contract_test_base import ContractTestBase
 from opentelemetry.proto.common.v1.common_pb2 import AnyValue
 from opentelemetry.proto.metrics.v1.metrics_pb2 import Metric, NumberDataPoint
 
 
-class RuntimeMetricsTest(DjangoTest):
+class RuntimeMetricsTest(ContractTestBase):
+    @override
+    @staticmethod
+    def get_application_image_name() -> str:
+        return "aws-application-signals-tests-django-app"
+
+    @override
+    def get_application_wait_pattern(self) -> str:
+        return "Quit the server with CONTROL-C."
+
+    @override
+    def get_application_extra_environment_variables(self):
+        return {"DJANGO_SETTINGS_MODULE": "django_server.settings"}
 
     def test_runtime_succeeds(self) -> None:
         self.mock_collector_client.clear_signals()