Implement auto-configurations for Brave and OpenTelemetry

- Configure Zipkin
- Configure Wavefront
- Configure Brave
- Configure OpenTelemetry
- Configure Micrometer Tracing bridges for OpenTelemetry and Brave
- Create the ObservationHandler for tracing with Micrometer

Closes gh-30156

Author: mhalbritter

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

@@ -50,6 +50,9 @@ dependencies {
 	optional("io.micrometer:micrometer-observation")
 	optional("io.micrometer:micrometer-core")
 	optional("io.micrometer:micrometer-tracing-api")
+	optional("io.micrometer:micrometer-tracing-bridge-brave")
+	optional("io.micrometer:micrometer-tracing-bridge-otel")
+	optional("io.micrometer:micrometer-tracing-reporter-wavefront")
 	optional("io.micrometer:micrometer-registry-appoptics")
 	optional("io.micrometer:micrometer-registry-atlas") {
 		exclude group: "javax.inject", module: "javax.inject"
@@ -75,6 +78,8 @@ dependencies {
 	optional("io.micrometer:micrometer-registry-signalfx")
 	optional("io.micrometer:micrometer-registry-statsd")
 	optional("io.micrometer:micrometer-registry-wavefront")
+	optional("io.zipkin.reporter2:zipkin-sender-urlconnection")
+	optional("io.opentelemetry:opentelemetry-exporter-zipkin")
 	optional("io.projectreactor.netty:reactor-netty-http")
 	optional("io.r2dbc:r2dbc-pool")
 	optional("io.r2dbc:r2dbc-spi")

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

@@ -16,10 +16,7 @@
 
 package org.springframework.boot.actuate.autoconfigure.metrics.export.wavefront;
 
-import java.time.Duration;
-
 import com.wavefront.sdk.common.WavefrontSender;
-import com.wavefront.sdk.common.clients.WavefrontClient.Builder;
 import io.micrometer.core.instrument.Clock;
 import io.micrometer.wavefront.WavefrontConfig;
 import io.micrometer.wavefront.WavefrontMeterRegistry;
@@ -28,16 +25,15 @@
 import org.springframework.boot.actuate.autoconfigure.metrics.MetricsAutoConfiguration;
 import org.springframework.boot.actuate.autoconfigure.metrics.export.ConditionalOnEnabledMetricsExport;
 import org.springframework.boot.actuate.autoconfigure.metrics.export.simple.SimpleMetricsExportAutoConfiguration;
-import org.springframework.boot.actuate.autoconfigure.metrics.export.wavefront.WavefrontProperties.Sender;
+import org.springframework.boot.actuate.autoconfigure.wavefront.WavefrontAutoConfiguration;
+import org.springframework.boot.actuate.autoconfigure.wavefront.WavefrontProperties;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 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.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.context.properties.PropertyMapper;
 import org.springframework.context.annotation.Bean;
-import org.springframework.util.unit.DataSize;
 
 /**
  * {@link EnableAutoConfiguration Auto-configuration} for exporting metrics to Wavefront.
@@ -49,29 +45,17 @@
  */
 @AutoConfiguration(
 		before = { CompositeMeterRegistryAutoConfiguration.class, SimpleMetricsExportAutoConfiguration.class },
-		after = MetricsAutoConfiguration.class)
-@ConditionalOnBean(Clock.class)
+		after = { MetricsAutoConfiguration.class, WavefrontAutoConfiguration.class })
+@ConditionalOnBean({ Clock.class, WavefrontSender.class })
 @ConditionalOnClass({ WavefrontMeterRegistry.class, WavefrontSender.class })
 @ConditionalOnEnabledMetricsExport("wavefront")
 @EnableConfigurationProperties(WavefrontProperties.class)
 public class WavefrontMetricsExportAutoConfiguration {
 
-	private final WavefrontProperties properties;
-
-	public WavefrontMetricsExportAutoConfiguration(WavefrontProperties properties) {
-		this.properties = properties;
-	}
-
-	@Bean
-	@ConditionalOnMissingBean
-	public WavefrontConfig wavefrontConfig() {
-		return new WavefrontPropertiesConfigAdapter(this.properties);
-	}
-
 	@Bean
 	@ConditionalOnMissingBean
-	public WavefrontSender wavefrontSender(WavefrontConfig wavefrontConfig) {
-		return createWavefrontSender(wavefrontConfig);
+	public WavefrontConfig wavefrontConfig(WavefrontProperties properties) {
+		return new WavefrontPropertiesConfigAdapter(properties);
 	}
 
 	@Bean
@@ -81,14 +65,4 @@ public WavefrontMeterRegistry wavefrontMeterRegistry(WavefrontConfig wavefrontCo
 		return WavefrontMeterRegistry.builder(wavefrontConfig).clock(clock).wavefrontSender(wavefrontSender).build();
 	}
 
-	private WavefrontSender createWavefrontSender(WavefrontConfig wavefrontConfig) {
-		Builder builder = WavefrontMeterRegistry.getDefaultSenderBuilder(wavefrontConfig);
-		PropertyMapper mapper = PropertyMapper.get().alwaysApplyingWhenNonNull();
-		Sender sender = this.properties.getSender();
-		mapper.from(sender.getMaxQueueSize()).to(builder::maxQueueSize);
-		mapper.from(sender.getFlushInterval()).asInt(Duration::getSeconds).to(builder::flushIntervalSeconds);
-		mapper.from(sender.getMessageSize()).asInt(DataSize::toBytes).to(builder::messageSizeBytes);
-		return builder.build();
-	}
-
 }

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

@@ -19,18 +19,24 @@
 import io.micrometer.wavefront.WavefrontConfig;
 
 import org.springframework.boot.actuate.autoconfigure.metrics.export.properties.PushRegistryPropertiesConfigAdapter;
+import org.springframework.boot.actuate.autoconfigure.wavefront.WavefrontProperties;
+import org.springframework.boot.actuate.autoconfigure.wavefront.WavefrontProperties.Metrics.Export;
 
 /**
- * Adapter to convert {@link WavefrontProperties} to a {@link WavefrontConfig}.
+ * Adapter to convert {@link WavefrontProperties.Metrics} to a {@link WavefrontConfig}.
  *
  * @author Jon Schneider
+ * @author Moritz Halbritter
  * @since 2.0.0
  */
-public class WavefrontPropertiesConfigAdapter extends PushRegistryPropertiesConfigAdapter<WavefrontProperties>
-		implements WavefrontConfig {
+public class WavefrontPropertiesConfigAdapter
+		extends PushRegistryPropertiesConfigAdapter<WavefrontProperties.Metrics.Export> implements WavefrontConfig {
+
+	private final WavefrontProperties properties;
 
 	public WavefrontPropertiesConfigAdapter(WavefrontProperties properties) {
-		super(properties);
+		super(properties.getMetrics().getExport());
+		this.properties = properties;
 	}
 
 	@Override
@@ -39,32 +45,28 @@ public String prefix() {
 	}
 
 	@Override
-	public String get(String k) {
-		return null;
+	public String uri() {
+		return this.properties.getEffectiveUri().toString();
 	}
 
 	@Override
-	public String uri() {
-		return get(this::getUriAsString, WavefrontConfig.DEFAULT_DIRECT::uri);
+	public String source() {
+		return this.properties.getSourceOrDefault();
 	}
 
 	@Override
-	public String source() {
-		return get(WavefrontProperties::getSource, WavefrontConfig.super::source);
+	public int batchSize() {
+		return this.properties.getSender().getBatchSize();
 	}
 
 	@Override
 	public String apiToken() {
-		return get(WavefrontProperties::getApiToken, WavefrontConfig.super::apiToken);
+		return this.properties.getApiTokenOrThrow();
 	}
 
 	@Override
 	public String globalPrefix() {
-		return get(WavefrontProperties::getGlobalPrefix, WavefrontConfig.super::globalPrefix);
-	}
-
-	private String getUriAsString(WavefrontProperties properties) {
-		return (properties.getUri() != null) ? properties.getUri().toString() : null;
+		return get(Export::getGlobalPrefix, WavefrontConfig.super::globalPrefix);
 	}
 
 }