Fix review comments. Included specific resources to filter, move our version metric to be part of auto configuration.

Author: akodali18

wavefront-spring-boot-bom/pom.xml

@@ -52,8 +52,11 @@
         <directory>src/main/resources</directory>
       </resource>
       <resource>
-        <directory>src/main/resources/</directory>
+        <directory>src/main/resources</directory>
         <filtering>true</filtering>
+        <includes>
+          <include>META-INF/wavefront-spring-boot/*.properties</include>
+        </includes>
       </resource>
     </resources>
     <plugins>

wavefront-spring-boot/src/main/java/com/wavefront/spring/autoconfigure/WavefrontMetricsConfiguration.java

@@ -1,16 +1,11 @@
 package com.wavefront.spring.autoconfigure;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.stream.Collectors;
-
+import com.wavefront.internal.reporter.WavefrontInternalReporter;
+import com.wavefront.internal_reporter_java.io.dropwizard.metrics5.MetricName;
 import com.wavefront.sdk.appagent.jvm.reporter.WavefrontJvmReporter;
+import com.wavefront.sdk.common.Utils;
 import com.wavefront.sdk.common.WavefrontSender;
 import com.wavefront.sdk.common.application.ApplicationTags;
-import io.micrometer.core.instrument.Tag;
-import io.micrometer.core.instrument.Tags;
-import io.micrometer.wavefront.WavefrontConfig;
-import io.micrometer.wavefront.WavefrontMeterRegistry;
 
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.actuate.autoconfigure.metrics.MeterRegistryCustomizer;
@@ -22,6 +17,17 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+import io.micrometer.core.instrument.Tag;
+import io.micrometer.core.instrument.Tags;
+import io.micrometer.wavefront.WavefrontConfig;
+import io.micrometer.wavefront.WavefrontMeterRegistry;
+
 /**
  * Configuration for Wavefront metrics.
  *
@@ -31,6 +37,7 @@
 @Configuration(proxyBeanMethods = false)
 @ConditionalOnBean(WavefrontSender.class)
 class WavefrontMetricsConfiguration {
+  public static final String SDK_INTERNAL_METRIC_PREFIX = "~sdk.java.wavefront_spring_boot_starter";
 
   @Bean
   @ConditionalOnMissingBean
@@ -43,6 +50,18 @@ WavefrontJvmReporter wavefrontJvmReporter(WavefrontSender wavefrontSender, Appli
     return reporter;
   }
 
+  @Bean
+  @ConditionalOnMissingBean
+  WavefrontInternalReporter wavefrontInternalReporter(WavefrontSender wavefrontSender,
+                                                      WavefrontConfig wavefrontConfig) {
+    WavefrontInternalReporter reporter = new WavefrontInternalReporter.Builder().
+        prefixedWith(SDK_INTERNAL_METRIC_PREFIX).withSource(wavefrontConfig.source()).
+        build(wavefrontSender);
+    Double sdkVersion = Utils.getSemVerGauge("wavefront-spring-boot");
+    reporter.newGauge(new MetricName("version", Collections.EMPTY_MAP), () -> (() -> sdkVersion));
+    reporter.start(1, TimeUnit.MINUTES);
+    return reporter;
+  }
 
   @Configuration(proxyBeanMethods = false)
   @ConditionalOnClass({ WavefrontMeterRegistry.class, MeterRegistryCustomizer.class })

wavefront-spring-boot/src/main/java/com/wavefront/spring/autoconfigure/WavefrontSleuthSpanHandler.java

@@ -75,7 +75,6 @@ final class WavefrontSleuthSpanHandler extends SpanHandler implements Runnable,
 
   private final static String DEFAULT_SOURCE = "wavefront-spring-boot";
   private final static String WAVEFRONT_GENERATED_COMPONENT = "wavefront-generated";
-  public static final String SDK_METRIC_PREFIX = "~sdk.java.wavefront_spring_boot_starter.";
 
   final LinkedBlockingQueue<Pair<TraceContext, MutableSpan>> spanBuffer;
   final WavefrontSender wavefrontSender;
@@ -132,8 +131,6 @@ final class WavefrontSleuthSpanHandler extends SpanHandler implements Runnable,
     this.spanBuffer = new LinkedBlockingQueue<>(maxQueueSize);
 
     // init internal metrics
-    double sdkVersion = Utils.getSemVerGauge("wavefront-spring-boot");
-    meterRegistry.gauge(SDK_METRIC_PREFIX + "version", sdkVersion);
     meterRegistry.gauge("reporter.queue.size", spanBuffer, sb -> (double) sb.size());
     meterRegistry.gauge("reporter.queue.remaining_capacity", spanBuffer,
         sb -> (double) sb.remainingCapacity());

wavefront-spring-boot/src/test/java/com/wavefront/spring/autoconfigure/WavefrontAutoConfigurationTests.java

@@ -7,6 +7,8 @@
 import brave.Tracer;
 import brave.TracingCustomizer;
 import brave.handler.SpanHandler;
+
+import com.wavefront.internal.reporter.WavefrontInternalReporter;
 import com.wavefront.opentracing.WavefrontTracer;
 import com.wavefront.opentracing.reporting.Reporter;
 import com.wavefront.sdk.appagent.jvm.reporter.WavefrontJvmReporter;
@@ -136,6 +138,29 @@ void applicationTagsAreNotExportedToNonWavefrontRegistry() {
         });
   }
 
+  @Test
+  void internalReporterIsConfiguredWhenNoneExists() {
+    this.contextRunner
+        .with(wavefrontMetrics(() -> mock(WavefrontSender.class)))
+        .run((context) -> assertThat(context).hasSingleBean(WavefrontInternalReporter.class));
+  }
+
+  @Test
+  void internalReporterCanBeCustomized() {
+    WavefrontInternalReporter reporter = mock(WavefrontInternalReporter.class);
+    this.contextRunner
+        .with(wavefrontMetrics(() -> mock(WavefrontSender.class)))
+        .withBean(WavefrontInternalReporter.class, () -> reporter)
+        .run((context) -> assertThat(context).getBean(WavefrontInternalReporter.class).isEqualTo(reporter));
+  }
+
+  @Test
+  void internalReporterNotConfiguredWithoutWavefrontSender() {
+    this.contextRunner
+        .with(metrics())
+        .run(context -> assertThat(context).doesNotHaveBean(WavefrontInternalReporter.class));
+  }
+
   @Test
   void jvmReporterIsConfiguredWhenNoneExists() {
     this.contextRunner