Skip to content

Commit f4fe857

Browse files
sabrennersabrenner
authored
Merge branch 'master' into sabrenner/llmobs-ml-app-optional
2 parents a54ec8b + 030f9bb commit f4fe857

25 files changed

Lines changed: 13 additions & 11 deletions

File tree

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
import java.util.Map;
1414
import java.util.zip.ZipOutputStream;
1515

16-
public final class ProfilerFlare implements TracerFlare.Reporter {
17-
private static final ProfilerFlare INSTANCE = new ProfilerFlare();
16+
public final class ProfilerFlareReporter implements TracerFlare.Reporter {
17+
private static final ProfilerFlareReporter INSTANCE = new ProfilerFlareReporter();
1818
private static Exception profilerInitializationException;
1919

2020
public static void register() {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public static synchronized boolean run(final boolean earlyStart, Instrumentation
9595

9696
// Register the profiler flare before we start the profiling system, but early during the
9797
// profiler lifecycle
98-
ProfilerFlare.register();
98+
ProfilerFlareReporter.register();
9999

100100
boolean startForceFirst =
101101
Platform.isNativeImage()
@@ -176,11 +176,11 @@ public static synchronized boolean run(final boolean earlyStart, Instrumentation
176176
// a detailed telemetry message has been sent from the attempts to enable the controllers
177177
// -----------------------------------------------------------------------------------------
178178
// but we do want to report this within the profiler flare
179-
ProfilerFlare.reportInitializationException(e);
179+
ProfilerFlareReporter.reportInitializationException(e);
180180
} catch (final ConfigurationException e) {
181181
log.warn("Failed to initialize profiling agent! {}", e.getMessage());
182182
log.debug(SEND_TELEMETRY, "Failed to initialize profiling agent!", e);
183-
ProfilerFlare.reportInitializationException(e);
183+
ProfilerFlareReporter.reportInitializationException(e);
184184
}
185185
}
186186
return false;

dd-java-agent/instrumentation/datastax-cassandra-3/build.gradle renamed to dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.0/build.gradle

File renamed without changes.

dd-java-agent/instrumentation/datastax-cassandra-3/gradle.lockfile renamed to dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.0/gradle.lockfile

File renamed without changes.

dd-java-agent/instrumentation/datastax-cassandra-3/src/main/java/datadog/trace/instrumentation/datastax/cassandra/CassandraClientDecorator.java renamed to dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra/CassandraClientDecorator.java

File renamed without changes.

dd-java-agent/instrumentation/datastax-cassandra-3/src/main/java/datadog/trace/instrumentation/datastax/cassandra/CassandraClientInstrumentation.java renamed to dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra/CassandraClientInstrumentation.java

File renamed without changes.

dd-java-agent/instrumentation/datastax-cassandra-3/src/main/java/datadog/trace/instrumentation/datastax/cassandra/CassandraClusterInstrumentation.java renamed to dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra/CassandraClusterInstrumentation.java

File renamed without changes.

dd-java-agent/instrumentation/datastax-cassandra-3/src/main/java/datadog/trace/instrumentation/datastax/cassandra/ContactPointsUtil.java renamed to dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra/ContactPointsUtil.java

File renamed without changes.

dd-java-agent/instrumentation/datastax-cassandra-3/src/main/java/datadog/trace/instrumentation/datastax/cassandra/TracingSession.java renamed to dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra/TracingSession.java

File renamed without changes.

dd-java-agent/instrumentation/datastax-cassandra-3.8/src/test/groovy/CassandraClientTest.groovy renamed to dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.0/src/test/groovy/CassandraClientTest.groovy

File renamed without changes.

0 commit comments

Comments
 (0)