Skip to content

tier1: read trusted headers per response, not once per stream #979

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.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
matthewdarwin wants to merge 1 commit into from
Closed

tier1: read trusted headers per response, not once per stream #979

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 4 additions & 8 deletions service/tier1.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1284,12 +1284,6 @@ func tier1ResponseHandler(
debugOutputForModules []string,
supportBuffering bool,
) substreams.ResponseFunc {
auth := dauth.FromContext(ctx)
organizationID := auth.OrganizationID()
apiKeyID := auth.APIKeyID()
userMeta := auth.Meta()
ip := auth.RealIP()

outputModuleHash := reqctx.OutputModuleHash(ctx)

endpoint := "sf.substreams.rpc.v2/Blocks"
Expand Down Expand Up @@ -1347,10 +1341,12 @@ func tier1ResponseHandler(
}
}

auth := dauth.FromContext(ctx) // per response, continuous auth can refresh it mid-stream

egressBytes := proto.Size(respAny.(proto.Message))
begin := time.Now()
if err := streamSrv.SendMsg(respAny); err != nil {
logger.Info("unable to send block probably due to client disconnecting", zap.String("user_id", organizationID), zap.String("api_key_id", apiKeyID), zap.Error(err))
logger.Info("unable to send block probably due to client disconnecting", zap.String("user_id", auth.OrganizationID()), zap.String("api_key_id", auth.APIKeyID()), zap.Error(err))
return connect.NewError(connect.CodeUnavailable, err)
}
stats.RecordReadTime(begin)
Expand All @@ -1366,7 +1362,7 @@ func tier1ResponseHandler(
stats.RecordEgress(egressBytes)
metering.AddEgressBytes(ctx, egressBytes)

metericsSender.Send(ctx, organizationID, apiKeyID, ip, userMeta, outputModuleHash, endpoint)
metericsSender.Send(ctx, auth.OrganizationID(), auth.APIKeyID(), auth.RealIP(), auth.Meta(), outputModuleHash, endpoint)
return nil
}
}
Expand Down