forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-22 20:56:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

rename done to spanEnd

Browse source
This commit is contained in:
jonny rhea 2026-01-04 17:46:04 -06:00
parent 2ae8b7d1b2
commit 70eda41f39
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
rpc/handler.go
View file

@ -523,25 +523,25 @@ func (h *handler) handleCall(cp *callProc, msg *jsonrpcMessage) *jsonrpcMessage
// Start root span for the request. // Start root span for the request.
var err error var err error
ctx, done := h.startSpan(cp.ctx, msg, "rpc.handleCall") ctx, spanEnd := h.startSpan(cp.ctx, msg, "rpc.handleCall")
defer done(&err) defer spanEnd(&err)
// Start tracing span before parsing arguments. // Start tracing span before parsing arguments.
_, pDone := h.startSpan(ctx, msg, "rpc.parsePositionalArguments") _, pSpanEnd := h.startSpan(ctx, msg, "rpc.parsePositionalArguments")
args, err := parsePositionalArguments(msg.Params, callb.argTypes) args, err := parsePositionalArguments(msg.Params, callb.argTypes)
pDone(&err) pSpanEnd(&err)
if err != nil { if err != nil {
return msg.errorResponse(&invalidParamsError{err.Error()}) return msg.errorResponse(&invalidParamsError{err.Error()})
} }
start := time.Now() start := time.Now()
// Start tracing span before running the method. // Start tracing span before running the method.
rctx, rDone := h.startSpan(ctx, msg, "rpc.runMethod") rctx, rSpanEnd := h.startSpan(ctx, msg, "rpc.runMethod")
answer := h.runMethod(rctx, msg, callb, args) answer := h.runMethod(rctx, msg, callb, args)
if answer.Error != nil { if answer.Error != nil {
err = errors.New(answer.Error.Message) err = errors.New(answer.Error.Message)
} }
rDone(&err) rSpanEnd(&err)
// Collect the statistics for RPC calls if metrics is enabled. // Collect the statistics for RPC calls if metrics is enabled.
rpcRequestGauge.Inc(1) rpcRequestGauge.Inc(1)
@ -613,7 +613,7 @@ func (h *handler) startSpan(ctx context.Context, msg *jsonrpcMessage, spanName s
} }
// Define the function to end the span and handle error recording // Define the function to end the span and handle error recording
done := func(err *error) { spanEnd := func(err *error) {
if *err != nil { if *err != nil {
span.RecordError(*err) span.RecordError(*err)
span.SetStatus(codes.Error, (*err).Error()) span.SetStatus(codes.Error, (*err).Error())
@ -623,7 +623,7 @@ func (h *handler) startSpan(ctx context.Context, msg *jsonrpcMessage, spanName s
} }
span.End() span.End()
} }
return ctx, done return ctx, spanEnd
} }
// tracer returns the OpenTelemetry Tracer for RPC call tracing. // tracer returns the OpenTelemetry Tracer for RPC call tracing.
@ -649,12 +649,12 @@ func (h *handler) runMethod(ctx context.Context, msg *jsonrpcMessage, callb *cal
// the parent span is not recording (e.g. subscription tracing disabled). // the parent span is not recording (e.g. subscription tracing disabled).
parentSpan := trace.SpanFromContext(ctx) parentSpan := trace.SpanFromContext(ctx)
if parentSpan.IsRecording() { if parentSpan.IsRecording() {
_, done := h.startSpan(ctx, msg, "rpc.msg.response") _, spanEnd := h.startSpan(ctx, msg, "rpc.msg.response")
response := msg.response(result) response := msg.response(result)
if response.Error != nil { if response.Error != nil {
err = errors.New(response.Error.Message) err = errors.New(response.Error.Message)
} }
done(&err) spanEnd(&err)
return response return response
} }
return msg.response(result) return msg.response(result)