change tag names, add tags only if they are known, add feature flag for experimental tags

Author: jordan-wong

communication/src/main/java/datadog/communication/http/OkHttpUtils.java

@@ -210,6 +210,26 @@ public static Request.Builder prepareRequest(final HttpUrl url, Map<String, Stri
       builder.addHeader(DATADOG_ENTITY_ID, entityId);
     }
 
+    if (Config.get().isExperimentalProcessTagsEnabled()) {
+      // custom X-Datadog-Process-Tags
+      String customTags = getCustomTags();
+      String existingProcessTags = headers.getOrDefault("X-Datadog-Process-Tags", "");
+      if (!existingProcessTags.isEmpty() && !existingProcessTags.endsWith(",")) {
+        existingProcessTags += ",";
+      }
+      if (customTags.length() > 0) {
+        headers.put("X-Datadog-Process-Tags", existingProcessTags + customTags);
+      }
+    }
+
+    for (Map.Entry<String, String> e : headers.entrySet()) {
+      builder.addHeader(e.getKey(), e.getValue());
+    }
+
+    return builder;
+  }
+
+  private static String getCustomTags() {
     String javaCommand = System.getProperty("sun.java.command", "unknown");
     String[] parts = javaCommand.split(" ");
     String mainTarget = parts.length > 0 ? parts[0] : "unknown";
@@ -246,24 +266,34 @@ public static Request.Builder prepareRequest(final HttpUrl url, Map<String, Stri
     String jbossMode = System.getProperty("jboss.server.mode", "unknown");
     String jbossServerName = System.getProperty("jboss.server.name", "unknown");
 
-    String customTags =
-        String.format(
-            "JavaMainClass:%s,JavaJarFile:%s,JavaJarPath:%s,JbossHome:%s,JbossMode:%s,JbossServerName:%s",
-            javaMainClass, javaJarFile, javaJarPath, jbossHome, jbossMode, jbossServerName);
-
-    String existingProcessTags = headers.getOrDefault("X-Datadog-Process-Tags", "");
-    if (!existingProcessTags.isEmpty() && !existingProcessTags.endsWith(",")) {
-      existingProcessTags += ",";
+    StringBuilder customTags = new StringBuilder();
+    if (!"unknown".equals(javaMainClass)) {
+      if (customTags.length() > 0) customTags.append(",");
+      customTags.append("java_main_class:").append(javaMainClass);
     }
-    headers.put("X-Datadog-Process-Tags", existingProcessTags + customTags);
-
-    System.out.println(customTags);
-
-    for (Map.Entry<String, String> e : headers.entrySet()) {
-      builder.addHeader(e.getKey(), e.getValue());
+    if (!"unknown".equals(javaJarFile)) {
+      if (customTags.length() > 0) customTags.append(",");
+      customTags.append("java_jar_file:").append(javaJarFile);
+    }
+    if (!"unknown".equals(javaJarPath)) {
+      if (customTags.length() > 0) customTags.append(",");
+      customTags.append("java_jar_path:").append(javaJarPath);
+    }
+    if (!"unknown".equals(jbossHome)) {
+      if (customTags.length() > 0) customTags.append(",");
+      customTags.append("jboss_home:").append(jbossHome);
+    }
+    if (!"unknown".equals(jbossMode)) {
+      if (customTags.length() > 0) customTags.append(",");
+      customTags.append("jboss_mode:").append(jbossMode);
+    }
+    if (!"unknown".equals(jbossServerName)) {
+      if (customTags.length() > 0) customTags.append(",");
+      customTags.append("jboss_server_name:").append(jbossServerName);
     }
 
-    return builder;
+    System.out.println(customTags);
+    return customTags.toString();
   }
 
   public static Request.Builder prepareRequest(

dd-trace-api/src/main/java/datadog/trace/api/config/GeneralConfig.java

@@ -95,6 +95,8 @@ public final class GeneralConfig {
   public static final String AGENTLESS_LOG_SUBMISSION_URL = "agentless.log.submission.url";
   public static final String APM_TRACING_ENABLED = "apm.tracing.enabled";
   public static final String JDK_SOCKET_ENABLED = "jdk.socket.enabled";
+  public static final String EXPERIMENTAL_PROCESS_TAGS_ENABLED =
+      "experimental.process.tags.enabled";
 
   private GeneralConfig() {}
 }

internal-api/src/main/java/datadog/trace/api/Config.java

@@ -570,6 +570,7 @@ public static String getHostName() {
   private final Set<String> experimentalFeaturesEnabled;
 
   private final boolean jdkSocketEnabled;
+  private final boolean experimentalProcessTagsEnabled;
 
   // Read order: System Properties -> Env Variables, [-> properties file], [-> default value]
   private Config() {
@@ -2011,6 +2012,9 @@ PROFILING_DATADOG_PROFILER_ENABLED, isDatadogProfilerSafeInCurrentEnvironment())
 
     this.jdkSocketEnabled = configProvider.getBoolean(JDK_SOCKET_ENABLED, true);
 
+    this.experimentalProcessTagsEnabled =
+        configProvider.getBoolean(EXPERIMENTAL_PROCESS_TAGS_ENABLED, false);
+
     log.debug("New instance: {}", this);
   }
 
@@ -3617,6 +3621,10 @@ public boolean isJdkSocketEnabled() {
     return jdkSocketEnabled;
   }
 
+  public boolean isExperimentalProcessTagsEnabled() {
+    return experimentalProcessTagsEnabled;
+  }
+
   /** @return A map of tags to be applied only to the local application root span. */
   public Map<String, Object> getLocalRootSpanTags() {
     final Map<String, String> runtimeTags = getRuntimeTags();