Skip to content

Commit 106bf88

Browse files
committed
Add verbose logging to DescribeCluster and AddOrUpdateRemoteCluster
1 parent 4289c12 commit 106bf88

1 file changed

Lines changed: 20 additions & 1 deletion

File tree

proxy/adminservice.go

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,14 @@ func NewAdminServiceProxyServer(
5858
}
5959

6060
func (s *adminServiceProxyServer) AddOrUpdateRemoteCluster(ctx context.Context, in0 *adminservice.AddOrUpdateRemoteClusterRequest) (*adminservice.AddOrUpdateRemoteClusterResponse, error) {
61+
s.logger.Info("Received AddOrUpdateRemoteCluster", tag.Address(in0.FrontendAddress), tag.NewBoolTag("Enabled", in0.GetEnableRemoteClusterConnection()), tag.NewStringsTag("configTags", s.metricLabelValues))
6162
if !common.IsRequestTranslationDisabled(ctx) {
6263
if len(s.outboundAddressOverride) > 0 {
6364
// Override this address so that cross-cluster connections flow through the proxy.
6465
// Use a separate "external address" config option because the outbound.listenerAddress may not be routable
6566
// from the local temporal server, or the proxy may be deployed behind a load balancer.
6667
in0.FrontendAddress = s.outboundAddressOverride
68+
s.logger.Info("Overwrote outbound address", tag.Address(in0.FrontendAddress), tag.NewStringsTag("configTags", s.metricLabelValues))
6769
}
6870
}
6971
return s.adminClient.AddOrUpdateRemoteCluster(ctx, in0)
@@ -90,18 +92,35 @@ func (s *adminServiceProxyServer) DeleteWorkflowExecution(ctx context.Context, i
9092
}
9193

9294
func (s *adminServiceProxyServer) DescribeCluster(ctx context.Context, in0 *adminservice.DescribeClusterRequest) (*adminservice.DescribeClusterResponse, error) {
95+
s.logger.Info("Received DescribeClusterRequest")
9396
resp, err := s.adminClient.DescribeCluster(ctx, in0)
9497
if common.IsRequestTranslationDisabled(ctx) {
9598
return resp, err
9699
}
97-
100+
if resp != nil {
101+
s.logger.Info("Raw DescribeClusterResponse", tag.NewStringTag("clusterID", resp.ClusterId),
102+
tag.NewStringTag("clusterName", resp.ClusterName), tag.NewStringTag("version", resp.ServerVersion),
103+
tag.NewInt64("failoverVersionIncrement", resp.FailoverVersionIncrement), tag.NewInt64("initialFailoverVersion", resp.InitialFailoverVersion),
104+
tag.NewBoolTag("isGlobalNamespaceEnabled", resp.IsGlobalNamespaceEnabled), tag.NewStringsTag("configTags", s.metricLabelValues))
105+
}
98106
if s.apiOverrides != nil && s.apiOverrides.AdminSerivce.DescribeCluster != nil {
99107
responseOverride := s.apiOverrides.AdminSerivce.DescribeCluster.Response
100108
if resp != nil && responseOverride.FailoverVersionIncrement != nil {
101109
resp.FailoverVersionIncrement = *responseOverride.FailoverVersionIncrement
110+
s.logger.Info("Overwrite FailoverVersionIncrement", tag.NewInt64("failoverVersionIncrement", resp.FailoverVersionIncrement),
111+
tag.NewStringsTag("configTags", s.metricLabelValues))
102112
}
103113
}
104114

115+
if resp != nil {
116+
s.logger.Info("Translated DescribeClusterResponse", tag.NewStringTag("clusterID", resp.ClusterId),
117+
tag.NewStringTag("clusterName", resp.ClusterName), tag.NewStringTag("version", resp.ServerVersion),
118+
tag.NewInt64("failoverVersionIncrement", resp.FailoverVersionIncrement), tag.NewInt64("initialFailoverVersion", resp.InitialFailoverVersion),
119+
tag.NewBoolTag("isGlobalNamespaceEnabled", resp.IsGlobalNamespaceEnabled), tag.NewStringsTag("configTags", s.metricLabelValues))
120+
}
121+
if err != nil {
122+
s.logger.Info("Error from remote server!", tag.Error(err), tag.NewStringsTag("configTags", s.metricLabelValues))
123+
}
105124
return resp, err
106125
}
107126

0 commit comments

Comments
 (0)