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

feat(otelgin): enhance gin error tracking with span recording #6346

Open
wants to merge 23 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
60f2e0c
feat(otelgin): enhance gin error tracking with span recording
flc1125 Nov 19, 2024
afe0635
Merge branch 'main' into gintrace-recorderror
flc1125 Nov 19, 2024
7817837
feat(otelgin): enhance gin error tracking with span recording
flc1125 Nov 20, 2024
dcc6c62
feat(otelgin): enhance gin error tracking with span recording
flc1125 Nov 20, 2024
f5d9a1c
Update CHANGELOG.md
flc1125 Nov 20, 2024
84f2f0e
test(otelgin): Add tests for span recording on errors
flc1125 Nov 21, 2024
e5ef74d
refactor(otelgin): Remove unused dependencies and simplify tests
flc1125 Nov 21, 2024
9cdd7d6
refactor(otelgin): Remove unused dependencies and simplify tests
flc1125 Nov 21, 2024
9b368d5
Merge branch 'main' into gintrace-recorderror
flc1125 Nov 21, 2024
cc1c612
test(instrumentation): remove `gin.errors` assertion in gintrace_test.go
flc1125 Nov 21, 2024
fc2dd22
Update instrumentation/github.com/gin-gonic/gin/otelgin/gintrace.go
flc1125 Nov 21, 2024
488835c
feat(otelgin): refine gin trace error handling and test cases
flc1125 Nov 21, 2024
92ff337
feat(otelgin): refine gin trace error handling and test cases
flc1125 Nov 21, 2024
23949c7
test(otelgin): remove redundant code
flc1125 Nov 21, 2024
5f403b8
chore(otelgin): refine error recording in gintrace
flc1125 Nov 23, 2024
1fa4d17
Merge branch 'main' into gintrace-recorderror
flc1125 Nov 23, 2024
05c91e7
Update CHANGELOG.md
flc1125 Nov 25, 2024
8c62a63
Update instrumentation/github.com/gin-gonic/gin/otelgin/test/gintrace…
flc1125 Nov 25, 2024
0a2260d
chore(otelgin): adjust imports sorting
flc1125 Nov 25, 2024
733d40a
Merge remote-tracking branch 'origin/gintrace-recorderror' into gintr…
flc1125 Nov 25, 2024
d280f2e
Merge branch 'main' into gintrace-recorderror
flc1125 Nov 25, 2024
3ab2b2c
feat(otelgin): enhance error handling and test coverage in gintrace
flc1125 Nov 25, 2024
a690136
Update instrumentation/github.com/gin-gonic/gin/otelgin/test/gintrace…
flc1125 Nov 26, 2024
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
- Added support for providing `endpoint`, `pollingIntervalMs` and `initialSamplingRate` using environment variable `OTEL_TRACES_SAMPLER_ARG` in `go.opentelemetry.io/contrib/samples/jaegerremote`. (#6310)
- Added support exporting logs via OTLP over gRPC in `go.opentelemetry.io/contrib/config`. (#6340)

### Changed

- Record errors instead of setting the `gin.errors` attribute in `go.opentelemetry.io/contrib/instrumentation/github.com/gin-gonic/gin/otelgin`. (#6346)

### Fixed

- Fix broken AWS presigned URLs when using instrumentation in `go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws`. (#5975)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,10 @@ func Middleware(service string, opts ...Option) gin.HandlerFunc {
span.SetAttributes(semconv.HTTPStatusCode(status))
}
if len(c.Errors) > 0 {
span.SetAttributes(attribute.String("gin.errors", c.Errors.String()))
span.SetStatus(codes.Error, "gin error")
Copy link
Member

Choose a reason for hiding this comment

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

gin error isn't very meaningful.

Suggested change
span.SetStatus(codes.Error, "gin error")
span.SetStatus(codes.Error, c.Errors.String())

Copy link
Contributor

Choose a reason for hiding this comment

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

Wont this duplicate, in a less useful flattened string from, the information being added as events below?

Copy link
Contributor Author

@flc1125 flc1125 Nov 26, 2024

Choose a reason for hiding this comment

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

@akats7 We can discuss it here. It should be the same issue here.

r: #6346 (comment)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I recommend using this method to record: span.SetStatus(codes.Error, c.Errors.String())

I would like to hear everyone's suggestions.

Copy link
Member

Choose a reason for hiding this comment

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

From: #6346 (comment)

I personally always find it convenient to have the error message at least partially included directly on the span instead of only having the span events. Since span events are sometimes (always?) stored in separate table it could becomes an additional step to view the message depending on the platform you use.

For example I know a lot of the java instrumentation just adds error: true as an attribute and then creates a span event, and we've had teams complain that the error message has no contextual info

Copy link
Member

@pellared pellared Nov 26, 2024

Choose a reason for hiding this comment

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

Personally, I do not mind duplication in an error scenario.

for _, err := range c.Errors {
span.RecordError(err.Err)
}
flc1125 marked this conversation as resolved.
Show resolved Hide resolved
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,7 @@ func TestTrace200(t *testing.T) {
assert.Contains(t, attr, attribute.Int("http.status_code", http.StatusOK))
assert.Contains(t, attr, attribute.String("http.method", "GET"))
assert.Contains(t, attr, attribute.String("http.route", "/user/:id"))
assert.Empty(t, span.Events())
}

func TestError(t *testing.T) {
Expand All @@ -177,7 +178,8 @@ func TestError(t *testing.T) {
// configure a handler that returns an error and 5xx status
// code
router.GET("/server_err", func(c *gin.Context) {
_ = c.AbortWithError(http.StatusInternalServerError, errors.New("oh no"))
_ = c.Error(errors.New("oh no one"))
_ = c.AbortWithError(http.StatusInternalServerError, errors.New("oh no two"))
})
r := httptest.NewRequest("GET", "/server_err", nil)
w := httptest.NewRecorder()
Expand All @@ -193,7 +195,17 @@ func TestError(t *testing.T) {
attr := span.Attributes()
assert.Contains(t, attr, attribute.String("net.host.name", "foobar"))
assert.Contains(t, attr, attribute.Int("http.status_code", http.StatusInternalServerError))
assert.Contains(t, attr, attribute.String("gin.errors", "Error #01: oh no\n"))
flc1125 marked this conversation as resolved.
Show resolved Hide resolved

// verify the error events
events := span.Events()
require.Len(t, events, 2)
assert.Equal(t, "exception", events[0].Name)
assert.Contains(t, events[0].Attributes, attribute.String("exception.type", "*errors.errorString"))
assert.Contains(t, events[0].Attributes, attribute.String("exception.message", "oh no one"))
assert.Equal(t, "exception", events[1].Name)
assert.Contains(t, events[1].Attributes, attribute.String("exception.type", "*errors.errorString"))
assert.Contains(t, events[1].Attributes, attribute.String("exception.message", "oh no two"))

// server errors set the status
assert.Equal(t, codes.Error, span.Status().Code)
}
Expand Down Expand Up @@ -224,6 +236,27 @@ func TestSpanStatus(t *testing.T) {
assert.Equal(t, tc.wantSpanStatus, sr.Ended()[0].Status().Code, "should only set Error status for HTTP statuses >= 500")
})
}

t.Run("The status code is 200, but an error is returned", func(t *testing.T) {
sr := tracetest.NewSpanRecorder()
provider := sdktrace.NewTracerProvider(
sdktrace.WithSpanProcessor(sr),
)

router := gin.New()
router.Use(otelgin.Middleware("foobar", otelgin.WithTracerProvider(provider)))
router.GET("/", func(c *gin.Context) {
_ = c.Error(errors.New("something went wrong"))
c.JSON(http.StatusOK, nil)
})

router.ServeHTTP(httptest.NewRecorder(), httptest.NewRequest("GET", "/", nil))

require.Len(t, sr.Ended(), 1)
assert.Equal(t, codes.Error, sr.Ended()[0].Status().Code)
require.Len(t, sr.Ended()[0].Events(), 1)
assert.Contains(t, sr.Ended()[0].Events()[0].Attributes, attribute.String("exception.message", "something went wrong"))
})
}

func TestSpanName(t *testing.T) {
Expand Down
Loading