use func provider for client info

Author: garmr-ulfr

tracker/clientcontext/injector.go

@@ -25,16 +25,16 @@ type ClientContextInjector struct {
 	inboundRule  *boundsRule
 	outboundRule *boundsRule
 	logger       log.ContextLogger
-	info         ClientInfo
+	getInfo      GetClientInfoFn
 }
 
 // NewClientContextInjector creates a tracker for injecting client info.
-func NewClientContextInjector(info ClientInfo, bounds MatchBounds, logger log.ContextLogger) *ClientContextInjector {
+func NewClientContextInjector(fn GetClientInfoFn, bounds MatchBounds, logger log.ContextLogger) *ClientContextInjector {
 	return &ClientContextInjector{
 		inboundRule:  newBoundsRule(bounds.Inbound),
 		outboundRule: newBoundsRule(bounds.Outbound),
 		logger:       logger,
-		info:         info,
+		getInfo:      fn,
 	}
 }
 
@@ -49,7 +49,8 @@ func (t *ClientContextInjector) RoutedConnection(
 	if !t.inboundRule.match(metadata.Inbound) || !t.outboundRule.match(matchOutbound.Tag()) {
 		return conn
 	}
-	return newWriteConn(conn, &t.info)
+	info := t.getInfo()
+	return newWriteConn(conn, &info)
 }
 
 // RoutedPacketConnection wraps the packet connection for writing client info.
@@ -63,7 +64,8 @@ func (t *ClientContextInjector) RoutedPacketConnection(
 	if !t.inboundRule.match(metadata.Inbound) || !t.outboundRule.match(matchOutbound.Tag()) {
 		return conn
 	}
-	return newWritePacketConn(conn, metadata, &t.info)
+	info := t.getInfo()
+	return newWritePacketConn(conn, metadata, &info)
 }
 
 func (t *ClientContextInjector) UpdateBounds(bounds MatchBounds) {

tracker/clientcontext/tracker.go

@@ -35,6 +35,8 @@ package clientcontext
 
 const packetPrefix = "CLIENTINFO "
 
+type GetClientInfoFn func() ClientInfo
+
 // ClientInfo holds information about the client user/device.
 type ClientInfo struct {
 	DeviceID    string

tracker/clientcontext/tracker_test.go

@@ -64,9 +64,10 @@ func TestIntegration(t *testing.T) {
 		CountryCode: "US",
 		Version:     "9.0",
 	}
+	infoFn := func() ClientInfo { return cInfo }
 	t.Run("with ClientContext tracker", func(t *testing.T) {
 		mTracker.info = nil
-		tracker := NewClientContextInjector(cInfo, MatchBounds{[]string{"any"}, []string{"any"}}, logger)
+		tracker := NewClientContextInjector(infoFn, MatchBounds{[]string{"any"}, []string{"any"}}, logger)
 		runTrackerTest(ctx, t, clientOpts, tracker, httpClient, addr)
 		require.Equal(t, &cInfo, mTracker.info)
 	})