Skip to content

chore(ci): fix e2e tests in v3 branch #4848

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions tests/e2e/utils/data_fetcher/logs.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
12 changes: 6 additions & 6 deletions tests/e2e/utils/data_fetcher/traces.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand All @@ -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:
Expand Down
Loading