open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix default enabled for runtime and oshi metrics (#5989)

This commit is contained in:
Trask Stalnaker 2022-05-06 00:43:57 -07:00 committed by GitHub
parent c89297f250
commit cef9e1925c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
instrumentation/oshi/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/oshi/OshiMetricsInstaller.java
View File

@ -19,10 +19,14 @@ import java.util.Collections;
*/ */
@AutoService(AgentListener.class) @AutoService(AgentListener.class)
public class OshiMetricsInstaller implements AgentListener { public class OshiMetricsInstaller implements AgentListener {
private static final boolean DEFAULT_ENABLED =
Config.get().getBoolean("otel.instrumentation.common.default-enabled", true);
@Override @Override
public void afterAgent(Config config, AutoConfiguredOpenTelemetrySdk unused) { public void afterAgent(Config config, AutoConfiguredOpenTelemetrySdk unused) {
if (new AgentConfig(config) if (new AgentConfig(config)
.isInstrumentationEnabled(Collections.singleton("oshi"), /* defaultEnabled= */ true)) { .isInstrumentationEnabled(Collections.singleton("oshi"), DEFAULT_ENABLED)) {
try { try {
// Call oshi.SystemInfo.getCurrentPlatformEnum() to activate SystemMetrics. // Call oshi.SystemInfo.getCurrentPlatformEnum() to activate SystemMetrics.
// Oshi instrumentation will intercept this call and enable SystemMetrics. // Oshi instrumentation will intercept this call and enable SystemMetrics.

7
instrumentation/runtime-metrics/javaagent/src/main/java/io/opentelemetry/instrumentation/javaagent/runtimemetrics/RuntimeMetricsInstaller.java
View File

@ -18,11 +18,14 @@ import java.util.Collections;
/** An {@link AgentListener} that enables runtime metrics during agent startup. */ /** An {@link AgentListener} that enables runtime metrics during agent startup. */
@AutoService(AgentListener.class) @AutoService(AgentListener.class)
public class RuntimeMetricsInstaller implements AgentListener { public class RuntimeMetricsInstaller implements AgentListener {
private static final boolean DEFAULT_ENABLED =
Config.get().getBoolean("otel.instrumentation.common.default-enabled", true);
@Override @Override
public void afterAgent(Config config, AutoConfiguredOpenTelemetrySdk unused) { public void afterAgent(Config config, AutoConfiguredOpenTelemetrySdk unused) {
if (new AgentConfig(config) if (new AgentConfig(config)
.isInstrumentationEnabled( .isInstrumentationEnabled(Collections.singleton("runtime-metrics"), DEFAULT_ENABLED)) {
Collections.singleton("runtime-metrics"), /* defaultEnabled= */ true)) {
GarbageCollector.registerObservers(GlobalOpenTelemetry.get()); GarbageCollector.registerObservers(GlobalOpenTelemetry.get());
MemoryPools.registerObservers(GlobalOpenTelemetry.get()); MemoryPools.registerObservers(GlobalOpenTelemetry.get());
} }