Add resolveHeaders tag to tchannel endpoint.request metrics

uber · Oct 31, 2018 · 1cbe93e · 1cbe93e
1 parent aae3084
commit 1cbe93e
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 27 deletions.
diff --git a/runtime/context.go b/runtime/context.go
@@ -64,11 +64,12 @@ const (
 	scopeTagHandler         = "handlerid"
 	scopeTagError           = "error"
 	scopeTagStatus          = "status"
-	scopeTagProtocal        = "protocal"
+	scopeTagProtocol        = "protocol"
 	scopeTagHTTP            = "HTTP"
 	scopeTagTChannel        = "TChannel"
 	scopeTagsTargetService  = "targetservice"
 	scopeTagsTargetEndpoint = "targetendpoint"
+	scopeTagResolvedHeaders = "resolvedheaders"
 )
 
 // WithEndpointField adds the endpoint information in the

diff --git a/runtime/router.go b/runtime/router.go
@@ -124,7 +124,7 @@ func (endpoint *RouterEndpoint) HandleRequest(
 	scopeTags := map[string]string{
 		scopeTagEndpoint: endpoint.EndpointName,
 		scopeTagHandler:  endpoint.HandlerName,
-		scopeTagProtocal: scopeTagHTTP,
+		scopeTagProtocol: scopeTagHTTP,
 	}
 
 	headers := map[string]string{}
@@ -257,7 +257,7 @@ func (router *HTTPRouter) handleNotFound(
 	scopeTags := map[string]string{
 		scopeTagEndpoint: router.notFoundEndpoint.EndpointName,
 		scopeTagHandler:  router.notFoundEndpoint.HandlerName,
-		scopeTagProtocal: scopeTagHTTP,
+		scopeTagProtocol: scopeTagHTTP,
 	}
 
 	ctx := r.Context()
@@ -276,7 +276,7 @@ func (router *HTTPRouter) handleMethodNotAllowed(
 	scopeTags := map[string]string{
 		scopeTagEndpoint: router.methodNotAllowedEndpoint.EndpointName,
 		scopeTagHandler:  router.methodNotAllowedEndpoint.HandlerName,
-		scopeTagProtocal: scopeTagHTTP,
+		scopeTagProtocol: scopeTagHTTP,
 	}
 
 	ctx := r.Context()

diff --git a/runtime/tchannel_server.go b/runtime/tchannel_server.go
@@ -189,7 +189,7 @@ func (s *TChannelRouter) Handle(ctx context.Context, call *tchannel.InboundCall)
 		scopeTagEndpoint:       e.EndpointID,
 		scopeTagHandler:        e.HandlerID,
 		scopeTagEndpointMethod: e.Method,
-		scopeTagProtocal:       scopeTagTChannel,
+		scopeTagProtocol:       scopeTagTChannel,
 	}
 
 	ctx = WithScopeTags(ctx, scopeTags)
@@ -228,7 +228,8 @@ func (s *TChannelRouter) handle(
 		return err
 	}
 
-	scopeTags := make(map[string]string)
+	scopeTags := map[string]string{scopeTagResolvedHeaders: "true"}
+	c.ctx = WithScopeTags(c.ctx, scopeTags)
 	c.ctx = WithEndpointRequestHeadersField(c.ctx, c.reqHeaders)
 	for k, v := range s.extractor.ExtractScopeTags(c.ctx) {
 		scopeTags[k] = v
@@ -264,6 +265,8 @@ func (s *TChannelRouter) handle(
 
 func (c *tchannelInboundCall) start() {
 	c.startTime = time.Now()
+	scopeTags := map[string]string{scopeTagResolvedHeaders: "false"}
+	c.ctx = WithScopeTags(c.ctx, scopeTags)
 	c.endpoint.ContextMetrics.IncCounter(c.ctx, endpointRequest, 1)
 }
 

diff --git a/test/endpoints/bar/bar_metrics_test.go b/test/endpoints/bar/bar_metrics_test.go
@@ -97,7 +97,7 @@ func TestCallMetrics(t *testing.T) {
 		"deviceversion": "carbon",
 		"dc":            "unknown",
 		"host":          zanzibar.GetHostname(),
-		"protocal":      "HTTP",
+		"protocol":      "HTTP",
 	}
 	eStatusTags := map[string]string{
 		"env":           "test",
@@ -110,7 +110,7 @@ func TestCallMetrics(t *testing.T) {
 		"deviceversion": "carbon",
 		"dc":            "unknown",
 		"host":          zanzibar.GetHostname(),
-		"protocal":      "HTTP",
+		"protocol":      "HTTP",
 	}
 	for _, name := range endpointNames {
 		key := tally.KeyForPrefixedStringMap(name, endpointTags)
@@ -152,7 +152,7 @@ func TestCallMetrics(t *testing.T) {
 		"regionname":    "san_francisco",
 		"device":        "ios",
 		"deviceversion": "carbon",
-		"protocal":      "HTTP",
+		"protocol":      "HTTP",
 	}
 	cStatusTags := map[string]string{
 		"env":           "test",
@@ -167,7 +167,7 @@ func TestCallMetrics(t *testing.T) {
 		"regionname":    "san_francisco",
 		"device":        "ios",
 		"deviceversion": "carbon",
-		"protocal":      "HTTP",
+		"protocol":      "HTTP",
 	}
 
 	for _, name := range httpClientNames {

diff --git a/test/endpoints/baz/baz_metrics_test.go b/test/endpoints/baz/baz_metrics_test.go
@@ -108,7 +108,7 @@ func TestCallMetrics(t *testing.T) {
 		"deviceversion": "carbon",
 		"dc":            "unknown",
 		"host":          zanzibar.GetHostname(),
-		"protocal":      "HTTP",
+		"protocol":      "HTTP",
 	}
 	statusTags := map[string]string{
 		"env":           "test",
@@ -121,7 +121,7 @@ func TestCallMetrics(t *testing.T) {
 		"deviceversion": "carbon",
 		"dc":            "unknown",
 		"host":          zanzibar.GetHostname(),
-		"protocal":      "HTTP",
+		"protocol":      "HTTP",
 	}
 	for _, name := range endpointNames {
 		key := tally.KeyForPrefixedStringMap(name, endpointTags)
@@ -191,7 +191,7 @@ func TestCallMetrics(t *testing.T) {
 		"regionname":     "san_francisco",
 		"device":         "ios",
 		"deviceversion":  "carbon",
-		"protocal":       "HTTP",
+		"protocol":       "HTTP",
 	}
 	for _, name := range clientNames {
 		key := tally.KeyForPrefixedStringMap(name, clientTags)

diff --git a/test/endpoints/tchannel/baz/baz_metrics_test.go b/test/endpoints/tchannel/baz/baz_metrics_test.go
@@ -117,17 +117,18 @@ func TestCallMetrics(t *testing.T) {
 		"endpoint.success",
 	}
 	endpointTags := map[string]string{
-		"env":            "test",
-		"service":        "test-gateway",
-		"endpointmethod": "SimpleService__Call",
-		"dc":             "unknown",
-		"host":           zanzibar.GetHostname(),
-		"endpointid":     "bazTChannel",
-		"handlerid":      "call",
-		"device":         "ios",
-		"deviceversion":  "carbon",
-		"regionname":     "san_francisco",
-		"protocal":       "TChannel",
+		"env":             "test",
+		"service":         "test-gateway",
+		"endpointmethod":  "SimpleService__Call",
+		"dc":              "unknown",
+		"host":            zanzibar.GetHostname(),
+		"endpointid":      "bazTChannel",
+		"handlerid":       "call",
+		"device":          "ios",
+		"deviceversion":   "carbon",
+		"regionname":      "san_francisco",
+		"protocol":        "TChannel",
+		"resolvedheaders": "true",
 	}
 
 	for _, name := range endpointNames {
@@ -197,7 +198,7 @@ func TestCallMetrics(t *testing.T) {
 		"host":           zanzibar.GetHostname(),
 		"endpointid":     "bazTChannel",
 		"handlerid":      "call",
-		"protocal":       "TChannel",
+		"protocol":       "TChannel",
 	}
 
 	for _, name := range clientNames {

diff --git a/test/health_test.go b/test/health_test.go
@@ -143,7 +143,7 @@ func TestHealthMetrics(t *testing.T) {
 		"deviceversion": "carbon",
 		"dc":            "unknown",
 		"host":          zanzibar.GetHostname(),
-		"protocal":      "HTTP",
+		"protocol":      "HTTP",
 	}
 	statusTags := map[string]string{
 		"env":           "test",
@@ -156,7 +156,7 @@ func TestHealthMetrics(t *testing.T) {
 		"deviceversion": "carbon",
 		"dc":            "unknown",
 		"host":          zanzibar.GetHostname(),
-		"protocal":      "HTTP",
+		"protocol":      "HTTP",
 	}
 	allhostTags := map[string]string{
 		"env":     "test",