Dump profiling template override & report profiling initialization errors within flare

Author: Matt

dd-java-agent/agent-profiling/src/main/java/com/datadog/profiling/agent/ProfilerFlare.java

@@ -6,19 +6,40 @@
 import datadog.trace.api.flare.TracerFlare;
 import datadog.trace.bootstrap.config.provider.ConfigProvider;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.Map;
 import java.util.zip.ZipOutputStream;
 
 public final class ProfilerFlare implements TracerFlare.Reporter {
   private static final ProfilerFlare INSTANCE = new ProfilerFlare();
+  private static Exception profilerInitializationException;
 
   public static void register() {
     TracerFlare.addReporter(INSTANCE);
   }
 
+  public static void reportInitializationException(Exception e) {
+    profilerInitializationException = e;
+  }
+
   @Override
   public void addReportToFlare(ZipOutputStream zip) throws IOException {
     TracerFlare.addText(zip, "profiler_config.txt", getProfilerConfig());
+    String templateOverrideFile = Config.get().getProfilingTemplateOverrideFile();
+    if (templateOverrideFile != null) {
+      try {
+        Path path = Paths.get(templateOverrideFile);
+        if (Files.exists(path)) {
+          String fileContents = new String(Files.readAllBytes(path), StandardCharsets.UTF_8);
+          TracerFlare.addText(zip, "profiling_template_override.jfp", fileContents);
+        }
+      } catch (IOException e) {
+        // no-op, ignore if we can't read the template override file
+      }
+    }
   }
 
   private String getProfilerConfig() {
@@ -29,6 +50,15 @@ private String getProfilerConfig() {
     ConfigProvider configProvider = ConfigProvider.getInstance();
     Config config = Config.get();
 
+    sb.append("=== Profiler Initalization Status ===\n");
+    if (profilerInitializationException == null) {
+      sb.append("Profiler initialized successfully.\n");
+    } else {
+      sb.append("Profiler initializtion failed due to: \n");
+      sb.append(profilerInitializationException.getMessage());
+      sb.append("\n");
+    }
+
     sb.append("=== Core Settings ===\n");
     appendConfig(
         sb,

dd-java-agent/agent-profiling/src/main/java/com/datadog/profiling/agent/ProfilingAgent.java

@@ -174,9 +174,13 @@ public static synchronized boolean run(final boolean earlyStart, Instrumentation
         log.warn(e.getMessage());
         // no need to send telemetry for this aggregate message
         //   a detailed telemetry message has been sent from the attempts to enable the controllers
+        // -----------------------------------------------------------------------------------------
+        // but we do want to report this within the profiler flare
+        ProfilerFlare.reportInitializationException(e);
       } catch (final ConfigurationException e) {
         log.warn("Failed to initialize profiling agent! {}", e.getMessage());
         log.debug(SEND_TELEMETRY, "Failed to initialize profiling agent!", e);
+        ProfilerFlare.reportInitializationException(e);
       }
     }
     return false;