impl: added attribute events to parse json formatted log into datadog

Author: zFlabmonsta

docker-compose.yml

@@ -55,5 +55,6 @@ services:
       - '/var/run/docker.sock:/var/run/docker.sock:ro'
       - '/var/lib/docker/containers:/var/lib/docker/containers:ro'
       - '/sys/fs/cgroup/:/host/sys/fs/cgroup:ro'
+      - '/sys/kernel/debug:/sys/kernel/debug'
 networks:
   web-service:

web/internal/web1/handler.go

@@ -19,7 +19,7 @@ func (h *handler) Welcome() func(w http.ResponseWriter, r *http.Request) {
 		ctx := r.Context()
 		req, err := http.NewRequest("GET", "http://web2-server:3001/web2", nil)
 		if err != nil {
-			h.log.Errorf(ctx, "Unable to create request: %w", err)
+			h.log.Errorf(ctx, "Welcome(): Unable to create request: %w", err)
 			return
 		}
 
@@ -28,7 +28,7 @@ func (h *handler) Welcome() func(w http.ResponseWriter, r *http.Request) {
 
 		_, err = http.DefaultClient.Do(req)
 		if err != nil {
-			h.log.Errorf(ctx, "bad response: %w", err)
+			h.log.Errorf(ctx, "Welcome():bad response: %w", err)
 			return
 		}
 

web/internal/web1/middleware.go

@@ -19,7 +19,8 @@ func DataDogTracer() func(http.Handler) http.Handler {
 				log.Printf("Failed to inject tracer: %v", err)
 			}
 
-			r = r.WithContext(context.WithValue(r.Context(), "datadogTraceID", r.Header.Get("X-Datadog-Trace-Id")))
+			r = r.WithContext(context.WithValue(r.Context(), "datadogTraceID", span.Context().TraceID()))
+			r = r.WithContext(context.WithValue(r.Context(), "datadogSpanID", span.Context().SpanID()))
 			next.ServeHTTP(w, r)
 		}
 		return http.HandlerFunc(fn)

web/internal/web2/middleware.go

@@ -17,10 +17,11 @@ func DataDogTracer() func(http.Handler) http.Handler {
 				return
 			}
 
-			span := tracer.StartSpan("web.request", tracer.ChildOf(sctx))
+			span := tracer.StartSpan("web2.request", tracer.ChildOf(sctx))
 			defer span.Finish()
 
-			r = r.WithContext(context.WithValue(r.Context(), "datadogTraceID", r.Header.Get("X-Datadog-Trace-Id")))
+			r = r.WithContext(context.WithValue(r.Context(), "datadogTraceID", span.Context().TraceID()))
+			r = r.WithContext(context.WithValue(r.Context(), "datadogSpanID", span.Context().SpanID()))
 			next.ServeHTTP(w, r)
 		}
 		return http.HandlerFunc(fn)

web/pkg/log/attr.go

@@ -0,0 +1,19 @@
+package log
+
+type HTTP struct {
+	Method     string `json:"method"`
+	StatusCode int    `json:"status_code"`
+}
+
+type Error struct {
+	Message string `json:"message"`
+}
+
+type Network struct {
+	ClientIP string `json:"client_ip"`
+}
+
+type DataDog struct {
+	TraceID uint64 `json:"trace_id"`
+	SpanID  uint64 `json:"span_id"`
+}

web/pkg/log/logger.go

@@ -22,21 +22,20 @@ func NewLogger(l *log.Logger, f Formatter) *LoggerWrapper {
 }
 
 func (l *LoggerWrapper) Errorf(ctx context.Context, format string, args ...interface{}) {
-	l.Logger.WithFields(l.tracingFields(ctx)).Errorf(format, args...)
+	l.Logger.WithFields(l.processAttrFields(ctx)).Errorf(format, args...)
 }
 
 func (l *LoggerWrapper) Infof(ctx context.Context, format string, args ...interface{}) {
-	l.Logger.WithFields(l.tracingFields(ctx)).Infof(format, args...)
+	l.Logger.WithFields(l.processAttrFields(ctx)).Infof(format, args...)
 }
 
-func (l *LoggerWrapper) WithFields(fields Fields) *LoggerWrapper {
-	l.Logger.WithFields(fields)
-	return l
-}
-
-func (l *LoggerWrapper) tracingFields(ctx context.Context) Fields {
+func (l *LoggerWrapper) processAttrFields(ctx context.Context) Fields {
 	return Fields{
 		"subdomain": ctx.Value("subdomain"),
-		"x-trace":   ctx.Value("datadogTraceID"),
+		"dd": DataDog{
+			TraceID: ctx.Value("datadogTraceID").(uint64),
+			SpanID:  ctx.Value("datadogSpanID").(uint64),
+		},
+		"http": ctx.Value(HTTP{}),
 	}
 }

web/pkg/log/middleware.go

@@ -1,8 +1,8 @@
 package log
 
 import (
+	"context"
 	"net/http"
-	"time"
 
 	"github.com/go-chi/chi/middleware"
 )
@@ -11,15 +11,13 @@ func Logger(l *LoggerWrapper) func(http.Handler) http.Handler {
 	return func(next http.Handler) http.Handler {
 		fn := func(w http.ResponseWriter, r *http.Request) {
 			ww := middleware.NewWrapResponseWriter(w, r.ProtoMajor)
-			timeNow := time.Now()
 			defer func() {
-				fields := Fields{
-					"duration":    timeNow.String(),
-					"status_code": ww.Status(),
-					"method":      r.Method,
-					"service":     "web-2",
+				http := &HTTP{
+					StatusCode: ww.Status(),
+					Method:     r.Method,
 				}
-				l.WithFields(fields).Infof(r.Context(), "http://%s%s", r.Host, r.RequestURI)
+				r = r.WithContext(context.WithValue(r.Context(), HTTP{}, http))
+				l.Infof(r.Context(), "http://%s%s", r.Host, r.RequestURI)
 			}()
 
 			next.ServeHTTP(ww, r)