Skip to content
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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: tracing add custom report err func #3370

Draft
wants to merge 6 commits into
base: main
Choose a base branch
from
Draft

feat: tracing add custom report err func #3370

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
96f9eed
feat: tracing add custom report err func
Jul 15, 2024
9e45a76
feat: optimize the definition of the customReportErr method
Jul 16, 2024
674077e
feat: optimize the delcar func name
Jul 16, 2024
8174d3d
style: optimize the variable declare
Jul 16, 2024
fabb4ed
Merge branch 'main' into trace-span-customer-err
daemon365 Jul 25, 2024
9201385
Merge branch 'main' into trace-span-customer-err
daemon365 Jul 25, 2024
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
13 changes: 8 additions & 5 deletions middleware/tracing/tracer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,12 @@ func NewTracer(kind trace.SpanKind, opts ...Option) *Tracer {
op := options{
propagator: propagation.NewCompositeTextMapPropagator(Metadata{}, propagation.Baggage{}, propagation.TraceContext{}),
tracerName: "kratos",
reportErrHandle: func(_ context.Context, span trace.Span, err error) {
span.RecordError(err)
if e := errors.FromError(err); e != nil {
span.SetAttributes(attribute.Key("rpc.status_code").Int64(int64(e.Code)))
}
},
}
for _, o := range opts {
o(&op)
Expand Down Expand Up @@ -60,12 +66,9 @@ func (t *Tracer) Start(ctx context.Context, operation string, carrier propagatio
}

// End finish tracing span
func (t *Tracer) End(_ context.Context, span trace.Span, m interface{}, err error) {
func (t *Tracer) End(ctx context.Context, span trace.Span, m interface{}, err error) {
if err != nil {
span.RecordError(err)
if e := errors.FromError(err); e != nil {
span.SetAttributes(attribute.Key("rpc.status_code").Int64(int64(e.Code)))
}
t.opt.reportErrHandle(ctx, span, err)
span.SetStatus(codes.Error, err.Error())
} else {
span.SetStatus(codes.Ok, "OK")
Expand Down
17 changes: 14 additions & 3 deletions middleware/tracing/tracing.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,14 @@ import (
// Option is tracing option.
type Option func(*options)

// ReportErrHandle report err func handler
type ReportErrHandle func(ctx context.Context, span trace.Span, err error)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ReportErrHandle -> ReportErrorHandle

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

已修改


type options struct {
tracerName string
tracerProvider trace.TracerProvider
propagator propagation.TextMapPropagator
tracerName string
tracerProvider trace.TracerProvider
propagator propagation.TextMapPropagator
reportErrHandle ReportErrHandle
}

// WithPropagator with tracer propagator.
Expand All @@ -43,6 +47,13 @@ func WithTracerName(tracerName string) Option {
}
}

// WithReportErrHandle with custom report err func
func WithReportErrHandle(f ReportErrHandle) Option {
return func(o *options) {
o.reportErrHandle = f
}
}

// Server returns a new server middleware for OpenTelemetry.
func Server(opts ...Option) middleware.Middleware {
tracer := NewTracer(trace.SpanKindServer, opts...)
Expand Down
Loading