Skip to content

Commit 2667045

Browse files
committed
Emit the dd-trace-java version as profiler setting event
1 parent d314908 commit 2667045

File tree

5 files changed

+8
-0
lines changed

5 files changed

+8
-0
lines changed

dd-java-agent/agent-profiling/profiling-controller-ddprof/build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ excludedClassesCoverage += [
2323
dependencies {
2424
api libs.slf4j
2525
api project(':internal-api')
26+
api project(':utils:version-utils')
27+
implementation project(path: ':dd-java-agent:agent-profiling:profiling-ddprof', configuration: 'shadow')
2628
api project(':dd-java-agent:agent-profiling:profiling-ddprof')
2729
api project(':dd-java-agent:agent-profiling:profiling-controller')
2830
api project(':dd-java-agent:agent-profiling:profiling-utils')

dd-java-agent/agent-profiling/profiling-controller-ddprof/src/main/java/com/datadog/profiling/controller/ddprof/DatadogProfilerSettings.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import com.datadog.profiling.controller.ProfilerSettingsSupport;
44
import com.datadog.profiling.ddprof.DatadogProfiler;
5+
import datadog.common.version.VersionInfo;
56
import datadog.trace.bootstrap.config.provider.ConfigProvider;
67

78
public class DatadogProfilerSettings extends ProfilerSettingsSupport {
@@ -14,6 +15,7 @@ public DatadogProfilerSettings(DatadogProfiler datadogProfiler) {
1415
}
1516

1617
public void publish() {
18+
datadogProfiler.recordSetting(VERSION_KEY, VersionInfo.VERSION);
1719
datadogProfiler.recordSetting(UPLOAD_PERIOD_KEY, String.valueOf(uploadPeriod), "seconds");
1820
datadogProfiler.recordSetting(UPLOAD_TIMEOUT_KEY, String.valueOf(uploadTimeout), "seconds");
1921
datadogProfiler.recordSetting(UPLOAD_COMPRESSION_KEY, uploadCompression);

dd-java-agent/agent-profiling/profiling-controller-openjdk/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ apply plugin: 'idea'
1717
dependencies {
1818
api libs.slf4j
1919
api project(':internal-api')
20+
api project(':utils:version-utils')
2021
api(project(':dd-java-agent:agent-bootstrap')) {
2122
exclude group: 'com.datadoghq', module: 'agent-logging'
2223
}

dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/JfrProfilerSettings.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import com.datadog.profiling.controller.ControllerContext;
44
import com.datadog.profiling.controller.ProfilerSettingsSupport;
55
import com.datadog.profiling.controller.openjdk.events.ProfilerSettingEvent;
6+
import datadog.common.version.VersionInfo;
67
import datadog.environment.JavaVirtualMachine;
78
import datadog.trace.api.Platform;
89
import datadog.trace.bootstrap.config.provider.ConfigProvider;
@@ -31,6 +32,7 @@ public JfrProfilerSettings(
3132

3233
public void publish() {
3334
if (new ProfilerSettingEvent(null, null, null).isEnabled()) {
35+
new ProfilerSettingEvent(VERSION_KEY, VersionInfo.VERSION).commit();
3436
new ProfilerSettingEvent(UPLOAD_PERIOD_KEY, String.valueOf(uploadPeriod), "seconds").commit();
3537
new ProfilerSettingEvent(UPLOAD_TIMEOUT_KEY, String.valueOf(uploadTimeout), "seconds")
3638
.commit();

dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/ProfilerSettingsSupport.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ public String toString() {
6464
}
6565
}
6666

67+
protected static final String VERSION_KEY = "Java Agent Version";
6768
protected static final String JFR_IMPLEMENTATION_KEY = "JFR Implementation";
6869
protected static final String UPLOAD_PERIOD_KEY = "Upload Period";
6970
protected static final String UPLOAD_TIMEOUT_KEY = "Upload Timeout";

0 commit comments

Comments
 (0)