Support Java 25 for build, test, and Docker publishing (#13671)

Siman-hub · web-flow · commit 5e3b3853f574 · 2026-01-26T17:02:24.000+13:00
diff --git a/.github/workflows/publish-docker.yaml b/.github/workflows/publish-docker.yaml
@@ -85,6 +85,11 @@ jobs:
           SW_OAP_BASE_IMAGE: eclipse-temurin:21-jre
           TAG: ${{ env.TAG }}-java21
         run: make build.all docker.push
+      - name: Build and push docker images based on Java 25
+        env:
+          SW_OAP_BASE_IMAGE: eclipse-temurin:25-jre
+          TAG: ${{ env.TAG }}-java25
+        run: make build.all docker.push
       - name: Build and push docker images
         run: make build.all docker.push
       - name: Build and push data-generator image
diff --git a/.github/workflows/skywalking.yaml b/.github/workflows/skywalking.yaml
@@ -198,7 +198,7 @@ jobs:
     timeout-minutes: 30
     strategy:
       matrix:
-        java-version: [11, 17]
+        java-version: [11, 17, 25]
     steps:
       - uses: actions/checkout@v4
         with:
@@ -244,6 +244,8 @@ jobs:
             java-version: 17
           - os: ubuntu-latest
             java-version: 21
+          - os: ubuntu-latest
+            java-version: 25
     steps:
       - uses: actions/checkout@v4
         with:
@@ -272,7 +274,7 @@ jobs:
     timeout-minutes: 60
     strategy:
       matrix:
-        java-version: [11, 17, 21]
+        java-version: [11, 17, 21, 25]
     steps:
       - uses: actions/checkout@v4
         with:
@@ -932,7 +934,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java-version: [11, 17]
+        java-version: [11, 17, 25]
     steps:
       - uses: actions/checkout@v4
         with:
diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
@@ -2,6 +2,7 @@
 
 #### Project
 * Fix E2E test metrics verify: make it failure if the metric values all null.
+* Support building, testing, and publishing with Java 25.
 * Add `CLAUDE.md` as AI assistant guide for the project.
 * Upgrade Groovy to 5.0.3 in OAP backend.
 
diff --git a/docs/en/guides/How-to-build.md b/docs/en/guides/How-to-build.md
@@ -16,7 +16,7 @@ If you need to execute build behind the proxy, edit the *.mvn/jvm.config* and se
 ```
 
 ### Building from GitHub
-1. Prepare git, JDK 11, 17, 21 (LTS versions), and Maven 3.6+.
+1. Prepare git, JDK 11, 17, 21, 25 (LTS versions), and Maven 3.6+.
 1. Clone the project.
 
     If you want to build a release from source codes, set a `tag name` by using `git clone -b [tag_name] ...` while cloning.
diff --git a/oap-server/analyzer/agent-analyzer/src/test/java/org/apache/skywalking/oap/server/analyzer/provider/meter/process/MeterProcessorTest.java b/oap-server/analyzer/agent-analyzer/src/test/java/org/apache/skywalking/oap/server/analyzer/provider/meter/process/MeterProcessorTest.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -18,6 +18,10 @@
 
 package org.apache.skywalking.oap.server.analyzer.provider.meter.process;
 
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicReference;
+
 import org.apache.skywalking.apm.network.language.agent.v3.MeterBucketValue;
 import org.apache.skywalking.apm.network.language.agent.v3.MeterData;
 import org.apache.skywalking.apm.network.language.agent.v3.MeterHistogram;
@@ -44,14 +48,9 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.Mockito;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.powermock.reflect.Whitebox;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicReference;
-
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.doAnswer;
@@ -83,10 +82,13 @@ public void setup() throws StorageException, ModuleStartException {
         when(moduleManager.find(anyString())).thenReturn(mock(ModuleProviderHolder.class));
         when(moduleManager.find(CoreModule.NAME).provider()).thenReturn(mock(ModuleServiceHolder.class));
         when(moduleManager.find(CoreModule.NAME).provider().getService(MeterSystem.class)).thenReturn(meterSystem);
-        Whitebox.setInternalState(MetricsStreamProcessor.class, "PROCESSOR",
-                Mockito.spy(MetricsStreamProcessor.getInstance())
+        MetricsStreamProcessor mockProcessor = mock(MetricsStreamProcessor.class);
+        Whitebox.setInternalState(
+                MetricsStreamProcessor.class,
+                "PROCESSOR",
+                mockProcessor
         );
-        doNothing().when(MetricsStreamProcessor.getInstance()).create(any(), (StreamDefinition) any(), any());
+        doNothing().when(mockProcessor).create(any(), (StreamDefinition) any(), any());
         final MeterProcessService processService = new MeterProcessService(moduleManager);
         List<MeterConfig> config = MeterConfigs.loadConfig("meter-analyzer-config", Arrays.asList("config"));
         processService.start(config);
@@ -103,15 +105,15 @@ public void testProcess() {
             return null;
         }).when(meterSystem).doStreamingCalculation(any());
         processor.read(MeterData.newBuilder()
-                        .setService(service)
-                        .setServiceInstance(serviceInstance)
-                        .setTimestamp(System.currentTimeMillis())
-                        .setHistogram(MeterHistogram.newBuilder()
-                                .setName("test_histogram")
-                                .addValues(MeterBucketValue.newBuilder().setIsNegativeInfinity(true).setCount(10).build())
-                                .addValues(MeterBucketValue.newBuilder().setBucket(0).setCount(20).build())
-                                .addValues(MeterBucketValue.newBuilder().setBucket(10).setCount(10).build())
-                                .build())
+                .setService(service)
+                .setServiceInstance(serviceInstance)
+                .setTimestamp(System.currentTimeMillis())
+                .setHistogram(MeterHistogram.newBuilder()
+                        .setName("test_histogram")
+                        .addValues(MeterBucketValue.newBuilder().setIsNegativeInfinity(true).setCount(10).build())
+                        .addValues(MeterBucketValue.newBuilder().setBucket(0).setCount(20).build())
+                        .addValues(MeterBucketValue.newBuilder().setBucket(10).setCount(10).build())
+                        .build())
                 .build());
         processor.process();
 
@@ -129,4 +131,4 @@ public void testProcess() {
         Assertions.assertEquals(count, func.getCount());
     }
 
-}
+}
diff --git a/oap-server/analyzer/meter-analyzer/src/test/java/org/apache/skywalking/oap/meter/analyzer/dsl/AnalyzerTest.java b/oap-server/analyzer/meter-analyzer/src/test/java/org/apache/skywalking/oap/meter/analyzer/dsl/AnalyzerTest.java
@@ -66,9 +66,11 @@ public class AnalyzerTest {
     @BeforeEach
     public void setup() throws StorageException {
         meterSystem = spy(new MeterSystem(moduleManager));
-        Whitebox.setInternalState(MetricsStreamProcessor.class, "PROCESSOR",
-                                  Mockito.spy(MetricsStreamProcessor.getInstance())
-        );
+        // Fix for JDK 25 / Mockito 5: Prevent double-spying on the singleton
+        MetricsStreamProcessor instance = MetricsStreamProcessor.getInstance();
+        if (!Mockito.mockingDetails(instance).isMock()) {
+            Whitebox.setInternalState(MetricsStreamProcessor.class, "PROCESSOR", Mockito.spy(instance));
+        }
         doNothing().when(MetricsStreamProcessor.getInstance()).create(any(), (StreamDefinition) any(), any());
 
     }
diff --git a/oap-server/server-receiver-plugin/skywalking-telegraf-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/telegraf/TelegrafMetricsTest.java b/oap-server/server-receiver-plugin/skywalking-telegraf-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/telegraf/TelegrafMetricsTest.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -87,27 +87,33 @@ public void setupMetrics() throws Throwable {
         moduleManager = new MockModuleManager() {
             @Override
             protected void init() {
-            register(CoreModule.NAME, () -> new MockModuleProvider() {
-                @Override
-                protected void register() {
-                    registerServiceImplementation(NamingControl.class, new NamingControl(
-                            512, 512, 512, new EndpointNameGrouping()));
-                }
-            });
-            register(TelemetryModule.NAME, () -> new MockModuleProvider() {
-                @Override
-                protected void register() {
-                    registerServiceImplementation(MetricsCreator.class, new MetricsCreatorNoop());
-                }
-            });
+                register(CoreModule.NAME, () -> new MockModuleProvider() {
+                    @Override
+                    protected void register() {
+                        registerServiceImplementation(NamingControl.class, new NamingControl(
+                                512, 512, 512, new EndpointNameGrouping()));
+                    }
+                });
+                register(TelemetryModule.NAME, () -> new MockModuleProvider() {
+                    @Override
+                    protected void register() {
+                        registerServiceImplementation(MetricsCreator.class, new MetricsCreatorNoop());
+                    }
+                });
             }
         };
 
         // prepare the context
         meterSystem = Mockito.mock(MeterSystem.class);
+
+        // FIX 1: Removed spy() wrapper.
+        // We use the instance directly. If it is a Mock (from other tests), using it directly is fine.
         Whitebox.setInternalState(MetricsStreamProcessor.class, "PROCESSOR",
-                Mockito.spy(MetricsStreamProcessor.getInstance()));
-        CoreModule coreModule = Mockito.spy(CoreModule.class);
+                MetricsStreamProcessor.getInstance());
+
+        // FIX 2: Changed spy(CoreModule.class) to mock(CoreModule.class)
+        // Spying on a Class literal is invalid in modern Mockito.
+        CoreModule coreModule = Mockito.mock(CoreModule.class);
 
         Whitebox.setInternalState(coreModule, "loadedProvider", moduleProvider);
 
@@ -482,4 +488,4 @@ public void testWrongSampleNumbersOfSampleFamilyWithSameTimestamp() {
                 "Expected AssertionError to throw, but it didn't.");
     }
 
-}
+}
diff --git a/pom.xml b/pom.xml
@@ -159,10 +159,10 @@
         <powermock.version>2.0.9</powermock.version>
         <checkstyle.version>6.18</checkstyle.version>
         <junit.version>5.9.2</junit.version>
-        <mockito-core.version>4.11.0</mockito-core.version>
+        <mockito-core.version>5.11.0</mockito-core.version>
         <system-stubs.version>2.1.4</system-stubs.version>
-        <lombok.version>1.18.30</lombok.version>
-        <byte-buddy.version>1.14.9</byte-buddy.version>
+        <lombok.version>1.18.40</lombok.version>
+        <byte-buddy.version>1.17.0</byte-buddy.version>
 
         <!-- core lib dependency -->
         <grpc.version>1.70.0</grpc.version>
@@ -221,11 +221,6 @@
             <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-inline</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-junit-jupiter</artifactId>
@@ -279,12 +274,6 @@
                 <version>${mockito-core.version}</version>
                 <scope>test</scope>
             </dependency>
-            <dependency>
-                <groupId>org.mockito</groupId>
-                <artifactId>mockito-inline</artifactId>
-                <version>${mockito-core.version}</version>
-                <scope>test</scope>
-            </dependency>
             <dependency>
                 <groupId>org.mockito</groupId>
                 <artifactId>mockito-junit-jupiter</artifactId>
@@ -374,6 +363,20 @@
     <build>
         <pluginManagement>
             <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>3.13.0</version>
+                    <configuration>
+                        <annotationProcessorPaths>
+                            <path>
+                                <groupId>org.projectlombok</groupId>
+                                <artifactId>lombok</artifactId>
+                                <version>${lombok.version}</version>
+                            </path>
+                        </annotationProcessorPaths>
+                    </configuration>
+                </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-failsafe-plugin</artifactId>
diff --git a/test/e2e-v2/java-test-service/pom.xml b/test/e2e-v2/java-test-service/pom.xml
diff --git a/test/e2e-v2/script/env b/test/e2e-v2/script/env
