Use spark application name when service is set to hadoop (#7294)

DD_SPARK_APP_NAME_AS_SERVICE also use spark.app.name as the default service if service is set to hadoop
DataDog · Jul 12, 2024 · 1538da0 · 1538da0
1 parent 63f16d7
commit 1538da0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/...spark/src/main/java/datadog/trace/instrumentation/spark/AbstractDatadogSparkListener.java b/...spark/src/main/java/datadog/trace/instrumentation/spark/AbstractDatadogSparkListener.java
@@ -1122,9 +1122,11 @@ private static String getSparkServiceName(SparkConf conf, boolean isRunningOnDat
       return null;
     }
 
-    // Keep service set by user, except if it is only "spark" that can be set by USM
+    // Keep service set by user, except if it is only "spark" or "hadoop" that can be set by USM
     String serviceName = Config.get().getServiceName();
-    if (Config.get().isServiceNameSetByUser() && !"spark".equals(serviceName)) {
+    if (Config.get().isServiceNameSetByUser()
+        && !"spark".equals(serviceName)
+        && !"hadoop".equals(serviceName)) {
       log.debug("Service '{}' explicitly set by user, not using the application name", serviceName);
       return null;
     }

diff --git a/...park/src/testFixtures/groovy/datadog/trace/instrumentation/spark/AbstractSparkTest.groovy b/...park/src/testFixtures/groovy/datadog/trace/instrumentation/spark/AbstractSparkTest.groovy
@@ -686,6 +686,7 @@ abstract class AbstractSparkTest extends AgentTestRunner {
     ddService | sparkAppNameAsService | appName    | isRunningOnDatabricks | expectedService
     "foobar"  | true                  | "some_app" | false                 | "(?!.*some_app).*"
     "spark"   | true                  | "some_app" | false                 | "some_app"
+    "hadoop"  | true                  | "some_app" | false                 | "some_app"
     null      | true                  | "some_app" | true                  | "(?!.*some_app).*"
     null      | true                  | "some_app" | false                 | "some_app"
     null      | false                 | "some_app" | false                 | "(?!.*some_app).*"