-
Notifications
You must be signed in to change notification settings - Fork 70
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add execution time in test run response (#612)
- Loading branch information
Showing
11 changed files
with
339 additions
and
217 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,187 @@ | ||
| package model | ||
|
|
||
| import ( | ||
| "encoding/json" | ||
| "errors" | ||
| "fmt" | ||
| "time" | ||
|
|
||
| "github.com/google/uuid" | ||
| "github.com/kubeshop/tracetest/server/assertions/comparator" | ||
| "github.com/kubeshop/tracetest/server/traces" | ||
| "go.opentelemetry.io/otel/trace" | ||
| ) | ||
|
|
||
| func (sar SpanAssertionResult) MarshalJSON() ([]byte, error) { | ||
| return json.Marshal(&struct { | ||
| SpanID string | ||
| ObservedValue string | ||
| CompareErr string | ||
| }{ | ||
| SpanID: sar.SpanID.String(), | ||
| ObservedValue: sar.ObservedValue, | ||
| CompareErr: errToString(sar.CompareErr), | ||
| }) | ||
| } | ||
|
|
||
| func (sar *SpanAssertionResult) UnmarshalJSON(data []byte) error { | ||
| aux := struct { | ||
| SpanID string | ||
| ObservedValue string | ||
| CompareErr string | ||
| }{} | ||
| if err := json.Unmarshal(data, &aux); err != nil { | ||
| return err | ||
| } | ||
|
|
||
| sid, err := trace.SpanIDFromHex(aux.SpanID) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| sar.SpanID = sid | ||
| sar.ObservedValue = aux.ObservedValue | ||
| sar.CompareErr = stringToErr(aux.CompareErr) | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func (a Assertion) MarshalJSON() ([]byte, error) { | ||
| return json.Marshal(&struct { | ||
| Attribute string | ||
| Comparator string | ||
| Value string | ||
| }{ | ||
| Attribute: a.Attribute, | ||
| Comparator: a.Comparator.String(), | ||
| Value: a.Value, | ||
| }) | ||
| } | ||
|
|
||
| func (a *Assertion) UnmarshalJSON(data []byte) error { | ||
| aux := struct { | ||
| Attribute string | ||
| Comparator string | ||
| Value string | ||
| }{} | ||
| if err := json.Unmarshal(data, &aux); err != nil { | ||
| return err | ||
| } | ||
|
|
||
| c, err := comparator.DefaultRegistry().Get(aux.Comparator) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| a.Attribute = aux.Attribute | ||
| a.Value = aux.Value | ||
| a.Comparator = c | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func (r *Run) MarshalJSON() ([]byte, error) { | ||
| return json.Marshal(&struct { | ||
| ID string | ||
| TraceID string | ||
| SpanID string | ||
| State string | ||
| LastErrorString string | ||
| CreatedAt time.Time | ||
| ServiceTriggeredAt time.Time | ||
| ServiceTriggerCompletedAt time.Time | ||
| ObtainedTraceAt time.Time | ||
| CompletedAt time.Time | ||
| Request HTTPRequest | ||
| Response HTTPResponse | ||
| Trace *traces.Trace | ||
| Results *RunResults | ||
| }{ | ||
| ID: r.ID.String(), | ||
| TraceID: r.TraceID.String(), | ||
| SpanID: r.SpanID.String(), | ||
| State: string(r.State), | ||
| LastErrorString: errToString(r.LastError), | ||
| CreatedAt: r.CreatedAt, | ||
| ServiceTriggeredAt: r.ServiceTriggeredAt, | ||
| ServiceTriggerCompletedAt: r.ServiceTriggerCompletedAt, | ||
| ObtainedTraceAt: r.ObtainedTraceAt, | ||
| CompletedAt: r.CompletedAt, | ||
| Request: r.Request, | ||
| Response: r.Response, | ||
| Trace: r.Trace, | ||
| Results: r.Results, | ||
| }) | ||
| } | ||
|
|
||
| func (r *Run) UnmarshalJSON(data []byte) error { | ||
| aux := struct { | ||
| ID string | ||
| TraceID string | ||
| SpanID string | ||
| State string | ||
| LastErrorString string | ||
| CreatedAt time.Time | ||
| ServiceTriggeredAt time.Time | ||
| ServiceTriggerCompletedAt time.Time | ||
| ObtainedTraceAt time.Time | ||
| CompletedAt time.Time | ||
| TestVersion int | ||
| Request HTTPRequest | ||
| Response HTTPResponse | ||
| Trace *traces.Trace | ||
| Results *RunResults | ||
| }{} | ||
|
|
||
| if err := json.Unmarshal(data, &aux); err != nil { | ||
| return fmt.Errorf("unmarshal run: %w", err) | ||
| } | ||
|
|
||
| id, err := uuid.Parse(aux.ID) | ||
| if err != nil { | ||
| return fmt.Errorf("unmarshal run: %w", err) | ||
| } | ||
|
|
||
| tid, err := trace.TraceIDFromHex(aux.TraceID) | ||
| if err != nil { | ||
| return fmt.Errorf("unmarshal run: %w", err) | ||
| } | ||
|
|
||
| sid, err := trace.SpanIDFromHex(aux.SpanID) | ||
| if err != nil { | ||
| return fmt.Errorf("unmarshal run: %w", err) | ||
| } | ||
|
|
||
| r.ID = id | ||
| r.TraceID = tid | ||
| r.SpanID = sid | ||
| r.State = RunState(aux.State) | ||
| r.LastError = stringToErr(aux.LastErrorString) | ||
| r.CreatedAt = aux.CreatedAt | ||
| r.ServiceTriggeredAt = aux.ServiceTriggeredAt | ||
| r.ObtainedTraceAt = aux.ObtainedTraceAt | ||
| r.CompletedAt = aux.CompletedAt | ||
| r.TestVersion = aux.TestVersion | ||
| r.Request = aux.Request | ||
| r.Response = aux.Response | ||
| r.Trace = aux.Trace | ||
| r.Results = aux.Results | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func errToString(err error) string { | ||
| if err != nil { | ||
| return err.Error() | ||
| } | ||
|
|
||
| return "" | ||
| } | ||
|
|
||
| func stringToErr(s string) error { | ||
| if s != "" { | ||
| return errors.New(s) | ||
| } | ||
|
|
||
| return nil | ||
| } |
Oops, something went wrong.