Change micrometer properties to use adapters

Update configuration property classes used with micrometer so that
they no longer directly implement `Config` interfaces. Properties
are now adapted to Config implementations independently.

See spring-projectsgh-9970

Author: philwebb

spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/PropertiesConfigAdapter.java

@@ -0,0 +1,61 @@
+/*
+ * Copyright 2012-2017 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.actuate.autoconfigure.metrics.export;
+
+import java.util.function.Function;
+
+import org.springframework.util.Assert;
+
+/**
+ * Base class for properties to config adapters.
+ *
+ * @param <T> The properties type
+ * @param <C> The config type
+ * @author Phillip Webb
+ * @since 2.0.0
+ */
+public class PropertiesConfigAdapter<T, C> {
+
+	private T properties;
+
+	private C defaults;
+
+	/**
+	 * Create a new {@link PropertiesConfigAdapter} instance.
+	 * @param properties the source properties
+	 * @param defaults a config implementation providing default values
+	 */
+	public PropertiesConfigAdapter(T properties, C defaults) {
+		Assert.notNull(properties, "Properties must not be null");
+		Assert.notNull(defaults, "Defaults must not be null");
+		this.properties = properties;
+		this.defaults = defaults;
+	}
+
+	/**
+	 * Get the value from the properties or use a fallback from the {@code defaults}.
+	 * @param getter the getter for the properties
+	 * @param fallback the fallback method from the {@code defaults}
+	 * @param <V> the value type
+	 * @return the property or fallback value
+	 */
+	protected final <V> V get(Function<T, V> getter, Function<C, V> fallback) {
+		V value = getter.apply(this.properties);
+		return (value != null ? value : fallback.apply(this.defaults));
+	}
+
+}

spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/RegistryProperties.java

@@ -18,41 +18,93 @@
 
 import java.time.Duration;
 
-import io.micrometer.core.instrument.spectator.step.StepRegistryConfig;
-
 /**
- * Specialization of {@link RegistryProperties} for configuring a metrics registry that
- * pushes aggregated metrics on a regular interval.
+ * Base class for properties that configure a metrics registry that pushes aggregated
+ * metrics on a regular interval.
  *
  * @author Jon Schneider
  * @author Andy Wilkinson
  * @since 2.0.0
  */
-public abstract class StepRegistryProperties extends RegistryProperties
-		implements StepRegistryConfig {
+public abstract class StepRegistryProperties {
+
+	/**
+	 * The step size (reporting frequency) to use.
+	 */
+	private Duration step = Duration.ofMinutes(1);
+
+	/**
+	 * Enable publishing to the backend.
+	 */
+	private Boolean enabled = true;
+
+	/**
+	 * The connection timeout for requests to the backend.
+	 */
+	private Duration connectTimeout;
+
+	/**
+	 * The read timeout for requests to the backend.
+	 */
+	private Duration readTimeout;
+
+	/**
+	 * The number of threads to use with the metrics publishing scheduler.
+	 */
+	private Integer numThreads;
+
+	/**
+	 * The number of measurements per request to use for the backend. If more measurements
+	 * are found, then multiple requests will be made.
+	 */
+	private Integer batchSize;
+
+	public Duration getStep() {
+		return this.step;
+	}
 
 	public void setStep(Duration step) {
-		set("step", step);
+		this.step = step;
+	}
+
+	public Boolean getEnabled() {
+		return this.enabled;
 	}
 
 	public void setEnabled(Boolean enabled) {
-		set("enabled", enabled);
+		this.enabled = enabled;
 	}
 
-	public void setBatchSize(Integer batchSize) {
-		set("batchSize", batchSize);
+	public Duration getConnectTimeout() {
+		return this.connectTimeout;
 	}
 
 	public void setConnectTimeout(Duration connectTimeout) {
-		set("connectTimeout", connectTimeout);
+		this.connectTimeout = connectTimeout;
+	}
+
+	public Duration getReadTimeout() {
+		return this.readTimeout;
 	}
 
 	public void setReadTimeout(Duration readTimeout) {
-		set("readTimeout", readTimeout);
+		this.readTimeout = readTimeout;
+	}
+
+	public Integer getNumThreads() {
+		return this.numThreads;
 	}
 
 	public void setNumThreads(Integer numThreads) {
-		set("numThreads", numThreads);
+		this.numThreads = numThreads;
+	}
+
+	public Integer getBatchSize() {
+		return this.batchSize;
+	}
+
+	public void setBatchSize(Integer batchSize) {
+		this.batchSize = batchSize;
 	}
 
 }

spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/StepRegistryProperties.java

@@ -0,0 +1,79 @@
+/*
+ * Copyright 2012-2017 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.actuate.autoconfigure.metrics.export;
+
+import java.time.Duration;
+
+import io.micrometer.core.instrument.spectator.step.StepRegistryConfig;
+
+/**
+ * Base class for {@link StepRegistryProperties} to {@link StepRegistryConfig} adapters.
+ *
+ * @param <T> The properties type
+ * @param <C> The config type
+ * @author Jon Schneider
+ * @author Phillip Webb
+ * @since 2.0.0
+ */
+public abstract class StepRegistryPropertiesConfigAdapter<T extends StepRegistryProperties, C extends StepRegistryConfig>
+		extends PropertiesConfigAdapter<T, C> implements StepRegistryConfig {
+
+	public StepRegistryPropertiesConfigAdapter(T properties, C defaults) {
+		super(properties, defaults);
+	}
+
+	@Override
+	public String prefix() {
+		return null;
+	}
+
+	@Override
+	public String get(String k) {
+		return null;
+	}
+
+	@Override
+	public Duration step() {
+		return get(T::getStep, C::step);
+	}
+
+	@Override
+	public boolean enabled() {
+		return get(T::getEnabled, C::enabled);
+	}
+
+	@Override
+	public Duration connectTimeout() {
+		return get(T::getConnectTimeout, C::connectTimeout);
+	}
+
+	@Override
+	public Duration readTimeout() {
+		return get(T::getReadTimeout, C::readTimeout);
+	}
+
+	@Override
+	public int numThreads() {
+		return get(T::getNumThreads, C::numThreads);
+	}
+
+	@Override
+	public int batchSize() {
+		return get(T::getBatchSize, C::batchSize);
+	}
+
+}

spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/StepRegistryPropertiesConfigAdapter.java

@@ -43,10 +43,16 @@
 @EnableConfigurationProperties(AtlasProperties.class)
 public class AtlasExportConfiguration {
 
+	@Bean
+	@ConditionalOnMissingBean(AtlasConfig.class)
+	public AtlasConfig atlasConfig(AtlasProperties atlasProperties) {
+		return new AtlasPropertiesConfigAdapter(atlasProperties);
+	}
+
 	@Bean
 	@ConditionalOnProperty(value = "spring.metrics.atlas.enabled", matchIfMissing = true)
-	public MetricsExporter atlasExporter(AtlasConfig config, Clock clock) {
-		return () -> new AtlasMeterRegistry(config, clock);
+	public MetricsExporter atlasExporter(AtlasConfig atlasConfig, Clock clock) {
+		return () -> new AtlasMeterRegistry(atlasConfig, clock);
 	}
 
 	@Bean