Merge a89637d into 2f9c950

uber · Oct 26, 2018 · 42f8adf · 42f8adf
2 parents 2f9c950 + a89637d
commit 42f8adf
Show file tree

Hide file tree

Showing 71 changed files with 233 additions and 250 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 - **BREAKING** Use [`ContextMerics`](https://godoc.org/github.com/uber/zanzibar/runtime#ContextMerics) instead of tally.Scope at [`NewRouterEndpoint`](https://godoc.org/github.com/uber/zanzibar/runtime#NewRouterEndpointContext), [`NewHTTPClient`](https://godoc.org/github.com/uber/zanzibar/runtime#NewHTTPClient), [`NewTChannelClient`](https://godoc.org/github.com/uber/zanzibar/runtime#NewTChannelClient)
 - **BREAKING** Use [`ContextMerics`](https://godoc.org/github.com/uber/zanzibar/runtime#ContextMerics) to emit metrics instead of metrics from call_metrics.go.
+- **BREAKING** All [`metrics`](https://godoc.org/github.com/uber/zanzibar/runtime#call_metrics.go) counter and timer name has been changed and is using RootScope instead of AllHostScope and PerHostScope
 - **BREAKING** Application packages must now export a global variable named `AppOptions` of type [`*zanzibar.Options`](https://godoc.org/github.com/uber/zanzibar/runtime#Options) to be located at package root (the package defined in `build.json`/`build.yaml`). 
 - Most built-in logs like `Finished an outgoing client HTTP request` now use the context logger. 
 - Added [`ContextExtractor`](https://godoc.org/github.com/uber/zanzibar/runtime#ContextExtractor) interface. It is part of the API for dfining "extractors" or functions to pull out dynamic fields like trace ID, request headers, etc. out of the context to be used in log fields and metric tags. These can be used to pull out fields that are application-specific without adding code to zanzibar. 

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
@@ -114,7 +114,7 @@ func (h *{{$handlerName}}) HandleRequest(
 				zap.String("stacktrace", stacktrace),
 				zap.String("endpoint", h.endpoint.EndpointName))
 
-			h.endpoint.ContextMetrics.IncCounter(ctx, zanzibar.InboundCallsPanic, 1)
+			h.endpoint.ContextMetrics.IncCounter(ctx, zanzibar.EndpointPanics, 1)
 			res.SendError(502, "Unexpected workflow panic, recovered at endpoint.", nil)
 		}
 	}()

diff --git a/codegen/templates/module_initializer.tmpl b/codegen/templates/module_initializer.tmpl
@@ -41,8 +41,8 @@ func InitializeDependencies(
 		Logger:         g.Logger,
 		ContextExtractor: g.ContextExtractor,
 		ContextLogger:  g.ContextLogger,
-		ContextMetrics: zanzibar.NewContextMetrics(g.AllHostScope),
-		Scope:          g.AllHostScope,
+		ContextMetrics: zanzibar.NewContextMetrics(g.RootScope),
+		Scope:          g.RootScope,
 		Tracer:         g.Tracer,
 		Config:         g.Config,
 		Channel:        g.Channel,

diff --git a/codegen/templates/module_mock_initializer.tmpl b/codegen/templates/module_mock_initializer.tmpl
@@ -57,7 +57,7 @@ func InitializeDependenciesMock(
 		ContextMetrics: g.ContextMetrics,
 		ContextLogger: g.ContextLogger,
 		Logger:  	   g.Logger,
-		Scope:         g.AllHostScope,
+		Scope:         g.RootScope,
 		Config:        g.Config,
 		Channel:       g.Channel,
 		Tracer:        g.Tracer,

diff --git a/codegen/templates/tchannel_endpoint.tmpl b/codegen/templates/tchannel_endpoint.tmpl
@@ -94,7 +94,7 @@ func (h *{{$handlerName}}) Handle(
 				zap.String("stacktrace", stacktrace),
 				zap.String("endpoint", h.endpoint.EndpointID))
 
-			h.endpoint.ContextMetrics.IncCounter(ctx, zanzibar.InboundCallsPanic, 1)
+			h.endpoint.ContextMetrics.IncCounter(ctx, zanzibar.EndpointPanics, 1)
 			isSuccessful = false
 			response = nil
 			headers = nil

diff --git a/codegen/test_data/endpoints/bar_bar_method_argnotstruct.gogen b/codegen/test_data/endpoints/bar_bar_method_argnotstruct.gogen
@@ -85,7 +85,7 @@ func (h *BarArgNotStructHandler) HandleRequest(
 				zap.String("stacktrace", stacktrace),
 				zap.String("endpoint", h.endpoint.EndpointName))
 
-			h.endpoint.ContextMetrics.IncCounter(ctx, zanzibar.InboundCallsPanic, 1)
+			h.endpoint.ContextMetrics.IncCounter(ctx, zanzibar.EndpointPanics, 1)
 			res.SendError(502, "Unexpected workflow panic, recovered at endpoint.", nil)
 		}
 	}()

diff --git a/codegen/test_data/endpoints/bar_bar_method_argwithheaders.gogen b/codegen/test_data/endpoints/bar_bar_method_argwithheaders.gogen
@@ -87,7 +87,7 @@ func (h *BarArgWithHeadersHandler) HandleRequest(
 				zap.String("stacktrace", stacktrace),
 				zap.String("endpoint", h.endpoint.EndpointName))
 
-			h.endpoint.ContextMetrics.IncCounter(ctx, zanzibar.InboundCallsPanic, 1)
+			h.endpoint.ContextMetrics.IncCounter(ctx, zanzibar.EndpointPanics, 1)
 			res.SendError(502, "Unexpected workflow panic, recovered at endpoint.", nil)
 		}
 	}()

diff --git a/codegen/test_data/endpoints/bar_bar_method_argwithmanyqueryparams.gogen b/codegen/test_data/endpoints/bar_bar_method_argwithmanyqueryparams.gogen
@@ -87,7 +87,7 @@ func (h *BarArgWithManyQueryParamsHandler) HandleRequest(
 				zap.String("stacktrace", stacktrace),
 				zap.String("endpoint", h.endpoint.EndpointName))
 
-			h.endpoint.ContextMetrics.IncCounter(ctx, zanzibar.InboundCallsPanic, 1)
+			h.endpoint.ContextMetrics.IncCounter(ctx, zanzibar.EndpointPanics, 1)
 			res.SendError(502, "Unexpected workflow panic, recovered at endpoint.", nil)
 		}
 	}()

