chore: fix new feedback set

Author: heitorlessa

tests/e2e/conftest.py

@@ -5,9 +5,9 @@
 
 import boto3
 
-# We only need typing_extensions for python versions <3.8
-from tests.e2e.utils import data_fetcher
+from tests.e2e.utils import data_fetcher, infrastructure
 
+# We only need typing_extensions for python versions <3.8
 if sys.version_info >= (3, 8):
     from typing import TypedDict
 else:
@@ -16,7 +16,6 @@
 from typing import Dict, Generator, Optional
 
 import pytest
-from e2e.utils import infrastructure
 
 
 class LambdaConfig(TypedDict):

tests/e2e/utils/asset.py

@@ -14,7 +14,7 @@
 logger = Logger(service="e2e-utils")
 
 
-class AssetTemplateConfigSource(BaseModel):
+class AssetManifest(BaseModel):
     path: str
     packaging: str
 
@@ -32,14 +32,13 @@ class AssetTemplateConfigDestinations(BaseModel):
 
 
 class AssetTemplateConfig(BaseModel):
-    source: AssetTemplateConfigSource
+    source: AssetManifest
     destinations: AssetTemplateConfigDestinations
 
 
 class TemplateAssembly(BaseModel):
     version: str
     files: Dict[str, AssetTemplateConfig]
-    docker_images: Dict = Field(Dict, alias="dockerImages")
 
 
 class Asset:

tests/e2e/utils/data_fetcher/metrics.py

@@ -22,7 +22,7 @@ def get_metrics(
 ) -> MetricDataResultTypeDef:
     """Fetch CloudWatch Metrics
 
-    It takes into account eventual consistency with up to 10 retries and 1s jitter.
+    It takes into account eventual consistency with up to 10 retries and 1.5s jitter.
 
     Parameters
     ----------

tests/e2e/utils/data_fetcher/traces.py

@@ -82,7 +82,6 @@ def __init__(
         self.start_date = start_date
         self.end_date = end_date or self.start_date + timedelta(minutes=5)
         self.xray_client: XRayClient = xray_client or boto3.client("xray")
-        self.trace_ids: List[str] = []
         self.trace_documents: Dict[str, TraceDocument] = {}
         self.subsegments: List[TraceSubsegment] = []
         self.exclude_segment_name = exclude_segment_name or self.default_exclude_seg_name
@@ -101,8 +100,8 @@ def __init__(
             FilterExpression=self.filter_expression,
         )
 
-        self.trace_ids = self._get_trace_ids(pages)
-        self.trace_documents = self._get_trace_documents()
+        trace_ids = self._get_trace_ids(pages)
+        self.trace_documents = self._get_trace_documents(trace_ids)
         self.subsegments = self._get_subsegments()
 
     def get_annotation(self, key: str, value: Optional[any] = None) -> List:
@@ -198,7 +197,7 @@ def _get_trace_ids(self, pages: PageIterator) -> List[str]:
 
         return trace_ids
 
-    def _get_trace_documents(self) -> Dict[str, TraceDocument]:
+    def _get_trace_documents(self, trace_ids: List[str]) -> Dict[str, TraceDocument]:
         """Find trace documents available in each trace segment
 
         Returns