Remove redundant use of DECORATE in TraceDecorator (#6877)

mcculls · web-flow · commit 396fccabad62 · 2024-04-03T12:47:56.000-04:00
diff --git a/dd-java-agent/instrumentation/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/TraceDecorator.java b/dd-java-agent/instrumentation/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/TraceDecorator.java
@@ -71,23 +71,23 @@ public AgentSpan startMethodSpan(Method method) {
     }
 
     if (operationName == null || operationName.length() == 0) {
-      if (DECORATE.useLegacyOperationName()) {
+      if (useLegacyOperationName()) {
         operationName = DEFAULT_OPERATION_NAME;
       } else {
-        operationName = DECORATE.spanNameForMethod(method);
+        operationName = spanNameForMethod(method);
       }
     }
 
     if (resourceName == null || resourceName.length() == 0) {
-      resourceName = DECORATE.spanNameForMethod(method);
+      resourceName = spanNameForMethod(method);
     }
 
     AgentSpan span =
         noParent
             ? startSpan(INSTRUMENTATION_NAME, operationName, null)
             : startSpan(INSTRUMENTATION_NAME, operationName);
 
-    DECORATE.afterStart(span);
+    afterStart(span);
     span.setResourceName(resourceName);
 
     if (measured || InstrumenterConfig.get().isMethodMeasured(method)) {

Original file line number	Diff line number	Diff line change
`@@ -71,23 +71,23 @@ public AgentSpan startMethodSpan(Method method) {`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`if (operationName == null \|\| operationName.length() == 0) {`
`74`		`- if (DECORATE.useLegacyOperationName()) {`
	`74`	`+ if (useLegacyOperationName()) {`
`75`	`75`	`operationName = DEFAULT_OPERATION_NAME;`
`76`	`76`	`} else {`
`77`		`- operationName = DECORATE.spanNameForMethod(method);`
	`77`	`+ operationName = spanNameForMethod(method);`
`78`	`78`	`}`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`if (resourceName == null \|\| resourceName.length() == 0) {`
`82`		`- resourceName = DECORATE.spanNameForMethod(method);`
	`82`	`+ resourceName = spanNameForMethod(method);`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`AgentSpan span =`
`86`	`86`	`noParent`
`87`	`87`	`? startSpan(INSTRUMENTATION_NAME, operationName, null)`
`88`	`88`	`: startSpan(INSTRUMENTATION_NAME, operationName);`
`89`	`89`
`90`		`- DECORATE.afterStart(span);`
	`90`	`+ afterStart(span);`
`91`	`91`	`span.setResourceName(resourceName);`
`92`	`92`
`93`	`93`	`if (measured \|\| InstrumenterConfig.get().isMethodMeasured(method)) {`