diff --git a/go.mod b/go.mod index 02c7d4e..f55d2c1 100644 --- a/go.mod +++ b/go.mod @@ -18,7 +18,6 @@ require ( github.com/pperaltaisern/watermillzap v1.0.0 github.com/prometheus/common v0.60.1 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/otel/trace v1.32.0 go.uber.org/zap v1.27.0 gopkg.in/yaml.v2 v2.4.0 ) @@ -113,6 +112,7 @@ require ( go.opentelemetry.io/collector/pdata v1.12.0 // indirect go.opentelemetry.io/otel v1.32.0 // indirect go.opentelemetry.io/otel/metric v1.32.0 // indirect + go.opentelemetry.io/otel/trace v1.32.0 // indirect go.uber.org/atomic v1.11.0 // indirect go.uber.org/multierr v1.11.0 // indirect go4.org/netipx v0.0.0-20230125063823-8449b0a6169f // indirect diff --git a/integration/watermill/gtag/publishermiddleware.go b/integration/watermill/gtag/publishermiddleware.go index 4a64a48..2bd407d 100644 --- a/integration/watermill/gtag/publishermiddleware.go +++ b/integration/watermill/gtag/publishermiddleware.go @@ -2,16 +2,15 @@ package gtag import ( "github.com/ThreeDotsLabs/watermill/message" - "go.opentelemetry.io/otel/trace" "go.uber.org/zap" ) func PublisherMiddlewareIgnoreError(next PublisherHandler) PublisherHandler { return func(l *zap.Logger, msg *message.Message) error { if err := next(l, msg); err != nil { - if spanCtx := trace.SpanContextFromContext(msg.Context()); spanCtx.IsValid() && spanCtx.IsSampled() { - l = l.With(zap.String("trace_id", spanCtx.TraceID().String()), zap.String("span_id", spanCtx.SpanID().String())) - } + // if spanCtx := trace.SpanContextFromContext(msg.Context()); spanCtx.IsValid() && spanCtx.IsSampled() { + // l = l.With(zap.String("trace_id", spanCtx.TraceID().String()), zap.String("span_id", spanCtx.SpanID().String())) + // } l.With(zap.Error(err)).Warn("ignoring error") } return nil diff --git a/integration/watermill/gtag/subscribermiddleware.go b/integration/watermill/gtag/subscribermiddleware.go index 71fbc0f..c54b12b 100644 --- a/integration/watermill/gtag/subscribermiddleware.go +++ b/integration/watermill/gtag/subscribermiddleware.go @@ -4,7 +4,6 @@ import ( "net/http" "github.com/foomo/sesamy-go/pkg/encoding/gtag" - "go.opentelemetry.io/otel/trace" "go.uber.org/zap" ) @@ -21,9 +20,9 @@ func SubscriberMiddlewareUserID(cookieName string) SubscriberMiddleware { func SubscriberMiddlewareLogger(next SubscriberHandler) SubscriberHandler { return func(l *zap.Logger, r *http.Request, payload *gtag.Payload) error { - if spanCtx := trace.SpanContextFromContext(r.Context()); spanCtx.IsValid() && spanCtx.IsSampled() { - l = l.With(zap.String("trace_id", spanCtx.TraceID().String()), zap.String("span_id", spanCtx.SpanID().String())) - } + // if spanCtx := trace.SpanContextFromContext(r.Context()); spanCtx.IsValid() && spanCtx.IsSampled() { + // l = l.With(zap.String("trace_id", spanCtx.TraceID().String()), zap.String("span_id", spanCtx.SpanID().String())) + // } l = l.With( zap.String("event_name", gtag.GetDefault(payload.EventName, "-").String()), zap.String("event_user_id", gtag.GetDefault(payload.UserID, "-")), diff --git a/integration/watermill/mpv2/publishermiddleware.go b/integration/watermill/mpv2/publishermiddleware.go index 72f8de7..a1e842f 100644 --- a/integration/watermill/mpv2/publishermiddleware.go +++ b/integration/watermill/mpv2/publishermiddleware.go @@ -5,7 +5,6 @@ import ( "github.com/ThreeDotsLabs/watermill/message" "github.com/foomo/sesamy-go/pkg/encoding/mpv2" - "go.opentelemetry.io/otel/trace" "go.uber.org/zap" ) @@ -13,9 +12,9 @@ import ( func PublisherMiddlewareIgnoreError(next PublisherHandler) PublisherHandler { return func(l *zap.Logger, msg *message.Message) error { if err := next(l, msg); err != nil { - if spanCtx := trace.SpanContextFromContext(msg.Context()); spanCtx.IsValid() && spanCtx.IsSampled() { - l = l.With(zap.String("trace_id", spanCtx.TraceID().String()), zap.String("span_id", spanCtx.SpanID().String())) - } + // if spanCtx := trace.SpanContextFromContext(msg.Context()); spanCtx.IsValid() && spanCtx.IsSampled() { + // l = l.With(zap.String("trace_id", spanCtx.TraceID().String()), zap.String("span_id", spanCtx.SpanID().String())) + // } l.With(zap.Error(err)).Warn("ignoring error") } return nil diff --git a/integration/watermill/mpv2/subscribermiddleware.go b/integration/watermill/mpv2/subscribermiddleware.go index 6f55947..592b4ab 100644 --- a/integration/watermill/mpv2/subscribermiddleware.go +++ b/integration/watermill/mpv2/subscribermiddleware.go @@ -8,7 +8,6 @@ import ( "github.com/foomo/sesamy-go/pkg/encoding/mpv2" "github.com/foomo/sesamy-go/pkg/session" "github.com/pkg/errors" - "go.opentelemetry.io/otel/trace" "go.uber.org/zap" ) @@ -81,9 +80,9 @@ func SubscriberMiddlewareLogger(next SubscriberHandler) SubscriberHandler { eventNames[i] = event.Name.String() } - if spanCtx := trace.SpanContextFromContext(r.Context()); spanCtx.IsValid() && spanCtx.IsSampled() { - l = l.With(zap.String("trace_id", spanCtx.TraceID().String()), zap.String("span_id", spanCtx.SpanID().String())) - } + // if spanCtx := trace.SpanContextFromContext(r.Context()); spanCtx.IsValid() && spanCtx.IsSampled() { + // l = l.With(zap.String("trace_id", spanCtx.TraceID().String()), zap.String("span_id", spanCtx.SpanID().String())) + // } l = l.With( zap.String("event_names", strings.Join(eventNames, ",")),