Log fields cleanup (#882)

uber · Jul 13, 2023 · c226da8 · c226da8
1 parent 0dc5fb6
commit c226da8
Show file tree

Hide file tree

Showing 68 changed files with 190 additions and 380 deletions.
diff --git a/codegen/template_bundle/template_files.go b/codegen/template_bundle/template_files.go
diff --git a/codegen/templates/endpoint.tmpl b/codegen/templates/endpoint.tmpl
@@ -111,8 +111,7 @@ func (h *{{$handlerName}}) HandleRequest(
 				ctx,
 				"Endpoint failure: endpoint panic",
 				zap.Error(e),
-				zap.String("stacktrace", stacktrace),
-				zap.String("endpoint", h.endpoint.EndpointName))
+				zap.String("stacktrace", stacktrace))
 
 			h.Dependencies.Default.ContextMetrics.IncCounter(ctx, zanzibar.MetricEndpointPanics, 1)
 			res.SendError(502, "Unexpected workflow panic, recovered at endpoint.", nil)
@@ -150,9 +149,7 @@ func (h *{{$handlerName}}) HandleRequest(
 
 	// log endpoint request to downstream services
 	if ce := h.Dependencies.Default.ContextLogger.Check(zapcore.DebugLevel, "stub"); ce != nil {
-		zfields := []zapcore.Field{
-			zap.String("endpoint", h.endpoint.EndpointName),
-		}
+		var zfields []zapcore.Field
 		{{- if ne .RequestType ""}}
 		zfields = append(zfields, zap.String("body", fmt.Sprintf("%s", req.GetRawBody())))
 		{{- end}}
@@ -180,9 +177,7 @@ func (h *{{$handlerName}}) HandleRequest(
 
 	// log downstream response to endpoint
 	if ce := h.Dependencies.Default.ContextLogger.Check(zapcore.DebugLevel, "stub"); ce != nil {
-		zfields := []zapcore.Field{
-			zap.String("endpoint", h.endpoint.EndpointName),
-		}
+		var zfields []zapcore.Field
 		{{- if ne .ResponseType ""}}
 		if body, err := json.Marshal(response); err == nil {
 			zfields = append(zfields, zap.String("body", fmt.Sprintf("%s", body)))

diff --git a/codegen/templates/tchannel_endpoint.tmpl b/codegen/templates/tchannel_endpoint.tmpl
@@ -91,8 +91,7 @@ func (h *{{$handlerName}}) Handle(
 				ctx,
 				"Endpoint failure: endpoint panic",
 				zap.Error(e),
-				zap.String("stacktrace", stacktrace),
-				zap.String("endpoint", h.endpoint.EndpointID))
+				zap.String("stacktrace", stacktrace))
 
 			h.Deps.Default.ContextMetrics.IncCounter(ctx, zanzibar.MetricEndpointPanics, 1)
 			isSuccessful = false

diff --git a/config/production.gen.go b/config/production.gen.go
diff --git a/...s/example-gateway/build/app/demo/endpoints/abc/abc_appdemoservice_method_call_tchannel.go b/...s/example-gateway/build/app/demo/endpoints/abc/abc_appdemoservice_method_call_tchannel.go
diff --git a/examples/example-gateway/build/clients/bar/mock-client/mock_client.go b/examples/example-gateway/build/clients/bar/mock-client/mock_client.go
diff --git a/examples/example-gateway/build/clients/contacts/mock-client/mock_client.go b/examples/example-gateway/build/clients/contacts/mock-client/mock_client.go
diff --git a/examples/example-gateway/build/clients/corge-http/mock-client/mock_client.go b/examples/example-gateway/build/clients/corge-http/mock-client/mock_client.go
diff --git a/examples/example-gateway/build/clients/custom-bar/mock-client/mock_client.go b/examples/example-gateway/build/clients/custom-bar/mock-client/mock_client.go
diff --git a/examples/example-gateway/build/clients/google-now/mock-client/mock_client.go b/examples/example-gateway/build/clients/google-now/mock-client/mock_client.go
diff --git a/examples/example-gateway/build/clients/multi/mock-client/mock_client.go b/examples/example-gateway/build/clients/multi/mock-client/mock_client.go
diff --git a/examples/example-gateway/build/clients/withexceptions/mock-client/mock_client.go b/examples/example-gateway/build/clients/withexceptions/mock-client/mock_client.go
diff --git a/examples/example-gateway/build/endpoints/bar/bar_bar_method_argnotstruct.go b/examples/example-gateway/build/endpoints/bar/bar_bar_method_argnotstruct.go
diff --git a/examples/example-gateway/build/endpoints/bar/bar_bar_method_argwithheaders.go b/examples/example-gateway/build/endpoints/bar/bar_bar_method_argwithheaders.go
diff --git a/examples/example-gateway/build/endpoints/bar/bar_bar_method_argwithmanyqueryparams.go b/examples/example-gateway/build/endpoints/bar/bar_bar_method_argwithmanyqueryparams.go