diff --git a/docs/modules/ROOT/nav.adoc b/docs/modules/ROOT/nav.adoc index f0e925571f..af17221548 100644 --- a/docs/modules/ROOT/nav.adoc +++ b/docs/modules/ROOT/nav.adoc @@ -32,7 +32,7 @@ ** xref:implementations/new-relic.adoc[New Relic] ** xref:implementations/otlp.adoc[OpenTelemetry Protocol (OTLP)] ** xref:implementations/prometheus.adoc[Prometheus] -** xref:implementations/signalFx.adoc[SignalFx] +** xref:implementations/signalFx.adoc[SignalFx] (deprecated) ** xref:implementations/stackdriver.adoc[Stackdriver] ** xref:implementations/statsD.adoc[statsD] ** xref:implementations/wavefront.adoc[Wavefront] diff --git a/docs/modules/ROOT/pages/implementations/signalFx.adoc b/docs/modules/ROOT/pages/implementations/signalFx.adoc index 2ee7e77b94..ebcccf75f3 100644 --- a/docs/modules/ROOT/pages/implementations/signalFx.adoc +++ b/docs/modules/ROOT/pages/implementations/signalFx.adoc @@ -2,6 +2,8 @@ :sectnums: :system: signalfx +CAUTION: This module has been deprecated in favor of the xref:implementations/otlp.adoc[OTLP Registry] because the /~https://github.com/signalfx/signalfx-java[SignalFX Java client library] that this module depends on has been deprecated. + SignalFx is a dimensional monitoring system SaaS with a full UI that operates on a push model. It has a rich set of alert "`detectors`". include::_install.adoc[] diff --git a/implementations/micrometer-registry-signalfx/build.gradle b/implementations/micrometer-registry-signalfx/build.gradle index f653ce2ee0..83e0b942c8 100644 --- a/implementations/micrometer-registry-signalfx/build.gradle +++ b/implementations/micrometer-registry-signalfx/build.gradle @@ -1,3 +1,5 @@ +description = 'MeterRegistry implementation for sending metrics to SignalFX. This module is deprecated in favor of the micrometer-registry-otlp module.' + dependencies { api project(':micrometer-core') diff --git a/implementations/micrometer-registry-signalfx/src/main/java/io/micrometer/signalfx/SignalFxConfig.java b/implementations/micrometer-registry-signalfx/src/main/java/io/micrometer/signalfx/SignalFxConfig.java index cab1e903db..6228201573 100644 --- a/implementations/micrometer-registry-signalfx/src/main/java/io/micrometer/signalfx/SignalFxConfig.java +++ b/implementations/micrometer-registry-signalfx/src/main/java/io/micrometer/signalfx/SignalFxConfig.java @@ -30,7 +30,9 @@ * Configuration for {@link SignalFxMeterRegistry}. * * @author Jon Schneider + * @deprecated this whole module is deprecated in favor of micrometer-registry-otlp */ +@Deprecated public interface SignalFxConfig extends StepRegistryConfig { @Override diff --git a/implementations/micrometer-registry-signalfx/src/main/java/io/micrometer/signalfx/SignalFxMeterRegistry.java b/implementations/micrometer-registry-signalfx/src/main/java/io/micrometer/signalfx/SignalFxMeterRegistry.java index d2287f0a83..d254f08136 100644 --- a/implementations/micrometer-registry-signalfx/src/main/java/io/micrometer/signalfx/SignalFxMeterRegistry.java +++ b/implementations/micrometer-registry-signalfx/src/main/java/io/micrometer/signalfx/SignalFxMeterRegistry.java @@ -52,7 +52,9 @@ * @author Jon Schneider * @author Johnny Lim * @since 1.0.0 + * @deprecated this whole module is deprecated in favor of micrometer-registry-otlp */ +@Deprecated public class SignalFxMeterRegistry extends StepMeterRegistry { private static final ThreadFactory DEFAULT_THREAD_FACTORY = new NamedThreadFactory("signalfx-metrics-publisher"); diff --git a/implementations/micrometer-registry-signalfx/src/main/java/io/micrometer/signalfx/SignalFxNamingConvention.java b/implementations/micrometer-registry-signalfx/src/main/java/io/micrometer/signalfx/SignalFxNamingConvention.java index d2b9de265e..5191105b4d 100644 --- a/implementations/micrometer-registry-signalfx/src/main/java/io/micrometer/signalfx/SignalFxNamingConvention.java +++ b/implementations/micrometer-registry-signalfx/src/main/java/io/micrometer/signalfx/SignalFxNamingConvention.java @@ -32,7 +32,9 @@ * conventions for metrics and dimensions * @author Jon Schneider * @author Johnny Lim + * @deprecated this whole module is deprecated in favor of micrometer-registry-otlp */ +@Deprecated public class SignalFxNamingConvention implements NamingConvention { private static final WarnThenDebugLogger logger = new WarnThenDebugLogger(SignalFxNamingConvention.class); diff --git a/implementations/micrometer-registry-signalfx/src/test/java/io/micrometer/signalfx/SignalFxConfigTest.java b/implementations/micrometer-registry-signalfx/src/test/java/io/micrometer/signalfx/SignalFxConfigTest.java index 7fef3a68ce..985165130f 100644 --- a/implementations/micrometer-registry-signalfx/src/test/java/io/micrometer/signalfx/SignalFxConfigTest.java +++ b/implementations/micrometer-registry-signalfx/src/test/java/io/micrometer/signalfx/SignalFxConfigTest.java @@ -23,6 +23,7 @@ import static org.assertj.core.api.Assertions.assertThat; +@SuppressWarnings("deprecation") class SignalFxConfigTest { private final Map props = new HashMap<>(); diff --git a/implementations/micrometer-registry-signalfx/src/test/java/io/micrometer/signalfx/SignalFxMeterRegistryCompatibilityTest.java b/implementations/micrometer-registry-signalfx/src/test/java/io/micrometer/signalfx/SignalFxMeterRegistryCompatibilityTest.java index 7ff7c850f9..bf51eb3fef 100644 --- a/implementations/micrometer-registry-signalfx/src/test/java/io/micrometer/signalfx/SignalFxMeterRegistryCompatibilityTest.java +++ b/implementations/micrometer-registry-signalfx/src/test/java/io/micrometer/signalfx/SignalFxMeterRegistryCompatibilityTest.java @@ -22,6 +22,7 @@ import java.time.Duration; +@SuppressWarnings("deprecation") class SignalFxMeterRegistryCompatibilityTest extends MeterRegistryCompatibilityKit { private final SignalFxConfig config = new SignalFxConfig() { diff --git a/implementations/micrometer-registry-signalfx/src/test/java/io/micrometer/signalfx/SignalFxMeterRegistryTest.java b/implementations/micrometer-registry-signalfx/src/test/java/io/micrometer/signalfx/SignalFxMeterRegistryTest.java index 5d1f6f5f56..91a4b1459f 100644 --- a/implementations/micrometer-registry-signalfx/src/test/java/io/micrometer/signalfx/SignalFxMeterRegistryTest.java +++ b/implementations/micrometer-registry-signalfx/src/test/java/io/micrometer/signalfx/SignalFxMeterRegistryTest.java @@ -52,6 +52,7 @@ * * @author Johnny Lim */ +@SuppressWarnings("deprecation") class SignalFxMeterRegistryTest { private final SignalFxConfig config = new SignalFxConfig() { diff --git a/implementations/micrometer-registry-signalfx/src/test/java/io/micrometer/signalfx/SignalFxNamingConventionTest.java b/implementations/micrometer-registry-signalfx/src/test/java/io/micrometer/signalfx/SignalFxNamingConventionTest.java index ebfa28531b..c8ccad99a0 100644 --- a/implementations/micrometer-registry-signalfx/src/test/java/io/micrometer/signalfx/SignalFxNamingConventionTest.java +++ b/implementations/micrometer-registry-signalfx/src/test/java/io/micrometer/signalfx/SignalFxNamingConventionTest.java @@ -27,6 +27,7 @@ * @author Jon Schneider * @author Johnny Lim */ +@SuppressWarnings("deprecation") class SignalFxNamingConventionTest { private final SignalFxNamingConvention convention = new SignalFxNamingConvention(); diff --git a/samples/micrometer-samples-core/src/main/java/io/micrometer/core/samples/utils/SampleRegistries.java b/samples/micrometer-samples-core/src/main/java/io/micrometer/core/samples/utils/SampleRegistries.java index 5bfa6f1523..a226e75f51 100644 --- a/samples/micrometer-samples-core/src/main/java/io/micrometer/core/samples/utils/SampleRegistries.java +++ b/samples/micrometer-samples-core/src/main/java/io/micrometer/core/samples/utils/SampleRegistries.java @@ -52,8 +52,6 @@ import io.micrometer.newrelic.NewRelicMeterRegistry; import io.micrometer.prometheusmetrics.PrometheusConfig; import io.micrometer.prometheusmetrics.PrometheusMeterRegistry; -import io.micrometer.signalfx.SignalFxConfig; -import io.micrometer.signalfx.SignalFxMeterRegistry; import io.micrometer.stackdriver.StackdriverConfig; import io.micrometer.stackdriver.StackdriverMeterRegistry; import io.micrometer.statsd.StatsdConfig; @@ -364,26 +362,6 @@ public String get(String k) { }, Clock.SYSTEM); } - public static SignalFxMeterRegistry signalFx(String accessToken) { - return new SignalFxMeterRegistry(new SignalFxConfig() { - @Override - public String accessToken() { - return accessToken; - } - - @Override - public Duration step() { - return Duration.ofSeconds(10); - } - - @Override - @Nullable - public String get(String k) { - return null; - } - }, Clock.SYSTEM); - } - public static WavefrontMeterRegistry wavefront() { return new WavefrontMeterRegistry(WavefrontConfig.DEFAULT_PROXY, Clock.SYSTEM); }