fix: include the IP of the leader in ASM follower sync error logs

block · Jul 11, 2024 · fedc7e7 · fedc7e7
1 parent d41616f
commit fedc7e7
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/common/configuration/asm.go b/common/configuration/asm.go
@@ -44,7 +44,7 @@ func newASMForTesting(ctx context.Context, secretsClient *secretsmanager.Client,
 	}
 	followerFactory := func(ctx context.Context, url *url.URL) (client asmClient, err error) {
 		rpcClient := rpc.Dial(ftlv1connect.NewAdminServiceClient, url.String(), log.Error)
-		return newASMFollower(ctx, rpcClient, clock), nil
+		return newASMFollower(ctx, rpcClient, url.String(), clock), nil
 	}
 	return &ASM{
 		coordinator: leader.NewCoordinator[asmClient](

diff --git a/common/configuration/asm_follower.go b/common/configuration/asm_follower.go
@@ -27,10 +27,10 @@ type asmFollower struct {
 
 var _ asmClient = &asmFollower{}
 
-func newASMFollower(ctx context.Context, rpcClient ftlv1connect.AdminServiceClient, clock clock.Clock) *asmFollower {
+func newASMFollower(ctx context.Context, rpcClient ftlv1connect.AdminServiceClient, leaderName string, clock clock.Clock) *asmFollower {
 	f := &asmFollower{
 		client: rpcClient,
-		cache:  newSecretsCache("asm-follower"),
+		cache:  newSecretsCache(fmt.Sprintf("asm/follower/%s", leaderName)),
 	}
 	go f.cache.sync(ctx, asmFollowerSyncInterval, func(ctx context.Context, secrets *xsync.MapOf[Ref, cachedSecret]) error {
 		return f.sync(ctx, secrets)

diff --git a/common/configuration/asm_leader.go b/common/configuration/asm_leader.go
@@ -31,7 +31,7 @@ var _ asmClient = &asmLeader{}
 func newASMLeader(ctx context.Context, client *secretsmanager.Client, clock clock.Clock) *asmLeader {
 	l := &asmLeader{
 		client: client,
-		cache:  newSecretsCache("asm-leader"),
+		cache:  newSecretsCache("asm/leader"),
 	}
 	go l.cache.sync(ctx, asmLeaderSyncInterval, func(ctx context.Context, secrets *xsync.MapOf[Ref, cachedSecret]) error {
 		return l.sync(ctx, secrets)

diff --git a/common/configuration/asm_test.go b/common/configuration/asm_test.go
@@ -168,7 +168,7 @@ func TestFollowerSync(t *testing.T) {
 	// fakeRPCClient connects the follower to the leader
 	fakeRPCClient := &fakeAdminClient{asm: asm}
 	followerClock := clock.NewMock()
-	follower := newASMFollower(ctx, fakeRPCClient, followerClock)
+	follower := newASMFollower(ctx, fakeRPCClient, "fake", followerClock)
 
 	testClientSync(ctx, t, follower, follower.cache, sm, func(percentage float64) {
 		// sync leader