Add HTTP customizers to enable observability with Micrometer.

Closes gh-661

Author: mp911de

spring-cloud-vault-config/pom.xml

@@ -59,6 +59,14 @@
 			<optional>true</optional>
 		</dependency>
 
+		<!-- Micrometer -->
+
+		<dependency>
+			<groupId>io.micrometer</groupId>
+			<artifactId>micrometer-tracing</artifactId>
+			<optional>true</optional>
+		</dependency>
+
 		<!-- HTTP Client Libraries -->
 		<dependency>
 			<groupId>org.apache.httpcomponents.client5</groupId>

spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultObservationAutoConfiguration.java

@@ -0,0 +1,50 @@
+/*
+ * Copyright 2016-2022 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.cloud.vault.config;
+
+import io.micrometer.observation.Observation;
+import io.micrometer.observation.ObservationRegistry;
+
+import org.springframework.boot.actuate.metrics.web.client.ObservationRestTemplateCustomizer;
+import org.springframework.boot.autoconfigure.AutoConfigureBefore;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnSingleCandidate;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.client.observation.DefaultClientRequestObservationConvention;
+import org.springframework.vault.client.RestTemplateCustomizer;
+
+/**
+ * {@link org.springframework.boot.autoconfigure.EnableAutoConfiguration
+ * Auto-configuration} for Observability.
+ *
+ * @author Mark Paluch
+ * @since 3.0
+ */
+@Configuration(proxyBeanMethods = false)
+@ConditionalOnClass(Observation.class)
+@AutoConfigureBefore(VaultAutoConfiguration.class)
+public class VaultObservationAutoConfiguration {
+
+	@Bean
+	@ConditionalOnSingleCandidate(ObservationRegistry.class)
+	public RestTemplateCustomizer observationVaultRestTemplateCustomizer(ObservationRegistry observationRegistry) {
+		return restTemplate -> new ObservationRestTemplateCustomizer(observationRegistry,
+				new DefaultClientRequestObservationConvention()).customize(restTemplate);
+	}
+
+}

spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultReactiveObservationAutoConfiguration.java

@@ -0,0 +1,52 @@
+/*
+ * Copyright 2016-2022 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.cloud.vault.config;
+
+import io.micrometer.observation.Observation;
+import io.micrometer.observation.ObservationRegistry;
+import reactor.core.publisher.Flux;
+
+import org.springframework.boot.actuate.metrics.web.reactive.client.ObservationWebClientCustomizer;
+import org.springframework.boot.autoconfigure.AutoConfigureBefore;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnSingleCandidate;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.vault.client.WebClientCustomizer;
+import org.springframework.web.reactive.function.client.DefaultClientRequestObservationConvention;
+import org.springframework.web.reactive.function.client.WebClient;
+
+/**
+ * {@link org.springframework.boot.autoconfigure.EnableAutoConfiguration
+ * Auto-configuration} for Reactive Observability.
+ *
+ * @author Mark Paluch
+ * @since 3.0
+ */
+@Configuration(proxyBeanMethods = false)
+@ConditionalOnClass({ Observation.class, WebClient.class, Flux.class })
+@AutoConfigureBefore(VaultReactiveAutoConfiguration.class)
+public class VaultReactiveObservationAutoConfiguration {
+
+	@Bean
+	@ConditionalOnSingleCandidate(ObservationRegistry.class)
+	public WebClientCustomizer observationVaultWebClientCustomizer(ObservationRegistry observationRegistry) {
+		return webClientBuilder -> new ObservationWebClientCustomizer(observationRegistry,
+				new DefaultClientRequestObservationConvention()).customize(webClientBuilder);
+	}
+
+}

spring-cloud-vault-config/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1,3 +1,5 @@
+org.springframework.cloud.vault.config.VaultObservationAutoConfiguration
+org.springframework.cloud.vault.config.VaultReactiveObservationAutoConfiguration
 org.springframework.cloud.vault.config.VaultReactiveAutoConfiguration
 org.springframework.cloud.vault.config.VaultAutoConfiguration
-org.springframework.cloud.vault.config.VaultHealthIndicatorAutoConfiguration
+org.springframework.cloud.vault.config.VaultHealthIndicatorAutoConfiguration