Bumps the go-deps group with 12 updates in the / directory: | Package | From | To | | --- | --- | --- | | [cloud.google.com/go/storage](https://github.com/googleapis/google-cloud-go) | `1.41.0` | `1.42.0` | | [github.com/Azure/azure-sdk-for-go/sdk/azidentity](https://github.com/Azure/azure-sdk-for-go) | `1.5.2` | `1.6.0` | | [github.com/Azure/go-autorest/autorest/azure/auth](https://github.com/Azure/go-autorest) | `0.5.12` | `0.5.13` | | [github.com/BurntSushi/toml](https://github.com/BurntSushi/toml) | `1.3.2` | `1.4.0` | | [github.com/aws/aws-sdk-go](https://github.com/aws/aws-sdk-go) | `1.53.6` | `1.54.2` | | [github.com/getsentry/sentry-go](https://github.com/getsentry/sentry-go) | `0.27.0` | `0.28.1` | | [github.com/gophercloud/gophercloud](https://github.com/gophercloud/gophercloud) | `1.11.0` | `1.12.0` | | [github.com/hashicorp/go-retryablehttp](https://github.com/hashicorp/go-retryablehttp) | `0.7.6` | `0.7.7` | | [github.com/openshift-online/ocm-sdk-go](https://github.com/openshift-online/ocm-sdk-go) | `0.1.420` | `0.1.425` | | [github.com/osbuild/images](https://github.com/osbuild/images) | `0.65.0` | `0.66.0` | | [github.com/spf13/cobra](https://github.com/spf13/cobra) | `1.8.0` | `1.8.1` | | [github.com/vmware/govmomi](https://github.com/vmware/govmomi) | `0.37.2` | `0.37.3` | Updates `cloud.google.com/go/storage` from 1.41.0 to 1.42.0 - [Release notes](https://github.com/googleapis/google-cloud-go/releases) - [Changelog](https://github.com/googleapis/google-cloud-go/blob/main/CHANGES.md) - [Commits](https://github.com/googleapis/google-cloud-go/compare/spanner/v1.41.0...spanner/v1.42.0) Updates `github.com/Azure/azure-sdk-for-go/sdk/azidentity` from 1.5.2 to 1.6.0 - [Release notes](https://github.com/Azure/azure-sdk-for-go/releases) - [Changelog](https://github.com/Azure/azure-sdk-for-go/blob/main/documentation/release.md) - [Commits](https://github.com/Azure/azure-sdk-for-go/compare/sdk/internal/v1.5.2...sdk/azcore/v1.6.0) Updates `github.com/Azure/go-autorest/autorest/azure/auth` from 0.5.12 to 0.5.13 - [Release notes](https://github.com/Azure/go-autorest/releases) - [Changelog](https://github.com/Azure/go-autorest/blob/main/CHANGELOG.md) - [Commits](https://github.com/Azure/go-autorest/compare/autorest/azure/auth/v0.5.12...autorest/azure/auth/v0.5.13) Updates `github.com/BurntSushi/toml` from 1.3.2 to 1.4.0 - [Release notes](https://github.com/BurntSushi/toml/releases) - [Commits](https://github.com/BurntSushi/toml/compare/v1.3.2...v1.4.0) Updates `github.com/aws/aws-sdk-go` from 1.53.6 to 1.54.2 - [Release notes](https://github.com/aws/aws-sdk-go/releases) - [Commits](https://github.com/aws/aws-sdk-go/compare/v1.53.6...v1.54.2) Updates `github.com/getsentry/sentry-go` from 0.27.0 to 0.28.1 - [Release notes](https://github.com/getsentry/sentry-go/releases) - [Changelog](https://github.com/getsentry/sentry-go/blob/master/CHANGELOG.md) - [Commits](https://github.com/getsentry/sentry-go/compare/v0.27.0...v0.28.1) Updates `github.com/gophercloud/gophercloud` from 1.11.0 to 1.12.0 - [Release notes](https://github.com/gophercloud/gophercloud/releases) - [Changelog](https://github.com/gophercloud/gophercloud/blob/master/CHANGELOG.md) - [Commits](https://github.com/gophercloud/gophercloud/compare/v1.11.0...v1.12.0) Updates `github.com/hashicorp/go-retryablehttp` from 0.7.6 to 0.7.7 - [Changelog](https://github.com/hashicorp/go-retryablehttp/blob/main/CHANGELOG.md) - [Commits](https://github.com/hashicorp/go-retryablehttp/compare/v0.7.6...v0.7.7) Updates `github.com/openshift-online/ocm-sdk-go` from 0.1.420 to 0.1.425 - [Release notes](https://github.com/openshift-online/ocm-sdk-go/releases) - [Changelog](https://github.com/openshift-online/ocm-sdk-go/blob/main/CHANGES.md) - [Commits](https://github.com/openshift-online/ocm-sdk-go/compare/v0.1.420...v0.1.425) Updates `github.com/osbuild/images` from 0.65.0 to 0.66.0 - [Release notes](https://github.com/osbuild/images/releases) - [Commits](https://github.com/osbuild/images/compare/v0.65.0...v0.66.0) Updates `github.com/spf13/cobra` from 1.8.0 to 1.8.1 - [Release notes](https://github.com/spf13/cobra/releases) - [Commits](https://github.com/spf13/cobra/compare/v1.8.0...v1.8.1) Updates `github.com/vmware/govmomi` from 0.37.2 to 0.37.3 - [Release notes](https://github.com/vmware/govmomi/releases) - [Changelog](https://github.com/vmware/govmomi/blob/main/CHANGELOG.md) - [Commits](https://github.com/vmware/govmomi/compare/v0.37.2...v0.37.3) Updates `golang.org/x/oauth2` from 0.20.0 to 0.21.0 - [Commits](https://github.com/golang/oauth2/compare/v0.20.0...v0.21.0) Updates `golang.org/x/sys` from 0.20.0 to 0.21.0 - [Commits](https://github.com/golang/sys/compare/v0.20.0...v0.21.0) Updates `google.golang.org/api` from 0.181.0 to 0.183.0 - [Release notes](https://github.com/googleapis/google-api-go-client/releases) - [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md) - [Commits](https://github.com/googleapis/google-api-go-client/compare/v0.181.0...v0.183.0) --- updated-dependencies: - dependency-name: cloud.google.com/go/storage dependency-type: direct:production update-type: version-update:semver-minor dependency-group: go-deps - dependency-name: github.com/Azure/azure-sdk-for-go/sdk/azidentity dependency-type: direct:production update-type: version-update:semver-minor dependency-group: go-deps - dependency-name: github.com/Azure/go-autorest/autorest/azure/auth dependency-type: direct:production update-type: version-update:semver-patch dependency-group: go-deps - dependency-name: github.com/BurntSushi/toml dependency-type: direct:production update-type: version-update:semver-minor dependency-group: go-deps - dependency-name: github.com/aws/aws-sdk-go dependency-type: direct:production update-type: version-update:semver-minor dependency-group: go-deps - dependency-name: github.com/getsentry/sentry-go dependency-type: direct:production update-type: version-update:semver-minor dependency-group: go-deps - dependency-name: github.com/gophercloud/gophercloud dependency-type: direct:production update-type: version-update:semver-minor dependency-group: go-deps - dependency-name: github.com/hashicorp/go-retryablehttp dependency-type: direct:production update-type: version-update:semver-patch dependency-group: go-deps - dependency-name: github.com/openshift-online/ocm-sdk-go dependency-type: direct:production update-type: version-update:semver-patch dependency-group: go-deps - dependency-name: github.com/osbuild/images dependency-type: direct:production update-type: version-update:semver-minor dependency-group: go-deps - dependency-name: github.com/spf13/cobra dependency-type: direct:production update-type: version-update:semver-patch dependency-group: go-deps - dependency-name: github.com/vmware/govmomi dependency-type: direct:production update-type: version-update:semver-patch dependency-group: go-deps - dependency-name: golang.org/x/oauth2 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: go-deps - dependency-name: golang.org/x/sys dependency-type: direct:production update-type: version-update:semver-minor dependency-group: go-deps - dependency-name: google.golang.org/api dependency-type: direct:production update-type: version-update:semver-minor dependency-group: go-deps ... Signed-off-by: dependabot[bot] <support@github.com>
144 lines
3.6 KiB
Go
144 lines
3.6 KiB
Go
package sentryecho
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"net/http"
|
|
"time"
|
|
|
|
"github.com/getsentry/sentry-go"
|
|
"github.com/labstack/echo/v4"
|
|
)
|
|
|
|
// The identifier of the Echo SDK.
|
|
const sdkIdentifier = "sentry.go.echo"
|
|
|
|
const valuesKey = "sentry"
|
|
const transactionKey = "sentry_transaction"
|
|
|
|
type handler struct {
|
|
repanic bool
|
|
waitForDelivery bool
|
|
timeout time.Duration
|
|
}
|
|
|
|
type Options struct {
|
|
// Repanic configures whether Sentry should repanic after recovery, in most cases it should be set to true,
|
|
// as echo includes its own Recover middleware what handles http responses.
|
|
Repanic bool
|
|
// WaitForDelivery configures whether you want to block the request before moving forward with the response.
|
|
// Because Echo's Recover handler doesn't restart the application,
|
|
// it's safe to either skip this option or set it to false.
|
|
WaitForDelivery bool
|
|
// Timeout for the event delivery requests.
|
|
Timeout time.Duration
|
|
}
|
|
|
|
// New returns a function that satisfies echo.HandlerFunc interface
|
|
// It can be used with Use() methods.
|
|
func New(options Options) echo.MiddlewareFunc {
|
|
timeout := options.Timeout
|
|
if timeout == 0 {
|
|
timeout = 2 * time.Second
|
|
}
|
|
return (&handler{
|
|
repanic: options.Repanic,
|
|
timeout: timeout,
|
|
waitForDelivery: options.WaitForDelivery,
|
|
}).handle
|
|
}
|
|
|
|
func (h *handler) handle(next echo.HandlerFunc) echo.HandlerFunc {
|
|
return func(ctx echo.Context) error {
|
|
hub := sentry.GetHubFromContext(ctx.Request().Context())
|
|
if hub == nil {
|
|
hub = sentry.CurrentHub().Clone()
|
|
}
|
|
|
|
if client := hub.Client(); client != nil {
|
|
client.SetSDKIdentifier(sdkIdentifier)
|
|
}
|
|
|
|
r := ctx.Request()
|
|
|
|
transactionName := r.URL.Path
|
|
transactionSource := sentry.SourceURL
|
|
|
|
if path := ctx.Path(); path != "" {
|
|
transactionName = path
|
|
transactionSource = sentry.SourceRoute
|
|
}
|
|
|
|
options := []sentry.SpanOption{
|
|
sentry.WithOpName("http.server"),
|
|
sentry.ContinueFromRequest(r),
|
|
sentry.WithTransactionSource(transactionSource),
|
|
}
|
|
|
|
transaction := sentry.StartTransaction(
|
|
sentry.SetHubOnContext(r.Context(), hub),
|
|
fmt.Sprintf("%s %s", r.Method, transactionName),
|
|
options...,
|
|
)
|
|
|
|
transaction.SetData("http.request.method", ctx.Request().Method)
|
|
|
|
defer func() {
|
|
status := ctx.Response().Status
|
|
if err := ctx.Get("error"); err != nil {
|
|
if httpError, ok := err.(*echo.HTTPError); ok {
|
|
status = httpError.Code
|
|
}
|
|
}
|
|
|
|
transaction.Status = sentry.HTTPtoSpanStatus(status)
|
|
transaction.SetData("http.response.status_code", status)
|
|
transaction.Finish()
|
|
}()
|
|
|
|
hub.Scope().SetRequest(r)
|
|
ctx.Set(valuesKey, hub)
|
|
ctx.Set(transactionKey, transaction)
|
|
defer h.recoverWithSentry(hub, r)
|
|
|
|
err := next(ctx)
|
|
if err != nil {
|
|
// Store the error so it can be used in the deferred function
|
|
ctx.Set("error", err)
|
|
}
|
|
|
|
return err
|
|
}
|
|
}
|
|
|
|
func (h *handler) recoverWithSentry(hub *sentry.Hub, r *http.Request) {
|
|
if err := recover(); err != nil {
|
|
eventID := hub.RecoverWithContext(
|
|
context.WithValue(r.Context(), sentry.RequestContextKey, r),
|
|
err,
|
|
)
|
|
if eventID != nil && h.waitForDelivery {
|
|
hub.Flush(h.timeout)
|
|
}
|
|
if h.repanic {
|
|
panic(err)
|
|
}
|
|
}
|
|
}
|
|
|
|
// GetHubFromContext retrieves attached *sentry.Hub instance from echo.Context.
|
|
func GetHubFromContext(ctx echo.Context) *sentry.Hub {
|
|
if hub, ok := ctx.Get(valuesKey).(*sentry.Hub); ok {
|
|
return hub
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// GetSpanFromContext retrieves attached *sentry.Span instance from echo.Context.
|
|
// If there is no transaction on echo.Context, it will return nil.
|
|
func GetSpanFromContext(ctx echo.Context) *sentry.Span {
|
|
if span, ok := ctx.Get(transactionKey).(*sentry.Span); ok {
|
|
return span
|
|
}
|
|
return nil
|
|
}
|