diff --git a/codegen/test_data/endpoints/bar_bar_method_argwithnestedqueryparams.gogen b/codegen/test_data/endpoints/bar_bar_method_argwithnestedqueryparams.gogen
@@ -87,7 +87,7 @@ func (h *BarArgWithNestedQueryParamsHandler) HandleRequest(
 				zap.String("stacktrace", stacktrace),
 				zap.String("endpoint", h.endpoint.EndpointName))
 
-			h.endpoint.ContextMetrics.IncCounter(ctx, zanzibar.InboundCallsPanic, 1)
+			h.endpoint.ContextMetrics.IncCounter(ctx, zanzibar.EndpointPanics, 1)
 			res.SendError(502, "Unexpected workflow panic, recovered at endpoint.", nil)
 		}
 	}()

diff --git a/codegen/test_data/endpoints/bar_bar_method_argwithparams.gogen b/codegen/test_data/endpoints/bar_bar_method_argwithparams.gogen
@@ -86,7 +86,7 @@ func (h *BarArgWithParamsHandler) HandleRequest(
 				zap.String("stacktrace", stacktrace),
 				zap.String("endpoint", h.endpoint.EndpointName))
 
-			h.endpoint.ContextMetrics.IncCounter(ctx, zanzibar.InboundCallsPanic, 1)
+			h.endpoint.ContextMetrics.IncCounter(ctx, zanzibar.EndpointPanics, 1)
 			res.SendError(502, "Unexpected workflow panic, recovered at endpoint.", nil)
 		}
 	}()

