rename to EmrUtils

Author: aboitreaud

dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/AbstractDatadogSparkListener.java

@@ -1212,7 +1212,7 @@ private void captureApplicationParameters(AgentTracer.SpanBuilder builder) {
   }
 
   private static void captureEmrStepId(AgentTracer.SpanBuilder builder) {
-    String stepId = EmrStepIdCapture.getEmrStepId();
+    String stepId = EmrUtils.getEmrStepId();
     if (stepId != null) {
       builder.withTag("emr_step_id", stepId);
     }

…trumentation/spark/EmrStepIdCapture.java …race/instrumentation/spark/EmrUtils.javadd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/EmrStepIdCapture.java renamed to dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/EmrUtils.java dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/EmrStepIdCapture.java renamed to dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/EmrUtils.java

@@ -9,9 +9,9 @@
 import org.slf4j.LoggerFactory;
 
 /** Extracts the AWS EMR Step ID from the working directory name (e.g. {@code s-0039...}). */
-class EmrStepIdCapture {
+class EmrUtils {
 
-  private static final Logger log = LoggerFactory.getLogger(EmrStepIdCapture.class);
+  private static final Logger log = LoggerFactory.getLogger(EmrUtils.class);
   private static final Pattern EMR_STEP_ID_PATTERN = Pattern.compile("^(s-[0-9A-Za-z]+)$");
 
   @Nullable
@@ -34,5 +34,5 @@ static String getEmrStepId() {
     return null;
   }
 
-  private EmrStepIdCapture() {}
+  private EmrUtils() {}
 }

dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/SparkLauncherInstrumentation.java

@@ -32,7 +32,7 @@ public String instrumentedType() {
   @Override
   public String[] helperClassNames() {
     return new String[] {
-      packageName + ".EmrStepIdCapture",
+      packageName + ".EmrUtils",
       packageName + ".SparkConfAllowList",
       packageName + ".SparkLauncherListener",
     };

dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/SparkLauncherListener.java

@@ -133,7 +133,7 @@ public void infoChanged(SparkAppHandle handle) {
   }
 
   private static void captureEmrStepId(AgentSpan span) {
-    String stepId = EmrStepIdCapture.getEmrStepId();
+    String stepId = EmrUtils.getEmrStepId();
     if (stepId != null) {
       span.setTag("emr_step_id", stepId);
     }

dd-java-agent/instrumentation/spark/spark_2.12/src/main/java/datadog/trace/instrumentation/spark/Spark212Instrumentation.java

@@ -26,7 +26,7 @@ public String[] helperClassNames() {
       packageName + ".AbstractSparkPlanSerializer",
       packageName + ".AbstractSparkPlanUtils",
       packageName + ".DatabricksParentContext",
-      packageName + ".EmrStepIdCapture",
+      packageName + ".EmrUtils",
       packageName + ".OpenlineageParentContext",
       packageName + ".DatadogSpark212Listener",
       packageName + ".PredeterminedTraceIdContext",

dd-java-agent/instrumentation/spark/spark_2.13/src/main/java/datadog/trace/instrumentation/spark/Spark213Instrumentation.java

@@ -26,7 +26,7 @@ public String[] helperClassNames() {
       packageName + ".AbstractSparkPlanSerializer",
       packageName + ".AbstractSparkPlanUtils",
       packageName + ".DatabricksParentContext",
-      packageName + ".EmrStepIdCapture",
+      packageName + ".EmrUtils",
       packageName + ".OpenlineageParentContext",
       packageName + ".DatadogSpark213Listener",
       packageName + ".PredeterminedTraceIdContext",