diff --git a/tests/e2e/utils/data_fetcher/logs.py b/tests/e2e/utils/data_fetcher/logs.py
index 8adc9381cab..f8214258581 100644
--- a/tests/e2e/utils/data_fetcher/logs.py
+++ b/tests/e2e/utils/data_fetcher/logs.py
@@ -4,22 +4,22 @@
 
 import boto3
 from mypy_boto3_logs import CloudWatchLogsClient
-from pydantic import BaseModel, Extra
+from pydantic import BaseModel
 from retry import retry
 
 
-class Log(BaseModel, extra=Extra.allow):
+class Log(BaseModel, extra="allow"):
     level: str
     location: str
     message: Union[dict, str]
     timestamp: str
     service: str
-    cold_start: Optional[bool]
-    function_name: Optional[str]
-    function_memory_size: Optional[str]
-    function_arn: Optional[str]
-    function_request_id: Optional[str]
-    xray_trace_id: Optional[str]
+    cold_start: Optional[bool] = None
+    function_name: Optional[str] = None
+    function_memory_size: Optional[str] = None
+    function_arn: Optional[str] = None
+    function_request_id: Optional[str] = None
+    xray_trace_id: Optional[str] = None
 
 
 class LogFetcher:
diff --git a/tests/e2e/utils/data_fetcher/traces.py b/tests/e2e/utils/data_fetcher/traces.py
index 09499499517..cc7f3ec19ef 100644
--- a/tests/e2e/utils/data_fetcher/traces.py
+++ b/tests/e2e/utils/data_fetcher/traces.py
@@ -15,10 +15,10 @@ class TraceSubsegment(BaseModel):
     name: str
     start_time: float
     end_time: float
-    aws: Optional[dict]
-    subsegments: Optional[List["TraceSubsegment"]]
-    annotations: Optional[Dict[str, Any]]
-    metadata: Optional[Dict[str, Dict[str, Any]]]
+    aws: Optional[dict] = None
+    subsegments: Optional[List["TraceSubsegment"]] = None
+    annotations: Optional[Dict[str, Any]] = None
+    metadata: Optional[Dict[str, Dict[str, Any]]] = None
 
 
 class TraceDocument(BaseModel):
@@ -27,10 +27,10 @@ class TraceDocument(BaseModel):
     start_time: float
     end_time: float
     trace_id: str
-    parent_id: Optional[str]
+    parent_id: Optional[str] = None
     aws: Dict
     origin: str
-    subsegments: Optional[List[TraceSubsegment]]
+    subsegments: Optional[List[TraceSubsegment]] = None
 
 
 class TraceFetcher: