mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-02-26 15:47:21 +00:00
d8b92cb9e6
The endSpan closure accepted error by value, meaning deferred calls like defer spanEnd(err) captured the error at defer-time (always nil), not at function-return time. This meant errors were never recorded on spans. - Changed endSpan to accept *error - Updated all call sites in rpc/handler.go to pass error pointers, and adjusted handleCall to avoid propagating child-span errors to the parent - Added TestTracingHTTPErrorRecording to verify that errors from RPC methods are properly recorded on the rpc.runMethod span
104 lines
3.7 KiB
Go
104 lines
3.7 KiB
Go
// Copyright 2026 The go-ethereum Authors
|
|
// This file is part of the go-ethereum library.
|
|
//
|
|
// The go-ethereum library is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU Lesser General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
//
|
|
// The go-ethereum library is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU Lesser General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU Lesser General Public License
|
|
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
package telemetry
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
|
|
"go.opentelemetry.io/otel"
|
|
"go.opentelemetry.io/otel/attribute"
|
|
"go.opentelemetry.io/otel/codes"
|
|
semconv "go.opentelemetry.io/otel/semconv/v1.38.0"
|
|
"go.opentelemetry.io/otel/trace"
|
|
)
|
|
|
|
// Attribute is an alias for attribute.KeyValue.
|
|
type Attribute = attribute.KeyValue
|
|
|
|
// StringAttribute creates an attribute with a string value.
|
|
func StringAttribute(key, val string) Attribute {
|
|
return attribute.String(key, val)
|
|
}
|
|
|
|
// Int64Attribute creates an attribute with an int64 value.
|
|
func Int64Attribute(key string, val int64) Attribute {
|
|
return attribute.Int64(key, val)
|
|
}
|
|
|
|
// BoolAttribute creates an attribute with a bool value.
|
|
func BoolAttribute(key string, val bool) Attribute {
|
|
return attribute.Bool(key, val)
|
|
}
|
|
|
|
// StartSpan creates a SpanKind=INTERNAL span.
|
|
func StartSpan(ctx context.Context, spanName string, attributes ...Attribute) (context.Context, trace.Span, func(*error)) {
|
|
return StartSpanWithTracer(ctx, otel.Tracer(""), spanName, attributes...)
|
|
}
|
|
|
|
// StartSpanWithTracer requires a tracer to be passed in and creates a SpanKind=INTERNAL span.
|
|
func StartSpanWithTracer(ctx context.Context, tracer trace.Tracer, name string, attributes ...Attribute) (context.Context, trace.Span, func(*error)) {
|
|
return startSpan(ctx, tracer, trace.SpanKindInternal, name, attributes...)
|
|
}
|
|
|
|
// RPCInfo contains information about the RPC request.
|
|
type RPCInfo struct {
|
|
System string
|
|
Service string
|
|
Method string
|
|
RequestID string
|
|
}
|
|
|
|
// StartServerSpan creates a SpanKind=SERVER span at the JSON-RPC boundary.
|
|
// The span name is formatted as $rpcSystem.$rpcService/$rpcMethod
|
|
// (e.g. "jsonrpc.engine/newPayloadV4") which follows the Open Telemetry
|
|
// semantic convensions: https://opentelemetry.io/docs/specs/semconv/rpc/rpc-spans/#span-name.
|
|
func StartServerSpan(ctx context.Context, tracer trace.Tracer, rpc RPCInfo, others ...Attribute) (context.Context, func(*error)) {
|
|
var (
|
|
name = fmt.Sprintf("%s.%s/%s", rpc.System, rpc.Service, rpc.Method)
|
|
attributes = append([]Attribute{
|
|
semconv.RPCSystemKey.String(rpc.System),
|
|
semconv.RPCServiceKey.String(rpc.Service),
|
|
semconv.RPCMethodKey.String(rpc.Method),
|
|
semconv.RPCJSONRPCRequestID(rpc.RequestID),
|
|
},
|
|
others...,
|
|
)
|
|
)
|
|
ctx, _, end := startSpan(ctx, tracer, trace.SpanKindServer, name, attributes...)
|
|
return ctx, end
|
|
}
|
|
|
|
// startSpan creates a span with the given kind.
|
|
func startSpan(ctx context.Context, tracer trace.Tracer, kind trace.SpanKind, spanName string, attributes ...Attribute) (context.Context, trace.Span, func(*error)) {
|
|
ctx, span := tracer.Start(ctx, spanName, trace.WithSpanKind(kind))
|
|
if len(attributes) > 0 {
|
|
span.SetAttributes(attributes...)
|
|
}
|
|
return ctx, span, endSpan(span)
|
|
}
|
|
|
|
// endSpan ends the span and handles error recording.
|
|
func endSpan(span trace.Span) func(*error) {
|
|
return func(err *error) {
|
|
if err != nil && *err != nil {
|
|
span.RecordError(*err)
|
|
span.SetStatus(codes.Error, (*err).Error())
|
|
}
|
|
span.End()
|
|
}
|
|
}
|