From 814c002bf6ca5d15bb92d234064b990edcff98f9 Mon Sep 17 00:00:00 2001 From: "nikita.smirnov" Date: Mon, 13 Nov 2023 15:22:31 +0400 Subject: [PATCH 01/18] Added java-driver-metrics-micrometer --- build.gradle | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index de6d504d..90b5575e 100644 --- a/build.gradle +++ b/build.gradle @@ -63,6 +63,10 @@ dependencies { implementation 'io.prometheus:simpleclient' + implementation('com.datastax.oss:java-driver-metrics-micrometer:4.15.0') { + because('to publish metric into ') + } + implementation 'io.ktor:ktor-server-netty:2.3.3' implementation 'io.ktor:ktor-server:2.3.3' implementation 'org.ehcache:ehcache:3.8.1' @@ -80,8 +84,8 @@ dependencies { } tasks.withType(KotlinCompile).configureEach { - kotlinOptions { - freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn" + compilerOptions { + freeCompilerArgs.add('-opt-in=kotlin.RequiresOptIn') } } From 56273eddaa413f702daaf7c48535f558e9e40ffc Mon Sep 17 00:00:00 2001 From: "nikita.smirnov" Date: Mon, 13 Nov 2023 15:36:28 +0400 Subject: [PATCH 02/18] Added 'session.enabled' and 'node.enabled' into application.conf --- src/main/resources/application.conf | 55 +++++++++++++++++++++++++++-- 1 file changed, 52 insertions(+), 3 deletions(-) diff --git a/src/main/resources/application.conf b/src/main/resources/application.conf index cd64a058..d52e1c79 100644 --- a/src/main/resources/application.conf +++ b/src/main/resources/application.conf @@ -1,5 +1,5 @@ ################################################################################ -# Copyright 2021-2021 Exactpro (Exactpro Systems Limited) +# Copyright 2021-2023 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. @@ -15,7 +15,56 @@ ################################################################################ datastax-java-driver { - advanced.protocol { - compression = lz4 + advanced { + protocol.compression = lz4 + metrics { + factory.class = MicrometerMetricsFactory + + session.enabled = [ + bytes-sent, + bytes-received + connected-nodes, + cql-requests, + cql-client-timeouts, + cql-prepared-cache-size, + throttling.delay, + throttling.queue-size, + throttling.errors, + continuous-cql-requests, + graph-requests, + graph-client-timeouts + ] + node.enabled = [ + pool.open-connections, + pool.available-streams, + pool.in-flight, + pool.orphaned-streams, + bytes-sent, + bytes-received, + cql-messages, + errors.request.unsent, + errors.request.aborted, + errors.request.write-timeouts, + errors.request.read-timeouts, + errors.request.unavailables, + errors.request.others, + retries.total, + retries.aborted, + retries.read-timeout, + retries.write-timeout, + retries.unavailable, + retries.other, + ignores.total, + ignores.aborted, + ignores.read-timeout, + ignores.write-timeout, + ignores.unavailable, + ignores.other, + speculative-executions, + errors.connection.init, + errors.connection.auth, + graph-messages + ] + } } } \ No newline at end of file From 712e26c08415689d83c46ca45b94f9c616b96e6e Mon Sep 17 00:00:00 2001 From: "nikita.smirnov" Date: Mon, 13 Nov 2023 15:57:16 +0400 Subject: [PATCH 03/18] use DropwizardMetricsFactory --- src/main/resources/application.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/application.conf b/src/main/resources/application.conf index d52e1c79..506b2fea 100644 --- a/src/main/resources/application.conf +++ b/src/main/resources/application.conf @@ -18,7 +18,7 @@ datastax-java-driver { advanced { protocol.compression = lz4 metrics { - factory.class = MicrometerMetricsFactory + factory.class = DropwizardMetricsFactory session.enabled = [ bytes-sent, From fbf5013d37a190a1a516601cc1e048938c712fe8 Mon Sep 17 00:00:00 2001 From: "nikita.smirnov" Date: Mon, 13 Nov 2023 17:59:04 +0400 Subject: [PATCH 04/18] change configuraton --- src/main/resources/application.conf | 47 ++--------------------------- 1 file changed, 2 insertions(+), 45 deletions(-) diff --git a/src/main/resources/application.conf b/src/main/resources/application.conf index 506b2fea..a73aa0a2 100644 --- a/src/main/resources/application.conf +++ b/src/main/resources/application.conf @@ -20,51 +20,8 @@ datastax-java-driver { metrics { factory.class = DropwizardMetricsFactory - session.enabled = [ - bytes-sent, - bytes-received - connected-nodes, - cql-requests, - cql-client-timeouts, - cql-prepared-cache-size, - throttling.delay, - throttling.queue-size, - throttling.errors, - continuous-cql-requests, - graph-requests, - graph-client-timeouts - ] - node.enabled = [ - pool.open-connections, - pool.available-streams, - pool.in-flight, - pool.orphaned-streams, - bytes-sent, - bytes-received, - cql-messages, - errors.request.unsent, - errors.request.aborted, - errors.request.write-timeouts, - errors.request.read-timeouts, - errors.request.unavailables, - errors.request.others, - retries.total, - retries.aborted, - retries.read-timeout, - retries.write-timeout, - retries.unavailable, - retries.other, - ignores.total, - ignores.aborted, - ignores.read-timeout, - ignores.write-timeout, - ignores.unavailable, - ignores.other, - speculative-executions, - errors.connection.init, - errors.connection.auth, - graph-messages - ] + session.enabled = [ bytes-sent, bytes-received connected-nodes, cql-requests, cql-client-timeouts, cql-prepared-cache-size, throttling.delay, throttling.queue-size, throttling.errors, continuous-cql-requests, graph-requests, graph-client-timeouts ] + node.enabled = [ pool.open-connections, pool.available-streams, pool.in-flight, pool.orphaned-streams, bytes-sent, bytes-received, cql-messages, errors.request.unsent, errors.request.aborted, errors.request.write-timeouts, errors.request.read-timeouts, errors.request.unavailables, errors.request.others, retries.total, retries.aborted, retries.read-timeout, retries.write-timeout, retries.unavailable, retries.other, ignores.total, ignores.aborted, ignores.read-timeout, ignores.write-timeout, ignores.unavailable, ignores.other, speculative-executions, errors.connection.init, errors.connection.auth, graph-messages ] } } } \ No newline at end of file From faeb94f2ac978a48cfcf0a86d97f5adc440b0607 Mon Sep 17 00:00:00 2001 From: "nikita.smirnov" Date: Mon, 13 Nov 2023 18:03:04 +0400 Subject: [PATCH 05/18] change configuraton --- src/main/resources/application.conf | 34 +++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/src/main/resources/application.conf b/src/main/resources/application.conf index a73aa0a2..ea81b1eb 100644 --- a/src/main/resources/application.conf +++ b/src/main/resources/application.conf @@ -20,8 +20,38 @@ datastax-java-driver { metrics { factory.class = DropwizardMetricsFactory - session.enabled = [ bytes-sent, bytes-received connected-nodes, cql-requests, cql-client-timeouts, cql-prepared-cache-size, throttling.delay, throttling.queue-size, throttling.errors, continuous-cql-requests, graph-requests, graph-client-timeouts ] - node.enabled = [ pool.open-connections, pool.available-streams, pool.in-flight, pool.orphaned-streams, bytes-sent, bytes-received, cql-messages, errors.request.unsent, errors.request.aborted, errors.request.write-timeouts, errors.request.read-timeouts, errors.request.unavailables, errors.request.others, retries.total, retries.aborted, retries.read-timeout, retries.write-timeout, retries.unavailable, retries.other, ignores.total, ignores.aborted, ignores.read-timeout, ignores.write-timeout, ignores.unavailable, ignores.other, speculative-executions, errors.connection.init, errors.connection.auth, graph-messages ] + session { + enabled = [ bytes-sent, bytes-received, connected-nodes, cql-requests, cql-client-timeouts, + cql-prepared-cache-size, throttling.delay, throttling.queue-size, throttling.errors + ] + cql-requests { + highest-latency = 3 seconds + significant-digits = 3 + refresh-interval = 5 minutes + } + throttling.delay { + highest-latency = 3 seconds + significant-digits = 3 + refresh-interval = 5 minutes + } + } + + node { + enabled = [ pool.open-connections, pool.available-streams, pool.in-flight, pool.orphaned-streams, + bytes-sent, bytes-received, cql-messages, errors.request.unsent, errors.request.aborted, + errors.request.write-timeouts, errors.request.read-timeouts, errors.request.unavailables, + errors.request.others, retries.total, retries.aborted, retries.read-timeout, + retries.write-timeout, retries.unavailable, retries.other, ignores.total, ignores.aborted, + ignores.read-timeout, ignores.write-timeout, ignores.unavailable, ignores.other, speculative-executions, + errors.connection.init, errors.connection.auth + ] + + cql-messages { + highest-latency = 3 seconds + significant-digits = 3 + refresh-interval = 5 minutes + } + } } } } \ No newline at end of file From 376841fd7d1b18de76ca29099880bb616f1b3493 Mon Sep 17 00:00:00 2001 From: "nikita.smirnov" Date: Mon, 13 Nov 2023 20:44:12 +0400 Subject: [PATCH 06/18] corrected configuration --- build.gradle | 4 --- src/main/resources/application.conf | 48 +++++++++++++++++++++++------ 2 files changed, 39 insertions(+), 13 deletions(-) diff --git a/build.gradle b/build.gradle index 90b5575e..30c3bd44 100644 --- a/build.gradle +++ b/build.gradle @@ -63,10 +63,6 @@ dependencies { implementation 'io.prometheus:simpleclient' - implementation('com.datastax.oss:java-driver-metrics-micrometer:4.15.0') { - because('to publish metric into ') - } - implementation 'io.ktor:ktor-server-netty:2.3.3' implementation 'io.ktor:ktor-server:2.3.3' implementation 'org.ehcache:ehcache:3.8.1' diff --git a/src/main/resources/application.conf b/src/main/resources/application.conf index ea81b1eb..829ea8f5 100644 --- a/src/main/resources/application.conf +++ b/src/main/resources/application.conf @@ -21,8 +21,16 @@ datastax-java-driver { factory.class = DropwizardMetricsFactory session { - enabled = [ bytes-sent, bytes-received, connected-nodes, cql-requests, cql-client-timeouts, - cql-prepared-cache-size, throttling.delay, throttling.queue-size, throttling.errors + enabled = [ + bytes-sent, + bytes-received, + connected-nodes, + cql-requests, + cql-client-timeouts, + cql-prepared-cache-size, + throttling.delay, + throttling.queue-size, + throttling.errors ] cql-requests { highest-latency = 3 seconds @@ -37,13 +45,35 @@ datastax-java-driver { } node { - enabled = [ pool.open-connections, pool.available-streams, pool.in-flight, pool.orphaned-streams, - bytes-sent, bytes-received, cql-messages, errors.request.unsent, errors.request.aborted, - errors.request.write-timeouts, errors.request.read-timeouts, errors.request.unavailables, - errors.request.others, retries.total, retries.aborted, retries.read-timeout, - retries.write-timeout, retries.unavailable, retries.other, ignores.total, ignores.aborted, - ignores.read-timeout, ignores.write-timeout, ignores.unavailable, ignores.other, speculative-executions, - errors.connection.init, errors.connection.auth + enabled = [ + pool.open-connections, + pool.available-streams, + pool.in-flight, + pool.orphaned-streams, + bytes-sent, + bytes-received, + cql-messages, + errors.request.unsent, + errors.request.aborted, + errors.request.write-timeouts, + errors.request.read-timeouts, + errors.request.unavailables, + errors.request.others, + retries.total, + retries.aborted, + retries.read-timeout, + retries.write-timeout, + retries.unavailable, + retries.other, + ignores.total, + ignores.aborted, + ignores.read-timeout, + ignores.write-timeout, + ignores.unavailable, + ignores.other, + speculative-executions, + errors.connection.init, + errors.connection.auth ] cql-messages { From 13cffe84c2d1c883bbbd7508231190216e8dfa69 Mon Sep 17 00:00:00 2001 From: "nikita.smirnov" Date: Tue, 14 Nov 2023 10:57:15 +0400 Subject: [PATCH 07/18] [TH2-5124] Bumped version, updated README.md --- README.md | 5 ++++- gradle.properties | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 078e3a44..9536297a 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Report data provider (5.9.2) +# Report data provider (5.9.3) # Overview This component serves as a backend for rpt-viewer. It will connect to the cassandra database via cradle api and expose the data stored in there as REST resources. @@ -295,6 +295,9 @@ spec: # Release notes +## 5.9.3 ++ Enabled [Cassandra driver metrics](https://docs.datastax.com/en/developer/java-driver/4.10/manual/core/metrics/) + ## 5.9.2 + Fix problem with accumulating all batches in memory when provider loads messages by group diff --git a/gradle.properties b/gradle.properties index ff7784db..667afe2f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,6 +16,6 @@ kotlin.code.style=official -release_version=5.9.2 +release_version=5.9.3 docker_image_name= \ No newline at end of file From da23dde837ce1f5d45d51bf8a2fddc08e4d52132 Mon Sep 17 00:00:00 2001 From: "nikita.smirnov" Date: Wed, 15 Nov 2023 13:58:04 +0400 Subject: [PATCH 08/18] [TH2-5124] disabled throttling metrics because they don't support --- src/main/resources/application.conf | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/main/resources/application.conf b/src/main/resources/application.conf index 829ea8f5..bed1c766 100644 --- a/src/main/resources/application.conf +++ b/src/main/resources/application.conf @@ -28,20 +28,12 @@ datastax-java-driver { cql-requests, cql-client-timeouts, cql-prepared-cache-size, - throttling.delay, - throttling.queue-size, - throttling.errors ] cql-requests { highest-latency = 3 seconds significant-digits = 3 refresh-interval = 5 minutes } - throttling.delay { - highest-latency = 3 seconds - significant-digits = 3 - refresh-interval = 5 minutes - } } node { From 1cd408141b448a477079fd147049657f2001d289 Mon Sep 17 00:00:00 2001 From: "nikita.smirnov" Date: Wed, 7 Feb 2024 11:02:30 +0400 Subject: [PATCH 09/18] [TH2-5124] Refactored logging --- .../th2/rptdataprovider/services/rabbitmq/RabbitMqService.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/kotlin/com/exactpro/th2/rptdataprovider/services/rabbitmq/RabbitMqService.kt b/src/main/kotlin/com/exactpro/th2/rptdataprovider/services/rabbitmq/RabbitMqService.kt index a4281cf0..b58176e8 100644 --- a/src/main/kotlin/com/exactpro/th2/rptdataprovider/services/rabbitmq/RabbitMqService.kt +++ b/src/main/kotlin/com/exactpro/th2/rptdataprovider/services/rabbitmq/RabbitMqService.kt @@ -182,7 +182,7 @@ abstract class RabbitMqService( } K_LOGGER.error(e) { "unexpected exception while trying to send a codec request" } } - }.also { K_LOGGER.info { "${request.requestId} mqRequestSenderScope ${it}ms" } } + }.also { K_LOGGER.debug { "${request.requestId} mqRequestSenderScope ${it}ms" } } } pendingRequest From 1ef19df6eb2f0228b593724f431b3fd561c1dc8b Mon Sep 17 00:00:00 2001 From: "nikita.smirnov" Date: Tue, 27 Feb 2024 15:05:54 +0400 Subject: [PATCH 10/18] [TH2-5165] Migrated to cradle api 5.2.0-... --- README.md | 7 +++++-- build.gradle | 14 +++++++------- gradle.properties | 2 +- .../handlers/events/TestEventPipeline.kt | 4 ++-- .../kotlin/handlers/messages/ExtractorTest.kt | 18 ++++++++++-------- 5 files changed, 25 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index 36493f18..4db00367 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Report data provider (5.9.5) +# Report data provider (5.10.0) # Overview This component serves as a backend for rpt-viewer. It will connect to the cassandra database via cradle api and expose the data stored in there as REST resources. @@ -295,7 +295,10 @@ spec: # Release notes -## 5.9.5 +## 5.10.0 ++ Updated cradle api: `5.2.0-dev` ++ Updated common: `5.8.0-dev` ++ Updated common-utils: `2.2.2-dev` + Disabled unsupported [Cassandra driver metrics](https://docs.datastax.com/en/developer/java-driver/4.10/manual/core/metrics/) ## 5.9.4 diff --git a/build.gradle b/build.gradle index 30c3bd44..7b399b53 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ plugins { id 'org.jetbrains.kotlin.jvm' version '1.8.22' id 'application' id 'com.palantir.docker' version '0.25.0' - id "org.owasp.dependencycheck" version "8.3.1" + id "org.owasp.dependencycheck" version "9.0.9" id "com.gorylenko.gradle-git-properties" version "2.4.1" id 'com.github.jk1.dependency-license-report' version '2.5' id "de.undercouch.download" version "5.4.0" @@ -15,7 +15,7 @@ plugins { ext { dockerImageVersion = release_version - cradleVersion = '5.1.4-dev' + cradleVersion = '5.2.0-TH2-5165-+' } group 'com.exactpro.th2' @@ -47,11 +47,11 @@ dependencies { implementation 'org.apache.commons:commons-lang3' - implementation('com.exactpro.th2:common:5.4.0-dev') { + implementation('com.exactpro.th2:common:5.8.0-dev') { exclude group: 'com.exactpro.th2', module: 'cradle-core' exclude group: 'com.exactpro.th2', module: 'cradle-cassandra' } - implementation 'com.exactpro.th2:common-utils:2.2.0-dev' + implementation 'com.exactpro.th2:common-utils:2.2.2-dev' implementation "com.exactpro.th2:cradle-core:${cradleVersion}" @@ -73,10 +73,10 @@ dependencies { testImplementation('org.jetbrains.kotlin:kotlin-reflect') { because('mockk needs it') } - testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.0' - testImplementation "org.junit.jupiter:junit-jupiter-params:5.10.0" + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.2' + testImplementation "org.junit.jupiter:junit-jupiter-params:5.10.2" - testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.0' + testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.2' } tasks.withType(KotlinCompile).configureEach { diff --git a/gradle.properties b/gradle.properties index c10c2fda..f777a819 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,6 +16,6 @@ kotlin.code.style=official -release_version=5.9.5 +release_version=5.10.0 docker_image_name= \ No newline at end of file diff --git a/src/test/kotlin/handlers/events/TestEventPipeline.kt b/src/test/kotlin/handlers/events/TestEventPipeline.kt index 736181fd..5b779d98 100644 --- a/src/test/kotlin/handlers/events/TestEventPipeline.kt +++ b/src/test/kotlin/handlers/events/TestEventPipeline.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. @@ -63,7 +63,7 @@ class TestEventPipeline { private val endTimestamp = Instant.parse("2022-04-21T01:15:00Z") private val batchSize = 4096 - private val pageId = PageId(BookId("testBook"), "testPage") + private val pageId = PageId(BookId("testBook"), startTimestamp,"testPage") private val scope = "testScope" private val eventsFromStartToEnd11 = createEvents("1", startTimestamp, endTimestamp) diff --git a/src/test/kotlin/handlers/messages/ExtractorTest.kt b/src/test/kotlin/handlers/messages/ExtractorTest.kt index a217bd1f..1d5ea1a9 100644 --- a/src/test/kotlin/handlers/messages/ExtractorTest.kt +++ b/src/test/kotlin/handlers/messages/ExtractorTest.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. @@ -37,6 +37,7 @@ import com.exactpro.th2.rptdataprovider.services.cradle.CradleService import io.mockk.coEvery import io.mockk.every import io.mockk.mockk +import kotlinx.coroutines.DelicateCoroutinesApi import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.cancelChildren import kotlinx.coroutines.channels.Channel @@ -65,7 +66,7 @@ class ExtractorTest { private val baseStreamName = "test_stream" private val streamDirection = "FIRST" - private val BOOK = BookId("") + private val bookId = BookId("") private val fullStreamName = "${baseStreamName}:${streamDirection}" private val streamNameObject = StreamName(baseStreamName, Direction.valueOf(streamDirection), BookId("")) @@ -93,7 +94,7 @@ class ExtractorTest { "direction" to listOf(streamDirection), "startTimestamp" to listOf(startTimestamp.toEpochMilli().toString()), "endTimestamp" to listOf(endTimestamp.toEpochMilli().toString()), - "bookId" to listOf(BOOK.name) + "bookId" to listOf(bookId.name) ) if (resumeId != null) { parameters["messageId"] = listOf(resumeId.toString()) @@ -113,10 +114,10 @@ class ExtractorTest { every { msg.sessionAlias } answers { fullStreamName } every { msg.protocol } answers { "protocol" } every { msg.direction } answers { Direction.FIRST } - every { msg.getContent() } answers { byteArrayOf(1, 1, 1) } - every { msg.getId() } answers { + every { msg.content } answers { byteArrayOf(1, 1, 1) } + every { msg.id } answers { StoredMessageId( - BOOK, + bookId, baseStreamName, Direction.valueOf(streamDirection), timestamp, @@ -128,6 +129,7 @@ class ExtractorTest { return msg } + @OptIn(DelicateCoroutinesApi::class) private fun mockContextWithCradleService(batch: StoredMessageBatch): ProtoContext { val context: ProtoContext = mockk() @@ -187,7 +189,7 @@ class ExtractorTest { startTimestamp = endTimestamp.plusNanos(1) } - return StoredMessageBatch(allMessages, PageId(BookId("1"), "1"), Instant.now()) + return StoredMessageBatch(allMessages, PageId(BookId("1"), start,"1"), Instant.now()) } @@ -250,7 +252,7 @@ class ExtractorTest { allMessages.add(getMessage(endTimestamp, index)) - return StoredMessageBatch(allMessages, PageId(BookId("1"), "1"), Instant.now()) + return StoredMessageBatch(allMessages, PageId(BookId("1"), startTimestamp, "1"), Instant.now()) } private fun testBorders( From 1f789617ba56b4c74b9c485741d851553c138936 Mon Sep 17 00:00:00 2001 From: "nikita.smirnov" Date: Fri, 1 Mar 2024 15:42:55 +0400 Subject: [PATCH 11/18] [TH2-5165] Bump-rebuild From 0e16ecd8dc6b48618b50c7993616745e595b12dd Mon Sep 17 00:00:00 2001 From: "nikita.smirnov" Date: Fri, 1 Mar 2024 15:44:55 +0400 Subject: [PATCH 12/18] [TH2-5165] Bump-rebuild --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index f777a819..c6d83db7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,4 +18,4 @@ kotlin.code.style=official release_version=5.10.0 -docker_image_name= \ No newline at end of file +docker_image_name= From 105f0e397598d93192c3257699df3611042872dd Mon Sep 17 00:00:00 2001 From: "nikita.smirnov" Date: Mon, 4 Mar 2024 15:38:23 +0400 Subject: [PATCH 13/18] [TH2-5165] bump rebuild --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index c6d83db7..f777a819 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,4 +18,4 @@ kotlin.code.style=official release_version=5.10.0 -docker_image_name= +docker_image_name= \ No newline at end of file From ac353c512e3cfc7673c4b07ab9e9bc41d9ae225b Mon Sep 17 00:00:00 2001 From: "nikita.smirnov" Date: Tue, 5 Mar 2024 13:52:38 +0400 Subject: [PATCH 14/18] [TH2-5165] revert BOOK_LABEL to book --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index f777a819..c6d83db7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,4 +18,4 @@ kotlin.code.style=official release_version=5.10.0 -docker_image_name= \ No newline at end of file +docker_image_name= From 59764630bc7630e54ce67c5e3abce16a8aec3b32 Mon Sep 17 00:00:00 2001 From: "nikita.smirnov" Date: Tue, 5 Mar 2024 15:27:42 +0400 Subject: [PATCH 15/18] [TH2-5165] revert logic to skip register load for empty day page interval --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index c6d83db7..f777a819 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,4 +18,4 @@ kotlin.code.style=official release_version=5.10.0 -docker_image_name= +docker_image_name= \ No newline at end of file From 16d17d316a55fb6ed5a1f83efa0156ba271a3b50 Mon Sep 17 00:00:00 2001 From: "nikita.smirnov" Date: Tue, 5 Mar 2024 15:53:25 +0400 Subject: [PATCH 16/18] [TH2-5165] revert logic to skip register load for empty day page interval --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index f777a819..c6d83db7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,4 +18,4 @@ kotlin.code.style=official release_version=5.10.0 -docker_image_name= \ No newline at end of file +docker_image_name= From ce8e3da43cb9fa3111adc2ec37eba29d35a860c8 Mon Sep 17 00:00:00 2001 From: "nikita.smirnov" Date: Wed, 6 Mar 2024 18:43:57 +0400 Subject: [PATCH 17/18] [TH2-5165] Migrated to dev release cradle API version --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 7b399b53..17dcb9ed 100644 --- a/build.gradle +++ b/build.gradle @@ -15,7 +15,7 @@ plugins { ext { dockerImageVersion = release_version - cradleVersion = '5.2.0-TH2-5165-+' + cradleVersion = '5.2.0-dev' } group 'com.exactpro.th2' From 3995013495000f8cf2a61106ce40fa19204ef78f Mon Sep 17 00:00:00 2001 From: "nikita.smirnov" Date: Wed, 6 Mar 2024 18:59:14 +0400 Subject: [PATCH 18/18] [TH2-5165] Updated github workflow --- ...ocker-publish.yml => build-dev-release.yml} | 13 +++++-------- .github/workflows/build-release.yml | 14 ++++++++++++++ ...v-docker-publish.yml => build-sanpshot.yml} | 5 ++++- .github/workflows/docker-publish.yml | 18 ------------------ 4 files changed, 23 insertions(+), 27 deletions(-) rename .github/workflows/{dev-release-docker-publish.yml => build-dev-release.yml} (60%) create mode 100644 .github/workflows/build-release.yml rename .github/workflows/{dev-docker-publish.yml => build-sanpshot.yml} (69%) delete mode 100644 .github/workflows/docker-publish.yml diff --git a/.github/workflows/dev-release-docker-publish.yml b/.github/workflows/build-dev-release.yml similarity index 60% rename from .github/workflows/dev-release-docker-publish.yml rename to .github/workflows/build-dev-release.yml index 290caef8..59d4309c 100644 --- a/.github/workflows/dev-release-docker-publish.yml +++ b/.github/workflows/build-dev-release.yml @@ -1,17 +1,14 @@ -name: Build and publish Docker distributions to Github Container Registry ghcr.io +name: Build and publish dev release Docker image to Github Container Registry ghcr.io -on: - workflow_dispatch: - push: - tags: - - \d+.\d+.\d+-dev +on: workflow_dispatch jobs: - build-job: + build: uses: th2-net/.github/.github/workflows/compound-java.yml@main with: build-target: 'Docker' - docker-username: ${{ github.actor }} devRelease: true + createTag: true + docker-username: ${{ github.actor }} secrets: docker-password: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml new file mode 100644 index 00000000..8f357426 --- /dev/null +++ b/.github/workflows/build-release.yml @@ -0,0 +1,14 @@ +name: Build and publish release Docker image to Github Container Registry ghcr.io + +on: workflow_dispatch + +jobs: + build: + uses: th2-net/.github/.github/workflows/compound-java.yml@main + with: + build-target: 'Docker' + devRelease: false + createTag: true + docker-username: ${{ github.actor }} + secrets: + docker-password: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/.github/workflows/dev-docker-publish.yml b/.github/workflows/build-sanpshot.yml similarity index 69% rename from .github/workflows/dev-docker-publish.yml rename to .github/workflows/build-sanpshot.yml index 858077b6..1618698e 100644 --- a/.github/workflows/dev-docker-publish.yml +++ b/.github/workflows/build-sanpshot.yml @@ -1,10 +1,13 @@ -name: Dev build and publish Docker distributions to Github Container Registry ghcr.io +name: Build and publish Docker image to Github Container Registry ghcr.io on: push: branches-ignore: - master - version-* + - dependabot** + paths-ignore: + - README.md jobs: build-job: diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml deleted file mode 100644 index 56d891de..00000000 --- a/.github/workflows/docker-publish.yml +++ /dev/null @@ -1,18 +0,0 @@ -name: Build and publish Docker distributions to Github Container Registry ghcr.io - -on: - push: - branches: - - master - - version-* - paths: - - gradle.properties - -jobs: - build-job: - uses: th2-net/.github/.github/workflows/compound-java.yml@main - with: - build-target: 'Docker' - docker-username: ${{ github.actor }} - secrets: - docker-password: ${{ secrets.GITHUB_TOKEN }}