-
Notifications
You must be signed in to change notification settings - Fork 2.4k
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
dmitryax
merged 5 commits into
open-telemetry:main
from
harrryr:refactor-fault-error-logic
Sep 19, 2023
Merged
Refactor fault/error logic #26681
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
9a32258
Refactor fault/error logic
harrryr 59678f5
Run make-fmt again
harrryr 9a53ae9
Merge branch 'main' into refactor-fault-error-logic
harrryr 4145060
Merge branch 'main' into refactor-fault-error-logic
harrryr 9704ad3
Add isError and isFault default values
harrryr File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 | ||
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 | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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 | ||
} | ||
|
||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: format seems off