Refactor pubsub test writes with tagged types

Author: bootjp

proxy/pubsub_test.go

@@ -11,12 +11,17 @@ import (
 	"github.com/tidwall/redcon"
 )
 
+// Tagged types to distinguish RESP wire types in mock writes.
+type respInt struct{ V int }     // WriteInt
+type respInt64 struct{ V int64 } // WriteInt64
+type respArray struct{ N int }   // WriteArray
+
 // mockDetachedConn implements redcon.DetachedConn for unit testing.
 type mockDetachedConn struct {
 	mu       sync.Mutex
 	commands []redcon.Command // queued commands to return from ReadCommand
 	cmdIdx   int
-	writes   []any // recorded writes: string for WriteString/WriteError/WriteBulkString, int for WriteInt/WriteArray, nil for WriteNull
+	writes   []any // recorded writes: string for WriteString/WriteError/WriteBulkString, respInt/respInt64/respArray for typed ints, nil for WriteNull
 	closed   bool
 	readErr  error // error to return from ReadCommand when commands exhausted
 }
@@ -74,20 +79,20 @@ func (m *mockDetachedConn) WriteBulkString(bulk string) {
 func (m *mockDetachedConn) WriteInt(num int) {
 	m.mu.Lock()
 	defer m.mu.Unlock()
-	m.writes = append(m.writes, num)
+	m.writes = append(m.writes, respInt{num})
 }
 func (m *mockDetachedConn) WriteInt64(num int64) {
 	m.mu.Lock()
 	defer m.mu.Unlock()
-	m.writes = append(m.writes, int(num))
+	m.writes = append(m.writes, respInt64{num})
 }
 func (m *mockDetachedConn) WriteUint64(_ uint64) {
 	// Not used in pubsub tests.
 }
 func (m *mockDetachedConn) WriteArray(count int) {
 	m.mu.Lock()
 	defer m.mu.Unlock()
-	m.writes = append(m.writes, count)
+	m.writes = append(m.writes, respArray{count})
 }
 func (m *mockDetachedConn) WriteNull() {
 	m.mu.Lock()
@@ -201,7 +206,7 @@ func TestPubSub_WriteUnsubAll_PerChannelReplies(t *testing.T) {
 	// Count array headers (each reply starts with WriteArray(3))
 	arrCount := 0
 	for _, w := range writes {
-		if n, ok := w.(int); ok && n == 3 {
+		if a, ok := w.(respArray); ok && a.N == 3 {
 			arrCount++
 		}
 	}
@@ -250,7 +255,7 @@ func TestPubSub_WriteUnsubAll_Patterns(t *testing.T) {
 	// Should have 1 reply (one pattern)
 	arrCount := 0
 	for _, w := range writes {
-		if n, ok := w.(int); ok && n == 3 {
+		if a, ok := w.(respArray); ok && a.N == 3 {
 			arrCount++
 		}
 	}
@@ -341,7 +346,7 @@ func TestPubSub_HandlePubSubPing(t *testing.T) {
 
 	writes := dconn.getWrites()
 	// ["pong", ""]
-	assert.Contains(t, writes, 2) // WriteArray(2)
+	assert.Contains(t, writes, respArray{2}) // WriteArray(2)
 	assert.Contains(t, writes, "BULKSTR:pong")
 	assert.Contains(t, writes, "BULKSTR:") // empty string
 }
@@ -372,7 +377,7 @@ func TestPubSub_HandleUnsubNoSession(t *testing.T) {
 		}
 	}
 	assert.True(t, hasNull)
-	assert.Contains(t, writes, 0) // WriteInt64(0)
+	assert.Contains(t, writes, respInt64{0}) // WriteInt64(0)
 }
 
 func TestPubSub_SubscribeInTxnRejected(t *testing.T) {

proxy/sentry.go

@@ -85,18 +85,21 @@ func (r *SentryReporter) CaptureDivergence(div Divergence) {
 	}
 	r.hub.WithScope(func(scope *sentry.Scope) {
 		scope.SetTag("command", div.Command)
-		scope.SetTag("key", div.Key)
 		scope.SetTag("kind", div.Kind.String())
+		// Omit raw key from Sentry tags to avoid leaking sensitive data;
+		// only send a truncated form as an extra for debugging.
+		scope.SetExtra("key", truncateValue(div.Key))
 		scope.SetExtra("primary", truncateValue(div.Primary))
 		scope.SetExtra("secondary", truncateValue(div.Secondary))
 		scope.SetFingerprint([]string{"divergence", div.Kind.String(), div.Command})
 		scope.SetLevel(sentry.LevelWarning)
-		r.hub.CaptureMessage(fmt.Sprintf("data divergence: %s %s (%s)", div.Kind, div.Command, div.Key))
+		r.hub.CaptureMessage(fmt.Sprintf("data divergence: %s %s", div.Kind, div.Command))
 	})
 }
 
 // ShouldReport checks if this fingerprint has been reported recently (cooldown-based).
-// Periodically evicts expired entries to prevent unbounded map growth.
+// Evicts expired entries when the map reaches maxReportEntries to bound memory usage.
+// Returns false (drops the report) if the map is still at capacity after eviction.
 func (r *SentryReporter) ShouldReport(fingerprint string) bool {
 	r.mu.Lock()
 	defer r.mu.Unlock()