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/build-release.yml b/.github/workflows/build-release.yml new file mode 100644 index 0000000..dcf70be --- /dev/null +++ b/.github/workflows/build-release.yml @@ -0,0 +1,15 @@ +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 }} + nvd-api-key: ${{ secrets.NVD_APIKEY }} \ No newline at end of file diff --git a/.github/workflows/build-sanpshot.yml b/.github/workflows/build-sanpshot.yml new file mode 100644 index 0000000..9366a44 --- /dev/null +++ b/.github/workflows/build-sanpshot.yml @@ -0,0 +1,20 @@ +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: + uses: th2-net/.github/.github/workflows/compound-java-dev.yml@main + with: + build-target: 'Docker' + 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 06dbda0..4e5f3a6 100644 --- a/.github/workflows/ci-unwelcome-words.yml +++ b/.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@v2 - 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 }} \ No newline at end of file + - 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 }} diff --git a/.github/workflows/dev-docker-publish.yml b/.github/workflows/dev-docker-publish.yml deleted file mode 100644 index 7ad5102..0000000 --- a/.github/workflows/dev-docker-publish.yml +++ /dev/null @@ -1,51 +0,0 @@ -name: Dev build and publish Docker distributions to Github Container Registry ghcr.io - -on: - push: - branches-ignore: - - master - - version-* -# paths: -# - gradle.properties -# - package_info.json - -jobs: - build: - runs-on: ubuntu-20.04 - steps: - - uses: actions/checkout@v3 - # Prepare custom build version - - name: Get branch name - id: branch - run: echo "branch_name=${GITHUB_REF#refs/*/}" >> $GITHUB_OUTPUT - - name: Get SHA of the commit - id: sha - run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT - - name: Get release_version - id: ver - uses: christian-draeger/read-properties@1.1.1 - with: - path: gradle.properties - properties: release_version - - name: Build custom release version - id: release_ver - run: echo value="${{ steps.ver.outputs.release_version }}-${{ steps.branch.outputs.branch_name }}-${{ github.run_id }}-${{ steps.sha.outputs.sha_short }}" >> $GITHUB_OUTPUT - - name: Show custom release version - run: echo ${{ steps.release_ver.outputs.value }} - # Build and publish image - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - uses: docker/login-action@v2 - with: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - run: echo "REPOSITORY_NAME=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_OUTPUT - id: meta - - name: Build and push - id: docker_build - uses: docker/build-push-action@v3 - with: - push: true - tags: ghcr.io/${{ github.repository }}:${{ steps.release_ver.outputs.value }} - labels: com.exactpro.th2.${{ steps.meta.outputs.REPOSITORY_NAME }}=${{ steps.ver.outputs.value }} \ No newline at end of file diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml deleted file mode 100644 index e529cdb..0000000 --- a/.github/workflows/docker-publish.yml +++ /dev/null @@ -1,37 +0,0 @@ -name: Build and publish Docker distributions to Github Container Registry ghcr.io - -on: - push: - branches: - - master - - version-* - paths: - - gradle.properties - -jobs: - build: - runs-on: ubuntu-20.04 - steps: - - uses: actions/checkout@v3 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - uses: docker/login-action@v2 - with: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - run: echo "REPOSITORY_NAME=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_OUTPUT - id: meta - - name: Read version from gradle.properties - id: read_property - uses: christian-draeger/read-properties@1.1.1 - with: - path: ./gradle.properties - properties: release_version - - name: Build and push - id: docker_build - uses: docker/build-push-action@v3 - with: - push: true - tags: ghcr.io/${{ github.repository }}:${{ steps.read_property.outputs.release_version }} - labels: com.exactpro.th2.${{ steps.meta.outputs.REPOSITORY_NAME }}=${{ steps.read_property.outputs.release_version }} \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 4c2ff9e..3329c30 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM gradle:7.6-jdk11 AS build +FROM gradle:8.11-jdk11 AS build ARG release_version ARG nexus_url ARG nexus_user diff --git a/README.md b/README.md index cbb9802..5fa1f20 100644 --- a/README.md +++ b/README.md @@ -1,84 +1,172 @@ -# Healer data processor (0.0.2) +# Event healer processor (0.0.3) -Healer data processor fixes wrong status of events. When a child event has a "failed" status and its parent +Event healer processor fixes wrong status of events. When a child event has a "failed" status and its parent has a "success" status, the status of the parent is wrong. Healer finds the parent event and makes its status "failed", too. +Sometimes parent event doesn't exist in cradle when the healer process its child event with "failed" states. +In this case processor repeats searching of the parent event with interval according to `processorSettings` + ## Configuration -There is an example of full configuration (infra-2.0) for the data processor +There is an example of full configuration (infra-2.1) for the event healer processor ```yaml -apiVersion: th2.exactpro.com/v1 +apiVersion: th2.exactpro.com/v2 kind: Th2Box metadata: name: event-healer spec: - image-name: ghcr.io/th2-net/th2-crawler-event-healer - image-version: + imageName: ghcr.io/th2-net/th2-crawler-event-healer + imageVersion: 0.0.3-dev type: th2-conn - custom-config: - stateSessionAlias: my-processor-state - enableStoreState: false - from: 2021-06-16T12:00:00.00Z - to: 2021-06-17T14:00:00.00Z - intervalLength: PT10M - syncInterval: PT10M - awaitTimeout: 10 - awaitUnit: SECONDS - events: - bookToScope: - book1: [] - book2: [] - processorSettings: - name: test-event-healer - version: 1.0.0 - maxCacheCapacity: 1000 pins: grpc: client: - name: to_data_provider - service-class: com.exactpro.th2.dataprovider.lw.grpc.DataProviderService + serviceClass: com.exactpro.th2.dataprovider.lw.grpc.DataProviderService linkTo: - - box: lw-data-provider + - box: lw-data-provider-grpc pin: server - name: to_data_provider_stream - service-class: com.exactpro.th2.dataprovider.lw.grpc.QueueDataProviderService + serviceClass: com.exactpro.th2.dataprovider.lw.grpc.QueueDataProviderService linkTo: - - box: lw-data-provider + - box: lw-data-provider-grpc pin: server - extended-settings: + customConfig: + crawler: + from: 2024-11-14T00:00:00.00Z + intervalLength: PT10M + syncInterval: PT10M + awaitTimeout: 10 + awaitUnit: SECONDS + events: + bookToScopes: + test_book: [ "script" ] + processorSettings: + maxCacheCapacity: 1024 + updateUnsubmittedEventInterval: 1 + updateUnsubmittedEventTimeUnit: SECONDS + updateUnsubmittedEventAttempts: 100 + extendedSettings: + envVariables: + JAVA_TOOL_OPTIONS: > + -XX:+ExitOnOutOfMemoryError + -XX:+UseContainerSupport + -Dlog4j2.shutdownHookEnabled=false + -Xlog:gc,gc+heap*,gc+start,gc+metaspace::utc,level,tags + -XX:MaxRAMPercentage=38 + -XX:MaxMetaspaceSize=80M + -XX:CompressedClassSpaceSize=12M + -XX:ReservedCodeCacheSize=35M + -XX:MaxDirectMemorySize=15M + -Ddatastax-java-driver.advanced.connection.init-query-timeout="5000 milliseconds" + -Ddatastax-java-driver.basic.request.timeout="10 seconds" + resources: + limits: + memory: 250Mi + cpu: 200m + requests: + memory: 100Mi + cpu: 50m +``` + +Please note the `th2-lw-data-provider` worked in gRPC mode is required for the current processor. +The main configuration of `th2-lw-data-provider` described below, full documentation can be found by the (link)[https://github.com/th2-net/th2-lw-data-provider] + +```yaml +apiVersion: th2.exactpro.com/v2 +kind: Th2CoreBox +metadata: + name: lw-data-provider-grpc +spec: + imageName: ghcr.io/th2-net/th2-lw-data-provider + imageVersion: 2.12.0-dev + type: th2-rpt-data-provider + customConfig: + grpcBackPressure: true + hostname: 0.0.0.0 + port: 8080 + mode: GRPC + extendedSettings: + envVariables: + JAVA_TOOL_OPTIONS: > + -XX:+ExitOnOutOfMemoryError + -XX:+UseContainerSupport + -Dlog4j2.shutdownHookEnabled=false + -Xlog:gc,gc+heap*,gc+start,gc+metaspace::utc,level,tags + -XX:MaxRAMPercentage=85 + -Ddatastax-java-driver.advanced.connection.init-query-timeout="5000 milliseconds" + -Ddatastax-java-driver.basic.request.timeout="10 seconds" + resources: + limits: + memory: 1000Mi + ephemeral-storage: 500Mi + cpu: 1000m + requests: + memory: 300Mi + ephemeral-storage: 500Mi + cpu: 50m service: enabled: true - type: ClusterIP - endpoints: - - name: 'grpc' - targetPort: 8080 - envVariables: - JAVA_TOOL_OPTIONS: '-XX:+ExitOnOutOfMemoryError -XX:+UseContainerSupport -XX:MaxRAMPercentage=85' - resources: - limits: - memory: 200Mi - cpu: 200m - requests: - memory: 100Mi - cpu: 50m + clusterIP: + - name: grpc + containerPort: 8080 + pins: + mq: + subscribers: + - name: from_codec_transport + attributes: + - from_codec + - transport-group + - subscribe + - name: from_codec_proto + attributes: + - from_codec + - parsed + - subscribe + publishers: + - name: to_codec + attributes: + - to_codec + - transport-group + - publish + grpc: + server: + - name: server + serviceClasses: + - com.exactpro.th2.dataprovider.lw.grpc.DataProviderService + - com.exactpro.th2.dataprovider.lw.grpc.QueueDataProviderService ``` -### Parameters description +### Processor settings description -+ name - the data processor name -+ version - the data processor version -+ maxCacheCapacity - the maximum capacity of the cache that stores - events processed by Healer. Caching events is useful in order to ++ **maxCacheCapacity** (_**1024** by default_) - the maximum capacity of the cache that stores + events processed by Healer. Caching events is useful in order to avoid their repeated retrieval from Cradle. - After reaching the maximum capacity, the least recent accessed event + After reaching the maximum capacity, the least recent accessed event from the cache will be removed, so no overflow occurs. - -See th2-crawler in **Useful links** section to see the goal of *name* and *version* -parameters. ++ **updateUnsubmittedEventInterval** (_**1** by default_) - value of interval between attempts for updating parent event status if it doesn't exist ++ **updateUnsubmittedEventTimeUnit** (_**SECONDS** by default_) - time unit of interval between attempts for updating parent event status if it doesn't exist ++ **updateUnsubmittedEventAttempts** (_**100**_ by default_) - number of attempts to update parent event status if it doesn't exist # Useful links +The event-healer based on the th2-processor-core project, you can look at its readme to read about processor configuration. + ++ th2-processor-core - https://github.com/th2-net/th2-processor-core-j ++ th2-lw-data-provider - https://github.com/th2-net/th2-lw-data-provider + th2-common - https://github.com/th2-net/th2-common-j -+ th2-crawler - https://github.com/th2-net/th2-crawler \ No newline at end of file +## Release notes + +### 0.0.3 +* Migrated to th2 gradle plugin `0.1.4` (based on th2-bom: `4.8.0`) +* Updated: + * common: `5.14.0-dev` + * common-utils: `2.3.0-dev` + * processor-core: `0.3.0-dev` + * cradle-cassandra: `5.4.4-dev` + * auto-service: `1.1.1` + * caffeine: `3.1.8` + * kotlin-logging: `3.0.5` + * kotlin: `1.8.22` \ No newline at end of file diff --git a/build.gradle b/build.gradle index 9750442..03e3241 100644 --- a/build.gradle +++ b/build.gradle @@ -1,19 +1,18 @@ plugins { - id 'com.palantir.docker' version '0.25.0' - id 'org.jetbrains.kotlin.jvm' version '1.6.21' - id 'org.jetbrains.kotlin.kapt' version "1.6.21" - id 'java' - id 'application' + id "application" + id "org.jetbrains.kotlin.jvm" version "1.8.22" + id "org.jetbrains.kotlin.kapt" version "1.8.22" + id "com.exactpro.th2.gradle.component" version "0.1.4" } group 'com.exactpro.th2' version release_version -sourceCompatibility = JavaVersion.VERSION_11 -targetCompatibility = JavaVersion.VERSION_11 +kotlin { + jvmToolchain(11) +} repositories { - mavenLocal() mavenCentral() maven { name 'Sonatype_snapshots' @@ -23,47 +22,35 @@ repositories { name 'Sonatype_releases' url 'https://s01.oss.sonatype.org/content/repositories/releases/' } + mavenLocal() - configurations.all { + configurations.configureEach { resolutionStrategy.cacheChangingModulesFor 0, 'seconds' resolutionStrategy.cacheDynamicVersionsFor 0, 'seconds' } } -jar { - manifest { - attributes( - 'Created-By': "${System.getProperty('java.version')} (${System.getProperty('java.vendor')})", - 'Specification-Title': '', - 'Specification-Vendor': 'Exactpro Systems LLC', - 'Implementation-Title': project.archivesBaseName, - 'Implementation-Vendor': 'Exactpro Systems LLC', - 'Implementation-Vendor-Id': 'com.exactpro', - 'Implementation-Version': project.version - ) - } -} - dependencies { - api platform('com.exactpro.th2:bom:4.0.2') + compileOnly 'com.google.auto.service:auto-service:1.1.1' + kapt 'com.google.auto.service:auto-service:1.1.1' - compileOnly 'com.google.auto.service:auto-service:1.0.1' - kapt 'com.google.auto.service:auto-service:1.0.1' + implementation 'com.github.ben-manes.caffeine:caffeine:3.1.8' + implementation 'io.github.microutils:kotlin-logging:3.0.5' + implementation 'com.fasterxml.jackson.core:jackson-databind:2.18.1' + implementation 'com.fasterxml.jackson.core:jackson-annotations:2.18.1' - implementation 'com.github.ben-manes.caffeine:caffeine:3.1.2' + implementation 'com.exactpro.th2:common:5.14.0-dev' + implementation "com.exactpro.th2:common-utils:2.3.0-dev" + implementation "com.exactpro.th2:processor-core:0.3.0-dev" - implementation 'com.exactpro.th2:common:4.0.0-TH2-4262-reduce-load-book-and-page-3574992387-SNAPSHOT' - implementation "com.exactpro.th2:common-utils:0.0.1-book-and-page-3572891451-SNAPSHOT" - implementation "com.exactpro.th2:processor-core:0.0.1-TH2-4262-reduce-load-book-and-page-3739179455-7524a15-SNAPSHOT" + implementation "com.exactpro.th2:cradle-cassandra:5.4.4-dev" - implementation "com.exactpro.th2:cradle-cassandra:4.0.0-dev-version-4-2548754188-SNAPSHOT" testImplementation "org.jetbrains.kotlin:kotlin-test-junit5" - testImplementation 'org.mockito.kotlin:mockito-kotlin:4.1.0' + testImplementation 'org.mockito.kotlin:mockito-kotlin:5.4.0' - testImplementation "org.junit.jupiter:junit-jupiter-api:5.9.0" - testImplementation "org.junit.jupiter:junit-jupiter-params:5.9.0" - testRuntimeOnly("org.junit.jupiter:junit-jupiter:5.9.0") + testImplementation "org.junit.jupiter:junit-jupiter-params:5.11.3" + testImplementation "org.junit.jupiter:junit-jupiter:5.11.3" } @@ -73,18 +60,4 @@ test { application { mainClass.set('com.exactpro.th2.processor.MainKt') -} - -applicationName = 'service' - -distTar { - archiveName "${applicationName}.tar" -} - -dockerPrepare { - dependsOn distTar -} - -docker { - copySpec.from(tarTree("$buildDir/distributions/${applicationName}.tar")) -} +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index a3c264a..044fc6a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -release_version = 0.0.2 +release_version = 0.0.3 description = 'th2 data service for fixing wrong status of events' vcs_url=https://github.com/th2-net/th2-crawler-event-healer.git diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e708b1c..e644113 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 070cb70..94113f2 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 4f906e0..1aa94a4 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,67 +17,99 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +119,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,88 +130,120 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index 107acd3..25da30d 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,13 +41,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -56,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/src/test/kotlin/com/exactpro/th2/processor/healer/ProcessorTest.kt b/src/test/kotlin/com/exactpro/th2/processor/healer/ProcessorTest.kt index b47bb2f..b5ed525 100644 --- a/src/test/kotlin/com/exactpro/th2/processor/healer/ProcessorTest.kt +++ b/src/test/kotlin/com/exactpro/th2/processor/healer/ProcessorTest.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. @@ -245,8 +245,8 @@ class ProcessorTest { verify(cradleStorage, times(3).description("Load events")).getTestEvent(any()) verify(cradleStorage, never().description("Update event A")).updateEventStatus(eq(eventA), eq(false)) - verify(cradleStorage, times(1).description("Update event B")).updateEventStatus(eq(eventB), eq(false)) - verify(cradleStorage, times(1).description("Update event C")).updateEventStatus(eq(eventC), eq(false)) + verify(cradleStorage, times(2).description("Update event B")).updateEventStatus(eq(eventB), eq(false)) + verify(cradleStorage, times(2).description("Update event C")).updateEventStatus(eq(eventC), eq(false)) verify(cradleStorage, never().description("Update event D")).updateEventStatus(eq(eventD), eq(false)) verify(cradleStorage, times(2).description("Update events")).updateEventStatus(any(), any()) @@ -396,7 +396,7 @@ class ProcessorTest { success, ByteArray(10), emptySet(), - PageId(bookId, PAGE_NAME), + PageId(bookId, PAGE_TIMESTAMP, PAGE_NAME), null, Instant.now() ) @@ -410,6 +410,7 @@ class ProcessorTest { private const val C_EVENT_ID = "c_event_id" private const val D_EVENT_ID = "d_event_id" + private val PAGE_TIMESTAMP = Instant.now() private val SETTINGS = Settings(1, 1, TimeUnit.MILLISECONDS, 3) private val PROCESSOR_EVENT_ID = EventID.newBuilder().apply { bookName = BOOK_NAME