Add tagged metrics for Thrift app errors

uber · Jan 12, 2019 · 15d78c5 · 15d78c5
1 parent 1c5c6cf
commit 15d78c5
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 13 deletions.
diff --git a/codegen/template_bundle/template_files.go b/codegen/template_bundle/template_files.go
diff --git a/codegen/templates/tchannel_endpoint.tmpl b/codegen/templates/tchannel_endpoint.tmpl
@@ -67,7 +67,7 @@ func New{{$handlerName}}(deps *module.Dependencies) *{{$handlerName}} {
 
 // {{$handlerName}} is the handler for "{{.ThriftService}}::{{.Name}}".
 type {{$handlerName}} struct {
-	Deps     *module.Dependencies
+	Deps	 *module.Dependencies
 	endpoint *zanzibar.TChannelEndpoint
 }
 
@@ -161,6 +161,10 @@ func (h *{{$handlerName}}) Handle(
 			{{$method := .Name -}}
 			{{range .Exceptions -}}
 				case *{{.Type}}:
+					ctxWithError := zanzibar.WithScopeTags(ctx, map[string]string{
+						"app-error": "{{.Type}}",
+					})
+					h.Deps.Default.ContextMetrics.IncCounter(ctxWithError, zanzibar.MetricEndpointAppErrors, 1)
 					if v == nil {
 						h.Deps.Default.ContextLogger.Error(
 							ctx,
@@ -175,6 +179,10 @@ func (h *{{$handlerName}}) Handle(
 					res.{{title .Name}} = v
 			{{end -}}
 				default:
+					ctxWithError := zanzibar.WithScopeTags(ctx, map[string]string{
+						"app-error": "unknown",
+					})
+					h.Deps.Default.ContextMetrics.IncCounter(ctxWithError, zanzibar.MetricEndpointAppErrors, 1)
 					h.Deps.Default.ContextLogger.Error(ctx, "Endpoint failure: handler returned error", zap.Error(err))
 					return false, nil, resHeaders, errors.Wrapf(
 						err, "%s.%s (%s) handler returned error",
@@ -243,12 +251,12 @@ func (h *{{$handlerName}}) redirectToDeputy(
 		h.Deps.Default.Logger,
 		h.Deps.Default.ContextMetrics,
 		&zanzibar.TChannelClientOption{
-			ServiceName:       serviceName,
-			ClientID:           "{{$clientID}}",
-			MethodNames:       methodNames,
-			Timeout:           timeout,
+			ServiceName:	   serviceName,
+			ClientID:		   "{{$clientID}}",
+			MethodNames:	   methodNames,
+			Timeout:		   timeout,
 			TimeoutPerAttempt: timeoutPerAttempt,
-			RoutingKey:        &routingKey,
+			RoutingKey:		&routingKey,
 		},
 	)
 

diff --git a/...es/example-gateway/build/endpoints/tchannel/baz/baz_simpleservice_method_call_tchannel.go b/...es/example-gateway/build/endpoints/tchannel/baz/baz_simpleservice_method_call_tchannel.go
diff --git a/...gateway/build/endpoints/tchannel/panic/panic_simpleservice_method_anothercall_tchannel.go b/...gateway/build/endpoints/tchannel/panic/panic_simpleservice_method_anothercall_tchannel.go
diff --git a/runtime/constants.go b/runtime/constants.go
@@ -34,6 +34,9 @@ const (
 	// MetricEndpointPanics is endpoint level panic counter
 	MetricEndpointPanics = "endpoint.panic"
 
+	// MetricEndpointAppErrors is endpoint level panic counter
+	MetricEndpointAppErrors = "endpoint.app-errors-err"
+
 	clientRequest      = "client.request"
 	clientSuccess      = "client.success"
 	clientStatus       = "client.status"