misc

scouter-contrib · Jan 16, 2021 · ae72b66 · ae72b66
1 parent 7e3f3b9
commit ae72b66
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/scouterx/strace/tctxmanager/tctxmanager.go b/scouterx/strace/tctxmanager/tctxmanager.go
@@ -17,6 +17,7 @@ var ac = conf.GetInstance()
 var txidMap = cachemap.New(10000)
 
 var fEndStuckServiceForcibly func(tctx *netio.TraceContext)
+var noopTctx = netio.NewTraceContext()
 
 func RegisterEndStuckServiceForciblyFunc(f func(tctx *netio.TraceContext)) {
 	fEndStuckServiceForcibly = f
@@ -27,6 +28,13 @@ func Size() int {
 	return 0
 }
 
+func GetTraceContextFallbackNoop(ctx context.Context) *netio.TraceContext {
+	tctx := GetTraceContext(ctx)
+	if tctx == nil {
+		return noopTctx
+	}
+}
+
 func GetTraceContext(ctx context.Context) *netio.TraceContext {
 	traceContext, ok := ctx.Value(tctxKey).(*netio.TraceContext)
 	if ok {

diff --git a/scouterx/strace/tracemain.go b/scouterx/strace/tracemain.go
@@ -479,4 +479,3 @@ func profileHttpHeaders(r http.Request, tctx *netio.TraceContext) {
 		tctx.Profile.Add(netdata.NewMessageStep(fmt.Sprintf("query: %s", r.URL.RawQuery), startTime))
 	}
 }
-
Original file line number	Diff line number	Diff line change
Expand Up		@@ -479,4 +479,3 @@ func profileHttpHeaders(r http.Request, tctx *netio.TraceContext) {
		tctx.Profile.Add(netdata.NewMessageStep(fmt.Sprintf("query: %s", r.URL.RawQuery), startTime))
		}
		}