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

chore/telemetrygateway: gracefully handle sams introspectToken cancelation (#63809)

Browse Source 
As titled, not much to action about these.

## Test plan

n/a
This commit is contained in:
Robert Lin 2024-07-15 10:45:00 -07:00 committed by GitHub
parent 8d4e5b52f4
commit 3250df9e1b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/telemetry-gateway/internal/server/samsm2m/samsm2m.go
View File

@ -65,8 +65,12 @@ func CheckWriteEventsScope(ctx context.Context, logger log.Logger, tokens TokenI
// for now until we have a concerted effort.
result, err := tokens.IntrospectToken(ctx, token)
if err != nil {
logger.Error("samsClient.IntrospectToken failed", log.Error(err))
return status.Error(codes.Internal, "unable to validate token")
if errors.IsContextCanceled(err) {
return status.Error(codes.Canceled, "request canceled")
} else {
logger.Error("samsClient.IntrospectToken failed", log.Error(err))
return status.Error(codes.Internal, "unable to validate token")
}
}
span.SetAttributes(attribute.String("client_id", result.ClientID))

15
cmd/telemetry-gateway/internal/server/server.go
View File

@ -24,7 +24,8 @@ import (
telemetrygatewayv1 "github.com/sourcegraph/sourcegraph/lib/telemetrygateway/v1"
)
type Server struct {
// APIServer is the Telemetry Gateway API server.
type APIServer struct {
logger log.Logger
eventsTopic pubsub.TopicPublisher
publishOpts events.PublishStreamOptions
@ -39,14 +40,14 @@ type Server struct {
telemetrygatewayv1.UnimplementedTelemeteryGatewayServiceServer
}
var _ telemetrygatewayv1.TelemeteryGatewayServiceServer = (*Server)(nil)
var _ telemetrygatewayv1.TelemeteryGatewayServiceServer = (*APIServer)(nil)
func New(
logger log.Logger,
eventsTopic pubsub.TopicPublisher,
samsClient *sams.ClientV1,
publishOpts events.PublishStreamOptions,
) (*Server, error) {
) (*APIServer, error) {
recordEventsRPCMetrics, err := newRecordEventsMetrics()
if err != nil {
return nil, err
@ -56,8 +57,8 @@ func New(
return nil, err
}
return &Server{
logger: logger.Scoped("server"),
return &APIServer{
logger: logger.Scoped("api"),
eventsTopic: eventsTopic,
publishOpts: publishOpts,
@ -68,7 +69,7 @@ func New(
}, nil
}
func (s *Server) RecordEvents(stream telemetrygatewayv1.TelemeteryGatewayService_RecordEventsServer) (err error) {
func (s *APIServer) RecordEvents(stream telemetrygatewayv1.TelemeteryGatewayService_RecordEventsServer) (err error) {
var (
logger = sgtrace.Logger(stream.Context(), s.logger).Scoped("RecordEvents")
// publisher is initialized once for RecordEventsRequestMetadata.
@ -207,7 +208,7 @@ func (s *Server) RecordEvents(stream telemetrygatewayv1.TelemeteryGatewayService
return nil
}
func (s *Server) RecordEvent(ctx context.Context, req *telemetrygatewayv1.RecordEventRequest) (_ *telemetrygatewayv1.RecordEventResponse, err error) {
func (s *APIServer) RecordEvent(ctx context.Context, req *telemetrygatewayv1.RecordEventRequest) (_ *telemetrygatewayv1.RecordEventResponse, err error) {
var (
metadata = req.GetMetadata()
event = req.GetEvent()