th2-net · Nikita-Smirnov-Exactpro · Aug 20, 2024 · Aug 20, 2024 · Aug 20, 2024
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# Lightweight data provider (2.10.0)
+# Lightweight data provider (2.11.0)
 
 # Overview
 This component serves as a data provider for [th2-data-services](https://github.com/th2-net/th2-data-services). It will connect to the cassandra database via [cradle api](https://github.com/th2-net/cradleapi) and expose the data stored in there as REST resources.
@@ -224,6 +224,15 @@ spec:
 
 # Release notes:
 
+## 2.11.0
+
++ Updated:
+  + th2 gradle plugin `0.1.1`
+  + common: `5.14.0-dev`
+  + cradle api: `5.4.2-dev`
+  + kotlin-logging: `5.1.4`
+  + micrometer-bom: `1.13.3`
+
 ## 2.10.0
 
 + Updated:

diff --git a/app/gradle.properties b/app/gradle.properties
@@ -1,4 +1,4 @@
 kotlin.code.style=official
-release_version=2.10.0
+release_version=2.11.0
 description='th2 Lightweight data provider component'
 kapt.include.compile.classpath=false
diff --git a/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/Extensions.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/Extensions.kt
diff --git a/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/Main.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/Main.kt
@@ -1,5 +1,5 @@
-/*******************************************************************************
- * Copyright 2021-2021 Exactpro (Exactpro Systems Limited)
+/*
+ * Copyright 2021-2024 Exactpro (Exactpro Systems Limited)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- ******************************************************************************/
+ */
 
 package com.exactpro.th2.lwdataprovider
 
@@ -25,7 +25,7 @@ import com.exactpro.th2.lwdataprovider.configuration.Mode
 import com.exactpro.th2.lwdataprovider.grpc.GrpcServer
 import com.exactpro.th2.lwdataprovider.http.HttpServer
 import com.exactpro.th2.lwdataprovider.metrics.DecodingMetrics
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
 import java.util.*
 import java.util.concurrent.ConcurrentLinkedDeque
 import java.util.concurrent.locks.Condition

diff --git a/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/RabbitMqDecoder.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/RabbitMqDecoder.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2023 Exactpro (Exactpro Systems Limited)
+ * Copyright 2021-2024 Exactpro (Exactpro Systems Limited)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,7 +28,7 @@ import com.exactpro.th2.lwdataprovider.workers.DecodeQueueBuffer
 import com.exactpro.th2.lwdataprovider.workers.ProtoCodecMessageListener
 import com.exactpro.th2.lwdataprovider.workers.TimeoutChecker
 import com.exactpro.th2.lwdataprovider.workers.TransportCodecMessageListener
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
 
 class RabbitMqDecoder(
     private val protoGroupBatchRouter: MessageRouter<MessageGroupBatch>,

diff --git a/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/configuration/Configuration.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/configuration/Configuration.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2023 Exactpro (Exactpro Systems Limited)
+ * Copyright 2021-2024 Exactpro (Exactpro Systems Limited)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@ package com.exactpro.th2.lwdataprovider.configuration
 
 import com.exactpro.th2.lwdataprovider.entities.internal.ResponseFormat
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
 import java.util.*
 import java.util.concurrent.TimeUnit
 import kotlin.math.max

diff --git a/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/configuration/Variable.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/configuration/Variable.kt
@@ -1,5 +1,5 @@
-/*******************************************************************************
- * Copyright 2021-2021 Exactpro (Exactpro Systems Limited)
+/*
+ * Copyright 2021-2024 Exactpro (Exactpro Systems Limited)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,11 +12,11 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- ******************************************************************************/
+ */
 
 package com.exactpro.th2.lwdataprovider.configuration
 
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
 import kotlin.reflect.KProperty
 
 class VariableBuilder {

diff --git a/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/db/CradleEventExtractor.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/db/CradleEventExtractor.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2023 Exactpro (Exactpro Systems Limited)
+ * Copyright 2021-2024 Exactpro (Exactpro Systems Limited)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,7 +35,7 @@ import com.exactpro.th2.lwdataprovider.entities.responses.BaseEventEntity
 import com.exactpro.th2.lwdataprovider.entities.responses.Event
 import com.exactpro.th2.lwdataprovider.filter.DataFilter
 import com.exactpro.th2.lwdataprovider.producers.EventProducer
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
 import java.time.Duration
 import java.time.Instant
 import java.util.Collections

diff --git a/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/db/CradleMessageExtractor.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/db/CradleMessageExtractor.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2023 Exactpro (Exactpro Systems Limited)
+ * Copyright 2021-2024 Exactpro (Exactpro Systems Limited)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,7 +37,7 @@ import com.exactpro.th2.lwdataprovider.db.util.getGenericWithSyncInterval
 import com.exactpro.th2.lwdataprovider.db.util.withMeasurements
 import com.exactpro.th2.lwdataprovider.handlers.util.BookGroup
 import com.exactpro.th2.lwdataprovider.toReportId
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
 import java.time.Duration
 import java.time.Instant
 import kotlin.system.measureTimeMillis

diff --git a/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/db/GeneralCradleExtractor.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/db/GeneralCradleExtractor.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Exactpro (Exactpro Systems Limited)
+ * Copyright 2022-2024 Exactpro (Exactpro Systems Limited)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@ import com.exactpro.cradle.CradleManager
 import com.exactpro.cradle.CradleStorage
 import com.exactpro.cradle.PageInfo
 import com.exactpro.cradle.counters.Interval
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
 import java.time.Instant
 
 class GeneralCradleExtractor(

diff --git a/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/db/util/RequestSyncUtil.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/db/util/RequestSyncUtil.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Exactpro (Exactpro Systems Limited)
+ * Copyright 2022-2024 Exactpro (Exactpro Systems Limited)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 package com.exactpro.th2.lwdataprovider.db.util
 
 import com.exactpro.th2.lwdataprovider.db.BaseDataSink
-import mu.KLogger
+import io.github.oshai.kotlinlogging.KLogger
 import java.time.Duration
 import java.time.Instant
 

diff --git a/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/grpc/GrpcDataProviderBackPressure.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/grpc/GrpcDataProviderBackPressure.kt
@@ -1,5 +1,5 @@
-/*******************************************************************************
- * Copyright 2022 Exactpro (Exactpro Systems Limited)
+/*
+ * Copyright 2022-2024 Exactpro (Exactpro Systems Limited)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- ******************************************************************************/
+ */
 
 package com.exactpro.th2.lwdataprovider.grpc
 
@@ -23,15 +23,14 @@ import com.exactpro.th2.lwdataprovider.db.DataMeasurement
 import com.exactpro.th2.lwdataprovider.handlers.GeneralCradleHandler
 import com.exactpro.th2.lwdataprovider.handlers.SearchEventsHandler
 import com.exactpro.th2.lwdataprovider.handlers.SearchMessagesHandler
+import io.github.oshai.kotlinlogging.KotlinLogging
 import io.grpc.Status
 import io.grpc.stub.ServerCallStreamObserver
 import io.grpc.stub.StreamObserver
-import mu.KotlinLogging
 import java.util.concurrent.BlockingQueue
 import java.util.concurrent.Future
 import java.util.concurrent.ScheduledExecutorService
 import java.util.concurrent.TimeUnit
-import java.util.concurrent.atomic.AtomicReference
 import java.util.concurrent.locks.ReentrantLock
 import kotlin.concurrent.withLock
 

diff --git a/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/grpc/GrpcDataProviderImpl.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/grpc/GrpcDataProviderImpl.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2023 Exactpro (Exactpro Systems Limited)
+ * Copyright 2022-2024 Exactpro (Exactpro Systems Limited)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -55,7 +55,7 @@ import com.exactpro.th2.lwdataprovider.handlers.SearchMessagesHandler
 import com.exactpro.th2.lwdataprovider.toCradle
 import io.grpc.Status
 import io.grpc.stub.StreamObserver
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
 import org.apache.commons.lang3.exception.ExceptionUtils
 import java.util.concurrent.ArrayBlockingQueue
 import java.util.concurrent.BlockingQueue
@@ -127,7 +127,7 @@ open class GrpcDataProviderImpl(
             sender.invoke(value)
             responseObserver.onCompleted()
         }
-        handler.cancel();
+        handler.cancel()
     }
 
     override fun searchEvents(request: EventSearchRequest, responseObserver: StreamObserver<EventSearchResponse>) {

diff --git a/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/grpc/GrpcServer.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/grpc/GrpcServer.kt
@@ -1,5 +1,5 @@
-/*******************************************************************************
- * Copyright 2022 Exactpro (Exactpro Systems Limited)
+/*
+ * Copyright 2022-2024 Exactpro (Exactpro Systems Limited)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- ******************************************************************************/
+ */
 
 package com.exactpro.th2.lwdataprovider.grpc
 
@@ -21,7 +21,7 @@ import com.exactpro.th2.lwdataprovider.Context
 import com.google.common.util.concurrent.ThreadFactoryBuilder
 import io.grpc.BindableService
 import io.grpc.Server
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
 import java.util.concurrent.Executors
 import java.util.concurrent.ScheduledExecutorService
 import java.util.concurrent.TimeUnit

diff --git a/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/grpc/QueueGrpcProvider.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/grpc/QueueGrpcProvider.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Exactpro (Exactpro Systems Limited)
+ * Copyright 2022-2024 Exactpro (Exactpro Systems Limited)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,7 +36,7 @@ import com.exactpro.th2.lwdataprovider.handlers.QueueMessagesHandler
 import io.grpc.Context
 import io.grpc.Status
 import io.grpc.stub.StreamObserver
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
 
 class QueueGrpcProvider(
     private val messagesHandler: QueueMessagesHandler,

diff --git a/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/handlers/GeneralCradleHandler.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/handlers/GeneralCradleHandler.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Exactpro (Exactpro Systems Limited)
+ * Copyright 2022-2024 Exactpro (Exactpro Systems Limited)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@ import com.exactpro.th2.lwdataprovider.entities.requests.AllPageInfoRequest
 import com.exactpro.th2.lwdataprovider.entities.requests.SsePageInfosSearchRequest
 import com.exactpro.th2.lwdataprovider.entities.responses.PageId
 import com.exactpro.th2.lwdataprovider.entities.responses.PageInfo
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
 import java.util.concurrent.Executor
 import com.exactpro.cradle.PageId as CradlePageId
 import com.exactpro.cradle.PageInfo as CradlePageInfo

diff --git a/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/handlers/MessageResponseHandler.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/handlers/MessageResponseHandler.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Exactpro (Exactpro Systems Limited)
+ * Copyright 2022-2024 Exactpro (Exactpro Systems Limited)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@ import com.exactpro.th2.lwdataprovider.ProviderStreamInfo
 import com.exactpro.th2.lwdataprovider.RequestedMessageDetails
 import com.exactpro.th2.lwdataprovider.ResponseHandler
 import com.exactpro.th2.lwdataprovider.db.DataMeasurement
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
 import java.util.concurrent.locks.Condition
 import java.util.concurrent.locks.ReentrantLock
 import javax.annotation.concurrent.GuardedBy

diff --git a/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/handlers/QueueEventsHandler.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/handlers/QueueEventsHandler.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Exactpro (Exactpro Systems Limited)
+ * Copyright 2022-2024 Exactpro (Exactpro Systems Limited)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,7 +30,7 @@ import com.exactpro.th2.lwdataprovider.entities.requests.QueueEventsScopeRequest
 import com.exactpro.th2.lwdataprovider.entities.responses.Event
 import com.exactpro.th2.lwdataprovider.handlers.util.BookScope
 import com.google.protobuf.UnsafeByteOperations
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
 import org.apache.commons.lang3.StringUtils.isBlank
 import java.util.concurrent.Executor
 import com.exactpro.th2.common.grpc.Event as CommonGrpcEvent

diff --git a/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/handlers/QueueMessagesHandler.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/handlers/QueueMessagesHandler.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Exactpro (Exactpro Systems Limited)
+ * Copyright 2022-2024 Exactpro (Exactpro Systems Limited)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,7 +35,7 @@ import com.exactpro.th2.lwdataprovider.grpc.toProtoRawMessage
 import com.exactpro.th2.lwdataprovider.handlers.util.BookGroup
 import com.exactpro.th2.lwdataprovider.handlers.util.GroupParametersHolder
 import com.exactpro.th2.lwdataprovider.handlers.util.computeNewParametersForGroupRequest
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
 import java.time.Instant
 import java.util.concurrent.Executor