Skip to content
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

Refactor fault/error logic #26681

Merged
merged 5 commits into from
Sep 19, 2023
Merged
Changes from 1 commit
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
41 changes: 17 additions & 24 deletions exporter/awsxrayexporter/internal/translator/cause.go
Original file line number Diff line number Diff line change
Expand Up @@ -118,41 +118,34 @@ func makeCause(span ptrace.Span, attributes map[string]pcommon.Value, resource p
}
}

// The logic to record error and fault should be kept in sync with the ADOT pulse repo whenever possible except for the throttle
// https://github.com/aws-observability/aws-apm-java-instrumentation/blob/main/awsagentprovider/src/main/java/software/amazon/opentelemetry/javaagent/providers/AwsSpanMetricsProcessor.java
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: format seems off

val, ok := span.Attributes().Get(conventions.AttributeHTTPStatusCode)

switch {
// The segment status for http spans will be based on their http.statuscode as we found some http
// spans does not fill with status.Code() but always filled with http.statuscode
case ok:
code := val.Int()
// We only differentiate between faults (server errors) and errors (client errors) for HTTP spans.
switch {
case code >= 400 && code <= 499:
isError = true
isFault = false
if code == 429 {
isThrottle = true
}
case code >= 500 && code <= 599:
isError = false
isThrottle = false
isFault = true
case status.Code() == ptrace.StatusCodeError:
var code int64
if ok {
code = val.Int()
}
isThrottle = false
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we have a default false value for isError and isFault as well? This can simplify the switch block.

switch {
case !ok || code < 400 || code > 599:
if status.Code() == ptrace.StatusCodeError {
isError = false
isThrottle = false
isFault = true
default:
} else {
isError = false
isThrottle = false
isFault = false
}
case status.Code() != ptrace.StatusCodeError:
isError = false
isThrottle = false
case code >= 400 && code <= 499:
isError = true
isFault = false
default:
if code == 429 {
isThrottle = true
}
case code >= 500 && code <= 599:
isError = false
isThrottle = false
isFault = true
}

Expand Down
Loading