Merge remote-tracking branch 'origin/main' into TS-2126

.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 }}

.github/workflows/docker-publish.yml → .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 }}
-
+      nvd-api-key: ${{ secrets.NVD_APIKEY }}

.github/workflows/dev-docker-publish.yml → .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
@@ -18,3 +17,4 @@ jobs:
       docker-username: ${{ github.actor }}
     secrets:
       docker-password: ${{ secrets.GITHUB_TOKEN }}
+      nvd-api-key: ${{ secrets.NVD_APIKEY }}

.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

README.md

@@ -334,68 +334,14 @@ spec:
         cpu: 20m
 ```
 
-# Changelog (th2-conn-dirty-broken-fix)
-
 ## 1.2.1
 
 * Property `th2.broken.strategy` is added to metadata to each message when a strategy is active
 
-# Changelog (th2-conn-dirty-fix)
-
-## 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.

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'

src/main/java/com/exactpro/th2/FixHandler.java

@@ -1390,7 +1390,7 @@ private CompletableFuture<MessageID> splitSend(IChannel channel, ByteBuf message
         CompletableFuture<MessageID> messageID = channel.send(asExpandable(message),
                 strategy.getState().enrichProperties(metadata),
                 eventID,
-                SendMode.DIRECT_MSTORE);
+                SendMode.DIRECT_MQ);
         messageID.thenAcceptAsync(x -> strategy.getState().addMessageID(x), executorService);
         return messageID;
     }
@@ -1771,7 +1771,7 @@ private void runLogonFromAnotherConnection(RuleConfiguration configuration) {
         props.put("sentUsingAnotherSocket", "True");
         ByteBuf logonBuf = Unpooled.wrappedBuffer(logon.toString().getBytes(StandardCharsets.UTF_8));
 
-        channel.send(logonBuf, strategy.getState().enrichProperties(props), null, SendMode.DIRECT_MSTORE)
+        channel.send(logonBuf, strategy.getState().enrichProperties(props), null, SendMode.DIRECT_MQ)
             .thenAcceptAsync(x -> {
                 strategy.getState().addMessageID(x);
             }, executorService);