From 3250df9e1b896af045ac19bed4234c45ce7f9c12 Mon Sep 17 00:00:00 2001
From: Robert Lin <robert@bobheadxi.dev>
Date: Mon, 15 Jul 2024 10:45:00 -0700
Subject: [PATCH] chore/telemetrygateway: gracefully handle sams
 introspectToken cancelation (#63809)

As titled, not much to action about these.

## Test plan

n/a
---
 .../internal/server/samsm2m/samsm2m.go            |  8 ++++++--
 cmd/telemetry-gateway/internal/server/server.go   | 15 ++++++++-------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/cmd/telemetry-gateway/internal/server/samsm2m/samsm2m.go b/cmd/telemetry-gateway/internal/server/samsm2m/samsm2m.go
index fbc6e59b4f0..dc66d6357cf 100644
--- a/cmd/telemetry-gateway/internal/server/samsm2m/samsm2m.go
+++ b/cmd/telemetry-gateway/internal/server/samsm2m/samsm2m.go
@@ -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))
 
diff --git a/cmd/telemetry-gateway/internal/server/server.go b/cmd/telemetry-gateway/internal/server/server.go
index 2bc4e5af80b..2f23892f166 100644
--- a/cmd/telemetry-gateway/internal/server/server.go
+++ b/cmd/telemetry-gateway/internal/server/server.go
@@ -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()