Merge remote-tracking branch 'origin/main' into draft-interface-clients-autoconfiguration

Author: OlgaMaciaszek

buildSrc/build.gradle

@@ -40,7 +40,6 @@ dependencies {
 	checkstyle("io.spring.javaformat:spring-javaformat-checkstyle:${javaFormatVersion}")
 
 	implementation(platform("org.springframework:spring-framework-bom:${versions.springFramework}"))
-	implementation("com.diffplug.gradle:goomph:3.37.2")
 	implementation("dev.adamko.dokkatoo:dokkatoo-plugin:2.3.1")
 	implementation("com.fasterxml.jackson.core:jackson-databind:${versions.jackson}")
 	implementation("com.github.node-gradle:gradle-node-plugin:3.5.1")
@@ -129,10 +128,6 @@ gradlePlugin {
 			id = "org.springframework.boot.optional-dependencies"
 			implementationClass = "org.springframework.boot.build.optional.OptionalDependenciesPlugin"
 		}
-		processedAnnotationsPlugin {
-			id = "org.springframework.boot.processed-annotations"
-			implementationClass = "org.springframework.boot.build.processors.ProcessedAnnotationsPlugin"
-		}
 		starterPlugin {
 			id = "org.springframework.boot.starter"
 			implementationClass = "org.springframework.boot.build.starters.StarterPlugin"

buildSrc/src/main/java/org/springframework/boot/build/antora/AntoraAsciidocAttributes.java

@@ -77,7 +77,7 @@ public Map<String, String> get() {
 		Map<String, String> attributes = new LinkedHashMap<>();
 		addGitHubAttributes(attributes);
 		addVersionAttributes(attributes);
-		addUrlArtifactRepository(attributes);
+		addArtifactAttributes(attributes);
 		addUrlJava(attributes);
 		addUrlLibraryLinkAttributes(attributes);
 		addPropertyAttributes(attributes);
@@ -139,8 +139,9 @@ private void addDependencyVersion(Map<String, String> attributes, String name, S
 		attributes.put("version-" + name, version);
 	}
 
-	private void addUrlArtifactRepository(Map<String, String> attributes) {
+	private void addArtifactAttributes(Map<String, String> attributes) {
 		attributes.put("url-artifact-repository", this.artifactRelease.getDownloadRepo());
+		attributes.put("artifact-release-type", this.artifactRelease.getType());
 	}
 
 	private void addUrlJava(Map<String, String> attributes) {

buildSrc/src/main/java/org/springframework/boot/build/context/properties/ConfigurationPropertiesPlugin.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2024 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.
@@ -33,7 +33,6 @@
 import org.gradle.api.tasks.compile.JavaCompile;
 import org.gradle.language.base.plugins.LifecycleBasePlugin;
 
-import org.springframework.boot.build.processors.ProcessedAnnotationsPlugin;
 import org.springframework.util.StringUtils;
 
 /**
@@ -92,7 +91,6 @@ private void configureConfigurationPropertiesAnnotationProcessor(Project project
 			.add(project.getDependencies()
 				.project(Collections.singletonMap("path",
 						":spring-boot-project:spring-boot-tools:spring-boot-configuration-processor")));
-		project.getPlugins().apply(ProcessedAnnotationsPlugin.class);
 	}
 
 	private void disableIncrementalCompilation(Project project) {

buildSrc/src/main/java/org/springframework/boot/build/processors/ProcessedAnnotationsPlugin.java

@@ -112,6 +112,27 @@ void urlArtifactRepositoryWhenSnapshot() {
 		assertThat(attributes.get()).containsEntry("url-artifact-repository", "https://repo.spring.io/snapshot");
 	}
 
+	@Test
+	void artifactReleaseTypeWhenRelease() {
+		AntoraAsciidocAttributes attributes = new AntoraAsciidocAttributes("1.2.3", true, null,
+				mockDependencyVersions(), null);
+		assertThat(attributes.get()).containsEntry("artifact-release-type", "release");
+	}
+
+	@Test
+	void artifactReleaseTypeWhenMilestone() {
+		AntoraAsciidocAttributes attributes = new AntoraAsciidocAttributes("1.2.3-M1", true, null,
+				mockDependencyVersions(), null);
+		assertThat(attributes.get()).containsEntry("artifact-release-type", "milestone");
+	}
+
+	@Test
+	void artifactReleaseTypeWhenSnapshot() {
+		AntoraAsciidocAttributes attributes = new AntoraAsciidocAttributes("1.2.3-SNAPSHOT", true, null,
+				mockDependencyVersions(), null);
+		assertThat(attributes.get()).containsEntry("artifact-release-type", "snapshot");
+	}
+
 	@Test
 	void urlLinksFromLibrary() {
 		Map<String, Function<LibraryVersion, String>> links = new LinkedHashMap<>();

buildSrc/src/test/java/org/springframework/boot/build/antora/AntoraAsciidocAttributesTests.java

@@ -24,7 +24,6 @@
 import io.micrometer.tracing.exporter.SpanReporter;
 import io.micrometer.tracing.otel.bridge.CompositeSpanExporter;
 import io.micrometer.tracing.otel.bridge.EventListener;
-import io.micrometer.tracing.otel.bridge.EventPublishingContextWrapper;
 import io.micrometer.tracing.otel.bridge.OtelBaggageManager;
 import io.micrometer.tracing.otel.bridge.OtelCurrentTraceContext;
 import io.micrometer.tracing.otel.bridge.OtelPropagator;
@@ -35,7 +34,6 @@
 import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.api.metrics.MeterProvider;
 import io.opentelemetry.api.trace.Tracer;
-import io.opentelemetry.context.ContextStorage;
 import io.opentelemetry.context.propagation.ContextPropagators;
 import io.opentelemetry.context.propagation.TextMapPropagator;
 import io.opentelemetry.sdk.resources.Resource;
@@ -164,8 +162,7 @@ EventPublisher otelTracerEventPublisher(List<EventListener> eventListeners) {
 
 	@Bean
 	@ConditionalOnMissingBean
-	OtelCurrentTraceContext otelCurrentTraceContext(EventPublisher publisher) {
-		ContextStorage.addWrapper(new EventPublishingContextWrapper(publisher));
+	OtelCurrentTraceContext otelCurrentTraceContext() {
 		return new OtelCurrentTraceContext();
 	}
 

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/OpenTelemetryAutoConfiguration.java

@@ -0,0 +1,178 @@
+/*
+ * Copyright 2012-2024 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
+ *
+ *      https://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.tracing;
+
+import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.function.UnaryOperator;
+
+import io.micrometer.tracing.otel.bridge.EventPublishingContextWrapper;
+import io.micrometer.tracing.otel.bridge.OtelTracer.EventPublisher;
+import io.opentelemetry.context.Context;
+import io.opentelemetry.context.ContextStorage;
+import io.opentelemetry.context.Scope;
+
+import org.springframework.boot.context.event.ApplicationStartingEvent;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationEvent;
+import org.springframework.context.ApplicationListener;
+import org.springframework.context.event.ContextClosedEvent;
+import org.springframework.context.event.ContextRefreshedEvent;
+import org.springframework.context.event.GenericApplicationListener;
+import org.springframework.core.Ordered;
+import org.springframework.core.ResolvableType;
+import org.springframework.util.ClassUtils;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+
+/**
+ * {@link ApplicationListener} to add an OpenTelemetry {@link ContextStorage} wrapper for
+ * {@link EventPublisher} bean support. A single {@link ContextStorage} wrapper is added
+ * as early as possible then updated with {@link EventPublisher} beans as needed.
+ *
+ * @author Phillip Webb
+ */
+class OpenTelemetryEventPublisherApplicationListener implements GenericApplicationListener {
+
+	private static final boolean OTEL_CONTEXT_PRESENT = ClassUtils.isPresent("io.opentelemetry.context.ContextStorage",
+			null);
+
+	private static final boolean MICROMETER_OTEL_PRESENT = ClassUtils
+		.isPresent("io.micrometer.tracing.otel.bridge.OtelTracer", null);
+
+	@Override
+	public int getOrder() {
+		return Ordered.HIGHEST_PRECEDENCE;
+	}
+
+	@Override
+	public boolean supportsEventType(ResolvableType eventType) {
+		Class<?> type = eventType.getRawClass();
+		return (type != null) && (ApplicationStartingEvent.class.isAssignableFrom(type)
+				|| ContextRefreshedEvent.class.isAssignableFrom(type)
+				|| ContextClosedEvent.class.isAssignableFrom(type));
+	}
+
+	@Override
+	public void onApplicationEvent(ApplicationEvent event) {
+		if (!OTEL_CONTEXT_PRESENT || !MICROMETER_OTEL_PRESENT) {
+			return;
+		}
+		if (event instanceof ApplicationStartingEvent) {
+			EventPublisherBeansContextWrapper.addWrapperIfNecessary();
+		}
+		if (event instanceof ContextRefreshedEvent contextRefreshedEvent) {
+			ApplicationContext applicationContext = contextRefreshedEvent.getApplicationContext();
+			List<EventPublishingContextWrapper> publishers = applicationContext
+				.getBeansOfType(EventPublisher.class, true, false)
+				.values()
+				.stream()
+				.map(EventPublishingContextWrapper::new)
+				.toList();
+			EventPublisherBeansContextWrapper.instance.put(applicationContext, publishers);
+		}
+		if (event instanceof ContextClosedEvent contextClosedEvent) {
+			EventPublisherBeansContextWrapper.instance.remove(contextClosedEvent.getApplicationContext());
+		}
+	}
+
+	/**
+	 * The single {@link ContextStorage} wrapper that delegates to {@link EventPublisher}
+	 * beans.
+	 */
+	static class EventPublisherBeansContextWrapper implements UnaryOperator<ContextStorage> {
+
+		private static final AtomicBoolean added = new AtomicBoolean();
+
+		private static final EventPublisherBeansContextWrapper instance = new EventPublisherBeansContextWrapper();
+
+		private final MultiValueMap<ApplicationContext, EventPublishingContextWrapper> publishers = new LinkedMultiValueMap<>();
+
+		private volatile ContextStorage delegate;
+
+		static void addWrapperIfNecessary() {
+			if (added.compareAndSet(false, true)) {
+				ContextStorage.addWrapper(instance);
+			}
+		}
+
+		@Override
+		public ContextStorage apply(ContextStorage contextStorage) {
+			return new EventPublisherBeansContextStorage(contextStorage);
+		}
+
+		void put(ApplicationContext applicationContext, List<EventPublishingContextWrapper> publishers) {
+			synchronized (this) {
+				this.publishers.addAll(applicationContext, publishers);
+				this.delegate = null;
+			}
+		}
+
+		void remove(ApplicationContext applicationContext) {
+			synchronized (this) {
+				this.publishers.remove(applicationContext);
+				this.delegate = null;
+			}
+		}
+
+		private ContextStorage getDelegate(ContextStorage parent) {
+			ContextStorage delegate = this.delegate;
+			if (delegate == null) {
+				synchronized (this) {
+					delegate = parent;
+					for (List<EventPublishingContextWrapper> publishers : this.publishers.values()) {
+						for (EventPublishingContextWrapper publisher : publishers) {
+							delegate = publisher.apply(delegate);
+						}
+					}
+				}
+			}
+			return delegate;
+		}
+
+		/**
+		 * The wrapped {@link ContextStorage} that delegates to the
+		 * {@link EventPublisherBeansContextWrapper}.
+		 */
+		class EventPublisherBeansContextStorage implements ContextStorage {
+
+			private final ContextStorage parent;
+
+			EventPublisherBeansContextStorage(ContextStorage wrapped) {
+				this.parent = wrapped;
+			}
+
+			@Override
+			public Scope attach(Context toAttach) {
+				return getDelegate(this.parent).attach(toAttach);
+			}
+
+			@Override
+			public Context current() {
+				return getDelegate(this.parent).current();
+			}
+
+			@Override
+			public Context root() {
+				return getDelegate(this.parent).root();
+			}
+
+		}
+
+	}
+
+}

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/OpenTelemetryEventPublisherApplicationListener.java

@@ -10,3 +10,7 @@ org.springframework.boot.actuate.autoconfigure.metrics.ValidationFailureAnalyzer
 # Environment Post Processors
 org.springframework.boot.env.EnvironmentPostProcessor=\
 org.springframework.boot.actuate.autoconfigure.tracing.LogCorrelationEnvironmentPostProcessor
+
+# Application Listeners
+org.springframework.context.ApplicationListener=\
+org.springframework.boot.actuate.autoconfigure.tracing.OpenTelemetryEventPublisherApplicationListener