Set performance-analyzer-rca 2.0.0 baseline JDK version to JDK-21

Signed-off-by: Andriy Redko <[email protected]>

Author: reta

.github/workflows/gauntlet-tests-workflow.yml

@@ -16,7 +16,7 @@ jobs:
     strategy:
       matrix:
         java:
-          - 17
+          - 21
     steps:
     - name: Set up JDK
       uses: actions/setup-java@v1

.github/workflows/gradle.yml

@@ -14,7 +14,7 @@ jobs:
     strategy:
       matrix:
         java:
-          - 17
+          - 21
       fail-fast: false
     runs-on: [ubuntu-latest]
     name: Building RCA package

build.gradle

@@ -6,14 +6,14 @@
 buildscript {
 
     ext {
-        opensearch_version = System.getProperty("opensearch.version", "3.0.0-SNAPSHOT")
+        opensearch_version = System.getProperty("opensearch.version", "3.0.0")
         isSnapshot = "true" == System.getProperty("build.snapshot", "true")
         buildVersionQualifier = System.getProperty("build.version_qualifier", "")
-        buildDockerJdkVersion = System.getProperty("build.docker_jdk_ver", "11")
+        buildDockerJdkVersion = System.getProperty("build.docker_jdk_ver", "21")
 
         // The PA Commons (https://github.com/opensearch-project/performance-analyzer-commons)
         // is a library dependency with hardcoded versioning in PA and RCA repos.
-        paCommonsVersion = "1.6.0"
+        paCommonsVersion = "2.0.0"
 
         // 3.0.0-SNAPSHOT -> 3.0.0.0-SNAPSHOT
         version_tokens = opensearch_version.tokenize('-')
@@ -147,7 +147,7 @@ check {
 }
 
 jacoco {
-    toolVersion = "0.8.11"
+    toolVersion = "0.8.13"
 }
 
 jacocoTestReport {
@@ -262,7 +262,7 @@ tasks.withType(Test) {
     jvmArgs('--add-opens=java.base/java.nio.file=ALL-UNNAMED')
     jvmArgs('--add-opens=java.base/java.lang=ALL-UNNAMED')
     jvmArgs('--add-opens=java.base/java.util=ALL-UNNAMED')
-    if (JavaVersion.current().compareTo(JavaVersion.VERSION_17) > 0) {
+    if (JavaVersion.current().compareTo(JavaVersion.VERSION_17) > 0 && JavaVersion.current().compareTo(JavaVersion.VERSION_24) < 0) {
       jvmArgs += ["-Djava.security.manager=allow"]
     }
 }
@@ -282,8 +282,8 @@ task rcaIt(type: Test) {
     //testLogging.showStandardStreams = true
 }
 
-sourceCompatibility = JavaVersion.VERSION_11
-targetCompatibility = JavaVersion.VERSION_11
+sourceCompatibility = JavaVersion.VERSION_21
+targetCompatibility = JavaVersion.VERSION_21
 
 compileJava {
     dependsOn spotlessApply
@@ -333,9 +333,6 @@ tasks.withType(JavaCompile) {
 import org.opensearch.gradle.VersionProperties
 
 dependencies {
-    if (JavaVersion.current() <= JavaVersion.VERSION_1_8) {
-        implementation files("${System.properties['java.home']}/../lib/tools.jar")
-    }
     def versions = VersionProperties.versions
 
     def commonslangVersion = "${versions.commonslang}"
@@ -359,7 +356,7 @@ dependencies {
     implementation 'org.bouncycastle:bcpkix-jdk15to18:1.78.1'
     implementation "org.xerial:sqlite-jdbc:${sqliteVersion}"
     implementation "com.google.guava:guava:${guavaVersion}"
-    implementation 'com.google.code.gson:gson:2.9.0'
+    implementation 'com.google.code.gson:gson:2.13.1'
     implementation 'org.checkerframework:checker-qual:3.29.0'
     implementation "com.fasterxml.jackson.core:jackson-annotations:${jacksonVersion}"
     implementation "com.fasterxml.jackson.core:jackson-databind:${jacksonDataBindVersion}"
@@ -370,8 +367,8 @@ dependencies {
     implementation group: 'commons-io', name: 'commons-io', version: '2.14.0'
     implementation group: 'com.google.errorprone', name: 'error_prone_annotations', version: '2.9.0'
     implementation group: 'com.google.protobuf', name: 'protobuf-java', version: "${protobufVersion}"
-    implementation 'io.grpc:grpc-netty:1.68.1'
-    implementation 'io.grpc:grpc-protobuf:1.68.1'
+    implementation 'io.grpc:grpc-netty:1.17.0'
+    implementation 'io.grpc:grpc-protobuf:1.72.0'
     implementation("io.netty:netty-codec-http2:${nettyVersion}")
     implementation("io.netty:netty-handler-proxy:${nettyVersion}")
     implementation 'io.grpc:grpc-stub:1.68.1'
@@ -390,7 +387,7 @@ dependencies {
     testImplementation group: 'org.powermock', name: 'powermock-module-junit4-common', version: '2.0.2'
     testImplementation group: 'org.powermock', name: 'powermock-reflect', version: '2.0.2'
     testImplementation group: 'org.javassist', name: 'javassist', version: '3.28.0-GA'
-    testImplementation group: 'net.bytebuddy', name: 'byte-buddy', version: '1.14.7'
+    testImplementation group: 'net.bytebuddy', name: 'byte-buddy', version: '1.17.5'
     testImplementation group: 'org.objenesis', name: 'objenesis', version: '3.2'
     testImplementation group: 'org.hamcrest', name: 'hamcrest-library', version: '2.1'
     testImplementation group: 'org.hamcrest', name: 'hamcrest', version: '2.1'

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -112,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -203,15 +205,15 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.

gradlew

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,22 +59,22 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell

gradlew.bat

@@ -351,14 +351,10 @@ public static ClientServers createClientServers(
             QueryMetricsRequestHandler queryMetricsRequestHandler =
                     new QueryMetricsRequestHandler(netClient, metricsRestUtil, appContext);
             httpServer.createContext(Util.METRICS_QUERY_URL, queryMetricsRequestHandler);
-            httpServer.createContext(
-                    Util.LEGACY_OPENDISTRO_METRICS_QUERY_URL, queryMetricsRequestHandler);
 
             QueryBatchRequestHandler queryBatchRequestHandler =
                     new QueryBatchRequestHandler(netClient, metricsRestUtil);
             httpServer.createContext(Util.BATCH_METRICS_URL, queryBatchRequestHandler);
-            httpServer.createContext(
-                    Util.LEGACY_OPENDISTRO_BATCH_METRICS_URL, queryBatchRequestHandler);
         }
 
         return new ClientServers(httpServer, netServer, netClient);

src/main/java/org/opensearch/performanceanalyzer/PerformanceAnalyzerApp.java

@@ -17,23 +17,14 @@ public class Util {
     private static final Logger LOG = LogManager.getLogger(Util.class);
 
     public static final String PA_BASE_URL = "/_plugins/_performanceanalyzer";
-    public static final String LEGACY_OPENDISTRO_PA_BASE_URL = PA_BASE_URL;
 
     public static final String METRICS_QUERY_URL = PA_BASE_URL + "/metrics";
-    public static final String LEGACY_OPENDISTRO_METRICS_QUERY_URL =
-            LEGACY_OPENDISTRO_PA_BASE_URL + "/metrics";
 
     public static final String BATCH_METRICS_URL = PA_BASE_URL + "/batch";
-    public static final String LEGACY_OPENDISTRO_BATCH_METRICS_URL =
-            LEGACY_OPENDISTRO_PA_BASE_URL + "/batch";
 
     public static final String RCA_QUERY_URL = PA_BASE_URL + "/rca";
-    public static final String LEGACY_OPENDISTRO_RCA_QUERY_URL =
-            LEGACY_OPENDISTRO_PA_BASE_URL + "/rca";
 
     public static final String ACTIONS_QUERY_URL = PA_BASE_URL + "/actions";
-    public static final String LEGACY_OPENDISTRO_ACTIONS_QUERY_URL =
-            LEGACY_OPENDISTRO_PA_BASE_URL + "/actions";
 
     public static final String OPENSEARCH_HOME = System.getProperty("opensearch.path.home");
     public static final String PLUGIN_LOCATION =

src/main/java/org/opensearch/performanceanalyzer/core/Util.java

@@ -492,13 +492,6 @@ private void removeRcaRequestHandler() {
         } catch (IllegalArgumentException e) {
             LOG.debug("Http(s) context for path: {} was not found to remove.", Util.RCA_QUERY_URL);
         }
-        try {
-            httpServer.removeContext(Util.LEGACY_OPENDISTRO_RCA_QUERY_URL);
-        } catch (IllegalArgumentException e) {
-            LOG.debug(
-                    "Http(s) context for path: {} was not found to remove.",
-                    Util.LEGACY_OPENDISTRO_RCA_QUERY_URL);
-        }
     }
 
     public static String getCatClusterManagerUrl() {
@@ -528,13 +521,10 @@ public RCAScheduler getRcaScheduler() {
 
     private void addRcaRequestHandler() {
         httpServer.createContext(Util.RCA_QUERY_URL, queryRcaRequestHandler);
-        httpServer.createContext(Util.LEGACY_OPENDISTRO_RCA_QUERY_URL, queryRcaRequestHandler);
     }
 
     private void addActionsRequestHandler() {
         httpServer.createContext(Util.ACTIONS_QUERY_URL, queryActionRequestHandler);
-        httpServer.createContext(
-                Util.LEGACY_OPENDISTRO_ACTIONS_QUERY_URL, queryActionRequestHandler);
     }
 
     public void setDeliberateInterrupt() {