Moved Event back to Observation

micrometer-metrics · Aug 25, 2022 · c5e12fe · c5e12fe
1 parent ba79927
commit c5e12fe
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 11 deletions.
diff --git a/micrometer-docs-generator-commons/src/main/java/io/micrometer/docs/commons/ParsingUtils.java b/micrometer-docs-generator-commons/src/main/java/io/micrometer/docs/commons/ParsingUtils.java
@@ -71,7 +71,11 @@ public static void updateKeyValuesFromEnum(JavaEnumImpl parentEnum, JavaSource<?
             return;
         }
         JavaEnumImpl myEnum = (JavaEnumImpl) source;
-        if (!myEnum.getInterfaces().contains(requiredClass.getCanonicalName())) {
+        String name = requiredClass.getName(); // requiredClass.getCanonicalName()
+        if (name.contains("$")) {
+            name = requiredClass.getName().substring(requiredClass.getName().lastIndexOf(".") + 1).replace("$", ".");
+        }
+        if (!myEnum.getInterfaces().contains(name)) {
             return;
         }
         logger.debug("Checking [" + parentEnum.getName() + "." + myEnum.getName() + "]");

diff --git a/...enerator-metrics/src/main/java/io/micrometer/docs/metrics/MetricSearchingFileVisitor.java b/...enerator-metrics/src/main/java/io/micrometer/docs/metrics/MetricSearchingFileVisitor.java
@@ -34,7 +34,6 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import io.micrometer.common.Event;
 import io.micrometer.common.docs.KeyName;
 import io.micrometer.common.util.internal.logging.InternalLogger;
 import io.micrometer.common.util.internal.logging.InternalLoggerFactory;
@@ -240,7 +239,7 @@ else if ("overridesDefaultMetricFrom".equals(methodName)) {
                 overridesDefaultMetricFrom = ParsingUtils.readClassToEnum(methodDeclaration);
             }
             else if ("getEvents".equals(methodName)) {
-                Collection<KeyValueEntry> entries = ParsingUtils.keyValueEntries(myEnum, methodDeclaration, Event.class, "getName");
+                Collection<KeyValueEntry> entries = ParsingUtils.keyValueEntries(myEnum, methodDeclaration, Observation.Event.class, "getName");
                 Collection<MetricEntry> counters = entries.stream().map(k -> new MetricEntry(k.getName(), null, null, myEnum.getCanonicalName(), enumConstant.getName(), k.getDescription(), null, null, Meter.Type.COUNTER, new TreeSet<>(), new TreeSet<>(), null, new TreeSet<>())).collect(Collectors.toList());
                 events.addAll(counters);
             }

diff --git a/...ter-docs-generator-metrics/src/test/java/io/micrometer/docs/metrics/EventObservation.java b/...ter-docs-generator-metrics/src/test/java/io/micrometer/docs/metrics/EventObservation.java
@@ -16,7 +16,7 @@
 
 package io.micrometer.docs.metrics;
 
-import io.micrometer.common.Event;
+import io.micrometer.observation.Observation;
 import io.micrometer.observation.docs.DocumentedObservation;
 
 enum EventObservation implements DocumentedObservation {
@@ -36,15 +36,15 @@ public String getContextualName() {
         }
 
         @Override
-        public Event[] getEvents() {
+        public Observation.Event[] getEvents() {
             return Events.values();
         }
     };
 
     /**
      * Observation events.
      */
-    enum Events implements Event {
+    enum Events implements Observation.Event {
 
         /**
          * Start event.

diff --git a/...docs-generator-spans/src/main/java/io/micrometer/docs/spans/SpanSearchingFileVisitor.java b/...docs-generator-spans/src/main/java/io/micrometer/docs/spans/SpanSearchingFileVisitor.java
@@ -34,7 +34,6 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import io.micrometer.common.Event;
 import io.micrometer.common.docs.KeyName;
 import io.micrometer.common.util.internal.logging.InternalLogger;
 import io.micrometer.common.util.internal.logging.InternalLoggerFactory;
@@ -248,7 +247,7 @@ else if ("getEvents".equals(methodName)) {
                 if (methodDeclaration.getReturnType2().toString().contains("EventValue")) {
                     events.addAll(ParsingUtils.keyValueEntries(myEnum, methodDeclaration, EventValue.class));
                 } else {
-                    events.addAll(ParsingUtils.keyValueEntries(myEnum, methodDeclaration, Event.class, "getContextualName"));
+                    events.addAll(ParsingUtils.keyValueEntries(myEnum, methodDeclaration, Observation.Event.class, "getContextualName"));
                 }
             }
             else if ("getPrefix".equals(methodName)) {

diff --git a/...r-docs-generator-spans/src/test/java/io/micrometer/docs/spans/test1/EventObservation.java b/...r-docs-generator-spans/src/test/java/io/micrometer/docs/spans/test1/EventObservation.java
@@ -16,7 +16,7 @@
 
 package io.micrometer.docs.spans.test1;
 
-import io.micrometer.common.Event;
+import io.micrometer.observation.Observation;
 import io.micrometer.observation.docs.DocumentedObservation;
 
 enum EventObservation implements DocumentedObservation {
@@ -36,15 +36,15 @@ public String getContextualName() {
         }
 
         @Override
-        public Event[] getEvents() {
+        public Observation.Event[] getEvents() {
             return Events.values();
         }
     };
 
     /**
      * Observation events.
      */
-    enum Events implements Event {
+    enum Events implements Observation.Event {
 
         /**
          * Start event.