alihan/fn-serverless
1
0
Fork 0
mirror of https://github.com/fnproject/fn.git synced 2022-10-28 21:29:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix spans for prometheus (#606)

Browse Source
This commit is contained in:
Nigel Deakin
2017-12-15 18:31:57 +00:00
committed by Reed Allman
parent 172aacd820
commit f1fc040948
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
api/agent/agent.go
View File

@@ -201,15 +201,19 @@ func (a *agent) Submit(callI Call) error {
call := callI.(*call) call := callI.(*call)
ctx := call.req.Context() ctx := call.req.Context()
// start spans in the correct order so each span is given, and inherits, the correct baggage // agent_submit_global has no parent span because we don't want it to inherit fn_appname or fn_path
span_global, ctx := opentracing.StartSpanFromContext(ctx, "agent_submit_global") span_global := opentracing.StartSpan("agent_submit_global")
defer span_global.Finish() defer span_global.Finish()
span_app, ctx := opentracing.StartSpanFromContext(ctx, "agent_submit_app") // agent_submit_global has no parent span because we don't want it to inherit fn_path
span_app := opentracing.StartSpan("agent_submit_app")
span_app.SetBaggageItem("fn_appname", callI.Model().AppName) span_app.SetBaggageItem("fn_appname", callI.Model().AppName)
defer span_app.Finish() defer span_app.Finish()
// agent_submit has a parent span in the usual way
// it doesn't matter if it inherits fn_appname or fn_path (and we set them here in any case)
span, ctx := opentracing.StartSpanFromContext(ctx, "agent_submit") span, ctx := opentracing.StartSpanFromContext(ctx, "agent_submit")
span.SetBaggageItem("fn_appname", callI.Model().AppName)
span.SetBaggageItem("fn_path", callI.Model().Path) span.SetBaggageItem("fn_path", callI.Model().Path)
defer span.Finish() defer span.Finish()