Capture the auto-injection related settings in JFR recording (#7317)

jbachorik · web-flow · commit 0e5e2749b0bd · 2024-07-12T16:35:19.000+02:00
diff --git a/dd-java-agent/agent-profiling/profiling-controller-ddprof/src/main/java/com/datadog/profiling/controller/ddprof/DatadogProfilerSettings.java b/dd-java-agent/agent-profiling/profiling-controller-ddprof/src/main/java/com/datadog/profiling/controller/ddprof/DatadogProfilerSettings.java
@@ -29,5 +29,11 @@ public void publish() {
     datadogProfiler.recordSetting(JFR_IMPLEMENTATION_KEY, "ddprof");
     datadogProfiler.recordSetting(STACK_DEPTH_KEY, String.valueOf(stackDepth));
     datadogProfiler.recordSetting(SELINUX_STATUS_KEY, seLinuxStatus);
+    if (serviceInstrumentationType != null) {
+      datadogProfiler.recordSetting(SERVICE_INSTRUMENTATION_TYPE, serviceInstrumentationType);
+    }
+    if (serviceInjection != null) {
+      datadogProfiler.recordSetting(SERVICE_INJECTION, serviceInjection);
+    }
   }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/JfrProfilerSettings.java b/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/JfrProfilerSettings.java
@@ -62,6 +62,12 @@ public void publish() {
       if (ddprofUnavailableReason != null) {
         new ProfilerSettingEvent(DDPROF_UNAVAILABLE_REASON_KEY, ddprofUnavailableReason).commit();
       }
+      if (serviceInstrumentationType != null) {
+        new ProfilerSettingEvent(SERVICE_INSTRUMENTATION_TYPE, serviceInstrumentationType).commit();
+      }
+      if (serviceInjection != null) {
+        new ProfilerSettingEvent(SERVICE_INJECTION, serviceInjection).commit();
+      }
     }
   }
 }
diff --git a/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/ProfilerSettingsSupport.java b/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/ProfilerSettingsSupport.java
@@ -31,6 +31,8 @@ public abstract class ProfilerSettingsSupport {
   protected static final String NATIVE_STACKS_KEY = "Native Stacks";
   protected static final String STACK_DEPTH_KEY = "Stack Depth";
   protected static final String SELINUX_STATUS_KEY = "SELinux Status";
+  protected static final String SERVICE_INSTRUMENTATION_TYPE = "Service Instrumentation Type";
+  protected static final String SERVICE_INJECTION = "Service Injection";
 
   protected static final String DDPROF_UNAVAILABLE_REASON_KEY = "DDProf Unavailable Reason";
 
@@ -50,6 +52,8 @@ public abstract class ProfilerSettingsSupport {
   protected final String perfEventsParanoid;
   protected final boolean hasNativeStacks;
   protected final String seLinuxStatus;
+  protected final String serviceInstrumentationType;
+  protected final String serviceInjection;
 
   protected final String ddprofUnavailableReason;
 
@@ -122,6 +126,13 @@ protected ProfilerSettingsSupport(
     seLinuxStatus = getSELinuxStatus();
     this.ddprofUnavailableReason = ddprofUnavailableReason;
     this.hasJfrStackDepthApplied = hasJfrStackDepthApplied;
+
+    serviceInjection =
+        configProvider.getString(
+            "injection.enabled"); // usually set via DD_INJECTION_ENABLED env var
+    serviceInstrumentationType =
+        // usually set via DD_INSTRUMENTATION_INSTALL_TYPE env var
+        configProvider.getString("instrumentation.install.type");
   }
 
   private String getSELinuxStatus() {

Original file line number	Diff line number	Diff line change
`@@ -29,5 +29,11 @@ public void publish() {`
`29`	`29`	`datadogProfiler.recordSetting(JFR_IMPLEMENTATION_KEY, "ddprof");`
`30`	`30`	`datadogProfiler.recordSetting(STACK_DEPTH_KEY, String.valueOf(stackDepth));`
`31`	`31`	`datadogProfiler.recordSetting(SELINUX_STATUS_KEY, seLinuxStatus);`
	`32`	`+ if (serviceInstrumentationType != null) {`
	`33`	`+ datadogProfiler.recordSetting(SERVICE_INSTRUMENTATION_TYPE, serviceInstrumentationType);`
	`34`	`+ }`
	`35`	`+ if (serviceInjection != null) {`
	`36`	`+ datadogProfiler.recordSetting(SERVICE_INJECTION, serviceInjection);`
	`37`	`+ }`
`32`	`38`	`}`
`33`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,12 @@ public void publish() {`
`62`	`62`	`if (ddprofUnavailableReason != null) {`
`63`	`63`	`new ProfilerSettingEvent(DDPROF_UNAVAILABLE_REASON_KEY, ddprofUnavailableReason).commit();`
`64`	`64`	`}`
	`65`	`+ if (serviceInstrumentationType != null) {`
	`66`	`+ new ProfilerSettingEvent(SERVICE_INSTRUMENTATION_TYPE, serviceInstrumentationType).commit();`
	`67`	`+ }`
	`68`	`+ if (serviceInjection != null) {`
	`69`	`+ new ProfilerSettingEvent(SERVICE_INJECTION, serviceInjection).commit();`
	`70`	`+ }`
`65`	`71`	`}`
`66`	`72`	`}`
`67`	`73`	`}`