Backport/backport 1572 to 2.x (#1580)

* remove job scheduler (#1560)

* remove job scheduler

Signed-off-by: Derek Ho <dxho@amazon.com>

* remove job scheduler files and build.gradle

Signed-off-by: Derek Ho <dxho@amazon.com>

* ktlint

Signed-off-by: Derek Ho <dxho@amazon.com>

* add back job scheduler to fix bwc

Signed-off-by: Derek Ho <dxho@amazon.com>

* remove job scheduler and add it back for older version

Signed-off-by: Derek Ho <dxho@amazon.com>

* remove job scheduler in prepare Bwc Tests

Signed-off-by: Derek Ho <dxho@amazon.com>

* bump bwc version

Signed-off-by: Derek Ho <dxho@amazon.com>

* add todo of removing job scheduler things after 2.9 release

Signed-off-by: Derek Ho <dxho@amazon.com>

---------

Signed-off-by: Derek Ho <dxho@amazon.com>
(cherry picked from commit 4e0ca5a)
Signed-off-by: Derek Ho <dxho@amazon.com>

* Resolve build issue (#1572)

* resolve dependency issues

Signed-off-by: Eric <menwe@amazon.com>

* resolve jacocoagent missing issue

Signed-off-by: Eric <menwe@amazon.com>

* bump up build.gradle

Signed-off-by: Derek Ho <dxho@amazon.com>

---------

Signed-off-by: Eric <menwe@amazon.com>
Signed-off-by: Derek Ho <dxho@amazon.com>
Co-authored-by: Derek Ho <dxho@amazon.com>
(cherry picked from commit 4345041)
Signed-off-by: Derek Ho <dxho@amazon.com>

* try get older common utils

Signed-off-by: Derek Ho <dxho@amazon.com>

* revert back

Signed-off-by: Derek Ho <dxho@amazon.com>

* revert kotlin version change

Signed-off-by: Derek Ho <dxho@amazon.com>

* additional core changes

Signed-off-by: Derek Ho <dxho@amazon.com>

* update import orderings

Signed-off-by: Derek Ho <dxho@amazon.com>

---------

Signed-off-by: Derek Ho <dxho@amazon.com>
Signed-off-by: Eric <menwe@amazon.com>
Co-authored-by: Eric Wei <menwe@amazon.com>

build.gradle

@@ -21,7 +21,7 @@ buildscript {
             opensearch_build += "-SNAPSHOT"
         }
         common_utils_version = System.getProperty("common_utils.version", opensearch_build)
-        kotlin_version = System.getProperty("kotlin.version", "1.6.0")
+        kotlin_version = System.getProperty("kotlin.version", "1.8.21")
         jackson_version = "2.14.1"
     }
 
@@ -37,7 +37,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.22.0"
-        classpath "org.jacoco:org.jacoco.agent:0.8.5"
+        classpath "org.jacoco:org.jacoco.agent:0.8.8"
     }
 }
 

src/main/kotlin/org/opensearch/observability/ObservabilityPlugin.kt

@@ -10,12 +10,12 @@ import org.opensearch.client.Client
 import org.opensearch.cluster.metadata.IndexNameExpressionResolver
 import org.opensearch.cluster.node.DiscoveryNodes
 import org.opensearch.cluster.service.ClusterService
-import org.opensearch.common.io.stream.NamedWriteableRegistry
 import org.opensearch.common.settings.ClusterSettings
 import org.opensearch.common.settings.IndexScopedSettings
 import org.opensearch.common.settings.Setting
 import org.opensearch.common.settings.Settings
 import org.opensearch.common.settings.SettingsFilter
+import org.opensearch.core.common.io.stream.NamedWriteableRegistry
 import org.opensearch.core.xcontent.NamedXContentRegistry
 import org.opensearch.env.Environment
 import org.opensearch.env.NodeEnvironment

src/main/kotlin/org/opensearch/observability/action/CreateObservabilityObjectRequest.kt

@@ -7,16 +7,16 @@ package org.opensearch.observability.action
 
 import org.opensearch.action.ActionRequest
 import org.opensearch.action.ActionRequestValidationException
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.io.stream.Writeable
-import org.opensearch.common.xcontent.XContentParserUtils
 import org.opensearch.commons.utils.fieldIfNotNull
 import org.opensearch.commons.utils.logger
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
+import org.opensearch.core.common.io.stream.Writeable
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.ToXContentObject
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
+import org.opensearch.core.xcontent.XContentParserUtils
 import org.opensearch.observability.metrics.Metrics
 import org.opensearch.observability.model.BaseObjectData
 import org.opensearch.observability.model.ObservabilityObjectDataProperties

src/main/kotlin/org/opensearch/observability/action/CreateObservabilityObjectResponse.kt

