BAEL-8140: undo micrometer changes

Author: etrandafir93

spring-boot-modules/spring-boot-3-observation/src/main/java/com/baeldung/micrometer/tags/Application.java

@@ -3,21 +3,14 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.Bean;
-import org.springframework.expression.Expression;
-import org.springframework.expression.ExpressionParser;
-import org.springframework.expression.spel.SpelParserConfiguration;
-import org.springframework.expression.spel.standard.SpelExpressionParser;
-import org.springframework.expression.spel.support.SimpleEvaluationContext;
-import org.springframework.expression.spel.support.StandardEvaluationContext;
 
-import io.micrometer.common.annotation.ValueExpressionResolver;
 import io.micrometer.core.aop.CountedAspect;
 import io.micrometer.core.aop.CountedMeterTagAnnotationHandler;
 import io.micrometer.core.aop.MeterTagAnnotationHandler;
 import io.micrometer.core.aop.TimedAspect;
 
 @SpringBootApplication
-public class Application {
+class Application {
 
     public static void main(String[] args) {
         SpringApplication.run(Application.class, args);
@@ -34,32 +27,10 @@ public MeterTagAnnotationHandler meterTagAnnotationHandler() {
     public CountedAspect countedAspect() {
         CountedAspect aspect = new CountedAspect();
         CountedMeterTagAnnotationHandler tagAnnotationHandler = new CountedMeterTagAnnotationHandler(
-            aClass -> o -> new SpelValueExpressionResolver().resolve(o.toString(), null),
-            aClass -> new SpelValueExpressionResolver());
+            aClass -> Object::toString,
+            aClass -> (exp, param) -> "");
         aspect.setMeterTagAnnotationHandler(tagAnnotationHandler);
         return aspect;
     }
 
-    public static class SpelValueExpressionResolver implements ValueExpressionResolver {
-
-        @Override
-        public String resolve(String expression, Object parameter) {
-            try {
-                SpelParserConfiguration config = new SpelParserConfiguration(true, true);
-                StandardEvaluationContext context = new StandardEvaluationContext(parameter);
-
-                ExpressionParser expressionParser = new SpelExpressionParser(config);
-                return expressionParser.parseExpression(expression)
-                    .getValue(context, String.class);
-
-                //                ExpressionParser expressionParser = new SpelExpressionParser();
-//                Expression expressionToEvaluate = expressionParser.parseExpression(expression);
-//                return expressionToEvaluate.getValue(parameter, String.class);
-            }
-            catch (Exception ex) {
-                ex.printStackTrace(); // todo: proper logging
-            }
-            return String.valueOf(parameter);
-        }
-    }
 }

spring-boot-modules/spring-boot-3-observation/src/main/java/com/baeldung/micrometer/tags/dummy/DummyService.java

@@ -1,18 +1,14 @@
 package com.baeldung.micrometer.tags.dummy;
 
-import java.math.BigDecimal;
 import java.util.concurrent.ThreadLocalRandom;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
-import com.baeldung.micrometer.tags.Application;
-
 import io.micrometer.core.annotation.Counted;
 import io.micrometer.core.annotation.Timed;
 import io.micrometer.core.aop.MeterTag;
-import io.micrometer.core.aop.MeterTags;
 import io.micrometer.core.instrument.Counter;
 import io.micrometer.core.instrument.Meter;
 import io.micrometer.core.instrument.MeterRegistry;
@@ -69,23 +65,6 @@ public String buzz(@MeterTag("device.type") String device) {
         return invokeSomeLogic();
     }
 
-    @Counted(value = "fizz")
-    public String fizz(
-        @MeterTag(key = "id", expression = "#order.id")
-        @MeterTag(key = "other.id", expression = "#order.otherOrder.id")
-        @MeterTag(key = "math", expression = "20 - 1")
-        @MeterTag(key = "total", expression = "#order.total")
-        @MeterTag(key = "other.total", expression = "#order.otherOrder.total")
-        @MeterTag(key = "total.group", expression = "#order.total > 50 ? 'high' : 'low'")
-        Order order
-    ) {
-        log.info("fizz({})", order);
-        return invokeSomeLogic();
-    }
-
-    public record Order(int id, int total, Order otherOrder) {
-    }
-
     private String invokeSomeLogic() {
         long sleepMs = ThreadLocalRandom.current()
             .nextInt(0, 100);

spring-boot-modules/spring-boot-3-observation/src/main/java/com/baeldung/micrometer/tags/dummy/DummyStartupListener.java

@@ -1,15 +1,12 @@
 package com.baeldung.micrometer.tags.dummy;
 
 import java.util.List;
-import java.util.concurrent.ThreadLocalRandom;
 import java.util.stream.IntStream;
 
 import org.springframework.boot.context.event.ApplicationReadyEvent;
 import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Component;
 
-import com.baeldung.micrometer.tags.dummy.DummyService.Order;
-
 @Component
 class DummyStartupListener {
 
@@ -27,17 +24,9 @@ void sendRequests() {
                 service.foo(deviceType);
                 service.bar(deviceType);
                 service.buzz(deviceType);
-                service.fizz(
-                    new Order(randomInt(), randomInt(),
-                        new Order(randomInt(), randomInt(), null)));
             });
     }
 
-    int randomInt() {
-        return ThreadLocalRandom.current()
-            .nextInt(1, 100);
-    }
-
     DummyStartupListener(DummyService service) {
         this.service = service;
     }