From 20f07b7936600af9604dd324788971a5be9ebf95 Mon Sep 17 00:00:00 2001 From: Oliver Drotbohm Date: Sun, 23 Feb 2025 09:48:05 +0100 Subject: [PATCH] GH-1068 - Switch to simple event type name for automatically created counters. --- .../observability/support/CrossModuleEventCounterFactory.java | 2 +- .../support/CrossModuleEventCounterFactoryUnitTests.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/support/CrossModuleEventCounterFactory.java b/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/support/CrossModuleEventCounterFactory.java index 33a7c636..752ea7e9 100644 --- a/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/support/CrossModuleEventCounterFactory.java +++ b/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/support/CrossModuleEventCounterFactory.java @@ -94,7 +94,7 @@ public class CrossModuleEventCounterFactory implements ModulithEventMetrics { private static final BiConsumer NO_OP = (event, builder) -> {}; private static final Function DEFAULT_FACTORY = event -> Counter - .builder(event.getClass().getName()); + .builder(event.getClass().getSimpleName()); public static final ModulithMetricsCustomizer DEFAULT = new ModulithMetricsCustomizer(Object.class, NO_OP); diff --git a/spring-modulith-observability/src/test/java/org/springframework/modulith/observability/support/CrossModuleEventCounterFactoryUnitTests.java b/spring-modulith-observability/src/test/java/org/springframework/modulith/observability/support/CrossModuleEventCounterFactoryUnitTests.java index aa0f3d8e..6b4f5cd7 100644 --- a/spring-modulith-observability/src/test/java/org/springframework/modulith/observability/support/CrossModuleEventCounterFactoryUnitTests.java +++ b/spring-modulith-observability/src/test/java/org/springframework/modulith/observability/support/CrossModuleEventCounterFactoryUnitTests.java @@ -25,7 +25,6 @@ import io.micrometer.core.instrument.simple.SimpleMeterRegistry; import java.util.function.Consumer; import org.junit.jupiter.api.Test; -import org.springframework.modulith.observability.support.CrossModuleEventCounterFactory; /** * Unit tests for {@link CrossModuleEventCounterFactory}. @@ -43,7 +42,7 @@ class CrossModuleEventCounterFactoryUnitTests { factory.customize(SampleEvent.class, (__, builder) -> builder.tag("key", "value")); assertCounter(new SampleEvent(), it -> { - assertThat(it.getName()).isEqualTo(SampleEvent.class.getName()); + assertThat(it.getName()).isEqualTo(SampleEvent.class.getSimpleName()); assertThat(it.getTag("key")).isNotNull(); }); }