@@ -5,14 +5,14 @@
 
 package org.opensearch.observability.action
 
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.io.stream.Writeable
-import org.opensearch.common.xcontent.XContentParserUtils
 import org.opensearch.commons.utils.logger
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
+import org.opensearch.core.common.io.stream.Writeable
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
+import org.opensearch.core.xcontent.XContentParserUtils
 import org.opensearch.observability.metrics.Metrics
 import org.opensearch.observability.model.BaseResponse
 import org.opensearch.observability.model.RestTag.OBJECT_ID_FIELD

src/main/kotlin/org/opensearch/observability/action/DeleteObservabilityObjectRequest.kt

@@ -8,16 +8,16 @@ package org.opensearch.observability.action
 import org.opensearch.action.ActionRequest
 import org.opensearch.action.ActionRequestValidationException
 import org.opensearch.action.ValidateActions
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.io.stream.Writeable
-import org.opensearch.common.xcontent.XContentParserUtils
 import org.opensearch.commons.utils.logger
 import org.opensearch.commons.utils.stringList
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
+import org.opensearch.core.common.io.stream.Writeable
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.ToXContentObject
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
+import org.opensearch.core.xcontent.XContentParserUtils
 import org.opensearch.observability.ObservabilityPlugin.Companion.LOG_PREFIX
 import org.opensearch.observability.metrics.Metrics
 import org.opensearch.observability.model.RestTag.OBJECT_ID_FIELD

src/main/kotlin/org/opensearch/observability/action/DeleteObservabilityObjectResponse.kt

@@ -5,22 +5,22 @@
 
 package org.opensearch.observability.action
 
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.io.stream.Writeable
-import org.opensearch.common.xcontent.XContentParserUtils
 import org.opensearch.commons.utils.STRING_READER
 import org.opensearch.commons.utils.STRING_WRITER
 import org.opensearch.commons.utils.enumReader
 import org.opensearch.commons.utils.enumWriter
 import org.opensearch.commons.utils.logger
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
+import org.opensearch.core.common.io.stream.Writeable
+import org.opensearch.core.rest.RestStatus
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
+import org.opensearch.core.xcontent.XContentParserUtils
 import org.opensearch.observability.metrics.Metrics
 import org.opensearch.observability.model.BaseResponse
 import org.opensearch.observability.model.RestTag.DELETE_RESPONSE_LIST_TAG
