artin/sourcegraph
1
0
Fork 0
mirror of https://github.com/sourcegraph/sourcegraph.git synced 2026-02-06 20:51:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

telemetry/resolvers: improve logging on RecordEvents errors (#62501)

Browse Source
This commit is contained in:
Robert Lin 2024-05-07 12:08:04 -07:00 committed by GitHub
parent de5e12a9dd
commit 9d762e658f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/frontend/internal/telemetry/resolvers/BUILD.bazel
View File

@ -18,6 +18,7 @@ go_library(
"//internal/gqlutil",
"//internal/telemetry/teestore",
"//internal/telemetrygateway/event",
"//internal/trace",
"//internal/version",
"//lib/errors",
"//lib/pointers",

9
cmd/frontend/internal/telemetry/resolvers/resolvers.go
View File

@ -11,6 +11,7 @@ import (
"github.com/sourcegraph/sourcegraph/internal/auth"
"github.com/sourcegraph/sourcegraph/internal/database"
"github.com/sourcegraph/sourcegraph/internal/telemetry/teestore"
"github.com/sourcegraph/sourcegraph/internal/trace"
"github.com/sourcegraph/sourcegraph/lib/errors"
telemetrygatewayv1 "github.com/sourcegraph/sourcegraph/lib/telemetrygateway/v1"
)
@ -74,12 +75,18 @@ func (r *Resolver) RecordEvents(ctx context.Context, args *graphqlbackend.Record
// This is an important failure, make sure we surface it, as it could be
// an implementation error.
data, _ := json.Marshal(args.Events)
r.logger.Error("failed to convert telemetry events to internal format",
trace.Logger(ctx, r.logger).Error("failed to convert telemetry events to internal format",
log.Error(err),
log.String("eventData", string(data)))
return nil, errors.Wrap(err, "invalid events provided")
}
if err := r.teestore.StoreEvents(ctx, gatewayEvents); err != nil {
// This is an important failure, make sure we surface it, as it could be
// an implementation error.
data, _ := json.Marshal(args.Events)
trace.Logger(ctx, r.logger).Error("error storing events",
log.Error(err),
log.String("eventData", string(data)))
return nil, errors.Wrap(err, "error storing events")
}
return &graphqlbackend.EmptyResponse{}, nil

2
cmd/frontend/internal/telemetry/resolvers/telemetrygateway.go
View File

@ -27,7 +27,7 @@ func newTelemetryGatewayEvents(
for i, gqlEvent := range gqlEvents {
if err := telemetrygatewayv1.ValidateEventFeatureAction(gqlEvent.Feature, gqlEvent.Action); err != nil {
return nil, errors.Wrapf(err, "invalid feature/action for event %d: %s/%s",
i, gqlEvent.Feature, gqlEvent.Action)
i, errors.Safe(gqlEvent.Feature), errors.Safe(gqlEvent.Action))
}
event := telemetrygatewayevent.New(ctx, now, newUUID)