modify to reduce code duplication

yiliangzhou · yiliangzhou · commit 430807e1d249 · 2024-07-31T16:47:04.000-04:00
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/Agent.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/Agent.java
@@ -204,11 +204,13 @@ public static void start(final Instrumentation inst, final URL agentJarURL, Stri
 
     boolean dataJobsEnabled = isFeatureEnabled(AgentFeature.DATA_JOBS);
     if (dataJobsEnabled) {
-      if (!isDataJobsSupported()) {
+      String javaCommand = System.getProperty("sun.java.command");
+      String dataJobsCommandPattern = Config.get().getDataJobsCommandPattern();
+      if (!isDataJobsSupported(javaCommand, dataJobsCommandPattern)) {
         log.warn(
             "Data Jobs Monitoring is not compatible with non-spark command {} based on command pattern {}. dd-trace-java will not be installed",
-            System.getProperty("sun.java.command"),
-            Config.get().getDataJobsCommandPattern());
+            javaCommand,
+            dataJobsCommandPattern);
         return;
       }
 
@@ -1316,10 +1318,7 @@ private static boolean isJFRSupported() {
     return BootstrapProxy.INSTANCE.getResource("jdk/jfr/Recording.class") != null;
   }
 
-  private static boolean isDataJobsSupported() {
-    String javaCommand = System.getProperty("sun.java.command");
-    String dataJobsCommandPattern = Config.get().getDataJobsCommandPattern();
-
+  private static boolean isDataJobsSupported(String javaCommand, String dataJobsCommandPattern) {
     if (null == javaCommand || null == dataJobsCommandPattern) {
       // if sun.java.command somehow is not set or data jobs command pattern is not
       // set, assume it's supported due to lack of info.
diff --git a/dd-java-agent/instrumentation/spark/src/main/java/datadog/trace/instrumentation/spark/AbstractDatadogSparkListener.java b/dd-java-agent/instrumentation/spark/src/main/java/datadog/trace/instrumentation/spark/AbstractDatadogSparkListener.java
@@ -162,8 +162,7 @@ private void initApplicationSpanIfNotInitialized() {
       builder
           .withStartTimestamp(applicationStart.time() * 1000)
           .withTag("application_name", applicationStart.appName())
-          .withTag("spark_user", applicationStart.sparkUser())
-          .withTag("_dd.spark.java.command", System.getProperty("sun.java.command"));
+          .withTag("spark_user", applicationStart.sparkUser());
 
       if (applicationStart.appAttemptId().isDefined()) {
         builder.withTag("app_attempt_id", applicationStart.appAttemptId().get());
@@ -332,8 +331,7 @@ public synchronized void onJobStart(SparkListenerJobStart jobStart) {
         buildSparkSpan("spark.job", jobStart.properties())
             .withStartTimestamp(jobStart.time() * 1000)
             .withTag("job_id", jobStart.jobId())
-            .withTag("stage_count", getStageCount(jobStart))
-            .withTag("_dd.spark.java.command", System.getProperty("sun.java.command"));
+            .withTag("stage_count", getStageCount(jobStart));
 
     String batchKey = getStreamingBatchKey(jobStart.properties());
     Long sqlExecutionId = getSqlExecutionId(jobStart.properties());
