Upgrade to Micrometer 1.5 snapshots

Author: snicoll

spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle

@@ -101,6 +101,7 @@ dependencies {
 	optional("org.springframework.data:spring-data-redis")
 	optional("org.springframework.data:spring-data-solr")
 	optional("org.springframework.integration:spring-integration-core")
+	optional("org.springframework.kafka:spring-kafka")
 	optional("org.springframework.security:spring-security-config")
 	optional("org.springframework.security:spring-security-web")
 	optional("org.springframework.session:spring-session-core")

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/KafkaMetricsAutoConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,37 +18,37 @@
 
 import java.util.Collections;
 
-import javax.management.MBeanServer;
-
 import io.micrometer.core.instrument.MeterRegistry;
-import io.micrometer.core.instrument.binder.kafka.KafkaConsumerMetrics;
-import org.apache.kafka.clients.consumer.KafkaConsumer;
+import io.micrometer.core.instrument.binder.kafka.KafkaClientMetrics;
 
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.autoconfigure.jmx.JmxAutoConfiguration;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnSingleCandidate;
+import org.springframework.boot.autoconfigure.kafka.KafkaAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.kafka.core.ProducerFactory;
 
 /**
  * Auto-configuration for Kafka metrics.
  *
  * @author Andy Wilkinson
+ * @author Stephane Nicoll
  * @since 2.1.0
  */
 @Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter({ MetricsAutoConfiguration.class, JmxAutoConfiguration.class })
-@ConditionalOnClass({ KafkaConsumerMetrics.class, KafkaConsumer.class })
+@AutoConfigureAfter({ MetricsAutoConfiguration.class, KafkaAutoConfiguration.class })
+@ConditionalOnClass({ KafkaClientMetrics.class, ProducerFactory.class })
 @ConditionalOnBean(MeterRegistry.class)
 public class KafkaMetricsAutoConfiguration {
 
 	@Bean
 	@ConditionalOnMissingBean
-	@ConditionalOnBean(MBeanServer.class)
-	public KafkaConsumerMetrics kafkaConsumerMetrics(MBeanServer mbeanServer) {
-		return new KafkaConsumerMetrics(mbeanServer, Collections.emptyList());
+	@ConditionalOnSingleCandidate(ProducerFactory.class)
+	public KafkaClientMetrics kafkaClientMetrics(ProducerFactory<?, ?> producerFactory) {
+		return new KafkaClientMetrics(producerFactory.createProducer(), Collections.emptyList());
 	}
 
 }

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/MeterValue.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,17 +25,18 @@
 
 /**
  * A meter value that is used when configuring micrometer. Can be a String representation
- * of either a {@link Long} (applicable to timers and distribution summaries) or a
+ * of either a {@link Double} (applicable to timers and distribution summaries) or a
  * {@link Duration} (applicable to only timers).
  *
  * @author Phillip Webb
+ * @author Stephane Nicoll
  * @since 2.2.0
  */
 public final class MeterValue {
 
 	private final Object value;
 
-	MeterValue(long value) {
+	MeterValue(double value) {
 		this.value = value;
 	}
 
@@ -48,26 +49,29 @@ public final class MeterValue {
 	 * @param meterType the meter type
 	 * @return the value or {@code null} if the value cannot be applied
 	 */
-	public Long getValue(Type meterType) {
+	public Double getValue(Type meterType) {
 		if (meterType == Type.DISTRIBUTION_SUMMARY) {
 			return getDistributionSummaryValue();
 		}
 		if (meterType == Type.TIMER) {
-			return getTimerValue();
+			Long timerValue = getTimerValue();
+			if (timerValue != null) {
+				return timerValue.doubleValue();
+			}
 		}
 		return null;
 	}
 
-	private Long getDistributionSummaryValue() {
-		if (this.value instanceof Long) {
-			return (Long) this.value;
+	private Double getDistributionSummaryValue() {
+		if (this.value instanceof Double) {
+			return (Double) this.value;
 		}
 		return null;
 	}
 
 	private Long getTimerValue() {
-		if (this.value instanceof Long) {
-			return TimeUnit.MILLISECONDS.toNanos((long) this.value);
+		if (this.value instanceof Double) {
+			return TimeUnit.MILLISECONDS.toNanos(((Double) this.value).longValue());
 		}
 		if (this.value instanceof Duration) {
 			return ((Duration) this.value).toNanos();
@@ -82,8 +86,9 @@ private Long getTimerValue() {
 	 * @return a {@link MeterValue} instance
 	 */
 	public static MeterValue valueOf(String value) {
-		if (isNumber(value)) {
-			return new MeterValue(Long.parseLong(value));
+		Double number = safeParseDouble(value);
+		if (number != null) {
+			return new MeterValue(number);
 		}
 		return new MeterValue(DurationStyle.detectAndParse(value));
 	}
@@ -92,13 +97,29 @@ public static MeterValue valueOf(String value) {
 	 * Return a new {@link MeterValue} instance for the given long value.
 	 * @param value the source value
 	 * @return a {@link MeterValue} instance
+	 * @deprecated as of 2.3.0 in favor of {@link #valueOf(double)}
 	 */
+	@Deprecated
 	public static MeterValue valueOf(long value) {
 		return new MeterValue(value);
 	}
 
-	private static boolean isNumber(String value) {
-		return value.chars().allMatch(Character::isDigit);
+	/**
+	 * Return a new {@link MeterValue} instance for the given double value.
+	 * @param value the source value
+	 * @return a {@link MeterValue} instance
+	 */
+	public static MeterValue valueOf(double value) {
+		return new MeterValue(value);
+	}
+
+	private static Double safeParseDouble(String value) {
+		try {
+			return Double.parseDouble(value);
+		}
+		catch (NumberFormatException nfe) {
+			return null;
+		}
 	}
 
 }

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/PropertiesMeterFilter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -91,16 +91,16 @@ public DistributionStatisticConfig configure(Meter.Id id, DistributionStatisticC
 				.build().merge(config);
 	}
 
-	private long[] convertSla(Meter.Type meterType, ServiceLevelAgreementBoundary[] sla) {
+	private double[] convertSla(Meter.Type meterType, ServiceLevelAgreementBoundary[] sla) {
 		if (sla == null) {
 			return null;
 		}
-		long[] converted = Arrays.stream(sla).map((candidate) -> candidate.getValue(meterType)).filter(Objects::nonNull)
-				.mapToLong(Long::longValue).toArray();
+		double[] converted = Arrays.stream(sla).map((candidate) -> candidate.getValue(meterType))
+				.filter(Objects::nonNull).mapToDouble(Double::doubleValue).toArray();
 		return (converted.length != 0) ? converted : null;
 	}
 
-	private Long convertMeterValue(Meter.Type meterType, String value) {
+	private Double convertMeterValue(Meter.Type meterType, String value) {
 		return (value != null) ? MeterValue.valueOf(value).getValue(meterType) : null;
 	}
 

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/ServiceLevelAgreementBoundary.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,8 +22,8 @@
 
 /**
  * A service level agreement boundary for use when configuring Micrometer. Can be
- * specified as either a {@link Long} (applicable to timers and distribution summaries) or
- * a {@link Duration} (applicable to only timers).
+ * specified as either a {@link Double} (applicable to timers and distribution summaries)
+ * or a {@link Duration} (applicable to only timers).
  *
  * @author Phillip Webb
  * @since 2.0.0
@@ -42,17 +42,17 @@ public final class ServiceLevelAgreementBoundary {
 	 * @param meterType the meter type
 	 * @return the value or {@code null} if the value cannot be applied
 	 */
-	public Long getValue(Meter.Type meterType) {
+	public Double getValue(Meter.Type meterType) {
 		return this.value.getValue(meterType);
 	}
 
 	/**
-	 * Return a new {@link ServiceLevelAgreementBoundary} instance for the given long
+	 * Return a new {@link ServiceLevelAgreementBoundary} instance for the given double
 	 * value.
 	 * @param value the source value
 	 * @return a {@link ServiceLevelAgreementBoundary} instance
 	 */
-	public static ServiceLevelAgreementBoundary valueOf(long value) {
+	public static ServiceLevelAgreementBoundary valueOf(double value) {
 		return new ServiceLevelAgreementBoundary(MeterValue.valueOf(value));
 	}
 

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/appoptics/AppOpticsProperties.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -46,6 +46,12 @@ public class AppOpticsProperties extends StepRegistryProperties {
 	 */
 	private String hostTag = "instance";
 
+	/**
+	 * Whether to ship a floored time, useful when sending measurements from multiple
+	 * hosts to align them on a given time boundary.
+	 */
+	private boolean floorTimes;
+
 	/**
 	 * Number of measurements per request to use for this backend. If more measurements
 	 * are found, then multiple requests will be made.
@@ -81,6 +87,14 @@ public void setHostTag(String hostTag) {
 		this.hostTag = hostTag;
 	}
 
+	public boolean isFloorTimes() {
+		return this.floorTimes;
+	}
+
+	public void setFloorTimes(boolean floorTimes) {
+		this.floorTimes = floorTimes;
+	}
+
 	@Override
 	public Integer getBatchSize() {
 		return this.batchSize;

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/appoptics/AppOpticsPropertiesConfigAdapter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -47,4 +47,9 @@ public String hostTag() {
 		return get(AppOpticsProperties::getHostTag, AppOpticsConfig.super::hostTag);
 	}
 
+	@Override
+	public boolean floorTimes() {
+		return get(AppOpticsProperties::isFloorTimes, AppOpticsConfig.super::floorTimes);
+	}
+
 }

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/datadog/DatadogProperties.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -56,7 +56,7 @@ public class DatadogProperties extends StepRegistryProperties {
 	 * URI to ship metrics to. If you need to publish metrics to an internal proxy
 	 * en-route to Datadog, you can define the location of the proxy with this.
 	 */
-	private String uri = "https://app.datadoghq.com";
+	private String uri = "https://api.datadoghq.com";
 
 	public String getApiKey() {
 		return this.apiKey;

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/elastic/ElasticProperties.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -40,11 +40,15 @@ public class ElasticProperties extends StepRegistryProperties {
 	private String index = "metrics";
 
 	/**
-	 * Index date format used for rolling indices. Appended to the index name, preceded by
-	 * a '-'.
+	 * Index date format used for rolling indices. Appended to the index name.
 	 */
 	private String indexDateFormat = "yyyy-MM";
 
+	/**
+	 * Prefix to separate the index name from the date format used for rolling indices.
+	 */
+	private String indexDateSeparator = "-";
+
 	/**
 	 * Name of the timestamp field.
 	 */
@@ -65,6 +69,11 @@ public class ElasticProperties extends StepRegistryProperties {
 	 */
 	private String password = "";
 
+	/**
+	 * Ingest pipeline name. By default, events are not pre-processed.
+	 */
+	private String pipeline = "";
+
 	public String getHost() {
 		return this.host;
 	}
@@ -89,6 +98,14 @@ public void setIndexDateFormat(String indexDateFormat) {
 		this.indexDateFormat = indexDateFormat;
 	}
 
+	public String getIndexDateSeparator() {
+		return this.indexDateSeparator;
+	}
+
+	public void setIndexDateSeparator(String indexDateSeparator) {
+		this.indexDateSeparator = indexDateSeparator;
+	}
+
 	public String getTimestampFieldName() {
 		return this.timestampFieldName;
 	}
@@ -121,4 +138,12 @@ public void setPassword(String password) {
 		this.password = password;
 	}
 
+	public String getPipeline() {
+		return this.pipeline;
+	}
+
+	public void setPipeline(String pipeline) {
+		this.pipeline = pipeline;
+	}
+
 }