diff --git a/codegen/test_data/endpoints/bar_bar_method_argwithqueryheader.gogen b/codegen/test_data/endpoints/bar_bar_method_argwithqueryheader.gogen
@@ -87,7 +87,7 @@ func (h *BarArgWithQueryHeaderHandler) HandleRequest(
 				zap.String("stacktrace", stacktrace),
 				zap.String("endpoint", h.endpoint.EndpointName))
 
-			h.endpoint.ContextMetrics.IncCounter(ctx, zanzibar.InboundCallsPanic, 1)
+			h.endpoint.ContextMetrics.IncCounter(ctx, zanzibar.EndpointPanics, 1)
 			res.SendError(502, "Unexpected workflow panic, recovered at endpoint.", nil)
 		}
 	}()

diff --git a/codegen/test_data/endpoints/bar_bar_method_argwithqueryparams.gogen b/codegen/test_data/endpoints/bar_bar_method_argwithqueryparams.gogen
@@ -87,7 +87,7 @@ func (h *BarArgWithQueryParamsHandler) HandleRequest(
 				zap.String("stacktrace", stacktrace),
 				zap.String("endpoint", h.endpoint.EndpointName))
 
-			h.endpoint.ContextMetrics.IncCounter(ctx, zanzibar.InboundCallsPanic, 1)
+			h.endpoint.ContextMetrics.IncCounter(ctx, zanzibar.EndpointPanics, 1)
 			res.SendError(502, "Unexpected workflow panic, recovered at endpoint.", nil)
 		}
 	}()

diff --git a/codegen/test_data/endpoints/bar_bar_method_helloworld.gogen b/codegen/test_data/endpoints/bar_bar_method_helloworld.gogen
@@ -85,7 +85,7 @@ func (h *BarHelloWorldHandler) HandleRequest(
 				zap.String("stacktrace", stacktrace),
 				zap.String("endpoint", h.endpoint.EndpointName))
 
-			h.endpoint.ContextMetrics.IncCounter(ctx, zanzibar.InboundCallsPanic, 1)
+			h.endpoint.ContextMetrics.IncCounter(ctx, zanzibar.EndpointPanics, 1)
 			res.SendError(502, "Unexpected workflow panic, recovered at endpoint.", nil)
 		}
 	}()

diff --git a/codegen/test_data/endpoints/bar_bar_method_missingarg.gogen b/codegen/test_data/endpoints/bar_bar_method_missingarg.gogen
@@ -84,7 +84,7 @@ func (h *BarMissingArgHandler) HandleRequest(
 				zap.String("stacktrace", stacktrace),
 				zap.String("endpoint", h.endpoint.EndpointName))
 
-			h.endpoint.ContextMetrics.IncCounter(ctx, zanzibar.InboundCallsPanic, 1)
+			h.endpoint.ContextMetrics.IncCounter(ctx, zanzibar.EndpointPanics, 1)
 			res.SendError(502, "Unexpected workflow panic, recovered at endpoint.", nil)
 		}
 	}()

diff --git a/codegen/test_data/endpoints/bar_bar_method_norequest.gogen b/codegen/test_data/endpoints/bar_bar_method_norequest.gogen
@@ -84,7 +84,7 @@ func (h *BarNoRequestHandler) HandleRequest(
 				zap.String("stacktrace", stacktrace),
 				zap.String("endpoint", h.endpoint.EndpointName))
 
-			h.endpoint.ContextMetrics.IncCounter(ctx, zanzibar.InboundCallsPanic, 1)
+			h.endpoint.ContextMetrics.IncCounter(ctx, zanzibar.EndpointPanics, 1)
 			res.SendError(502, "Unexpected workflow panic, recovered at endpoint.", nil)
 		}
 	}()

diff --git a/codegen/test_data/endpoints/bar_bar_method_normal.gogen b/codegen/test_data/endpoints/bar_bar_method_normal.gogen
@@ -95,7 +95,7 @@ func (h *BarNormalHandler) HandleRequest(
 				zap.String("stacktrace", stacktrace),
 				zap.String("endpoint", h.endpoint.EndpointName))
 
