Merge branch '1.1.x'

grantkl · Apr 10, 2019 · cd5222d · cd5222d
2 parents 3e270c7 + b87acdd
commit cd5222d
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 0 deletions.
diff --git a/...meter-registry-stackdriver/src/main/java/io/micrometer/stackdriver/StackdriverConfig.java b/...meter-registry-stackdriver/src/main/java/io/micrometer/stackdriver/StackdriverConfig.java
@@ -18,6 +18,12 @@
 import io.micrometer.core.instrument.config.MissingRequiredConfigurationException;
 import io.micrometer.core.instrument.step.StepRegistryConfig;
 
+/**
+ * {@link StepRegistryConfig} for Stackdriver.
+ *
+ * @author Jon Schneider
+ * @since 1.1.0
+ */
 public interface StackdriverConfig extends StepRegistryConfig {
     @Override
     default String prefix() {

diff --git a/...egistry-stackdriver/src/main/java/io/micrometer/stackdriver/StackdriverMeterRegistry.java b/...egistry-stackdriver/src/main/java/io/micrometer/stackdriver/StackdriverMeterRegistry.java
@@ -57,6 +57,12 @@
 import static java.util.stream.Collectors.toCollection;
 import static java.util.stream.StreamSupport.stream;
 
+/**
+ * {@link StepMeterRegistry} for Stackdriver.
+ *
+ * @author Jon Schneider
+ * @since 1.1.0
+ */
 @Incubating(since = "1.1.0")
 public class StackdriverMeterRegistry extends StepMeterRegistry {
     private static final ThreadFactory DEFAULT_THREAD_FACTORY = new NamedThreadFactory("stackdriver-metrics-publisher");

diff --git a/...stry-stackdriver/src/main/java/io/micrometer/stackdriver/StackdriverNamingConvention.java b/...stry-stackdriver/src/main/java/io/micrometer/stackdriver/StackdriverNamingConvention.java
@@ -22,6 +22,12 @@
 
 import java.util.regex.Pattern;
 
+/**
+ * {@link NamingConvention} for Stackdriver.
+ *
+ * @author Jon Schneider
+ * @since 1.1.0
+ */
 public class StackdriverNamingConvention implements NamingConvention {
     private static final int MAX_NAME_LENGTH = 200;
     private static final int MAX_TAG_KEY_LENGTH = 100;

diff --git a/...tackdriver/src/main/java/io/micrometer/stackdriver/util/ClearCustomMetricDescriptors.java b/...tackdriver/src/main/java/io/micrometer/stackdriver/util/ClearCustomMetricDescriptors.java
@@ -32,6 +32,9 @@
  *
  * @see <a href="https://cloud.google.com/monitoring/docs/reference/libraries#setting_up_authentication">Google Cloud authentication</a>
  * @see <a href="https://cloud.google.com/monitoring/access-control">Google Cloud access control</a>
+ *
+ * @author Jon Schneider
+ * @since 1.1.0
  */
 public class ClearCustomMetricDescriptors {
     public static void clearCustomMetricDescriptors(MetricServiceSettings settings, String projectId) {

diff --git a/...er/spring/autoconfigure/export/stackdriver/StackdriverMetricsExportAutoConfiguration.java b/...er/spring/autoconfigure/export/stackdriver/StackdriverMetricsExportAutoConfiguration.java
@@ -41,6 +41,7 @@
  * Configuration for exporting metrics to Stackdriver.
  *
  * @author Jon Schneider
+ * @since 1.1.0
  */
 @Configuration
 @AutoConfigureBefore({CompositeMeterRegistryAutoConfiguration.class,

diff --git a/...ain/java/io/micrometer/spring/autoconfigure/export/stackdriver/StackdriverProperties.java b/...ain/java/io/micrometer/spring/autoconfigure/export/stackdriver/StackdriverProperties.java
@@ -25,6 +25,7 @@
  * {@link ConfigurationProperties} for configuring metrics export to Stackdriver.
  *
  * @author Jon Schneider
+ * @since 1.1.0
  */
 @ConfigurationProperties(prefix = "management.metrics.export.stackdriver")
 public class StackdriverProperties extends StepRegistryProperties {