[agent.java] Only when the trace_propagete_b3_header option is true, the b3 header is used to determine gxid and txid.

gunlee01 · gunlee01 · commit 1eeee67bb59f · 2022-03-26T16:26:11.000+09:00
diff --git a/scouter.agent.java/src/main/java/scouter/xtra/http/HttpTrace.java b/scouter.agent.java/src/main/java/scouter/xtra/http/HttpTrace.java
@@ -304,7 +304,7 @@ public void start(TraceContext ctx, Object req, Object res) {
                     }
                 }
 
-                if (b3ModeValid) {
+                if (b3ModeValid && conf.trace_propagete_b3_header) {
                     ctx.gxid = HexCodec.lowerHexToUnsignedLong(b3TraceId);
                     ctx.txid = HexCodec.lowerHexToUnsignedLong(request.getHeader(B3Constant.B3_HEADER_SPANID));
                     String caller = request.getHeader(B3Constant.B3_HEADER_PARENTSPANID);

Original file line number	Diff line number	Diff line change
`@@ -304,7 +304,7 @@ public void start(TraceContext ctx, Object req, Object res) {`
`304`	`304`	`}`
`305`	`305`	`}`
`306`	`306`
`307`		`- if (b3ModeValid) {`
	`307`	`+ if (b3ModeValid && conf.trace_propagete_b3_header) {`
`308`	`308`	`ctx.gxid = HexCodec.lowerHexToUnsignedLong(b3TraceId);`
`309`	`309`	`ctx.txid = HexCodec.lowerHexToUnsignedLong(request.getHeader(B3Constant.B3_HEADER_SPANID));`
`310`	`310`	`String caller = request.getHeader(B3Constant.B3_HEADER_PARENTSPANID);`