Add ITVersion for helping management the versions in IT

oap-server/server-library/library-integration-test/pom.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You under the Apache License, Version 2.0
+  ~ (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
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>server-library</artifactId>
+        <groupId>org.apache.skywalking</groupId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>library-integration-test</artifactId>
+
+</project>

oap-server/server-library/library-integration-test/src/main/java/org/apache/skywalking/oap/server/library/it/ITVersions.java

@@ -0,0 +1,76 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (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
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.skywalking.oap.server.library.it;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * ITVersions is a utility class to read the version information from the environment file.
+ */
+public class ITVersions {
+
+    static Map<String, String> ENV = readingEnv("test", "e2e-v2", "script", "env");
+
+    // The prefix of the integration version in the environment file.
+    static final String INTERGRATION_PREFIX = "INTEGRATION_";
+
+    // Get the version from the environment file.
+    public static String get(String key) {
+        // trying to find the integration version first
+        final String integrationVal = ENV.get(INTERGRATION_PREFIX + key);
+        if (integrationVal != null && integrationVal.length() > 0) {
+            return integrationVal;
+        }
+        // if not found, return the normal version
+        return ENV.get(key);
+    }
+
+    private static Map<String, String> readingEnv(String... envFile) {
+        // Find the project root directory and get the environment file path.
+        Path envFilePath = getProjectRootDir();
+        for (String subPath : envFile) {
+            envFilePath = envFilePath.resolve(subPath);
+        }
+
+        try {
+            return Files.readAllLines(envFilePath).stream()
+                .filter(l -> !l.startsWith("#"))
+                .map(l -> l.split("=", 2))
+                .filter(l -> l.length == 2)
+                .collect(Collectors.toMap(l -> l[0], l -> l[1], (older, newer) -> newer));
+        } catch (IOException e) {
+            throw new IllegalStateException("Reading environment file error, path: " + envFile, e);
+        }
+    }
+
+    // Get the project root directory which should contain the mvnw file.
+    private static Path getProjectRootDir() {
+        Path path = Paths.get(System.getProperty("user.dir"));
+        while (!Files.exists(path.resolve("mvnw"))) {
+            path = path.getParent();
+        }
+        return path;
+    }
+
+}

oap-server/server-library/pom.xml

@@ -36,5 +36,6 @@
         <module>library-datacarrier-queue</module>
         <module>library-kubernetes-support</module>
         <module>library-async-profiler-jfr-parser</module>
+        <module>library-integration-test</module>
     </modules>
 </project>

oap-server/server-storage-plugin/storage-banyandb-plugin/pom.xml

@@ -48,5 +48,11 @@
             <groupId>org.apache.skywalking</groupId>
             <artifactId>banyandb-java-client</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.skywalking</groupId>
+            <artifactId>library-integration-test</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>

oap-server/server-storage-plugin/storage-banyandb-plugin/src/test/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/BanyanDBIT.java

@@ -50,6 +50,7 @@
 import org.apache.skywalking.oap.server.core.storage.type.Convert2Entity;
 import org.apache.skywalking.oap.server.core.storage.type.Convert2Storage;
 import org.apache.skywalking.oap.server.core.storage.type.StorageBuilder;
+import org.apache.skywalking.oap.server.library.it.ITVersions;
 import org.apache.skywalking.oap.server.library.module.ModuleManager;
 import org.apache.skywalking.oap.server.library.module.ModuleProviderHolder;
 import org.apache.skywalking.oap.server.library.module.ModuleServiceHolder;
@@ -77,7 +78,7 @@
 public class BanyanDBIT {
     private static final String REGISTRY = "ghcr.io";
     private static final String IMAGE_NAME = "apache/skywalking-banyandb";
-    private static final String TAG = "6e99ab7e8fed451d24e4d6041ec4c3db7c44f237";
+    private static final String TAG = ITVersions.get("SW_BANYANDB_COMMIT");
 
     private static final String IMAGE = REGISTRY + "/" + IMAGE_NAME + ":" + TAG;
     private static MockedStatic<DefaultScopeDefine> DEFAULT_SCOPE_DEFINE_MOCKED_STATIC;

test/e2e-v2/script/env

@@ -13,6 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+INTEGRATION_SW_BANYANDB_COMMIT=6e99ab7e8fed451d24e4d6041ec4c3db7c44f237
+
 SW_AGENT_JAVA_COMMIT=f0245864e4388a388fe7445b56b6ce7cedc94aaf
 SW_AGENT_SATELLITE_COMMIT=ea27a3f4e126a24775fe12e2aa2695bcb23d99c3
 SW_AGENT_NGINX_LUA_COMMIT=c3cee4841798a147d83b96a10914d4ac0e11d0aa