Migrate aspectjweaver from 1.9.20.1 to 1.9.23 (#6064)

AspectJ 1.9.23 introduced support for Java 23 through upgrading
the Eclipse JDT compiler. Unfortunately, the Eclipse JDT compiler
dropped support for Java version under Java 17 and since we have builds
using versions lower than 17, we need to work around this:

1. We cannot use versions under Java 17 for compiling with ajc
so this is disabled for those builds. Artifacts are built using Java 17+
so this is not a problem for them.

2. Since we have binary compatibility checks (japicmp), we need to
disable them for the AspectJ created fields and methods for builds using
Java versions lower than 17.

3. In micrometer-test-aspectj-ctw, we cannot test
Compile-Time Weaving (CTW) using Java versions lower than 17 as we did
before the version upgrade since we cannot compile those classes with
ajc anymore on these Java versions. Instead, we can use the latest
Micrometer SNAPSHOT (built with Java 17+) and the latest AspectJ
that supports Java versions before 17 (1.9.20.1 as of today).

See gh-6022

Author: jonatan-ivanov

gradle/libs.versions.toml

@@ -3,8 +3,7 @@ activemq-artemis = "2.40.0"
 application-insights = "2.6.4"
 archunit = "1.4.0"
 asmForPlugins = "7.3.1"
-# 1.9.20.1 is the last release that accepts jdk 11 for building
-aspectjweaver = "1.9.20.1"
+aspectjweaver = "1.9.23"
 assertj = "3.27.3"
 awaitility = "4.3.0"
 caffeine = "2.9.3"

micrometer-core/build.gradle

@@ -1,9 +1,32 @@
 plugins {
     alias(libs.plugins.kotlin19)
-    alias(libs.plugins.aspectj)
+    alias(libs.plugins.aspectj) apply false
     id 'me.champeau.mrjar' version "0.1.1"
 }
 
+if (javaLanguageVersion.canCompileOrRun(17)) {
+    apply plugin: 'io.freefair.aspectj.post-compile-weaving'
+}
+else {
+    // ignore ajc generated code from japicmp comparison for < Java 17 builds
+    project.tasks.japicmp {
+        fieldExcludes.addAll([
+            'io.micrometer.core.aop.CountedAspect#ajc$perSingletonInstance',
+            'io.micrometer.core.aop.TimedAspect#ajc$perSingletonInstance'
+        ])
+        methodExcludes.addAll([
+            'io.micrometer.core.aop.CountedAspect#ajc$inlineAccessFieldGet$io_micrometer_core_aop_CountedAspect$io_micrometer_core_aop_CountedAspect$shouldSkip(io.micrometer.core.aop.CountedAspect)',
+            'io.micrometer.core.aop.CountedAspect#ajc$inlineAccessMethod$io_micrometer_core_aop_CountedAspect$io_micrometer_core_aop_CountedAspect$perform(io.micrometer.core.aop.CountedAspect, org.aspectj.lang.ProceedingJoinPoint, io.micrometer.core.annotation.Counted)',
+            'io.micrometer.core.aop.CountedAspect#aspectOf()',
+            'io.micrometer.core.aop.CountedAspect#hasAspect()',
+            'io.micrometer.core.aop.TimedAspect#ajc$inlineAccessFieldGet$io_micrometer_core_aop_TimedAspect$io_micrometer_core_aop_TimedAspect$shouldSkip(io.micrometer.core.aop.TimedAspect)',
+            'io.micrometer.core.aop.TimedAspect#ajc$inlineAccessMethod$io_micrometer_core_aop_TimedAspect$io_micrometer_core_aop_TimedAspect$perform(io.micrometer.core.aop.TimedAspect, org.aspectj.lang.ProceedingJoinPoint, io.micrometer.core.annotation.Timed, java.lang.reflect.Method)',
+            'io.micrometer.core.aop.TimedAspect#aspectOf()',
+            'io.micrometer.core.aop.TimedAspect#hasAspect()'
+        ])
+    }
+}
+
 description 'Core module of Micrometer containing instrumentation API and implementation'
 
 multiRelease {

micrometer-observation/build.gradle

@@ -1,5 +1,25 @@
 plugins {
-    alias(libs.plugins.aspectj)
+    alias(libs.plugins.aspectj) apply false
+}
+
+if (javaLanguageVersion.canCompileOrRun(17)) {
+    apply plugin: 'io.freefair.aspectj.post-compile-weaving'
+}
+else {
+    // ignore ajc generated code from japicmp comparison for < Java 17 builds
+    project.tasks.japicmp {
+        fieldExcludes.addAll([
+            'io.micrometer.observation.aop.ObservedAspect#ajc$perSingletonInstance'
+        ])
+        methodExcludes.addAll([
+            'io.micrometer.observation.aop.ObservedAspect#ajc$inlineAccessFieldGet$io_micrometer_observation_aop_ObservedAspect$io_micrometer_observation_aop_ObservedAspect$shouldSkip(io.micrometer.observation.aop.ObservedAspect)',
+            'io.micrometer.observation.aop.ObservedAspect#ajc$inlineAccessMethod$io_micrometer_observation_aop_ObservedAspect$io_micrometer_observation_aop_ObservedAspect$getDeclaringClass(io.micrometer.observation.aop.ObservedAspect, org.aspectj.lang.ProceedingJoinPoint)',
+            'io.micrometer.observation.aop.ObservedAspect#ajc$inlineAccessMethod$io_micrometer_observation_aop_ObservedAspect$io_micrometer_observation_aop_ObservedAspect$getMethod(io.micrometer.observation.aop.ObservedAspect, org.aspectj.lang.ProceedingJoinPoint)',
+            'io.micrometer.observation.aop.ObservedAspect#ajc$inlineAccessMethod$io_micrometer_observation_aop_ObservedAspect$io_micrometer_observation_aop_ObservedAspect$observe(io.micrometer.observation.aop.ObservedAspect, org.aspectj.lang.ProceedingJoinPoint, java.lang.reflect.Method, io.micrometer.observation.annotation.Observed)',
+            'io.micrometer.observation.aop.ObservedAspect#aspectOf()',
+            'io.micrometer.observation.aop.ObservedAspect#hasAspect()'
+        ])
+    }
 }
 
 description 'Module containing Observation related code'

micrometer-test-aspectj-ctw/build.gradle

@@ -5,10 +5,23 @@ plugins {
 
 description 'AspectJ compile-time weaving test for Micrometer aspects'
 
+if (!javaLanguageVersion.canCompileOrRun(17)) {
+    repositories {
+        maven { url 'https://repo.spring.io/snapshot' }
+    }
+}
+
 dependencies {
-    aspect project(':micrometer-core')
-    aspect project(':micrometer-observation')
-    implementation libs.aspectjrt
+    if (javaLanguageVersion.canCompileOrRun(17)) {
+        aspect project(':micrometer-core')
+        implementation libs.aspectjrt
+    }
+    else {
+        // Use the latest Micrometer SNAPSHOT (built with Java 17+)
+        // and the latest AspectJ that supports Java versions before 17
+        aspect 'io.micrometer:micrometer-core:latest.integration'
+        implementation 'org.aspectj:aspectjrt:1.9.20.1'
+    }
 
     testImplementation libs.assertj
 }

micrometer-test-aspectj-ctw/src/test/java/io/micrometer/test/ctw/MeasuredClassTest.java

@@ -25,6 +25,7 @@
 import io.micrometer.observation.ObservationRegistry;
 import io.micrometer.observation.Observations;
 import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -40,6 +41,11 @@ class MeasuredClassTest {
 
     MeasuredClass measured = new MeasuredClass();
 
+    @BeforeAll
+    static void setUpClass() {
+        System.out.println("java.version: " + System.getProperty("java.version"));
+    }
+
     @BeforeEach
     void setUp() {
         observationRegistry.observationConfig().observationHandler(new DefaultMeterObservationHandler(registry));