more logs

Author: rolodato

analytics_test.go

@@ -3,6 +3,7 @@ package flagsmith
 import (
 	"context"
 	"io"
+	"log/slog"
 	"net/http"
 	"net/http/httptest"
 	"sync"
@@ -42,7 +43,7 @@ func TestAnalytics(t *testing.T) {
 	client.SetHeader("X-Environment-Key", EnvironmentAPIKey)
 
 	// Now let's create the processor
-	processor := NewAnalyticsProcessor(context.Background(), client, server.URL+"/api/v1/", &analyticsTimer, defaultLogger())
+	processor := NewAnalyticsProcessor(context.Background(), client, server.URL+"/api/v1/", &analyticsTimer, slog.Default())
 
 	// and, track some features
 	processor.TrackFeature("feature_1")

client.go

@@ -60,9 +60,7 @@ func NewClient(apiKey string, options ...Option) (*Client, error) {
 		client: resty.New(),
 	}
 
-	if c.log == nil {
-		c.log = defaultLogger()
-	}
+	c.log = slog.Default()
 	c.client = resty.
 		New().
 		OnBeforeRequest(newRestyLogRequestMiddleware(c.log)).

logger.go

@@ -29,25 +29,18 @@ func (s restySlogLogger) Debugf(format string, v ...interface{}) {
 	s.logger.Debug(msg)
 }
 
-func defaultLogger() *slog.Logger {
-	return slog.Default().WithGroup("flagsmith")
-}
-
 func newRestyLogRequestMiddleware(logger *slog.Logger) resty.RequestMiddleware {
 	return func(c *resty.Client, req *resty.Request) error {
 		// Create a child logger with request metadata
 		reqLogger := logger.With(
 			"method", req.Method,
 			"url", req.URL,
 		)
+		reqLogger.Debug("request")
+
 		// Store the logger in this request's context, and use it in the response
 		req.SetContext(context.WithValue(req.Context(), "logger", reqLogger))
 
-		reqLogger.Debug("request",
-			slog.String("method", req.Method),
-			slog.String("url", req.URL),
-		)
-
 		// Time the current request
 		req.SetContext(context.WithValue(req.Context(), "startTime", time.Now()))
 
@@ -64,23 +57,11 @@ func newRestyLogResponseMiddleware(logger *slog.Logger) resty.ResponseMiddleware
 		if reqLogger == nil {
 			reqLogger = logger
 		}
-		attrs := []slog.Attr{
-			slog.Int("status", resp.StatusCode()),
-			slog.Duration("duration", time.Since(startTime)),
-			slog.Int64("content_length", resp.Size()),
-		}
 		reqLogger.Debug("response",
 			slog.Int("status", resp.StatusCode()),
 			slog.Duration("duration", time.Since(startTime)),
 			slog.Int64("content_length", resp.Size()),
 		)
-		msg := "received error response"
-		level := slog.LevelDebug
-		if resp.IsError() {
-			level = slog.LevelError
-		}
-		logger.LogAttrs(context.Background(), level, msg, attrs...)
-
 		return nil
 	}
 }

realtime.go

@@ -7,6 +7,7 @@ import (
 	"errors"
 	"log/slog"
 	"net/http"
+	"net/url"
 	"strings"
 	"time"
 )
@@ -16,17 +17,25 @@ func (c *Client) startRealtimeUpdates(ctx context.Context) {
 	if err != nil {
 		panic("Failed to fetch the environment while configuring real-time updates")
 	}
+
 	env := c.environment.GetEnvironment()
-	stream_url := c.config.realtimeBaseUrl + "sse/environments/" + env.APIKey + "/stream"
 	envUpdatedAt := env.UpdatedAt
+	log := c.log.With("environment", env.APIKey, "current_updated_at", &envUpdatedAt)
+
+	streamPath, err := url.JoinPath(c.config.realtimeBaseUrl, "sse/environments", env.APIKey, "stream")
+	if err != nil {
+		log.Error("failed to build stream URL", "error", err)
+		panic(err)
+	}
+
 	for {
 		select {
 		case <-ctx.Done():
 			return
 		default:
-			resp, err := http.Get(stream_url)
+			resp, err := http.Get(streamPath)
 			if err != nil {
-				c.log.Error("failed to connect to realtime service", "error", err)
+				log.Error("failed to connect to realtime service", "error", err)
 				continue
 			}
 			defer resp.Body.Close()
@@ -37,11 +46,12 @@ func (c *Client) startRealtimeUpdates(ctx context.Context) {
 				if strings.HasPrefix(line, "data: ") {
 					parsedTime, err := parseUpdatedAtFromSSE(line)
 					if err != nil {
-						c.log.Error("failed to parse realtime update event", "error", err, "raw_event", line)
+						log.Error("failed to parse realtime update event", "error", err, "raw_event", line)
 						continue
 					}
 					if parsedTime.After(envUpdatedAt) {
-						c.log.Info("received update event",
+						log.WithGroup("event").Info("received update event",
+							slog.Duration("update_delay", parsedTime.Sub(envUpdatedAt)),
 							slog.Time("updated_at", parsedTime),
 							slog.String("environment", env.APIKey),
 						)
@@ -59,6 +69,7 @@ func (c *Client) startRealtimeUpdates(ctx context.Context) {
 		}
 	}
 }
+
 func parseUpdatedAtFromSSE(line string) (time.Time, error) {
 	var eventData struct {
 		UpdatedAt float64 `json:"updated_at"`