-import org.opensearch.rest.RestStatus
 import java.io.IOException
 
 /**

src/main/kotlin/org/opensearch/observability/action/GetObservabilityObjectRequest.kt

@@ -8,21 +8,21 @@ package org.opensearch.observability.action
 import org.opensearch.action.ActionRequest
 import org.opensearch.action.ActionRequestValidationException
 import org.opensearch.action.ValidateActions
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.io.stream.Writeable
-import org.opensearch.common.xcontent.XContentParserUtils
 import org.opensearch.commons.utils.STRING_READER
 import org.opensearch.commons.utils.STRING_WRITER
 import org.opensearch.commons.utils.enumReader
 import org.opensearch.commons.utils.enumSet
 import org.opensearch.commons.utils.fieldIfNotNull
 import org.opensearch.commons.utils.logger
 import org.opensearch.commons.utils.stringList
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
+import org.opensearch.core.common.io.stream.Writeable
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.ToXContentObject
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
+import org.opensearch.core.xcontent.XContentParserUtils
 import org.opensearch.observability.metrics.Metrics
 import org.opensearch.observability.model.ObservabilityObjectType
 import org.opensearch.observability.model.RestTag.FILTER_PARAM_LIST_FIELD

src/main/kotlin/org/opensearch/observability/action/GetObservabilityObjectResponse.kt

@@ -5,9 +5,9 @@
 
 package org.opensearch.observability.action
 
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.io.stream.Writeable
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
+import org.opensearch.core.common.io.stream.Writeable
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser

src/main/kotlin/org/opensearch/observability/action/ObservabilityActions.kt

@@ -7,14 +7,14 @@ package org.opensearch.observability.action
 
 import org.opensearch.OpenSearchStatusException
 import org.opensearch.commons.authuser.User
+import org.opensearch.core.rest.RestStatus
 import org.opensearch.observability.ObservabilityPlugin.Companion.LOG_PREFIX
 import org.opensearch.observability.index.ObservabilityIndex
 import org.opensearch.observability.metrics.Metrics
 import org.opensearch.observability.model.ObservabilityObjectDoc
 import org.opensearch.observability.model.ObservabilityObjectSearchResult
 import org.opensearch.observability.security.UserAccessManager
 import org.opensearch.observability.util.logger
-import org.opensearch.rest.RestStatus
 import java.time.Instant
 
 /**

src/main/kotlin/org/opensearch/observability/action/PluginBaseAction.kt

@@ -16,16 +16,16 @@ import org.opensearch.action.ActionResponse
 import org.opensearch.action.support.ActionFilters
 import org.opensearch.action.support.HandledTransportAction
 import org.opensearch.client.Client
-import org.opensearch.common.io.stream.Writeable
 import org.opensearch.commons.ConfigConstants.OPENSEARCH_SECURITY_USER_INFO_THREAD_CONTEXT
 import org.opensearch.commons.authuser.User
+import org.opensearch.core.common.io.stream.Writeable
+import org.opensearch.core.rest.RestStatus
 import org.opensearch.index.IndexNotFoundException
 import org.opensearch.index.engine.VersionConflictEngineException
 import org.opensearch.indices.InvalidIndexNameException
 import org.opensearch.observability.ObservabilityPlugin.Companion.LOG_PREFIX
 import org.opensearch.observability.metrics.Metrics
 import org.opensearch.observability.util.logger
-import org.opensearch.rest.RestStatus
 import org.opensearch.tasks.Task
 import org.opensearch.transport.TransportService
 import java.io.IOException

src/main/kotlin/org/opensearch/observability/action/UpdateObservabilityObjectRequest.kt

@@ -8,15 +8,15 @@ package org.opensearch.observability.action
 import org.opensearch.action.ActionRequest
 import org.opensearch.action.ActionRequestValidationException
 import org.opensearch.action.ValidateActions
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.io.stream.Writeable
-import org.opensearch.common.xcontent.XContentParserUtils
 import org.opensearch.core.common.Strings
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
+import org.opensearch.core.common.io.stream.Writeable
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.ToXContentObject
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
+import org.opensearch.core.xcontent.XContentParserUtils
 import org.opensearch.observability.metrics.Metrics
 import org.opensearch.observability.model.BaseObjectData
 import org.opensearch.observability.model.ObservabilityObjectDataProperties

src/main/kotlin/org/opensearch/observability/action/UpdateObservabilityObjectResponse.kt

@@ -5,13 +5,13 @@
 
 package org.opensearch.observability.action
 
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.xcontent.XContentParserUtils
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
 import org.opensearch.core.xcontent.XContentParser.Token
+import org.opensearch.core.xcontent.XContentParserUtils
 import org.opensearch.observability.ObservabilityPlugin.Companion.LOG_PREFIX
 import org.opensearch.observability.metrics.Metrics
 import org.opensearch.observability.model.BaseResponse

src/main/kotlin/org/opensearch/observability/index/ObservabilityIndex.kt

@@ -24,6 +24,7 @@ import org.opensearch.common.component.LifecycleListener
 import org.opensearch.common.unit.TimeValue
 import org.opensearch.common.xcontent.LoggingDeprecationHandler
 import org.opensearch.common.xcontent.XContentType
+import org.opensearch.core.rest.RestStatus
 import org.opensearch.core.xcontent.NamedXContentRegistry
 import org.opensearch.index.IndexNotFoundException
 import org.opensearch.index.query.QueryBuilders
@@ -40,7 +41,6 @@ import org.opensearch.observability.model.SearchResults
 import org.opensearch.observability.settings.PluginSettings
 import org.opensearch.observability.util.SecureIndexClient
 import org.opensearch.observability.util.logger
-import org.opensearch.rest.RestStatus
 import org.opensearch.search.SearchHit
 import org.opensearch.search.builder.SearchSourceBuilder
 import java.util.concurrent.TimeUnit

src/main/kotlin/org/opensearch/observability/index/ObservabilityQueryHelper.kt

@@ -6,6 +6,7 @@
 package org.opensearch.observability.index
 
 import org.opensearch.OpenSearchStatusException
+import org.opensearch.core.rest.RestStatus
 import org.opensearch.index.query.BoolQueryBuilder
 import org.opensearch.index.query.Operator
 import org.opensearch.index.query.QueryBuilder
@@ -15,7 +16,6 @@ import org.opensearch.observability.model.RestTag.CREATED_TIME_FIELD
 import org.opensearch.observability.model.RestTag.NAME_FIELD
 import org.opensearch.observability.model.RestTag.QUERY_FIELD
 import org.opensearch.observability.model.RestTag.UPDATED_TIME_FIELD
-import org.opensearch.rest.RestStatus
 import org.opensearch.search.builder.SearchSourceBuilder
 import org.opensearch.search.sort.SortOrder
 import java.util.EnumSet

src/main/kotlin/org/opensearch/observability/metrics/RollingCounter.kt

@@ -33,7 +33,7 @@ internal class RollingCounter(
         trim()
         timeToCountMap.compute(
             getKey(clock.millis())
-        ) { k: Long?, v: Long? -> if (v == null) n else v + n }
+        ) { _: Long?, v: Long? -> if (v == null) n else v + n }
     }
 
     /**

src/main/kotlin/org/opensearch/observability/model/Application.kt

@@ -5,15 +5,15 @@
 
 package org.opensearch.observability.model
 
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.io.stream.Writeable
 import org.opensearch.common.xcontent.XContentFactory
-import org.opensearch.common.xcontent.XContentParserUtils
 import org.opensearch.commons.utils.stringList
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
+import org.opensearch.core.common.io.stream.Writeable
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
+import org.opensearch.core.xcontent.XContentParserUtils
 import org.opensearch.observability.ObservabilityPlugin.Companion.LOG_PREFIX
 import org.opensearch.observability.util.fieldIfNotNull
 import org.opensearch.observability.util.logger

src/main/kotlin/org/opensearch/observability/model/BaseModel.kt

@@ -5,7 +5,7 @@
 
 package org.opensearch.observability.model
 
-import org.opensearch.common.io.stream.Writeable
+import org.opensearch.core.common.io.stream.Writeable
 import org.opensearch.core.xcontent.ToXContent
 
 /**

src/main/kotlin/org/opensearch/observability/model/BaseResponse.kt

@@ -6,12 +6,12 @@
 package org.opensearch.observability.model
 
 import org.opensearch.action.ActionResponse
-import org.opensearch.common.io.stream.StreamInput
 import org.opensearch.common.xcontent.XContentFactory
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.rest.RestStatus
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.ToXContentObject
 import org.opensearch.core.xcontent.XContentBuilder
-import org.opensearch.rest.RestStatus
 import java.io.IOException
 
 /**

src/main/kotlin/org/opensearch/observability/model/Notebook.kt

@@ -5,14 +5,14 @@
 
 package org.opensearch.observability.model
 
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.io.stream.Writeable
 import org.opensearch.common.xcontent.XContentFactory
-import org.opensearch.common.xcontent.XContentParserUtils
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
+import org.opensearch.core.common.io.stream.Writeable
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
+import org.opensearch.core.xcontent.XContentParserUtils
 import org.opensearch.observability.ObservabilityPlugin.Companion.LOG_PREFIX
 import org.opensearch.observability.util.fieldIfNotNull
 import org.opensearch.observability.util.logger

src/main/kotlin/org/opensearch/observability/model/ObservabilityObjectDataProperties.kt

@@ -5,7 +5,7 @@
 
 package org.opensearch.observability.model
 
-import org.opensearch.common.io.stream.Writeable
+import org.opensearch.core.common.io.stream.Writeable
 import org.opensearch.core.xcontent.XContentParser
 
 internal object ObservabilityObjectDataProperties {

src/main/kotlin/org/opensearch/observability/model/ObservabilityObjectDoc.kt

@@ -5,16 +5,16 @@
 
 package org.opensearch.observability.model
 
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.io.stream.Writeable
 import org.opensearch.common.xcontent.XContentFactory
-import org.opensearch.common.xcontent.XContentParserUtils
 import org.opensearch.commons.utils.logger
 import org.opensearch.commons.utils.stringList
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
+import org.opensearch.core.common.io.stream.Writeable
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
+import org.opensearch.core.xcontent.XContentParserUtils
 import org.opensearch.observability.model.ObservabilityObjectDataProperties.getReaderForObjectType
 import org.opensearch.observability.model.RestTag.ACCESS_LIST_FIELD
 import org.opensearch.observability.model.RestTag.CREATED_TIME_FIELD

src/main/kotlin/org/opensearch/observability/model/ObservabilityObjectSearchResult.kt

@@ -7,7 +7,7 @@ package org.opensearch.observability.model
 
 import org.apache.lucene.search.TotalHits
 import org.opensearch.action.search.SearchResponse
-import org.opensearch.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamInput
 import org.opensearch.core.xcontent.XContentParser
 import org.opensearch.observability.model.RestTag.OBJECT_LIST_FIELD
 

src/main/kotlin/org/opensearch/observability/model/OperationalPanel.kt

@@ -5,14 +5,14 @@
 
 package org.opensearch.observability.model
 
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.io.stream.Writeable
 import org.opensearch.common.xcontent.XContentFactory
-import org.opensearch.common.xcontent.XContentParserUtils
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
+import org.opensearch.core.common.io.stream.Writeable
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
+import org.opensearch.core.xcontent.XContentParserUtils
 import org.opensearch.observability.ObservabilityPlugin.Companion.LOG_PREFIX
 import org.opensearch.observability.util.fieldIfNotNull
 import org.opensearch.observability.util.logger