Megre dev version 1 to master

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

.github/workflows/ci-unwelcome-words.yml

@@ -7,17 +7,17 @@ jobs:
   test:
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v3
-        with:
-          ref: ${{ github.sha }}
-      - name: Checkout tool
-        uses: actions/checkout@v3
-        with:
-          repository: exactpro-th2/ci-github-action
-          ref: master
-          token: ${{ secrets.PAT_CI_ACTION }}
-          path: ci-github-action
-      - name: Run CI action
-        uses: ./ci-github-action
-        with:
-          ref: ${{ github.sha }}
+    - uses: actions/checkout@v4
+      with:
+        ref: ${{ github.sha }}
+    - name: Checkout tool
+      uses: actions/checkout@v4
+      with:
+        repository: exactpro-th2/ci-github-action
+        ref: master
+        token: ${{ secrets.PAT_CI_ACTION }}
+        path: ci-github-action
+    - name: Run CI action
+      uses: ./ci-github-action
+      with:
+        ref: ${{ github.sha }}

Dockerfile

@@ -1,4 +1,4 @@
-FROM gradle:7.1-jdk11 AS build
+FROM gradle:7.6-jdk11 AS build
 ARG release_version
 COPY ./ .
 RUN gradle --no-daemon clean build dockerPrepare -Prelease_version=${release_version}

README.md

@@ -1,4 +1,4 @@
-# th2-conn-dirty-fix (0.0.5)
+# th2-conn-dirty-fix (1.7.0)
 
 This microservice allows sending and receiving messages via FIX protocol
 
@@ -12,6 +12,7 @@ This microservice allows sending and receiving messages via FIX protocol
 
 ## Session settings
 
++ *sessionGroup* - session group for incoming/outgoing th2 messages (equal to session alias by default)
 + *sessionAlias* - session alias for incoming/outgoing th2 messages
 + *handler* - handler settings
 + *mangler* - mangler settings
@@ -40,11 +41,21 @@ 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.
++ *loadMissedMessagesFromCradle* - defines how retransmission will be handled. If true, then requested through `ResendRequest` messages (or messages requested on Logon with `NextExpectedSeqNum`) will be loaded from cradle.
 + *sessionStartTime* - UTC time when session starts. (`nullable`)
 + *sessionEndTime* - UTC time when session ends. required if startSessionTime is filled.
++ *sendingDateTimeFormat* - `SendingTime` field format for outgoing messages. (`nullable`, `default format` in this case is `"yyyyMMdd-HH:mm:ss.SSSSSSSSS"`) 
 + *useNextExpectedSeqNum* - session management based on next expected sequence number. (`false` by default)
 + *saveAdminMessages* - defines if admin messages will be saved to internal outgoing buffer. (`false` by default)
++ *resetStateOnServerReset* - whether to reset the server sequence after receiving logout with text `Next Expected MSN too high, MSN to be sent is x but received y`.
++ *logoutOnIncorrectServerSequence* - whether to logout session when server send message with sequence number less than expected. If `false` then internal conn sequence will be reset to sequence number from server message.
++ *connectionTimeoutOnSend* - timeout in milliseconds for sending message from queue thread
+  (please read about [acknowledgment timeout](https://www.rabbitmq.com/consumers.html#acknowledgement-timeout) to understand the problem).
+  _Default, 30000 mls._ Each failed sending attempt decreases the timeout in half (but not less than _minConnectionTimeoutOnSend_).
+  The timeout is reset to the original value after a successful sending attempt.
+  If connection is not established within the specified timeout an error will be reported.
++ *minConnectionTimeoutOnSend* - minimum value for the sending message timeout in milliseconds. _Default value is 1000 mls._
 
 ### Security settings
 
@@ -220,11 +231,12 @@ metadata:
   name: fix-client
 spec:
   image-name: ghcr.io/th2-net/th2-conn-dirty-fix
-  image-version: 0.0.1
+  image-version: 1.0.0
   type: th2-conn
   custom-config:
     maxBatchSize: 1000
     maxFlushTime: 1000
+    batchByGroup: true
     publishSentEvents: true
     publishConnectEvents: true
     sessions:
@@ -273,6 +285,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:
@@ -320,22 +335,135 @@ spec:
 
 # Changelog
 
+## 1.7.0
+* Added support for th2 transport protocol
+* Added configuration option for non-default book per session.
+* Migrated to th2 gradle plugin `0.0.8`
+* Updated:
+  * common: `5.13.1-dev`
+  * conn-dirty-tcp-core: `3.6.0-dev`
+
+## 1.6.1
+
+* Channel subscriptions recovery on failure 
+* Updated bom: `4.6.1-dev`
+* Updated common: `5.10.0-dev`
+* Updated common-utils: `2.2.3-dev`
+* Updated conn-dirty-tcp-core: `3.5.0-dev`
+
+## 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.0.2
+* dev releases
+* apply changes from version-0
+
+## 1.0.1
+* Add bookId to lw data provider query
+
+## 1.0.0
+* Bump `conn-dirty-tcp-core` to `3.0.0` for books and pages support
+
+## 0.3.0
+* Ability to recover messages from cradle.
+
+## 0.2.0
+* optional state reset on silent server reset.
+
+## 0.1.1
+* correct sequence numbers increments.
+* update conn-dirty-tcp-core to `2.3.0`
+
+## 0.1.0
+* correct handling of sequence reset with `endSeqNo = 0`
+* Skip messages mangling on error in `demo-fix-mangler` with error event instead of throwing exception.
+* allow unconditional rule application
+
+## 0.0.10
+* disable reconnect when session is in not-active state.
+
+## 0.0.9
+* correct heartbeat and test request handling
+
+## 0.0.8
+
+* th2-common upgrade to `3.44.1`
+* th2-bom upgrade to `4.2.0`
+
+## 0.0.7
+
+* wait for acceptor logout response on close
+* load sequences from lwdp
+
+## 0.0.6
+
+* wait for logout to be sent
+
 ## 0.0.5
 
 * copy messages before putting them into cache
 
 ## 0.0.4
+
 * Session management based on NextExpectedSeqNum field.
 * Recovery handling
-  * outgoing messages are now saved
-  * if message wasn't saved sequence reset message with gap fill mode flag is sent.
+    * outgoing messages are now saved
+    * if message wasn't saved sequence reset message with gap fill mode flag is sent.
 * Session start and Session end configuration to handle sequence reset by exchange schedule.
 
 ## 0.0.3
 
 * Added new password option into settings
-* Provided ability to specify encrypt algorithm for reading key from file and encrypting password and new password fields 
+* Provided ability to specify encrypt algorithm for reading key from file and encrypting password and new password fields
 
 ## 0.0.2
 
-* Supported the password encryption via `RSA` algorithm.
+* Supported the password encryption via `RSA` algorithm.