From 654b4437168e247214626c802c6dd2f0c117a033 Mon Sep 17 00:00:00 2001 From: Denis Plotnikov Date: Thu, 16 Feb 2023 19:36:34 +0400 Subject: [PATCH 1/6] update readme --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 7a20290..44743e4 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ This microservice allows sending and receiving messages via FIX protocol + *disconnectRequestDelay* - the interval for the shutdown request + *resetSeqNumFlag* - resetting sequence number in initial Logon message (when conn started) + *resetOnLogon* - resetting the sequence number in Logon in other cases (e.g. disconnect) -+ *stateFilePath* - path to file where sequences will be saved to use with next login attempts. It is useful when acceptor does not support sequence reset. (`nullable`) ++ *loadSequencesFromCradle* - defines if sequences will be loaded from cradle to use them in logon message. + *sessionStartTime* - UTC time when session starts. (`nullable`) + *sessionEndTime* - UTC time when session ends. required if startSessionTime is filled. + *useNextExpectedSeqNum* - session management based on next expected sequence number. (`false` by default) @@ -275,6 +275,9 @@ spec: - remove: { tag: 110, matches: (.*) } update-checksum: false pins: + - name: to_data_provider + connection-type: grpc-client + service-class: com.exactpro.th2.dataprovider.grpc.DataProviderService - name: to_send connection-type: mq attributes: From e3d93e297699f292b6552a05fb48e412c4641689 Mon Sep 17 00:00:00 2001 From: Nikita Smirnov <46124551+Nikita-Smirnov-Exactpro@users.noreply.github.com> Date: Fri, 17 Feb 2023 19:08:57 +0400 Subject: [PATCH 2/6] Bump rebuild --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 81cc620..70acf75 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ release_version=1.0.0 -jackson_version=2.11.2 \ No newline at end of file +jackson_version=2.11.2 From fe2b88f0a75caa7fb1ec9c0f080aaa2c1df5113b Mon Sep 17 00:00:00 2001 From: "nikita.smirnov" Date: Tue, 27 Feb 2024 13:14:14 +0400 Subject: [PATCH 3/6] Used conn-dirty-tcp-core:3.4.0-dev version --- build.gradle | 2 +- src/main/java/com/exactpro/th2/FixHandler.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index bb334cf..58c5e7f 100644 --- a/build.gradle +++ b/build.gradle @@ -58,7 +58,7 @@ dependencies { implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.15.2' - implementation 'com.exactpro.th2:conn-dirty-tcp-core:3.3.0-TH2-5001+' + implementation 'com.exactpro.th2:conn-dirty-tcp-core:3.4.0-dev' implementation 'com.exactpro.th2:grpc-lw-data-provider:2.2.0-dev' implementation 'org.slf4j:slf4j-api' diff --git a/src/main/java/com/exactpro/th2/FixHandler.java b/src/main/java/com/exactpro/th2/FixHandler.java index ca80f1e..ddbb069 100644 --- a/src/main/java/com/exactpro/th2/FixHandler.java +++ b/src/main/java/com/exactpro/th2/FixHandler.java @@ -1358,7 +1358,7 @@ private CompletableFuture splitSend(IChannel channel, ByteBuf message String slicesTimestamps = sendingTimes.stream().map(formatter::format).collect(Collectors.joining(",")); metadata.put(SPLIT_SEND_TIMESTAMPS_PROPERTY, slicesTimestamps); LOGGER.info("Sent message by slices: {}", slicesTimestamps); - CompletableFuture messageID = channel.send(asExpandable(message), metadata, eventID, SendMode.DIRECT_MSTORE); + CompletableFuture messageID = channel.send(asExpandable(message), metadata, eventID, SendMode.DIRECT_MQ); messageID.thenAcceptAsync(x -> strategy.getState().addMessageID(x), executorService); return messageID; } @@ -1739,7 +1739,7 @@ private void runLogonFromAnotherConnection(RuleConfiguration configuration) { props.put("sentUsingAnotherSocket", "True"); ByteBuf logonBuf = Unpooled.wrappedBuffer(logon.toString().getBytes(StandardCharsets.UTF_8)); - channel.send(logonBuf, props, null, SendMode.DIRECT_MSTORE) + channel.send(logonBuf, props, null, SendMode.DIRECT_MQ) .thenAcceptAsync(x -> { strategy.getState().addMessageID(x); }, executorService); From ac3e430d5467de18967eebb0499e9d17b2f496bd Mon Sep 17 00:00:00 2001 From: "nikita.smirnov" Date: Tue, 27 Feb 2024 13:20:55 +0400 Subject: [PATCH 4/6] Updated GitHub workflow --- ...cker-publish.yml => build-dev-release.yml} | 13 +++++------- .github/workflows/build-release.yml | 14 +++++++++++++ ...-docker-publish.yml => build-sanpshot.yml} | 7 +++---- .github/workflows/ci-unwelcome-words.yml | 4 ++-- .github/workflows/docker-publish.yml | 20 ------------------- 5 files changed, 24 insertions(+), 34 deletions(-) rename .github/workflows/{dev-release-docker-publish.yml => build-dev-release.yml} (62%) create mode 100644 .github/workflows/build-release.yml rename .github/workflows/{dev-docker-publish.yml => build-sanpshot.yml} (65%) 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 62% rename from .github/workflows/dev-release-docker-publish.yml rename to .github/workflows/build-dev-release.yml index 54c4d76..59d4309 100644 --- a/.github/workflows/dev-release-docker-publish.yml +++ b/.github/workflows/build-dev-release.yml @@ -1,17 +1,14 @@ -name: Build and publish dev-release Java distributions to sonatype. +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 0000000..8f35742 --- /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 65% rename from .github/workflows/dev-docker-publish.yml rename to .github/workflows/build-sanpshot.yml index eab42dc..e6cef5c 100644 --- a/.github/workflows/dev-docker-publish.yml +++ b/.github/workflows/build-sanpshot.yml @@ -1,15 +1,14 @@ -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 + - main - version-* - dependabot** paths-ignore: - README.md - jobs: build-job: uses: th2-net/.github/.github/workflows/compound-java-dev.yml@main @@ -17,4 +16,4 @@ jobs: build-target: 'Docker' docker-username: ${{ github.actor }} secrets: - docker-password: ${{ secrets.GITHUB_TOKEN }} + docker-password: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/.github/workflows/ci-unwelcome-words.yml b/.github/workflows/ci-unwelcome-words.yml index 686d0fd..b23bb56 100644 --- a/.github/workflows/ci-unwelcome-words.yml +++ b/.github/workflows/ci-unwelcome-words.yml @@ -7,11 +7,11 @@ jobs: test: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: ref: ${{ github.sha }} - name: Checkout tool - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: exactpro-th2/ci-github-action ref: master diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml deleted file mode 100644 index cec50a6..0000000 --- a/.github/workflows/docker-publish.yml +++ /dev/null @@ -1,20 +0,0 @@ -name: Build and publish Docker distributions to Github Container Registry ghcr.io - -on: - push: - branches: - - master - - version-* - paths: - - gradle.properties -# - package_info.json - -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 }} - \ No newline at end of file From 20f4f822c673bf0c76ee94e291c8d60d6b6e56e7 Mon Sep 17 00:00:00 2001 From: "nikita.smirnov" Date: Wed, 3 Jul 2024 17:50:29 +0400 Subject: [PATCH 5/6] Updated GitHub workflow --- .github/workflows/build-dev-release.yml | 15 +++++++++++++++ .../{docker-publish.yml => build-release.yml} | 17 ++++++----------- ...ev-docker-publish.yml => build-sanpshot.yml} | 3 ++- .github/workflows/ci-unwelcome-words.yml | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 2 +- 5 files changed, 26 insertions(+), 15 deletions(-) create mode 100644 .github/workflows/build-dev-release.yml rename .github/workflows/{docker-publish.yml => build-release.yml} (53%) rename .github/workflows/{dev-docker-publish.yml => build-sanpshot.yml} (75%) diff --git a/.github/workflows/build-dev-release.yml b/.github/workflows/build-dev-release.yml new file mode 100644 index 0000000..b438d11 --- /dev/null +++ b/.github/workflows/build-dev-release.yml @@ -0,0 +1,15 @@ +name: Build and publish dev 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: true + createTag: true + docker-username: ${{ github.actor }} + secrets: + docker-password: ${{ secrets.GITHUB_TOKEN }} + nvd-api-key: ${{ secrets.NVD_APIKEY }} \ No newline at end of file diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/build-release.yml similarity index 53% rename from .github/workflows/docker-publish.yml rename to .github/workflows/build-release.yml index cec50a6..dcf70be 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/build-release.yml @@ -1,20 +1,15 @@ -name: Build and publish Docker distributions to Github Container Registry ghcr.io +name: Build and publish release Docker image to Github Container Registry ghcr.io -on: - push: - branches: - - master - - version-* - paths: - - gradle.properties -# - package_info.json +on: workflow_dispatch jobs: - build-job: + 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 + nvd-api-key: ${{ secrets.NVD_APIKEY }} \ No newline at end of file diff --git a/.github/workflows/dev-docker-publish.yml b/.github/workflows/build-sanpshot.yml similarity index 75% rename from .github/workflows/dev-docker-publish.yml rename to .github/workflows/build-sanpshot.yml index 6f77755..9366a44 100644 --- a/.github/workflows/dev-docker-publish.yml +++ b/.github/workflows/build-sanpshot.yml @@ -1,4 +1,4 @@ -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: @@ -17,3 +17,4 @@ jobs: docker-username: ${{ github.actor }} secrets: docker-password: ${{ secrets.GITHUB_TOKEN }} + nvd-api-key: ${{ secrets.NVD_APIKEY }} \ No newline at end of file diff --git a/.github/workflows/ci-unwelcome-words.yml b/.github/workflows/ci-unwelcome-words.yml index 686d0fd..b23bb56 100644 --- a/.github/workflows/ci-unwelcome-words.yml +++ b/.github/workflows/ci-unwelcome-words.yml @@ -7,11 +7,11 @@ jobs: test: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: ref: ${{ github.sha }} - name: Checkout tool - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: exactpro-th2/ci-github-action ref: master diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 69a9715..070cb70 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 4e304f0ef2c76abf90f6ced56c974f794ce3a740 Mon Sep 17 00:00:00 2001 From: "nikita.smirnov" Date: Wed, 3 Jul 2024 18:07:11 +0400 Subject: [PATCH 6/6] Corrected readme --- README.md | 61 +------------------------------------------------------ 1 file changed, 1 insertion(+), 60 deletions(-) diff --git a/README.md b/README.md index 030fc5f..feb26a3 100644 --- a/README.md +++ b/README.md @@ -336,60 +336,10 @@ spec: # Changelog -## 1.5.1 - -* Property `th2.operation_timestamp` is added to metadata to each message -* Use mutable map for metadata when sending a messages from the handler - * Fix error when new property with operation timestamp added to the immutable map - -## 1.5.0 - -* `minConnectionTimeoutOnSend` parameter is added. -* Sending timeout now decreases in half on each failed attempt (but not less than `minConnectionTimeoutOnSend`). - -## 1.4.2 -* Ungraceful session disconnect support. -* Removed NPE when session is reset by schedule. -* Use UTC time zone for sending time tag - -## 1.4.1 -* Timeout on send from queue thread - * Parameter `connectionTimeoutOnSend` was added - -## 1.4.0 -* Updated bom: `4.5.0-dev` -* Updated common: `5.4.0-dev` -* Updated common-utils: `2.2.0-dev` -* Updated grpc-lw-data-provider: `2.1.0-dev` -* Updated kotlin: `1.8.22` -* Added support for th2 transport protocol - -## 1.3.2 -* Improve logging: log session group and session alias for each log message. - -## 1.3.1 -* fix multiple consequent SOH characters - -## 1.3.0 -* Added handling for incoming test request messages -* Fixed resetSeqNum flag handling on incoming logon messages. -* Added option to automatically reset server sequence when internal conn sequence doesn't match with sequence that server sent. - -## 1.2.1 -* fix multiple consequent SOH characters - -## 1.2.0 -* loading requested messages from cradle. - -## 1.1.1 -* fix scheduling: hasn't worked for some ranges. - -## 1.1.0 -* state reset option on server update. - ## 1.2.0 * Added support for th2 transport protocol * Header tags are forced to update by conn +* Merged changes from [th2-conn-dirty-fix:1.5.1](https://github.com/th2-net/th2-conn-dirty-fix) ## 1.1.0 * state reset option on server update. @@ -404,18 +354,9 @@ spec: ## 1.0.0 * Bump `conn-dirty-tcp-core` to `3.0.0` for books and pages support -<<<<<<< HEAD -<<<<<<< HEAD -======= -## 0.3.0 -* Ability to recover messages from cradle. - ->>>>>>> original/dev-version-1 -======= ## 0.3.0 * Ability to recover messages from cradle. ->>>>>>> original/dev-version-1 ## 0.2.0 * optional state reset on silent server reset.