remove unused code

Author: SylvainJuge

jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/MetricAssertions.java

@@ -6,7 +6,6 @@
 package io.opentelemetry.contrib.jmxscraper.target_systems;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.entry;
 
 import io.opentelemetry.proto.common.v1.KeyValue;
 import io.opentelemetry.proto.metrics.v1.Metric;
@@ -47,24 +46,6 @@ static void assertSum(
     assertThat(metric.getSum().getIsMonotonic()).isEqualTo(isMonotonic);
   }
 
-  static void assertTypedGauge(
-      Metric metric, String name, String description, String unit, List<String> types) {
-    assertThat(metric.getName()).isEqualTo(name);
-    assertThat(metric.getDescription()).isEqualTo(description);
-    assertThat(metric.getUnit()).isEqualTo(unit);
-    assertThat(metric.hasGauge()).isTrue();
-    assertTypedPoints(metric.getGauge().getDataPointsList(), types);
-  }
-
-  static void assertTypedSum(
-      Metric metric, String name, String description, String unit, List<String> types) {
-    assertThat(metric.getName()).isEqualTo(name);
-    assertThat(metric.getDescription()).isEqualTo(description);
-    assertThat(metric.getUnit()).isEqualTo(unit);
-    assertThat(metric.hasSum()).isTrue();
-    assertTypedPoints(metric.getSum().getDataPointsList(), types);
-  }
-
   @SafeVarargs
   static void assertSumWithAttributes(
       Metric metric,
@@ -122,19 +103,6 @@ static void assertGaugeWithAttributes(
     assertAttributedPoints(metric.getGauge().getDataPointsList(), attributeGroupAssertions);
   }
 
-  @SuppressWarnings("unchecked")
-  private static void assertTypedPoints(List<NumberDataPoint> points, List<String> types) {
-    Consumer<MapAssert<String, String>>[] assertions =
-        types.stream()
-            .map(
-                type ->
-                    (Consumer<MapAssert<String, String>>)
-                        attrs -> attrs.containsOnly(entry("name", type)))
-            .toArray(Consumer[]::new);
-
-    assertAttributedPoints(points, assertions);
-  }
-
   @SuppressWarnings("unchecked")
   private static void assertAttributedPoints(
       List<NumberDataPoint> points,

jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/MetricsVerifier.java

@@ -57,124 +57,6 @@ public MetricsVerifier add(String metricName, Consumer<MetricAssert> assertion)
     return this;
   }
 
-  // TODO: can now be inlined
-  @CanIgnoreReturnValue
-  public MetricsVerifier assertGauge(String metricName, String description, String unit) {
-    return add(
-        metricName,
-        metric ->
-            metric
-                .hasDescription(description)
-                .hasUnit(unit)
-                .isGauge()
-                .hasDataPointsWithoutAttributes());
-  }
-
-  @CanIgnoreReturnValue
-  public MetricsVerifier assertTypedGauge(
-      String metricName, String description, String unit, List<String> types) {
-    return add(
-        metricName,
-        metric ->
-            metric.hasDescription(description).hasUnit(unit).isGauge().hasTypedDataPoints(types));
-  }
-
-  // TODO: can now be inlined
-  @CanIgnoreReturnValue
-  public MetricsVerifier assertCounter(String metricName, String description, String unit) {
-    return add(
-        metricName,
-        metric ->
-            metric
-                .hasDescription(description)
-                .hasUnit(unit)
-                .isCounter()
-                .hasDataPointsWithoutAttributes());
-  }
-
-  // TODO: can now be inlined
-  @CanIgnoreReturnValue
-  public MetricsVerifier assertUpDownCounter(String metricName, String description, String unit) {
-    return add(
-        metricName,
-        metric ->
-            metric
-                .hasDescription(description)
-                .hasUnit(unit)
-                .isUpDownCounter()
-                .hasDataPointsWithoutAttributes());
-  }
-
-  // TODO: can now be inlined
-  @SafeVarargs
-  @CanIgnoreReturnValue
-  public final MetricsVerifier assertGaugeWithAttributes( // only used in activemq
-      String metricName, String description, String unit, Map.Entry<String, String>... attributes) {
-    return add(
-        metricName,
-        metric ->
-            metric
-                .hasDescription(description)
-                .hasUnit(unit)
-                .isGauge()
-                .hasDataPointsAttributes(attributes));
-  }
-
-  // TODO: can now be inlined
-  @SafeVarargs
-  @CanIgnoreReturnValue
-  public final MetricsVerifier assertCounterWithAttributes(
-      String metricName, String description, String unit, Map<String, String>... attributeSets) {
-    return add(
-        metricName,
-        metric ->
-            metric
-                .hasDescription(description)
-                .hasUnit(unit)
-                .isCounter()
-                .hasDataPointsAttributes(attributeSets));
-  }
-
-  // TODO: can now be inlined
-  @SafeVarargs
-  @CanIgnoreReturnValue
-  public final MetricsVerifier assertCounterWithAttributes(
-      String metricName, String description, String unit, Map.Entry<String, String>... attributes) {
-    return add(
-        metricName,
-        metric ->
-            metric
-                .hasDescription(description)
-                .hasUnit(unit)
-                .isCounter()
-                .hasDataPointsAttributes(attributes));
-  }
-
-  // TODO: can now be inlined
-  @SafeVarargs
-  @CanIgnoreReturnValue
-  public final MetricsVerifier assertUpDownCounterWithAttributes(
-      String metricName, String description, String unit, Map.Entry<String, String>... attributes) {
-    return add(
-        metricName,
-        metric ->
-            metric
-                .hasDescription(description)
-                .hasUnit(unit)
-                .isUpDownCounter()
-                .hasDataPointsAttributes(attributes));
-  }
-
-  // TODO: can now be inlined
-  @CanIgnoreReturnValue
-  public MetricsVerifier assertTypedCounter(
-      String metricName, String description, String unit, List<String> types) {
-    return add(
-        metricName,
-        metric ->
-            metric.hasDescription(description).hasUnit(unit).isCounter().hasTypedDataPoints(types));
-  }
-
   public void verify(List<Metric> metrics) {
     verifyAllExpectedMetricsWereReceived(metrics);