Minor changes

Signed-off-by: sejli <[email protected]>
opensearch-project · Sep 30, 2022 · d96e31c · d96e31c
1 parent 112d5d8
commit d96e31c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 8 deletions.
diff --git a/opensearch-observability/build.gradle b/opensearch-observability/build.gradle
@@ -28,7 +28,7 @@ buildscript {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlin_version}"
         classpath "org.jetbrains.kotlin:kotlin-allopen:${kotlin_version}"
         classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.12.0"
-        classpath "org.jacoco:org.jacoco.agent:0.8.5"
+        classpath "org.jacoco:org.jacoco.agent:0.8.7"
     }
 }
 
@@ -117,6 +117,7 @@ allprojects {
     plugins.withId('java') {
         sourceCompatibility = targetCompatibility = "1.8"
     }
+    jacoco.toolVersion = "0.8.7"
 }
 
 dependencies {

diff --git a/...rch-observability/src/main/kotlin/org/opensearch/observability/settings/PluginSettings.kt b/...rch-observability/src/main/kotlin/org/opensearch/observability/settings/PluginSettings.kt
@@ -8,14 +8,14 @@ package org.opensearch.observability.settings
 import org.apache.logging.log4j.LogManager
 import org.opensearch.bootstrap.BootstrapInfo
 import org.opensearch.cluster.service.ClusterService
+import org.opensearch.common.io.PathUtils
 import org.opensearch.common.settings.Setting
 import org.opensearch.common.settings.Setting.Property.Dynamic
 import org.opensearch.common.settings.Setting.Property.NodeScope
 import org.opensearch.common.settings.Settings
 import org.opensearch.observability.ObservabilityPlugin.Companion.LOG_PREFIX
 import org.opensearch.observability.ObservabilityPlugin.Companion.PLUGIN_NAME
 import java.io.IOException
-import java.nio.file.Paths
 
 /**
  * settings specific to observability Plugin.
@@ -246,7 +246,7 @@ internal object PluginSettings {
         var settings: Settings? = null
         val configDirName = BootstrapInfo.getSystemProperties()?.get("opensearch.path.conf")?.toString()
         if (configDirName != null) {
-            val defaultSettingYmlFile = Paths.get(configDirName, PLUGIN_NAME, "observability.yml")
+            val defaultSettingYmlFile = PathUtils.get(configDirName, PLUGIN_NAME, "observability.yml")
             try {
                 settings = Settings.builder().loadFromPath(defaultSettingYmlFile).build()
             } catch (exception: IOException) {

diff --git a/opensearch-observability/src/test/kotlin/org/opensearch/observability/PluginRestTestCase.kt b/opensearch-observability/src/test/kotlin/org/opensearch/observability/PluginRestTestCase.kt
@@ -26,7 +26,6 @@ import org.opensearch.client.Response
 import org.opensearch.client.ResponseException
 import org.opensearch.client.RestClient
 import org.opensearch.client.RestClientBuilder
-import org.opensearch.common.io.PathUtils
 import org.opensearch.common.settings.Settings
 import org.opensearch.common.unit.TimeValue
 import org.opensearch.common.util.concurrent.ThreadContext
@@ -39,7 +38,6 @@ import java.io.IOException
 import java.io.InputStreamReader
 import java.nio.charset.StandardCharsets
 import java.nio.file.Files
-import java.nio.file.Paths
 import java.security.cert.X509Certificate
 import javax.management.MBeanServerInvocationHandler
 import javax.management.ObjectName
@@ -264,7 +262,7 @@ abstract class PluginRestTestCase : OpenSearchRestTestCase() {
                     false
                 )
                 proxy.getExecutionData(false)?.let {
-                    val path = PathUtils.get("$jacocoBuildPath/integTest.exec")
+                    val path = Paths.get("$jacocoBuildPath/integTest.exec")
                     Files.write(path, it)
                 }
             }

diff --git a/...servability/src/test/kotlin/org/opensearch/observability/bwc/TABackwardCompatibilityIT.kt b/...servability/src/test/kotlin/org/opensearch/observability/bwc/TABackwardCompatibilityIT.kt
@@ -13,8 +13,6 @@ import org.opensearch.observability.PluginRestTestCase
 import org.opensearch.observability.constructNotebookRequest
 import org.opensearch.rest.RestRequest
 import org.opensearch.rest.RestStatus
-// import kotlin.Collections.List
-// import kotlin.Collections.Map
 
 class TABackwardCompatibilityIT : PluginRestTestCase() {