Fix 2.19.5 Build Failures (opensearch-project#5195)

* fix 2.19.5 build failures

Signed-off-by: Eric Wei <mengwei.eric@gmail.com>

* fix 2.19.5 build issue

Signed-off-by: Eric Wei <mengwei.eric@gmail.com>

* fixed all failing CIs from previous commits

Signed-off-by: Eric Wei <mengwei.eric@gmail.com>

---------

Signed-off-by: Eric Wei <mengwei.eric@gmail.com>

Author: mengweieric

build.gradle

@@ -123,6 +123,7 @@ allprojects {
         resolutionStrategy.force "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.0"
         resolutionStrategy.force "net.bytebuddy:byte-buddy:1.14.9"
         resolutionStrategy.force "org.apache.commons:commons-lang3:3.18.0"
+        resolutionStrategy.force "com.google.errorprone:error_prone_annotations:2.45.0"
     }
 }
 

doctest/bootstrap.sh

@@ -21,4 +21,4 @@ fi
 
 $DIR/.venv/bin/pip install -U pip setuptools wheel
 $DIR/.venv/bin/pip install -r $DIR/requirements.txt
-$DIR/.venv/bin/pip install -e ./sql-cli
+$DIR/.venv/bin/pip install -e $DIR/sql-cli

doctest/build.gradle

@@ -22,14 +22,13 @@ def plugin_path = project(':doctest').projectDir
 
 task cloneSqlCli(type: Exec) {
     def repoDir = new File("${project.projectDir}/sql-cli")
-    
+
     if (repoDir.exists()) {
-        // Repository already exists, fetch and checkout latest
-        commandLine 'git', '-C', repoDir.absolutePath, 'fetch', 'origin', 'main'
-        commandLine 'git', '-C', repoDir.absolutePath, 'checkout', 'origin/main'
+        // Repository already exists, fetch and checkout stable branch
+        commandLine 'git', '-C', repoDir.absolutePath, 'fetch', 'origin', '1.0-legacy'
     } else {
-        // Repository doesn't exist, clone it
-        commandLine 'git', 'clone', 'https://github.com/opensearch-project/sql-cli.git', repoDir.absolutePath
+        // Repository doesn't exist, clone the stable branch
+        commandLine 'git', 'clone', '-b', '1.0-legacy', 'https://github.com/opensearch-project/sql-cli.git', repoDir.absolutePath
     }
 }
 

integ-test/build.gradle

@@ -251,8 +251,20 @@ testClusters {
     }
 }
 
+def isPrometheusRunning() {
+    try {
+        def process = "pgrep -f prometheus".execute()
+        def result = !process.text.trim().isEmpty()
+        return result
+    } catch (Exception e) {
+        return false
+    }
+}
+
 task startPrometheus(type: SpawnProcessTask) {
     mustRunAfter ':doctest:doctest'
+    pidLockFileName ".prom.pid.lock"
+    onlyIf { !isPrometheusRunning() }
 
     doFirst {
         download.run {
@@ -275,6 +287,7 @@ task startPrometheus(type: SpawnProcessTask) {
 }
 
 task stopPrometheus(type: KillProcessTask) {
+    pidLockFileName ".prom.pid.lock"
     doLast {
         file("$projectDir/bin/prometheus").deleteDir()
         file("$projectDir/bin/prometheus.tar.gz").delete()

plugin/build.gradle

@@ -115,6 +115,7 @@ configurations.all {
     resolutionStrategy.force "org.apache.httpcomponents:httpcore:4.4.15"
     resolutionStrategy.force "org.apache.httpcomponents:httpclient:4.5.14"
     resolutionStrategy.force "org.jetbrains.kotlin:kotlin-stdlib-common:1.6.0"
+    resolutionStrategy.force "com.google.errorprone:error_prone_annotations:2.45.0"
 }
 
 configurations {

prometheus/src/test/java/org/opensearch/sql/prometheus/storage/PrometheusStorageFactoryTest.java

@@ -130,7 +130,7 @@ void testGetStorageEngineWithWrongAuthType() {
         .thenReturn(Collections.emptyList());
     PrometheusStorageFactory prometheusStorageFactory = new PrometheusStorageFactory(settings);
     HashMap<String, String> properties = new HashMap<>();
-    properties.put("prometheus.uri", "https://test.com");
+    properties.put("prometheus.uri", "http://localhost:9090");
     properties.put("prometheus.auth.type", "random");
     properties.put("prometheus.auth.region", "us-east-1");
     properties.put("prometheus.auth.secret_key", "accessKey");
@@ -150,7 +150,7 @@ void testGetStorageEngineWithNONEAuthType() {
         .thenReturn(Collections.emptyList());
     PrometheusStorageFactory prometheusStorageFactory = new PrometheusStorageFactory(settings);
     HashMap<String, String> properties = new HashMap<>();
-    properties.put("prometheus.uri", "https://test.com");
+    properties.put("prometheus.uri", "http://localhost:9090");
     StorageEngine storageEngine = prometheusStorageFactory.getStorageEngine(properties);
     Assertions.assertTrue(storageEngine instanceof PrometheusStorageEngine);
   }