foomo/sesamy-go
1
0
Fork 0
mirror of https://github.com/foomo/sesamy-go.git synced 2025-10-16 12:35:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: only log on ignore

Browse Source
This commit is contained in:
Kevin Franklin Kim 2024-11-12 10:31:30 +01:00
parent dae9b3ee29
commit d289d04298
No known key found for this signature in database
5 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.golangci.yml
View File

@ -70,6 +70,8 @@ linters-settings:
disabled: true
- name: comment-spacings
disabled: true
- name: max-public-structs
disabled: true
- name: struct-tag
arguments:
- "json,inline"

9
integration/watermill/gtag/publishermiddleware.go
View File

@ -2,13 +2,18 @@ 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 {
err := next(l, msg)
l.With(zap.Error(err)).Warn("ignoring 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()))
}
l.With(zap.Error(err)).Warn("ignoring error")
}
return nil
}
}

4
integration/watermill/gtag/subscribermiddleware.go
View File

@ -4,6 +4,7 @@ import (
"net/http"
"github.com/foomo/sesamy-go/pkg/encoding/gtag"
"go.opentelemetry.io/otel/trace"
"go.uber.org/zap"
)
@ -20,6 +21,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()))
}
l = l.With(
zap.String("event_name", gtag.GetDefault(payload.EventName, "-").String()),
zap.String("event_user_id", gtag.GetDefault(payload.UserID, "-")),

9
integration/watermill/mpv2/publishermiddleware.go
View File

@ -5,14 +5,19 @@ import (
"github.com/ThreeDotsLabs/watermill/message"
"github.com/foomo/sesamy-go/pkg/encoding/mpv2"
"go.opentelemetry.io/otel/trace"
"go.uber.org/zap"
)
// PublisherMiddlewareIgnoreError ignores error responses from the gtm endpoint to prevent retries.
func PublisherMiddlewareIgnoreError(next PublisherHandler) PublisherHandler {
return func(l *zap.Logger, msg *message.Message) error {
err := next(l, msg)
l.With(zap.Error(err)).Warn("ignoring 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()))
}
l.With(zap.Error(err)).Warn("ignoring error")
}
return nil
}
}

5
integration/watermill/mpv2/subscribermiddleware.go
View File

@ -8,6 +8,7 @@ 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"
)
@ -80,6 +81,10 @@ 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()))
}
l = l.With(
zap.String("event_names", strings.Join(eventNames, ",")),
zap.String("event_user_id", payload.UserID),