diff --git a/pom.xml b/pom.xml index d7d670bd..62ef4505 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ org.springframework.modulith spring-modulith - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT pom diff --git a/spring-modulith-actuator/pom.xml b/spring-modulith-actuator/pom.xml index 265041e5..dea91c86 100644 --- a/spring-modulith-actuator/pom.xml +++ b/spring-modulith-actuator/pom.xml @@ -4,7 +4,7 @@ org.springframework.modulith spring-modulith - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT Spring Modulith - Actuator diff --git a/spring-modulith-api/pom.xml b/spring-modulith-api/pom.xml index 86f56f9e..7e97b623 100644 --- a/spring-modulith-api/pom.xml +++ b/spring-modulith-api/pom.xml @@ -4,7 +4,7 @@ org.springframework.modulith spring-modulith - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT ../pom.xml diff --git a/spring-modulith-apt/pom.xml b/spring-modulith-apt/pom.xml index c83950c3..a46a4756 100644 --- a/spring-modulith-apt/pom.xml +++ b/spring-modulith-apt/pom.xml @@ -4,7 +4,7 @@ org.springframework.modulith spring-modulith - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT Spring Modulith - APT diff --git a/spring-modulith-bom/pom.xml b/spring-modulith-bom/pom.xml index e0f753df..10c5c012 100644 --- a/spring-modulith-bom/pom.xml +++ b/spring-modulith-bom/pom.xml @@ -13,7 +13,7 @@ org.springframework.modulith spring-modulith - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT ../pom.xml @@ -22,152 +22,152 @@ org.springframework.modulith spring-modulith-actuator - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT org.springframework.modulith spring-modulith-api - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT org.springframework.modulith spring-modulith-apt - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT org.springframework.modulith spring-modulith-core - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT org.springframework.modulith spring-modulith-docs - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT org.springframework.modulith spring-modulith-events-amqp - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT org.springframework.modulith spring-modulith-events-api - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT org.springframework.modulith spring-modulith-events-aws-sns - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT org.springframework.modulith spring-modulith-events-aws-sqs - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT org.springframework.modulith spring-modulith-events-core - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT org.springframework.modulith spring-modulith-events-jackson - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT org.springframework.modulith spring-modulith-events-jdbc - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT org.springframework.modulith spring-modulith-events-jms - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT org.springframework.modulith spring-modulith-events-jpa - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT org.springframework.modulith spring-modulith-events-kafka - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT org.springframework.modulith spring-modulith-events-messaging - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT org.springframework.modulith spring-modulith-events-mongodb - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT org.springframework.modulith spring-modulith-events-tests - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT org.springframework.modulith spring-modulith-junit - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT org.springframework.modulith spring-modulith-moments - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT org.springframework.modulith spring-modulith-observability - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT org.springframework.modulith spring-modulith-runtime - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT org.springframework.modulith spring-modulith-starter-core - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT org.springframework.modulith spring-modulith-starter-insight - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT org.springframework.modulith spring-modulith-starter-jdbc - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT org.springframework.modulith spring-modulith-starter-jpa - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT org.springframework.modulith spring-modulith-starter-mongodb - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT org.springframework.modulith spring-modulith-starter-neo4j - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT org.springframework.modulith spring-modulith-starter-test - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT org.springframework.modulith spring-modulith-test - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT diff --git a/spring-modulith-core/pom.xml b/spring-modulith-core/pom.xml index 2b832795..04563748 100644 --- a/spring-modulith-core/pom.xml +++ b/spring-modulith-core/pom.xml @@ -4,7 +4,7 @@ org.springframework.modulith spring-modulith - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT ../pom.xml diff --git a/spring-modulith-distribution/pom.xml b/spring-modulith-distribution/pom.xml index 756622b7..db202f64 100644 --- a/spring-modulith-distribution/pom.xml +++ b/spring-modulith-distribution/pom.xml @@ -13,7 +13,7 @@ org.springframework.modulith spring-modulith - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT ../pom.xml diff --git a/spring-modulith-docs/pom.xml b/spring-modulith-docs/pom.xml index 259d0cfe..8307bcd9 100644 --- a/spring-modulith-docs/pom.xml +++ b/spring-modulith-docs/pom.xml @@ -4,7 +4,7 @@ org.springframework.modulith spring-modulith - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT ../pom.xml diff --git a/spring-modulith-events/pom.xml b/spring-modulith-events/pom.xml index 70d54691..06fa40f2 100644 --- a/spring-modulith-events/pom.xml +++ b/spring-modulith-events/pom.xml @@ -4,7 +4,7 @@ org.springframework.modulith spring-modulith - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT ../pom.xml diff --git a/spring-modulith-events/spring-modulith-events-amqp/pom.xml b/spring-modulith-events/spring-modulith-events-amqp/pom.xml index 79a0987b..5a95b5d3 100644 --- a/spring-modulith-events/spring-modulith-events-amqp/pom.xml +++ b/spring-modulith-events/spring-modulith-events-amqp/pom.xml @@ -5,7 +5,7 @@ org.springframework.modulith spring-modulith-events - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT Spring Modulith - Events - AMQP support diff --git a/spring-modulith-events/spring-modulith-events-api/pom.xml b/spring-modulith-events/spring-modulith-events-api/pom.xml index ce05c123..f6fab4ef 100644 --- a/spring-modulith-events/spring-modulith-events-api/pom.xml +++ b/spring-modulith-events/spring-modulith-events-api/pom.xml @@ -5,7 +5,7 @@ org.springframework.modulith spring-modulith-events - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT Spring Modulith - Events - API diff --git a/spring-modulith-events/spring-modulith-events-aws-sns/pom.xml b/spring-modulith-events/spring-modulith-events-aws-sns/pom.xml index 673a72d5..7c6a9d63 100644 --- a/spring-modulith-events/spring-modulith-events-aws-sns/pom.xml +++ b/spring-modulith-events/spring-modulith-events-aws-sns/pom.xml @@ -5,7 +5,7 @@ org.springframework.modulith spring-modulith-events - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT Spring Modulith - Events - AWS SNS support diff --git a/spring-modulith-events/spring-modulith-events-aws-sqs/pom.xml b/spring-modulith-events/spring-modulith-events-aws-sqs/pom.xml index 534f751a..0e5eaad4 100644 --- a/spring-modulith-events/spring-modulith-events-aws-sqs/pom.xml +++ b/spring-modulith-events/spring-modulith-events-aws-sqs/pom.xml @@ -5,7 +5,7 @@ org.springframework.modulith spring-modulith-events - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT Spring Modulith - Events - AWS SQS support diff --git a/spring-modulith-events/spring-modulith-events-core/pom.xml b/spring-modulith-events/spring-modulith-events-core/pom.xml index 34cafd1d..0aff17b3 100644 --- a/spring-modulith-events/spring-modulith-events-core/pom.xml +++ b/spring-modulith-events/spring-modulith-events-core/pom.xml @@ -4,7 +4,7 @@ org.springframework.modulith spring-modulith-events - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT ../pom.xml diff --git a/spring-modulith-events/spring-modulith-events-jackson/pom.xml b/spring-modulith-events/spring-modulith-events-jackson/pom.xml index b2b02da3..2fdece2c 100644 --- a/spring-modulith-events/spring-modulith-events-jackson/pom.xml +++ b/spring-modulith-events/spring-modulith-events-jackson/pom.xml @@ -4,7 +4,7 @@ org.springframework.modulith spring-modulith-events - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT ../pom.xml diff --git a/spring-modulith-events/spring-modulith-events-jdbc/pom.xml b/spring-modulith-events/spring-modulith-events-jdbc/pom.xml index 86dd607a..09f3a32d 100644 --- a/spring-modulith-events/spring-modulith-events-jdbc/pom.xml +++ b/spring-modulith-events/spring-modulith-events-jdbc/pom.xml @@ -4,7 +4,7 @@ org.springframework.modulith spring-modulith-events - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT ../pom.xml diff --git a/spring-modulith-events/spring-modulith-events-jms/pom.xml b/spring-modulith-events/spring-modulith-events-jms/pom.xml index 889e2ae6..1226b0ed 100644 --- a/spring-modulith-events/spring-modulith-events-jms/pom.xml +++ b/spring-modulith-events/spring-modulith-events-jms/pom.xml @@ -5,7 +5,7 @@ org.springframework.modulith spring-modulith-events - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT Spring Modulith - Events - JMS support diff --git a/spring-modulith-events/spring-modulith-events-jpa/pom.xml b/spring-modulith-events/spring-modulith-events-jpa/pom.xml index 76adf8b8..96d7267b 100644 --- a/spring-modulith-events/spring-modulith-events-jpa/pom.xml +++ b/spring-modulith-events/spring-modulith-events-jpa/pom.xml @@ -4,7 +4,7 @@ org.springframework.modulith spring-modulith-events - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT ../pom.xml diff --git a/spring-modulith-events/spring-modulith-events-kafka/pom.xml b/spring-modulith-events/spring-modulith-events-kafka/pom.xml index b41a33ef..2248cf84 100644 --- a/spring-modulith-events/spring-modulith-events-kafka/pom.xml +++ b/spring-modulith-events/spring-modulith-events-kafka/pom.xml @@ -5,7 +5,7 @@ org.springframework.modulith spring-modulith-events - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT Spring Modulith - Events - Kafka support diff --git a/spring-modulith-events/spring-modulith-events-messaging/pom.xml b/spring-modulith-events/spring-modulith-events-messaging/pom.xml index eefa0b3d..94b54e09 100644 --- a/spring-modulith-events/spring-modulith-events-messaging/pom.xml +++ b/spring-modulith-events/spring-modulith-events-messaging/pom.xml @@ -5,7 +5,7 @@ org.springframework.modulith spring-modulith-events - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT Spring Modulith - Events - Spring Messaging support diff --git a/spring-modulith-events/spring-modulith-events-mongodb/pom.xml b/spring-modulith-events/spring-modulith-events-mongodb/pom.xml index 92965d68..31de0660 100644 --- a/spring-modulith-events/spring-modulith-events-mongodb/pom.xml +++ b/spring-modulith-events/spring-modulith-events-mongodb/pom.xml @@ -4,7 +4,7 @@ org.springframework.modulith spring-modulith-events - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT ../pom.xml diff --git a/spring-modulith-events/spring-modulith-events-neo4j/pom.xml b/spring-modulith-events/spring-modulith-events-neo4j/pom.xml index 6ddb210b..ed146d10 100644 --- a/spring-modulith-events/spring-modulith-events-neo4j/pom.xml +++ b/spring-modulith-events/spring-modulith-events-neo4j/pom.xml @@ -4,7 +4,7 @@ org.springframework.modulith spring-modulith-events - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT ../pom.xml diff --git a/spring-modulith-events/spring-modulith-events-tests/pom.xml b/spring-modulith-events/spring-modulith-events-tests/pom.xml index 6095588b..fbca49d1 100644 --- a/spring-modulith-events/spring-modulith-events-tests/pom.xml +++ b/spring-modulith-events/spring-modulith-events-tests/pom.xml @@ -3,7 +3,7 @@ org.springframework.modulith spring-modulith-events - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT Spring Modulith - Events - Integration tests diff --git a/spring-modulith-examples/pom.xml b/spring-modulith-examples/pom.xml index 723e518f..e15a2ab3 100644 --- a/spring-modulith-examples/pom.xml +++ b/spring-modulith-examples/pom.xml @@ -10,7 +10,7 @@ org.springframework.modulith spring-modulith-examples - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT pom Spring Modulith - Examples @@ -100,7 +100,7 @@ org.springframework.modulith spring-modulith-bom - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT pom import diff --git a/spring-modulith-examples/spring-modulith-example-epr-jdbc/pom.xml b/spring-modulith-examples/spring-modulith-example-epr-jdbc/pom.xml index d7147fd9..85bdacff 100644 --- a/spring-modulith-examples/spring-modulith-example-epr-jdbc/pom.xml +++ b/spring-modulith-examples/spring-modulith-example-epr-jdbc/pom.xml @@ -5,7 +5,7 @@ org.springframework.modulith spring-modulith-examples - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT ../pom.xml diff --git a/spring-modulith-examples/spring-modulith-example-epr-mongodb/pom.xml b/spring-modulith-examples/spring-modulith-example-epr-mongodb/pom.xml index 232cb613..3a47a2dc 100644 --- a/spring-modulith-examples/spring-modulith-example-epr-mongodb/pom.xml +++ b/spring-modulith-examples/spring-modulith-example-epr-mongodb/pom.xml @@ -5,7 +5,7 @@ org.springframework.modulith spring-modulith-examples - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT ../pom.xml diff --git a/spring-modulith-examples/spring-modulith-example-epr-neo4j/pom.xml b/spring-modulith-examples/spring-modulith-example-epr-neo4j/pom.xml index e1e5f49b..0061a5aa 100644 --- a/spring-modulith-examples/spring-modulith-example-epr-neo4j/pom.xml +++ b/spring-modulith-examples/spring-modulith-example-epr-neo4j/pom.xml @@ -5,7 +5,7 @@ org.springframework.modulith spring-modulith-examples - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT ../pom.xml diff --git a/spring-modulith-examples/spring-modulith-example-full/pom.xml b/spring-modulith-examples/spring-modulith-example-full/pom.xml index b9285d0f..ce8715d5 100644 --- a/spring-modulith-examples/spring-modulith-example-full/pom.xml +++ b/spring-modulith-examples/spring-modulith-example-full/pom.xml @@ -5,7 +5,7 @@ org.springframework.modulith spring-modulith-examples - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT ../pom.xml diff --git a/spring-modulith-examples/spring-modulith-example-kafka/pom.xml b/spring-modulith-examples/spring-modulith-example-kafka/pom.xml index c43cbc30..51ecc1be 100644 --- a/spring-modulith-examples/spring-modulith-example-kafka/pom.xml +++ b/spring-modulith-examples/spring-modulith-example-kafka/pom.xml @@ -4,7 +4,7 @@ org.springframework.modulith spring-modulith-examples - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT Spring Modulith - Examples - Kafka Example diff --git a/spring-modulith-integration-test/pom.xml b/spring-modulith-integration-test/pom.xml index 2b1eefb3..816646c4 100644 --- a/spring-modulith-integration-test/pom.xml +++ b/spring-modulith-integration-test/pom.xml @@ -4,7 +4,7 @@ org.springframework.modulith spring-modulith - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT ../pom.xml diff --git a/spring-modulith-junit/pom.xml b/spring-modulith-junit/pom.xml index 23ae8949..e05e23ab 100644 --- a/spring-modulith-junit/pom.xml +++ b/spring-modulith-junit/pom.xml @@ -4,7 +4,7 @@ org.springframework.modulith spring-modulith - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT ../pom.xml diff --git a/spring-modulith-moments/pom.xml b/spring-modulith-moments/pom.xml index fd801e36..b618e593 100644 --- a/spring-modulith-moments/pom.xml +++ b/spring-modulith-moments/pom.xml @@ -4,7 +4,7 @@ org.springframework.modulith spring-modulith - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT Spring Modulith - Moments diff --git a/spring-modulith-observability/pom.xml b/spring-modulith-observability/pom.xml index 89e485e5..90d3d9b1 100644 --- a/spring-modulith-observability/pom.xml +++ b/spring-modulith-observability/pom.xml @@ -4,7 +4,7 @@ org.springframework.modulith spring-modulith - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT spring-modulith-observability @@ -83,12 +83,6 @@ true - - io.opentelemetry - opentelemetry-api - true - - diff --git a/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/LocalServiceRenamingSpanFilter.java b/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/LocalServiceRenamingSpanFilter.java deleted file mode 100644 index 919536e6..00000000 --- a/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/LocalServiceRenamingSpanFilter.java +++ /dev/null @@ -1,24 +0,0 @@ -package org.springframework.modulith.observability; - -import io.micrometer.tracing.exporter.FinishedSpan; -import io.micrometer.tracing.exporter.SpanFilter; - -/** - * {@link SpanFilter} that sets a local service name according - * to the current module's name. - * - * @author Marcin Grzejszczak - * @since 1.3 - */ -public class LocalServiceRenamingSpanFilter implements SpanFilter { - - @Override - public FinishedSpan map(FinishedSpan span) { - String moduleKey = span.getTags().get(ModulithObservations.LowKeys.MODULE_KEY.asString()); - if (moduleKey != null) { - // Wait for tracing 1.5.0 - span.setLocalServiceName(moduleKey); - } - return span; - } -} diff --git a/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/autoconfigure/ModuleObservabilityAutoConfiguration.java b/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/autoconfigure/ModuleObservabilityAutoConfiguration.java index bf453db6..f15f00e5 100644 --- a/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/autoconfigure/ModuleObservabilityAutoConfiguration.java +++ b/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/autoconfigure/ModuleObservabilityAutoConfiguration.java @@ -15,11 +15,12 @@ */ package org.springframework.modulith.observability.autoconfigure; -import io.micrometer.common.KeyValue; +import brave.handler.MutableSpan; +import brave.handler.SpanHandler; +import brave.propagation.TraceContext; import io.micrometer.observation.ObservationFilter; import io.micrometer.observation.ObservationRegistry; import io.micrometer.tracing.Tracer; -import io.micrometer.tracing.exporter.SpanFilter; import org.springframework.beans.factory.ObjectProvider; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; @@ -33,7 +34,6 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.env.Environment; import org.springframework.core.task.support.ContextPropagatingTaskDecorator; -import org.springframework.modulith.observability.LocalServiceRenamingSpanFilter; import org.springframework.modulith.observability.ModuleEventListener; import org.springframework.modulith.observability.ModuleObservabilityBeanPostProcessor; import org.springframework.modulith.observability.ModulePassingObservationFilter; @@ -77,13 +77,25 @@ class ModuleObservabilityAutoConfiguration { } @Configuration(proxyBeanMethods = false) - @ConditionalOnClass(Tracer.class) - static class MicrometerTracingConfiguration { - + @ConditionalOnClass(SpanHandler.class) + static class BraveConfiguration { + /** + * Corresponds to {@link ModulithObservations.LowKeys#MODULE_KEY} + */ + private static final String MODULE_KEY_TAG_NAME = "module.key"; @Bean - SpanFilter localSpanFilter() { - return new LocalServiceRenamingSpanFilter(); + SpanHandler localServiceNameRenamingSpanHandler() { + return new SpanHandler() { + @Override public boolean end(TraceContext context, MutableSpan span, Cause cause) { + String tag = span.tag(MODULE_KEY_TAG_NAME); + if (tag != null) { + span.localServiceName(tag); + } + return super.end(context, span, cause); + } + }; } } + } diff --git a/spring-modulith-observability/src/test/java/org/springframework/modulith/observability/ModuleTracingBeanPostProcessorIntegrationTests.java b/spring-modulith-observability/src/test/java/org/springframework/modulith/observability/ModuleObservabilityBeanPostProcessorIntegrationTests.java similarity index 92% rename from spring-modulith-observability/src/test/java/org/springframework/modulith/observability/ModuleTracingBeanPostProcessorIntegrationTests.java rename to spring-modulith-observability/src/test/java/org/springframework/modulith/observability/ModuleObservabilityBeanPostProcessorIntegrationTests.java index e57dda43..bc94420b 100644 --- a/spring-modulith-observability/src/test/java/org/springframework/modulith/observability/ModuleTracingBeanPostProcessorIntegrationTests.java +++ b/spring-modulith-observability/src/test/java/org/springframework/modulith/observability/ModuleObservabilityBeanPostProcessorIntegrationTests.java @@ -39,13 +39,13 @@ import org.springframework.scheduling.annotation.AsyncAnnotationAdvisor; * * @author Oliver Drotbohm */ -class ModuleTracingBeanPostProcessorIntegrationTests { +class ModuleObservabilityBeanPostProcessorIntegrationTests { @Test void decoratesExposedComponentsWithTracingInterceptor() { SampleComponent bean = SpringApplication - .run(new Class[] { ExampleApplication.class, ModuleTracingConfiguration.class }, new String[] {}) + .run(new Class[] { ExampleApplication.class, ModuleObservabilityConfiguration.class }, new String[] {}) .getBean(SampleComponent.class); assertThat(bean).isInstanceOfSatisfying(Advised.class, it -> { @@ -60,7 +60,7 @@ class ModuleTracingBeanPostProcessorIntegrationTests { } @Configuration - static class ModuleTracingConfiguration { + static class ModuleObservabilityConfiguration { @Bean ModuleObservabilityBeanPostProcessor foo(ConfigurableApplicationContext context) { diff --git a/spring-modulith-observability/src/test/java/org/springframework/modulith/observability/ModuleTracingBeanPostProcessorUnitTests.java b/spring-modulith-observability/src/test/java/org/springframework/modulith/observability/ModuleObservabilityBeanPostProcessorUnitTests.java similarity index 97% rename from spring-modulith-observability/src/test/java/org/springframework/modulith/observability/ModuleTracingBeanPostProcessorUnitTests.java rename to spring-modulith-observability/src/test/java/org/springframework/modulith/observability/ModuleObservabilityBeanPostProcessorUnitTests.java index e8da23b3..7853688c 100644 --- a/spring-modulith-observability/src/test/java/org/springframework/modulith/observability/ModuleTracingBeanPostProcessorUnitTests.java +++ b/spring-modulith-observability/src/test/java/org/springframework/modulith/observability/ModuleObservabilityBeanPostProcessorUnitTests.java @@ -32,7 +32,7 @@ import org.springframework.modulith.runtime.ApplicationModulesRuntime; * * @author Oliver Drotbohm */ -class ModuleTracingBeanPostProcessorUnitTests { +class ModuleObservabilityBeanPostProcessorUnitTests { @Test // GH-498 void doesNotProxyConfiguationProperties() { diff --git a/spring-modulith-runtime/pom.xml b/spring-modulith-runtime/pom.xml index 225c8c1e..ad18c573 100644 --- a/spring-modulith-runtime/pom.xml +++ b/spring-modulith-runtime/pom.xml @@ -4,7 +4,7 @@ org.springframework.modulith spring-modulith - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT Spring Modulith - Runtime support diff --git a/spring-modulith-starters/pom.xml b/spring-modulith-starters/pom.xml index 42f1a68e..8a60c218 100644 --- a/spring-modulith-starters/pom.xml +++ b/spring-modulith-starters/pom.xml @@ -4,7 +4,7 @@ org.springframework.modulith spring-modulith - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT ../pom.xml diff --git a/spring-modulith-starters/spring-modulith-starter-core/pom.xml b/spring-modulith-starters/spring-modulith-starter-core/pom.xml index e035fad7..7a4c30c5 100644 --- a/spring-modulith-starters/spring-modulith-starter-core/pom.xml +++ b/spring-modulith-starters/spring-modulith-starter-core/pom.xml @@ -5,7 +5,7 @@ org.springframework.modulith spring-modulith-starters - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT ../pom.xml @@ -21,26 +21,26 @@ org.springframework.modulith spring-modulith-api - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT org.springframework.modulith spring-modulith-apt - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT org.springframework.modulith spring-modulith-core - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT runtime org.springframework.modulith spring-modulith-moments - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT diff --git a/spring-modulith-starters/spring-modulith-starter-insight/pom.xml b/spring-modulith-starters/spring-modulith-starter-insight/pom.xml index 44c13280..40b5f747 100644 --- a/spring-modulith-starters/spring-modulith-starter-insight/pom.xml +++ b/spring-modulith-starters/spring-modulith-starter-insight/pom.xml @@ -5,7 +5,7 @@ org.springframework.modulith spring-modulith-starters - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT ../pom.xml @@ -21,14 +21,14 @@ org.springframework.modulith spring-modulith-actuator - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT runtime org.springframework.modulith spring-modulith-observability - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT runtime diff --git a/spring-modulith-starters/spring-modulith-starter-jdbc/pom.xml b/spring-modulith-starters/spring-modulith-starter-jdbc/pom.xml index d8e22e04..2f392c8a 100644 --- a/spring-modulith-starters/spring-modulith-starter-jdbc/pom.xml +++ b/spring-modulith-starters/spring-modulith-starter-jdbc/pom.xml @@ -5,7 +5,7 @@ org.springframework.modulith spring-modulith-starters - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT ../pom.xml @@ -21,7 +21,7 @@ org.springframework.modulith spring-modulith-starter-core - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT @@ -29,24 +29,24 @@ org.springframework.modulith spring-modulith-events-api - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT org.springframework.modulith spring-modulith-events-core - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT runtime org.springframework.modulith spring-modulith-events-jackson - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT runtime org.springframework.modulith spring-modulith-events-jdbc - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT runtime diff --git a/spring-modulith-starters/spring-modulith-starter-jpa/pom.xml b/spring-modulith-starters/spring-modulith-starter-jpa/pom.xml index 16cafcbd..679fd3d3 100644 --- a/spring-modulith-starters/spring-modulith-starter-jpa/pom.xml +++ b/spring-modulith-starters/spring-modulith-starter-jpa/pom.xml @@ -5,7 +5,7 @@ org.springframework.modulith spring-modulith-starters - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT ../pom.xml @@ -21,7 +21,7 @@ org.springframework.modulith spring-modulith-starter-core - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT @@ -29,24 +29,24 @@ org.springframework.modulith spring-modulith-events-api - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT org.springframework.modulith spring-modulith-events-core - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT runtime org.springframework.modulith spring-modulith-events-jackson - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT runtime org.springframework.modulith spring-modulith-events-jpa - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT runtime diff --git a/spring-modulith-starters/spring-modulith-starter-mongodb/pom.xml b/spring-modulith-starters/spring-modulith-starter-mongodb/pom.xml index aa0be512..6c424e09 100644 --- a/spring-modulith-starters/spring-modulith-starter-mongodb/pom.xml +++ b/spring-modulith-starters/spring-modulith-starter-mongodb/pom.xml @@ -5,7 +5,7 @@ org.springframework.modulith spring-modulith-starters - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT ../pom.xml @@ -21,31 +21,31 @@ org.springframework.modulith spring-modulith-starter-core - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT org.springframework.modulith spring-modulith-events-api - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT org.springframework.modulith spring-modulith-events-core - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT runtime org.springframework.modulith spring-modulith-events-jackson - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT runtime org.springframework.modulith spring-modulith-events-mongodb - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT runtime diff --git a/spring-modulith-starters/spring-modulith-starter-neo4j/pom.xml b/spring-modulith-starters/spring-modulith-starter-neo4j/pom.xml index 68ac8d2f..e0132a88 100644 --- a/spring-modulith-starters/spring-modulith-starter-neo4j/pom.xml +++ b/spring-modulith-starters/spring-modulith-starter-neo4j/pom.xml @@ -5,7 +5,7 @@ org.springframework.modulith spring-modulith-starters - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT ../pom.xml @@ -21,7 +21,7 @@ org.springframework.modulith spring-modulith-starter-core - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT @@ -29,24 +29,24 @@ org.springframework.modulith spring-modulith-events-api - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT org.springframework.modulith spring-modulith-events-core - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT runtime org.springframework.modulith spring-modulith-events-jackson - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT runtime org.springframework.modulith spring-modulith-events-neo4j - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT runtime diff --git a/spring-modulith-starters/spring-modulith-starter-test/pom.xml b/spring-modulith-starters/spring-modulith-starter-test/pom.xml index 25120ef0..42404380 100644 --- a/spring-modulith-starters/spring-modulith-starter-test/pom.xml +++ b/spring-modulith-starters/spring-modulith-starter-test/pom.xml @@ -4,7 +4,7 @@ org.springframework.modulith spring-modulith-starters - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT ../pom.xml @@ -25,13 +25,13 @@ org.springframework.modulith spring-modulith-test - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT org.springframework.modulith spring-modulith-docs - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT diff --git a/spring-modulith-test/pom.xml b/spring-modulith-test/pom.xml index b56c77ac..2676e8ca 100644 --- a/spring-modulith-test/pom.xml +++ b/spring-modulith-test/pom.xml @@ -4,7 +4,7 @@ org.springframework.modulith spring-modulith - 1.3.0-SNAPSHOT + 1.4.0-GH-927-SNAPSHOT ../pom.xml