[Backport] [2.x] Update to Gradle 8.5 (opensearch-project#1131) (open…

…search-project#1132) * Update to Gradle 8.5 (opensearch-project#1131) Signed-off-by: Andriy Redko <[email protected]> (cherry picked from commit 7c0ce4c) Signed-off-by: Andriy Redko <[email protected]> * Update Jackson to 2.16.1 Signed-off-by: Andriy Redko <[email protected]> --------- Signed-off-by: Andriy Redko <[email protected]>
ohltyler · Jan 24, 2024 · 72b7d53 · 72b7d53
1 parent 871b1dd
commit 72b7d53
Show file tree

Hide file tree

Showing 68 changed files with 505 additions and 754 deletions.
diff --git a/.github/workflows/test_build_multi_platform.yml b/.github/workflows/test_build_multi_platform.yml
@@ -16,7 +16,7 @@ jobs:
   Build-ad-windows:
     strategy:
       matrix:
-        java: [ 11, 17 ]
+        java: [ 11, 17, 21 ]
     name: Build and Test Anomaly Detection Plugin on Windows
     runs-on: windows-latest
     env:
@@ -49,7 +49,7 @@ jobs:
     needs: Get-CI-Image-Tag
     strategy:
       matrix:
-        java: [11,17]
+        java: [11, 17, 21]
       fail-fast: false
     name: Build and Test Anomaly detection Plugin
     runs-on: ubuntu-latest
@@ -89,7 +89,7 @@ jobs:
   Build-ad-macos:
     strategy:
       matrix:
-        java: [11,17,20]
+        java: [11,17,21]
       fail-fast: false
 
     name: Build and Test Anomaly detection Plugin

diff --git a/.github/workflows/test_bwc.yml b/.github/workflows/test_bwc.yml
@@ -17,7 +17,7 @@ jobs:
     needs: Get-CI-Image-Tag
     strategy:
       matrix:
-        java: [11,17]
+        java: [11,17,21]
       fail-fast: false
 
     name: Test Anomaly detection BWC

diff --git a/.github/workflows/test_security.yml b/.github/workflows/test_security.yml
@@ -11,7 +11,7 @@ jobs:
   Build-ad:
     strategy:
       matrix:
-        java: [11,17]
+        java: [11,17,21]
       fail-fast: false
 
     name: Security test workflow for Anomaly Detection

diff --git a/build.gradle b/build.gradle
@@ -61,11 +61,10 @@ buildscript {
 }
 
 plugins {
-    id 'nebula.ospackage' version "8.3.0" apply false
-    id "com.diffplug.gradle.spotless" version "3.26.1"
+    id 'com.netflix.nebula.ospackage' version "11.6.0"
+    id "com.diffplug.spotless" version "6.24.0"
     id 'java-library'
-    // Gradle 7.6 support was added in test-retry 1.4.0.
-    id 'org.gradle.test-retry' version '1.4.1'
+    id 'org.gradle.test-retry' version '1.5.7'
 }
 
 tasks.withType(JavaCompile) {
@@ -119,11 +118,16 @@ allprojects {
 
     version = "${opensearch_build}"
 
-    plugins.withId('java') {
-        sourceCompatibility = targetCompatibility = JavaVersion.VERSION_11
+    plugins.withId('jacoco') {
+        jacoco.toolVersion = '0.8.11'
     }
 }
 
+java {
+  targetCompatibility = JavaVersion.VERSION_11
+  sourceCompatibility = JavaVersion.VERSION_11
+}
+
 ext {
     projectSubstitutions = [:]
     licenseFile = rootProject.file('LICENSE.txt')
@@ -146,10 +150,10 @@ configurations.all {
         force "org.apache.httpcomponents:httpcore:${versions.httpcore}"
         force "commons-codec:commons-codec:${versions.commonscodec}"
 
-        force "org.mockito:mockito-core:2.25.0"
-        force "org.objenesis:objenesis:3.0.1"
-        force "net.bytebuddy:byte-buddy:1.9.15"
-        force "net.bytebuddy:byte-buddy-agent:1.9.15"
+        force "org.mockito:mockito-core:5.9.0"
+        force "org.objenesis:objenesis:3.3"
+        force "net.bytebuddy:byte-buddy:1.14.9"
+        force "net.bytebuddy:byte-buddy-agent:1.14.9"
         force "com.google.code.gson:gson:2.8.9"
         force "junit:junit:4.13.2"
     }
@@ -727,8 +731,8 @@ jacocoTestCoverageVerification {
 
 jacocoTestReport {
     reports {
-        xml.enabled = true
-        html.enabled = true
+        xml.required = true
+        html.required = true
     }
 }
 
@@ -755,8 +759,8 @@ dependencies {
     implementation 'software.amazon.randomcutforest:randomcutforest-core:3.8.0'
 
     // force Jackson version to avoid version conflict issue
-    implementation "com.fasterxml.jackson.core:jackson-databind:2.14.1"
-    implementation "com.fasterxml.jackson.core:jackson-annotations:2.14.1"
+    implementation "com.fasterxml.jackson.core:jackson-databind:2.16.1"
+    implementation "com.fasterxml.jackson.core:jackson-annotations:2.16.1"
 
     // used for serializing/deserializing rcf models.
     implementation group: 'io.protostuff', name: 'protostuff-core', version: '1.8.0'
@@ -773,31 +777,21 @@ dependencies {
     }
 
     testImplementation group: 'pl.pragmatists', name: 'JUnitParams', version: '1.1.1'
-    testImplementation group: 'org.mockito', name: 'mockito-core', version: '2.25.0'
-    testImplementation group: 'org.powermock', name: 'powermock-api-mockito2', version: '2.0.2'
-    testImplementation group: 'org.powermock', name: 'powermock-module-junit4', version: '2.0.2'
-    testImplementation group: 'org.powermock', name: 'powermock-module-junit4-common', version: '2.0.2'
-    testImplementation group: 'org.powermock', name: 'powermock-core', version: '2.0.2'
-    testImplementation group: 'org.powermock', name: 'powermock-api-support', version: '2.0.2'
-    testImplementation group: 'org.powermock', name: 'powermock-reflect', version: '2.0.2'
-    testImplementation group: 'org.objenesis', name: 'objenesis', version: '3.0.1'
-    testImplementation group: 'net.bytebuddy', name: 'byte-buddy', version: '1.9.15'
-    testImplementation group: 'net.bytebuddy', name: 'byte-buddy-agent', version: '1.9.15'
+    testImplementation group: 'org.mockito', name: 'mockito-core', version: '5.9.0'
+    testImplementation group: 'org.objenesis', name: 'objenesis', version: '3.3'
+    testImplementation group: 'net.bytebuddy', name: 'byte-buddy', version: '1.14.9'
+    testImplementation group: 'net.bytebuddy', name: 'byte-buddy-agent', version: '1.14.9'
     testCompileOnly 'org.apiguardian:apiguardian-api:1.1.0'
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.2'
-    testImplementation  'org.junit.jupiter:junit-jupiter-params:5.7.2'
-    testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.7.2'
-    testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.7.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
+    testImplementation  'org.junit.jupiter:junit-jupiter-params:5.8.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
+    testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.8.2'
     testCompileOnly 'junit:junit:4.13.2'
 }
 
 compileJava.options.compilerArgs << "-Xlint:-deprecation,-rawtypes,-serial,-try,-unchecked"
 
-test {
-    useJUnitPlatform()
-}
-
-apply plugin: 'nebula.ospackage'
+apply plugin: 'com.netflix.nebula.ospackage'
 
 // This is afterEvaluate because the bundlePlugin ZIP task is updated afterEvaluate and changes the ZIP name to match the plugin name
 afterEvaluate {
@@ -838,9 +832,8 @@ afterEvaluate {
         task renameRpm(type: Copy) {
             from("$buildDir/distributions")
             into("$buildDir/distributions")
-            include archiveName
-            rename archiveName, "${packageName}-${version}.rpm"
-            doLast { delete file("$buildDir/distributions/$archiveName") }
+            rename "$archiveFileName", "${packageName}-${archiveVersion}.rpm"
+            doLast { delete file("$buildDir/distributions/$archiveFileName") }
         }
     }
 
@@ -851,9 +844,8 @@ afterEvaluate {
         task renameDeb(type: Copy) {
             from("$buildDir/distributions")
             into("$buildDir/distributions")
-            include archiveName
-            rename archiveName, "${packageName}-${version}.deb"
-            doLast { delete file("$buildDir/distributions/$archiveName") }
+            rename "$archiveFileName", "${packageName}-${archiveVersion}.deb"
+            doLast { delete file("$buildDir/distributions/$archiveFileName") }
         }
     }
 
@@ -898,4 +890,13 @@ task updateVersion {
         // Include the required files that needs to be updated with new Version
         ant.replaceregexp(file:'build.gradle', match: '"opensearch.version", "\\d.*"', replace: '"opensearch.version", "' + newVersion.tokenize('-')[0] + '-SNAPSHOT"', flags:'g', byline:true)
     }
-}
+}
+
+tasks.withType(AbstractPublishToMaven) {
+   def predicate = provider {
+        publication.name == "pluginZip"
+    }
+    onlyIf("Publishing only ZIP distributions") {
+        predicate.get()
+    }
+}
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
@@ -83,10 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# 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
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,26 +131,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -197,11 +198,15 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+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,
+#     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" \

diff --git a/src/main/java/org/opensearch/ad/AnomalyDetectorJobRunner.java b/src/main/java/org/opensearch/ad/AnomalyDetectorJobRunner.java
@@ -304,38 +304,11 @@ private void runAnomalyDetectionJob(
                 detectionStartTime.toEpochMilli(),
                 executionStartTime.toEpochMilli()
             );
-            client
-                .execute(
-                    AnomalyResultAction.INSTANCE,
-                    request,
-                    ActionListener
-                        .wrap(
-                            response -> {
-                                indexAnomalyResult(
-                                    jobParameter,
-                                    lockService,
-                                    lock,
-                                    detectionStartTime,
-                                    executionStartTime,
-                                    response,
-                                    recorder,
-                                    detector
-                                );
-                            },
-                            exception -> {
-                                handleAdException(
-                                    jobParameter,
-                                    lockService,
-                                    lock,
-                                    detectionStartTime,
-                                    executionStartTime,
-                                    exception,
-                                    recorder,
-                                    detector
-                                );
-                            }
-                        )
-                );
+            client.execute(AnomalyResultAction.INSTANCE, request, ActionListener.wrap(response -> {
+                indexAnomalyResult(jobParameter, lockService, lock, detectionStartTime, executionStartTime, response, recorder, detector);
+            }, exception -> {
+                handleAdException(jobParameter, lockService, lock, detectionStartTime, executionStartTime, exception, recorder, detector);
+            }));
         } catch (Exception e) {
             indexAnomalyResultException(
                 jobParameter,
@@ -669,11 +642,9 @@ private void releaseLock(AnomalyDetectorJob jobParameter, LockService lockServic
         lockService
             .release(
                 lock,
-                ActionListener
-                    .wrap(
-                        released -> { log.info("Released lock for AD job {}", jobParameter.getName()); },
-                        exception -> { log.error("Failed to release lock for AD job: " + jobParameter.getName(), exception); }
-                    )
+                ActionListener.wrap(released -> { log.info("Released lock for AD job {}", jobParameter.getName()); }, exception -> {
+                    log.error("Failed to release lock for AD job: " + jobParameter.getName(), exception);
+                })
             );
     }
 }
diff --git a/src/main/java/org/opensearch/ad/AnomalyDetectorRunner.java b/src/main/java/org/opensearch/ad/AnomalyDetectorRunner.java
@@ -83,11 +83,9 @@ public void executeDetector(
                     listener.onResponse(Collections.emptyList());
                     return;
                 }
-                ActionListener<EntityAnomalyResult> entityAnomalyResultListener = ActionListener
-                    .wrap(
-                        entityAnomalyResult -> { listener.onResponse(entityAnomalyResult.getAnomalyResults()); },
-                        e -> onFailure(e, listener, detector.getDetectorId())
-                    );
+                ActionListener<EntityAnomalyResult> entityAnomalyResultListener = ActionListener.wrap(entityAnomalyResult -> {
+                    listener.onResponse(entityAnomalyResult.getAnomalyResults());
+                }, e -> onFailure(e, listener, detector.getDetectorId()));
                 MultiResponsesDelegateActionListener<EntityAnomalyResult> multiEntitiesResponseListener =
                     new MultiResponsesDelegateActionListener<EntityAnomalyResult>(
                         entityAnomalyResultListener,

diff --git a/src/main/java/org/opensearch/ad/caching/PriorityCache.java b/src/main/java/org/opensearch/ad/caching/PriorityCache.java
@@ -133,12 +133,9 @@ public PriorityCache(
         Duration inactiveEntityTtl = DateUtils.toDuration(checkpointTtl.get(settings));
 
         this.inActiveEntities = createInactiveCache(inactiveEntityTtl, maxInactiveStates);
-        clusterService
-            .getClusterSettings()
-            .addSettingsUpdateConsumer(
-                checkpointTtl,
-                it -> { this.inActiveEntities = createInactiveCache(DateUtils.toDuration(it), maxInactiveStates); }
-            );
+        clusterService.getClusterSettings().addSettingsUpdateConsumer(checkpointTtl, it -> {
+            this.inActiveEntities = createInactiveCache(DateUtils.toDuration(it), maxInactiveStates);
+        });
 
         this.threadPool = threadPool;
         this.random = new Random(42);
@@ -163,19 +160,15 @@ public ModelState<EntityModel> get(String modelId, AnomalyDetector detector) {
         // during maintenance period, stop putting new entries
         if (!maintenanceLock.isLocked() && modelState == null) {
             if (EnabledSetting.isDoorKeeperInCacheEnabled()) {
-                DoorKeeper doorKeeper = doorKeepers
-                    .computeIfAbsent(
-                        detectorId,
-                        id -> {
-                            // reset every 60 intervals
-                            return new DoorKeeper(
-                                AnomalyDetectorSettings.DOOR_KEEPER_FOR_CACHE_MAX_INSERTION,
-                                AnomalyDetectorSettings.DOOR_KEEPER_FAULSE_POSITIVE_RATE,
-                                detector.getDetectionIntervalDuration().multipliedBy(AnomalyDetectorSettings.DOOR_KEEPER_MAINTENANCE_FREQ),
-                                clock
-                            );
-                        }
+                DoorKeeper doorKeeper = doorKeepers.computeIfAbsent(detectorId, id -> {
+                    // reset every 60 intervals
+                    return new DoorKeeper(
+                        AnomalyDetectorSettings.DOOR_KEEPER_FOR_CACHE_MAX_INSERTION,
+                        AnomalyDetectorSettings.DOOR_KEEPER_FAULSE_POSITIVE_RATE,
+                        detector.getDetectionIntervalDuration().multipliedBy(AnomalyDetectorSettings.DOOR_KEEPER_MAINTENANCE_FREQ),
+                        clock
                     );
+                });
 
                 // first hit, ignore
                 // since door keeper may get reset during maintenance, it is possible