-			h.endpoint.ContextMetrics.IncCounter(ctx, zanzibar.InboundCallsPanic, 1)
+			h.endpoint.ContextMetrics.IncCounter(ctx, zanzibar.EndpointPanics, 1)
 			res.SendError(502, "Unexpected workflow panic, recovered at endpoint.", nil)
 		}
 	}()

diff --git a/codegen/test_data/endpoints/bar_bar_method_toomanyargs.gogen b/codegen/test_data/endpoints/bar_bar_method_toomanyargs.gogen
@@ -87,7 +87,7 @@ func (h *BarTooManyArgsHandler) HandleRequest(
 				zap.String("stacktrace", stacktrace),
 				zap.String("endpoint", h.endpoint.EndpointName))
 
-			h.endpoint.ContextMetrics.IncCounter(ctx, zanzibar.InboundCallsPanic, 1)
+			h.endpoint.ContextMetrics.IncCounter(ctx, zanzibar.EndpointPanics, 1)
 			res.SendError(502, "Unexpected workflow panic, recovered at endpoint.", nil)
 		}
 	}()

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
diff --git a/examples/example-gateway/build/endpoints/bar/bar_bar_method_argwithnestedqueryparams.go b/examples/example-gateway/build/endpoints/bar/bar_bar_method_argwithnestedqueryparams.go
diff --git a/examples/example-gateway/build/endpoints/bar/bar_bar_method_argwithparams.go b/examples/example-gateway/build/endpoints/bar/bar_bar_method_argwithparams.go
diff --git a/examples/example-gateway/build/endpoints/bar/bar_bar_method_argwithqueryheader.go b/examples/example-gateway/build/endpoints/bar/bar_bar_method_argwithqueryheader.go
diff --git a/examples/example-gateway/build/endpoints/bar/bar_bar_method_argwithqueryparams.go b/examples/example-gateway/build/endpoints/bar/bar_bar_method_argwithqueryparams.go
diff --git a/examples/example-gateway/build/endpoints/bar/bar_bar_method_helloworld.go b/examples/example-gateway/build/endpoints/bar/bar_bar_method_helloworld.go
diff --git a/examples/example-gateway/build/endpoints/bar/bar_bar_method_missingarg.go b/examples/example-gateway/build/endpoints/bar/bar_bar_method_missingarg.go
diff --git a/examples/example-gateway/build/endpoints/bar/bar_bar_method_norequest.go b/examples/example-gateway/build/endpoints/bar/bar_bar_method_norequest.go
diff --git a/examples/example-gateway/build/endpoints/bar/bar_bar_method_normal.go b/examples/example-gateway/build/endpoints/bar/bar_bar_method_normal.go
diff --git a/examples/example-gateway/build/endpoints/bar/bar_bar_method_toomanyargs.go b/examples/example-gateway/build/endpoints/bar/bar_bar_method_toomanyargs.go
diff --git a/examples/example-gateway/build/endpoints/baz/baz_simpleservice_method_call.go b/examples/example-gateway/build/endpoints/baz/baz_simpleservice_method_call.go
diff --git a/examples/example-gateway/build/endpoints/baz/baz_simpleservice_method_compare.go b/examples/example-gateway/build/endpoints/baz/baz_simpleservice_method_compare.go
diff --git a/examples/example-gateway/build/endpoints/baz/baz_simpleservice_method_getprofile.go b/examples/example-gateway/build/endpoints/baz/baz_simpleservice_method_getprofile.go
diff --git a/examples/example-gateway/build/endpoints/baz/baz_simpleservice_method_headerschema.go b/examples/example-gateway/build/endpoints/baz/baz_simpleservice_method_headerschema.go
diff --git a/examples/example-gateway/build/endpoints/baz/baz_simpleservice_method_ping.go b/examples/example-gateway/build/endpoints/baz/baz_simpleservice_method_ping.go
diff --git a/examples/example-gateway/build/endpoints/baz/baz_simpleservice_method_sillynoop.go b/examples/example-gateway/build/endpoints/baz/baz_simpleservice_method_sillynoop.go
diff --git a/examples/example-gateway/build/endpoints/baz/baz_simpleservice_method_trans.go b/examples/example-gateway/build/endpoints/baz/baz_simpleservice_method_trans.go