From e59456684aab47e2205e428cc0c5f5b771f2f0d0 Mon Sep 17 00:00:00 2001 From: Kirill Kurdyukov Date: Tue, 9 Jun 2026 13:50:38 +0300 Subject: [PATCH 1/2] dev: move module up level --- ...ring-ydb.yaml => ci-spring-ydb-retry.yaml} | 22 +-- ...ydb.yaml => publish-spring-ydb-retry.yaml} | 26 ++-- .../README.md | 0 .../pom.xml | 124 ++++++++++++++- spring-ydb-retry/slo/Dockerfile | 19 +++ .../slo/README.md | 0 .../slo/playground/README.md | 0 .../slo/playground/chaos-aggressive/chaos.sh | 0 .../playground/chaos-aggressive/compose.yaml | 8 +- .../slo/playground/chaos/chaos.sh | 0 .../slo/playground/chaos/compose.yaml | 8 +- .../provisioning/dashboards/dashboard.yaml | 0 .../grafana/provisioning/dashboards/slo.json | 0 .../provisioning/datasources/datasource.yaml | 0 .../configs/prometheus/prometheus.yaml | 0 .../slo/playground/configs/ydb.yaml | 0 .../slo/pom.xml | 2 +- .../slo/src/README.md | 0 .../main/java/tech/ydb/slo/OtelConfig.java | 0 .../java/tech/ydb/slo/SloApplication.java | 0 .../src/main/java/tech/ydb/slo/SloConfig.java | 0 .../java/tech/ydb/slo/SloResultWriter.java | 0 .../src/main/java/tech/ydb/slo/SloRunner.java | 0 .../main/java/tech/ydb/slo/SloService.java | 0 .../src/main/java/tech/ydb/slo/SloStats.java | 0 .../src/main/resources/application.properties | 0 .../java/tech/ydb/retry/BackoffSleeper.java | 0 .../tech/ydb/retry/YdbDelayCalculator.java | 0 .../java/tech/ydb/retry/YdbRetryPolicy.java | 0 .../tech/ydb/retry/YdbRetryPolicyConfig.java | 0 .../tech/ydb/retry/YdbRetryProperties.java | 0 .../YdbTransactionAutoConfiguration.java | 0 .../ydb/retry/YdbTransactionInterceptor.java | 0 .../YdbTransactionInterceptorFactory.java | 0 .../YdbTransactionInterceptorReplacer.java | 0 .../java/tech/ydb/retry/YdbTransactional.java | 0 .../java/tech/ydb/retry/YdbVendorCode.java | 0 ...ot.autoconfigure.AutoConfiguration.imports | 0 .../ydb/retry/InterceptorTestSupport.java | 0 .../NestedYdbTransactionalRetryTest.java | 0 .../RetryStartsFreshTransactionTest.java | 0 .../SqlExceptionStatusExtractionTest.java | 0 .../TransactionPropagationRetryTest.java | 0 .../retry/TransactionalDefaultRetryTest.java | 0 .../ydb/retry/YdbDelayCalculatorTest.java | 0 .../ydb/retry/YdbRetryPolicyConfigTest.java | 0 .../tech/ydb/retry/YdbRetryPolicyTest.java | 0 .../YdbTransactionAutoConfigurationTest.java | 0 .../YdbTransactionInterceptorFactoryTest.java | 0 ...bTransactionInterceptorInvocationTest.java | 0 ...YdbTransactionInterceptorReplacerTest.java | 0 .../YdbTransactionManagerResolutionTest.java | 0 .../YdbTransactionalConfigOverrideTest.java | 0 .../CombinedErrorIntegrationTest.java | 0 .../CommitTransactionRetryTest.java | 0 .../retry/integration/ConcurrentRunner.java | 0 .../ConcurrentWriteIntegrationTest.java | 0 .../DeterministicErrorChannel.java | 0 .../DeterministicErrorChannelTest.java | 0 .../DisabledRetryIntegrationTest.java | 0 .../ExecuteQueryRetryIntegrationTest.java | 0 .../integration/HappyPathIntegrationTest.java | 0 .../IdempotentRetryIntegrationTest.java | 0 .../IntegrationEnvironmentTest.java | 0 .../integration/MaxRetriesExhaustedTest.java | 0 .../NonRetryableCommitIntegrationTest.java | 0 .../ydb/retry/integration/YdbDockerTest.java | 0 .../retry/integration/YdbIntegrationTest.java | 0 .../integration/app/SimpleUserRepository.java | 0 .../tech/ydb/retry/integration/app/User.java | 0 .../integration/app/UserApplication.java | 0 .../retry/integration/app/UserService.java | 0 .../resources/application-disabled.properties | 0 .../resources/application-enabled.properties | 0 .../test/resources/application-ydb.properties | 0 .../db/migration/V1__create_table.sql | 0 spring-ydb/pom.xml | 142 ------------------ spring-ydb/spring-ydb-retry/slo/Dockerfile | 22 --- 78 files changed, 170 insertions(+), 203 deletions(-) rename .github/workflows/{ci-spring-ydb.yaml => ci-spring-ydb-retry.yaml} (76%) rename .github/workflows/{publish-spring-ydb.yaml => publish-spring-ydb-retry.yaml} (73%) rename {spring-ydb/spring-ydb-retry => spring-ydb-retry}/README.md (100%) rename {spring-ydb/spring-ydb-retry => spring-ydb-retry}/pom.xml (60%) create mode 100644 spring-ydb-retry/slo/Dockerfile rename {spring-ydb/spring-ydb-retry => spring-ydb-retry}/slo/README.md (100%) rename {spring-ydb/spring-ydb-retry => spring-ydb-retry}/slo/playground/README.md (100%) rename {spring-ydb/spring-ydb-retry => spring-ydb-retry}/slo/playground/chaos-aggressive/chaos.sh (100%) rename {spring-ydb/spring-ydb-retry => spring-ydb-retry}/slo/playground/chaos-aggressive/compose.yaml (98%) rename {spring-ydb/spring-ydb-retry => spring-ydb-retry}/slo/playground/chaos/chaos.sh (100%) rename {spring-ydb/spring-ydb-retry => spring-ydb-retry}/slo/playground/chaos/compose.yaml (98%) rename {spring-ydb/spring-ydb-retry => spring-ydb-retry}/slo/playground/configs/grafana/provisioning/dashboards/dashboard.yaml (100%) rename {spring-ydb/spring-ydb-retry => spring-ydb-retry}/slo/playground/configs/grafana/provisioning/dashboards/slo.json (100%) rename {spring-ydb/spring-ydb-retry => spring-ydb-retry}/slo/playground/configs/grafana/provisioning/datasources/datasource.yaml (100%) rename {spring-ydb/spring-ydb-retry => spring-ydb-retry}/slo/playground/configs/prometheus/prometheus.yaml (100%) rename {spring-ydb/spring-ydb-retry => spring-ydb-retry}/slo/playground/configs/ydb.yaml (100%) rename {spring-ydb/spring-ydb-retry => spring-ydb-retry}/slo/pom.xml (98%) rename {spring-ydb/spring-ydb-retry => spring-ydb-retry}/slo/src/README.md (100%) rename {spring-ydb/spring-ydb-retry => spring-ydb-retry}/slo/src/main/java/tech/ydb/slo/OtelConfig.java (100%) rename {spring-ydb/spring-ydb-retry => spring-ydb-retry}/slo/src/main/java/tech/ydb/slo/SloApplication.java (100%) rename {spring-ydb/spring-ydb-retry => spring-ydb-retry}/slo/src/main/java/tech/ydb/slo/SloConfig.java (100%) rename {spring-ydb/spring-ydb-retry => spring-ydb-retry}/slo/src/main/java/tech/ydb/slo/SloResultWriter.java (100%) rename {spring-ydb/spring-ydb-retry => spring-ydb-retry}/slo/src/main/java/tech/ydb/slo/SloRunner.java (100%) rename {spring-ydb/spring-ydb-retry => spring-ydb-retry}/slo/src/main/java/tech/ydb/slo/SloService.java (100%) rename {spring-ydb/spring-ydb-retry => spring-ydb-retry}/slo/src/main/java/tech/ydb/slo/SloStats.java (100%) rename {spring-ydb/spring-ydb-retry => spring-ydb-retry}/slo/src/main/resources/application.properties (100%) rename {spring-ydb/spring-ydb-retry => spring-ydb-retry}/src/main/java/tech/ydb/retry/BackoffSleeper.java (100%) rename {spring-ydb/spring-ydb-retry => spring-ydb-retry}/src/main/java/tech/ydb/retry/YdbDelayCalculator.java (100%) rename {spring-ydb/spring-ydb-retry => spring-ydb-retry}/src/main/java/tech/ydb/retry/YdbRetryPolicy.java (100%) rename {spring-ydb/spring-ydb-retry => spring-ydb-retry}/src/main/java/tech/ydb/retry/YdbRetryPolicyConfig.java (100%) rename {spring-ydb/spring-ydb-retry => spring-ydb-retry}/src/main/java/tech/ydb/retry/YdbRetryProperties.java (100%) rename {spring-ydb/spring-ydb-retry => spring-ydb-retry}/src/main/java/tech/ydb/retry/YdbTransactionAutoConfiguration.java (100%) rename {spring-ydb/spring-ydb-retry => spring-ydb-retry}/src/main/java/tech/ydb/retry/YdbTransactionInterceptor.java (100%) rename {spring-ydb/spring-ydb-retry => spring-ydb-retry}/src/main/java/tech/ydb/retry/YdbTransactionInterceptorFactory.java (100%) rename {spring-ydb/spring-ydb-retry => spring-ydb-retry}/src/main/java/tech/ydb/retry/YdbTransactionInterceptorReplacer.java (100%) rename {spring-ydb/spring-ydb-retry => spring-ydb-retry}/src/main/java/tech/ydb/retry/YdbTransactional.java (100%) rename {spring-ydb/spring-ydb-retry => spring-ydb-retry}/src/main/java/tech/ydb/retry/YdbVendorCode.java (100%) rename {spring-ydb/spring-ydb-retry => spring-ydb-retry}/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports (100%) rename {spring-ydb/spring-ydb-retry => spring-ydb-retry}/src/test/java/tech/ydb/retry/InterceptorTestSupport.java (100%) rename {spring-ydb/spring-ydb-retry => spring-ydb-retry}/src/test/java/tech/ydb/retry/NestedYdbTransactionalRetryTest.java (100%) rename {spring-ydb/spring-ydb-retry => spring-ydb-retry}/src/test/java/tech/ydb/retry/RetryStartsFreshTransactionTest.java (100%) rename {spring-ydb/spring-ydb-retry => spring-ydb-retry}/src/test/java/tech/ydb/retry/SqlExceptionStatusExtractionTest.java (100%) rename {spring-ydb/spring-ydb-retry => spring-ydb-retry}/src/test/java/tech/ydb/retry/TransactionPropagationRetryTest.java (100%) rename {spring-ydb/spring-ydb-retry => spring-ydb-retry}/src/test/java/tech/ydb/retry/TransactionalDefaultRetryTest.java (100%) rename {spring-ydb/spring-ydb-retry => spring-ydb-retry}/src/test/java/tech/ydb/retry/YdbDelayCalculatorTest.java (100%) rename {spring-ydb/spring-ydb-retry => spring-ydb-retry}/src/test/java/tech/ydb/retry/YdbRetryPolicyConfigTest.java (100%) rename {spring-ydb/spring-ydb-retry => spring-ydb-retry}/src/test/java/tech/ydb/retry/YdbRetryPolicyTest.java (100%) rename {spring-ydb/spring-ydb-retry => spring-ydb-retry}/src/test/java/tech/ydb/retry/YdbTransactionAutoConfigurationTest.java (100%) rename {spring-ydb/spring-ydb-retry => spring-ydb-retry}/src/test/java/tech/ydb/retry/YdbTransactionInterceptorFactoryTest.java (100%) rename {spring-ydb/spring-ydb-retry => spring-ydb-retry}/src/test/java/tech/ydb/retry/YdbTransactionInterceptorInvocationTest.java (100%) rename {spring-ydb/spring-ydb-retry => spring-ydb-retry}/src/test/java/tech/ydb/retry/YdbTransactionInterceptorReplacerTest.java (100%) rename {spring-ydb/spring-ydb-retry => spring-ydb-retry}/src/test/java/tech/ydb/retry/YdbTransactionManagerResolutionTest.java (100%) rename {spring-ydb/spring-ydb-retry => spring-ydb-retry}/src/test/java/tech/ydb/retry/YdbTransactionalConfigOverrideTest.java (100%) rename {spring-ydb/spring-ydb-retry => spring-ydb-retry}/src/test/java/tech/ydb/retry/integration/CombinedErrorIntegrationTest.java (100%) rename {spring-ydb/spring-ydb-retry => spring-ydb-retry}/src/test/java/tech/ydb/retry/integration/CommitTransactionRetryTest.java (100%) rename {spring-ydb/spring-ydb-retry => spring-ydb-retry}/src/test/java/tech/ydb/retry/integration/ConcurrentRunner.java (100%) rename {spring-ydb/spring-ydb-retry => spring-ydb-retry}/src/test/java/tech/ydb/retry/integration/ConcurrentWriteIntegrationTest.java (100%) rename {spring-ydb/spring-ydb-retry => spring-ydb-retry}/src/test/java/tech/ydb/retry/integration/DeterministicErrorChannel.java (100%) rename {spring-ydb/spring-ydb-retry => spring-ydb-retry}/src/test/java/tech/ydb/retry/integration/DeterministicErrorChannelTest.java (100%) rename {spring-ydb/spring-ydb-retry => spring-ydb-retry}/src/test/java/tech/ydb/retry/integration/DisabledRetryIntegrationTest.java (100%) rename {spring-ydb/spring-ydb-retry => spring-ydb-retry}/src/test/java/tech/ydb/retry/integration/ExecuteQueryRetryIntegrationTest.java (100%) rename {spring-ydb/spring-ydb-retry => spring-ydb-retry}/src/test/java/tech/ydb/retry/integration/HappyPathIntegrationTest.java (100%) rename {spring-ydb/spring-ydb-retry => spring-ydb-retry}/src/test/java/tech/ydb/retry/integration/IdempotentRetryIntegrationTest.java (100%) rename {spring-ydb/spring-ydb-retry => spring-ydb-retry}/src/test/java/tech/ydb/retry/integration/IntegrationEnvironmentTest.java (100%) rename {spring-ydb/spring-ydb-retry => spring-ydb-retry}/src/test/java/tech/ydb/retry/integration/MaxRetriesExhaustedTest.java (100%) rename {spring-ydb/spring-ydb-retry => spring-ydb-retry}/src/test/java/tech/ydb/retry/integration/NonRetryableCommitIntegrationTest.java (100%) rename {spring-ydb/spring-ydb-retry => spring-ydb-retry}/src/test/java/tech/ydb/retry/integration/YdbDockerTest.java (100%) rename {spring-ydb/spring-ydb-retry => spring-ydb-retry}/src/test/java/tech/ydb/retry/integration/YdbIntegrationTest.java (100%) rename {spring-ydb/spring-ydb-retry => spring-ydb-retry}/src/test/java/tech/ydb/retry/integration/app/SimpleUserRepository.java (100%) rename {spring-ydb/spring-ydb-retry => spring-ydb-retry}/src/test/java/tech/ydb/retry/integration/app/User.java (100%) rename {spring-ydb/spring-ydb-retry => spring-ydb-retry}/src/test/java/tech/ydb/retry/integration/app/UserApplication.java (100%) rename {spring-ydb/spring-ydb-retry => spring-ydb-retry}/src/test/java/tech/ydb/retry/integration/app/UserService.java (100%) rename {spring-ydb/spring-ydb-retry => spring-ydb-retry}/src/test/resources/application-disabled.properties (100%) rename {spring-ydb/spring-ydb-retry => spring-ydb-retry}/src/test/resources/application-enabled.properties (100%) rename {spring-ydb/spring-ydb-retry => spring-ydb-retry}/src/test/resources/application-ydb.properties (100%) rename {spring-ydb/spring-ydb-retry => spring-ydb-retry}/src/test/resources/db/migration/V1__create_table.sql (100%) delete mode 100644 spring-ydb/pom.xml delete mode 100644 spring-ydb/spring-ydb-retry/slo/Dockerfile diff --git a/.github/workflows/ci-spring-ydb.yaml b/.github/workflows/ci-spring-ydb-retry.yaml similarity index 76% rename from .github/workflows/ci-spring-ydb.yaml rename to .github/workflows/ci-spring-ydb-retry.yaml index f5782347..b3ab707c 100644 --- a/.github/workflows/ci-spring-ydb.yaml +++ b/.github/workflows/ci-spring-ydb-retry.yaml @@ -1,14 +1,14 @@ -name: Spring YDB CI with Maven +name: Spring YDB Retry CI with Maven on: push: paths: - - 'spring-ydb/**' + - 'spring-ydb-retry/**' branches: - main pull_request: paths: - - 'spring-ydb/**' + - 'spring-ydb-retry/**' env: MAVEN_ARGS: --batch-mode --update-snapshots -Dstyle.color=always @@ -33,19 +33,19 @@ jobs: cache: 'maven' - name: Download dependencies (Default) - working-directory: ./spring-ydb + working-directory: ./spring-ydb-retry run: mvn $MAVEN_ARGS dependency:resolve-plugins dependency:go-offline - name: Download dependencies (Spring Boot 3) - working-directory: ./spring-ydb + working-directory: ./spring-ydb-retry run: mvn $MAVEN_ARGS -Pspring-boot3 dependency:resolve-plugins dependency:go-offline - name: Download dependencies (Spring Boot 4) - working-directory: ./spring-ydb + working-directory: ./spring-ydb-retry run: mvn $MAVEN_ARGS -Pspring-boot4 dependency:resolve-plugins dependency:go-offline build: - name: Spring YDB build & tests + name: Spring YDB Retry build & tests runs-on: ubuntu-24.04 needs: prepare @@ -63,14 +63,14 @@ jobs: distribution: 'temurin' cache: maven - - name: Build spring-ydb - working-directory: ./spring-ydb + - name: Build spring-ydb-retry + working-directory: ./spring-ydb-retry run: mvn $MAVEN_ARGS package - name: Tests with Spring Boot 3 - working-directory: ./spring-ydb + working-directory: ./spring-ydb-retry run: mvn $MAVEN_ARGS -Pspring-boot3 test - name: Tests with Spring Boot 4 - working-directory: ./spring-ydb + working-directory: ./spring-ydb-retry run: mvn $MAVEN_ARGS -Pspring-boot4 test diff --git a/.github/workflows/publish-spring-ydb.yaml b/.github/workflows/publish-spring-ydb-retry.yaml similarity index 73% rename from .github/workflows/publish-spring-ydb.yaml rename to .github/workflows/publish-spring-ydb-retry.yaml index e1eff2cd..b99bb2c4 100644 --- a/.github/workflows/publish-spring-ydb.yaml +++ b/.github/workflows/publish-spring-ydb-retry.yaml @@ -1,35 +1,35 @@ -name: Publish Spring YDB +name: Publish Spring YDB Retry on: push: tags: - - 'spring-ydb/v*.*.*' + - 'spring-ydb-retry/v*.*.*' env: MAVEN_ARGS: --batch-mode --no-transfer-progress -Dstyle.color=always jobs: validate: - name: Validate Spring YDB + name: Validate Spring YDB Retry runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v5 - - name: Extract spring-ydb version + - name: Extract spring-ydb-retry version run: | - cd spring-ydb - SPRING_YDB_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout) - echo "SPRING_YDB_VERSION=$SPRING_YDB_VERSION" >> "$GITHUB_ENV" + cd spring-ydb-retry + SPRING_YDB_RETRY_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout) + echo "SPRING_YDB_RETRY_VERSION=$SPRING_YDB_RETRY_VERSION" >> "$GITHUB_ENV" - name: Fail workflow if version is snapshot - if: endsWith(env.SPRING_YDB_VERSION, 'SNAPSHOT') + if: endsWith(env.SPRING_YDB_RETRY_VERSION, 'SNAPSHOT') uses: actions/github-script@v8 with: script: core.setFailed('SNAPSHOT version cannot be published') - name: Fail workflow if version is not equal to tag name - if: format('spring-ydb/v{0}', env.SPRING_YDB_VERSION) != github.ref_name + if: format('spring-ydb-retry/v{0}', env.SPRING_YDB_RETRY_VERSION) != github.ref_name uses: actions/github-script@v8 with: script: core.setFailed('Release name must be equal to project version') @@ -42,15 +42,15 @@ jobs: cache: 'maven' - name: Download dependencies - working-directory: ./spring-ydb + working-directory: ./spring-ydb-retry run: mvn $MAVEN_ARGS -Pspring-boot-minimal dependency:go-offline - name: Build with Maven - working-directory: ./spring-ydb + working-directory: ./spring-ydb-retry run: mvn $MAVEN_ARGS -Pspring-boot-minimal package publish: - name: Publish Spring YDB + name: Publish Spring YDB Retry runs-on: ubuntu-latest needs: validate @@ -75,7 +75,7 @@ jobs: server-password: MAVEN_PASSWORD - name: Publish package - working-directory: ./spring-ydb + working-directory: ./spring-ydb-retry run: mvn $MAVEN_ARGS -Possrh-s01,spring-boot-minimal -Dgpg.passphrase=${{ secrets.MAVEN_OSSRH_GPG_PASSWORD }} clean deploy env: MAVEN_USERNAME: ${{ secrets.MAVEN_OSSRH_USERNAME }} diff --git a/spring-ydb/spring-ydb-retry/README.md b/spring-ydb-retry/README.md similarity index 100% rename from spring-ydb/spring-ydb-retry/README.md rename to spring-ydb-retry/README.md diff --git a/spring-ydb/spring-ydb-retry/pom.xml b/spring-ydb-retry/pom.xml similarity index 60% rename from spring-ydb/spring-ydb-retry/pom.xml rename to spring-ydb-retry/pom.xml index d1e5b64d..f1dd0568 100644 --- a/spring-ydb/spring-ydb-retry/pom.xml +++ b/spring-ydb-retry/pom.xml @@ -5,17 +5,70 @@ 4.0.0 - - tech.ydb - spring-ydb - 1.0.0-SNAPSHOT - - + tech.ydb spring-ydb-retry + 0.9.0 jar Spring YDB Retry Spring retry module for YDB + https://github.com/ydb-platform/ydb-java-dialects + + + + Ekaterina Isaeva + ikaterina0909@gmail.com + YDB + https://ydb.tech/ + + + Kirill Kurdyukov + kurdyukov-kir@ydb.tech + YDB + https://ydb.tech/ + + + + + https://github.com/ydb-platform/ydb-java-dialects + scm:git:https://github.com/ydb-platform/ydb-java-dialects.git + scm:git:https://github.com/ydb-platform/ydb-java-dialects.git + + + + + Apache License, Version 2.0 + https://www.apache.org/licenses/LICENSE-2.0 + + + + + 17 + 17 + 17 + 17 + UTF-8 + 6.2.0 + 3.4.0 + 2.3.22 + + + + + + org.springframework.boot + spring-boot-dependencies + ${spring-boot.version} + pom + import + + + tech.ydb.jdbc + ydb-jdbc-driver + ${ydb-jdbc.version} + + + @@ -180,8 +233,26 @@ + + spring-boot-minimal + + true + + + 3.4.0 + + + + spring-boot3 + + 3.5.7 + + spring-boot4 + + 4.0.0 + org.springframework.boot @@ -190,5 +261,46 @@ + + ossrh-s01 + + false + + + + + + org.apache.maven.plugins + maven-gpg-plugin + 3.2.7 + + + sign-artifacts + verify + + sign + + + + + + --pinentry-mode + loopback + + + + + org.sonatype.central + central-publishing-maven-plugin + 0.7.0 + true + + ossrh-s01 + + + + + + diff --git a/spring-ydb-retry/slo/Dockerfile b/spring-ydb-retry/slo/Dockerfile new file mode 100644 index 00000000..eddb2bb8 --- /dev/null +++ b/spring-ydb-retry/slo/Dockerfile @@ -0,0 +1,19 @@ +FROM maven:3.9-eclipse-temurin-21 AS build + +WORKDIR /build + +COPY pom.xml ./pom.xml +COPY src ./src +RUN mvn install -DskipTests -B + +COPY slo/pom.xml ./slo/pom.xml +COPY slo/src ./slo/src +RUN cd slo && mvn package -DskipTests -B + +FROM eclipse-temurin:21-jre + +WORKDIR /app +COPY --from=build /build/slo/target/ydb-slo-workload-1.0.0-SNAPSHOT-exec.jar app.jar + +EXPOSE 8080 +ENTRYPOINT ["java", "-jar", "app.jar"] diff --git a/spring-ydb/spring-ydb-retry/slo/README.md b/spring-ydb-retry/slo/README.md similarity index 100% rename from spring-ydb/spring-ydb-retry/slo/README.md rename to spring-ydb-retry/slo/README.md diff --git a/spring-ydb/spring-ydb-retry/slo/playground/README.md b/spring-ydb-retry/slo/playground/README.md similarity index 100% rename from spring-ydb/spring-ydb-retry/slo/playground/README.md rename to spring-ydb-retry/slo/playground/README.md diff --git a/spring-ydb/spring-ydb-retry/slo/playground/chaos-aggressive/chaos.sh b/spring-ydb-retry/slo/playground/chaos-aggressive/chaos.sh similarity index 100% rename from spring-ydb/spring-ydb-retry/slo/playground/chaos-aggressive/chaos.sh rename to spring-ydb-retry/slo/playground/chaos-aggressive/chaos.sh diff --git a/spring-ydb/spring-ydb-retry/slo/playground/chaos-aggressive/compose.yaml b/spring-ydb-retry/slo/playground/chaos-aggressive/compose.yaml similarity index 98% rename from spring-ydb/spring-ydb-retry/slo/playground/chaos-aggressive/compose.yaml rename to spring-ydb-retry/slo/playground/chaos-aggressive/compose.yaml index 9501c198..abd3c649 100644 --- a/spring-ydb/spring-ydb-retry/slo/playground/chaos-aggressive/compose.yaml +++ b/spring-ydb-retry/slo/playground/chaos-aggressive/compose.yaml @@ -279,8 +279,8 @@ services: app-with-retry: build: - context: ../../../.. - dockerfile: spring-ydb-retry/slo/Dockerfile + context: ../../.. + dockerfile: slo/Dockerfile container_name: ydb-app-with-retry platform: linux/amd64 networks: @@ -306,8 +306,8 @@ services: app-no-retry: build: - context: ../../../.. - dockerfile: spring-ydb-retry/slo/Dockerfile + context: ../../.. + dockerfile: slo/Dockerfile container_name: ydb-app-no-retry platform: linux/amd64 networks: diff --git a/spring-ydb/spring-ydb-retry/slo/playground/chaos/chaos.sh b/spring-ydb-retry/slo/playground/chaos/chaos.sh similarity index 100% rename from spring-ydb/spring-ydb-retry/slo/playground/chaos/chaos.sh rename to spring-ydb-retry/slo/playground/chaos/chaos.sh diff --git a/spring-ydb/spring-ydb-retry/slo/playground/chaos/compose.yaml b/spring-ydb-retry/slo/playground/chaos/compose.yaml similarity index 98% rename from spring-ydb/spring-ydb-retry/slo/playground/chaos/compose.yaml rename to spring-ydb-retry/slo/playground/chaos/compose.yaml index b876ef0b..61cf3dfb 100644 --- a/spring-ydb/spring-ydb-retry/slo/playground/chaos/compose.yaml +++ b/spring-ydb-retry/slo/playground/chaos/compose.yaml @@ -271,8 +271,8 @@ services: app-with-retry: build: - context: ../../../.. - dockerfile: spring-ydb-retry/slo/Dockerfile + context: ../../.. + dockerfile: slo/Dockerfile container_name: ydb-app-with-retry platform: linux/amd64 networks: @@ -298,8 +298,8 @@ services: app-no-retry: build: - context: ../../../.. - dockerfile: spring-ydb-retry/slo/Dockerfile + context: ../../.. + dockerfile: slo/Dockerfile container_name: ydb-app-no-retry platform: linux/amd64 networks: diff --git a/spring-ydb/spring-ydb-retry/slo/playground/configs/grafana/provisioning/dashboards/dashboard.yaml b/spring-ydb-retry/slo/playground/configs/grafana/provisioning/dashboards/dashboard.yaml similarity index 100% rename from spring-ydb/spring-ydb-retry/slo/playground/configs/grafana/provisioning/dashboards/dashboard.yaml rename to spring-ydb-retry/slo/playground/configs/grafana/provisioning/dashboards/dashboard.yaml diff --git a/spring-ydb/spring-ydb-retry/slo/playground/configs/grafana/provisioning/dashboards/slo.json b/spring-ydb-retry/slo/playground/configs/grafana/provisioning/dashboards/slo.json similarity index 100% rename from spring-ydb/spring-ydb-retry/slo/playground/configs/grafana/provisioning/dashboards/slo.json rename to spring-ydb-retry/slo/playground/configs/grafana/provisioning/dashboards/slo.json diff --git a/spring-ydb/spring-ydb-retry/slo/playground/configs/grafana/provisioning/datasources/datasource.yaml b/spring-ydb-retry/slo/playground/configs/grafana/provisioning/datasources/datasource.yaml similarity index 100% rename from spring-ydb/spring-ydb-retry/slo/playground/configs/grafana/provisioning/datasources/datasource.yaml rename to spring-ydb-retry/slo/playground/configs/grafana/provisioning/datasources/datasource.yaml diff --git a/spring-ydb/spring-ydb-retry/slo/playground/configs/prometheus/prometheus.yaml b/spring-ydb-retry/slo/playground/configs/prometheus/prometheus.yaml similarity index 100% rename from spring-ydb/spring-ydb-retry/slo/playground/configs/prometheus/prometheus.yaml rename to spring-ydb-retry/slo/playground/configs/prometheus/prometheus.yaml diff --git a/spring-ydb/spring-ydb-retry/slo/playground/configs/ydb.yaml b/spring-ydb-retry/slo/playground/configs/ydb.yaml similarity index 100% rename from spring-ydb/spring-ydb-retry/slo/playground/configs/ydb.yaml rename to spring-ydb-retry/slo/playground/configs/ydb.yaml diff --git a/spring-ydb/spring-ydb-retry/slo/pom.xml b/spring-ydb-retry/slo/pom.xml similarity index 98% rename from spring-ydb/spring-ydb-retry/slo/pom.xml rename to spring-ydb-retry/slo/pom.xml index 0641d0fd..6f9825c6 100644 --- a/spring-ydb/spring-ydb-retry/slo/pom.xml +++ b/spring-ydb-retry/slo/pom.xml @@ -57,7 +57,7 @@ tech.ydb spring-ydb-retry - 1.0.0-SNAPSHOT + 0.9.0 io.opentelemetry diff --git a/spring-ydb/spring-ydb-retry/slo/src/README.md b/spring-ydb-retry/slo/src/README.md similarity index 100% rename from spring-ydb/spring-ydb-retry/slo/src/README.md rename to spring-ydb-retry/slo/src/README.md diff --git a/spring-ydb/spring-ydb-retry/slo/src/main/java/tech/ydb/slo/OtelConfig.java b/spring-ydb-retry/slo/src/main/java/tech/ydb/slo/OtelConfig.java similarity index 100% rename from spring-ydb/spring-ydb-retry/slo/src/main/java/tech/ydb/slo/OtelConfig.java rename to spring-ydb-retry/slo/src/main/java/tech/ydb/slo/OtelConfig.java diff --git a/spring-ydb/spring-ydb-retry/slo/src/main/java/tech/ydb/slo/SloApplication.java b/spring-ydb-retry/slo/src/main/java/tech/ydb/slo/SloApplication.java similarity index 100% rename from spring-ydb/spring-ydb-retry/slo/src/main/java/tech/ydb/slo/SloApplication.java rename to spring-ydb-retry/slo/src/main/java/tech/ydb/slo/SloApplication.java diff --git a/spring-ydb/spring-ydb-retry/slo/src/main/java/tech/ydb/slo/SloConfig.java b/spring-ydb-retry/slo/src/main/java/tech/ydb/slo/SloConfig.java similarity index 100% rename from spring-ydb/spring-ydb-retry/slo/src/main/java/tech/ydb/slo/SloConfig.java rename to spring-ydb-retry/slo/src/main/java/tech/ydb/slo/SloConfig.java diff --git a/spring-ydb/spring-ydb-retry/slo/src/main/java/tech/ydb/slo/SloResultWriter.java b/spring-ydb-retry/slo/src/main/java/tech/ydb/slo/SloResultWriter.java similarity index 100% rename from spring-ydb/spring-ydb-retry/slo/src/main/java/tech/ydb/slo/SloResultWriter.java rename to spring-ydb-retry/slo/src/main/java/tech/ydb/slo/SloResultWriter.java diff --git a/spring-ydb/spring-ydb-retry/slo/src/main/java/tech/ydb/slo/SloRunner.java b/spring-ydb-retry/slo/src/main/java/tech/ydb/slo/SloRunner.java similarity index 100% rename from spring-ydb/spring-ydb-retry/slo/src/main/java/tech/ydb/slo/SloRunner.java rename to spring-ydb-retry/slo/src/main/java/tech/ydb/slo/SloRunner.java diff --git a/spring-ydb/spring-ydb-retry/slo/src/main/java/tech/ydb/slo/SloService.java b/spring-ydb-retry/slo/src/main/java/tech/ydb/slo/SloService.java similarity index 100% rename from spring-ydb/spring-ydb-retry/slo/src/main/java/tech/ydb/slo/SloService.java rename to spring-ydb-retry/slo/src/main/java/tech/ydb/slo/SloService.java diff --git a/spring-ydb/spring-ydb-retry/slo/src/main/java/tech/ydb/slo/SloStats.java b/spring-ydb-retry/slo/src/main/java/tech/ydb/slo/SloStats.java similarity index 100% rename from spring-ydb/spring-ydb-retry/slo/src/main/java/tech/ydb/slo/SloStats.java rename to spring-ydb-retry/slo/src/main/java/tech/ydb/slo/SloStats.java diff --git a/spring-ydb/spring-ydb-retry/slo/src/main/resources/application.properties b/spring-ydb-retry/slo/src/main/resources/application.properties similarity index 100% rename from spring-ydb/spring-ydb-retry/slo/src/main/resources/application.properties rename to spring-ydb-retry/slo/src/main/resources/application.properties diff --git a/spring-ydb/spring-ydb-retry/src/main/java/tech/ydb/retry/BackoffSleeper.java b/spring-ydb-retry/src/main/java/tech/ydb/retry/BackoffSleeper.java similarity index 100% rename from spring-ydb/spring-ydb-retry/src/main/java/tech/ydb/retry/BackoffSleeper.java rename to spring-ydb-retry/src/main/java/tech/ydb/retry/BackoffSleeper.java diff --git a/spring-ydb/spring-ydb-retry/src/main/java/tech/ydb/retry/YdbDelayCalculator.java b/spring-ydb-retry/src/main/java/tech/ydb/retry/YdbDelayCalculator.java similarity index 100% rename from spring-ydb/spring-ydb-retry/src/main/java/tech/ydb/retry/YdbDelayCalculator.java rename to spring-ydb-retry/src/main/java/tech/ydb/retry/YdbDelayCalculator.java diff --git a/spring-ydb/spring-ydb-retry/src/main/java/tech/ydb/retry/YdbRetryPolicy.java b/spring-ydb-retry/src/main/java/tech/ydb/retry/YdbRetryPolicy.java similarity index 100% rename from spring-ydb/spring-ydb-retry/src/main/java/tech/ydb/retry/YdbRetryPolicy.java rename to spring-ydb-retry/src/main/java/tech/ydb/retry/YdbRetryPolicy.java diff --git a/spring-ydb/spring-ydb-retry/src/main/java/tech/ydb/retry/YdbRetryPolicyConfig.java b/spring-ydb-retry/src/main/java/tech/ydb/retry/YdbRetryPolicyConfig.java similarity index 100% rename from spring-ydb/spring-ydb-retry/src/main/java/tech/ydb/retry/YdbRetryPolicyConfig.java rename to spring-ydb-retry/src/main/java/tech/ydb/retry/YdbRetryPolicyConfig.java diff --git a/spring-ydb/spring-ydb-retry/src/main/java/tech/ydb/retry/YdbRetryProperties.java b/spring-ydb-retry/src/main/java/tech/ydb/retry/YdbRetryProperties.java similarity index 100% rename from spring-ydb/spring-ydb-retry/src/main/java/tech/ydb/retry/YdbRetryProperties.java rename to spring-ydb-retry/src/main/java/tech/ydb/retry/YdbRetryProperties.java diff --git a/spring-ydb/spring-ydb-retry/src/main/java/tech/ydb/retry/YdbTransactionAutoConfiguration.java b/spring-ydb-retry/src/main/java/tech/ydb/retry/YdbTransactionAutoConfiguration.java similarity index 100% rename from spring-ydb/spring-ydb-retry/src/main/java/tech/ydb/retry/YdbTransactionAutoConfiguration.java rename to spring-ydb-retry/src/main/java/tech/ydb/retry/YdbTransactionAutoConfiguration.java diff --git a/spring-ydb/spring-ydb-retry/src/main/java/tech/ydb/retry/YdbTransactionInterceptor.java b/spring-ydb-retry/src/main/java/tech/ydb/retry/YdbTransactionInterceptor.java similarity index 100% rename from spring-ydb/spring-ydb-retry/src/main/java/tech/ydb/retry/YdbTransactionInterceptor.java rename to spring-ydb-retry/src/main/java/tech/ydb/retry/YdbTransactionInterceptor.java diff --git a/spring-ydb/spring-ydb-retry/src/main/java/tech/ydb/retry/YdbTransactionInterceptorFactory.java b/spring-ydb-retry/src/main/java/tech/ydb/retry/YdbTransactionInterceptorFactory.java similarity index 100% rename from spring-ydb/spring-ydb-retry/src/main/java/tech/ydb/retry/YdbTransactionInterceptorFactory.java rename to spring-ydb-retry/src/main/java/tech/ydb/retry/YdbTransactionInterceptorFactory.java diff --git a/spring-ydb/spring-ydb-retry/src/main/java/tech/ydb/retry/YdbTransactionInterceptorReplacer.java b/spring-ydb-retry/src/main/java/tech/ydb/retry/YdbTransactionInterceptorReplacer.java similarity index 100% rename from spring-ydb/spring-ydb-retry/src/main/java/tech/ydb/retry/YdbTransactionInterceptorReplacer.java rename to spring-ydb-retry/src/main/java/tech/ydb/retry/YdbTransactionInterceptorReplacer.java diff --git a/spring-ydb/spring-ydb-retry/src/main/java/tech/ydb/retry/YdbTransactional.java b/spring-ydb-retry/src/main/java/tech/ydb/retry/YdbTransactional.java similarity index 100% rename from spring-ydb/spring-ydb-retry/src/main/java/tech/ydb/retry/YdbTransactional.java rename to spring-ydb-retry/src/main/java/tech/ydb/retry/YdbTransactional.java diff --git a/spring-ydb/spring-ydb-retry/src/main/java/tech/ydb/retry/YdbVendorCode.java b/spring-ydb-retry/src/main/java/tech/ydb/retry/YdbVendorCode.java similarity index 100% rename from spring-ydb/spring-ydb-retry/src/main/java/tech/ydb/retry/YdbVendorCode.java rename to spring-ydb-retry/src/main/java/tech/ydb/retry/YdbVendorCode.java diff --git a/spring-ydb/spring-ydb-retry/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/spring-ydb-retry/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from spring-ydb/spring-ydb-retry/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to spring-ydb-retry/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/spring-ydb/spring-ydb-retry/src/test/java/tech/ydb/retry/InterceptorTestSupport.java b/spring-ydb-retry/src/test/java/tech/ydb/retry/InterceptorTestSupport.java similarity index 100% rename from spring-ydb/spring-ydb-retry/src/test/java/tech/ydb/retry/InterceptorTestSupport.java rename to spring-ydb-retry/src/test/java/tech/ydb/retry/InterceptorTestSupport.java diff --git a/spring-ydb/spring-ydb-retry/src/test/java/tech/ydb/retry/NestedYdbTransactionalRetryTest.java b/spring-ydb-retry/src/test/java/tech/ydb/retry/NestedYdbTransactionalRetryTest.java similarity index 100% rename from spring-ydb/spring-ydb-retry/src/test/java/tech/ydb/retry/NestedYdbTransactionalRetryTest.java rename to spring-ydb-retry/src/test/java/tech/ydb/retry/NestedYdbTransactionalRetryTest.java diff --git a/spring-ydb/spring-ydb-retry/src/test/java/tech/ydb/retry/RetryStartsFreshTransactionTest.java b/spring-ydb-retry/src/test/java/tech/ydb/retry/RetryStartsFreshTransactionTest.java similarity index 100% rename from spring-ydb/spring-ydb-retry/src/test/java/tech/ydb/retry/RetryStartsFreshTransactionTest.java rename to spring-ydb-retry/src/test/java/tech/ydb/retry/RetryStartsFreshTransactionTest.java diff --git a/spring-ydb/spring-ydb-retry/src/test/java/tech/ydb/retry/SqlExceptionStatusExtractionTest.java b/spring-ydb-retry/src/test/java/tech/ydb/retry/SqlExceptionStatusExtractionTest.java similarity index 100% rename from spring-ydb/spring-ydb-retry/src/test/java/tech/ydb/retry/SqlExceptionStatusExtractionTest.java rename to spring-ydb-retry/src/test/java/tech/ydb/retry/SqlExceptionStatusExtractionTest.java diff --git a/spring-ydb/spring-ydb-retry/src/test/java/tech/ydb/retry/TransactionPropagationRetryTest.java b/spring-ydb-retry/src/test/java/tech/ydb/retry/TransactionPropagationRetryTest.java similarity index 100% rename from spring-ydb/spring-ydb-retry/src/test/java/tech/ydb/retry/TransactionPropagationRetryTest.java rename to spring-ydb-retry/src/test/java/tech/ydb/retry/TransactionPropagationRetryTest.java diff --git a/spring-ydb/spring-ydb-retry/src/test/java/tech/ydb/retry/TransactionalDefaultRetryTest.java b/spring-ydb-retry/src/test/java/tech/ydb/retry/TransactionalDefaultRetryTest.java similarity index 100% rename from spring-ydb/spring-ydb-retry/src/test/java/tech/ydb/retry/TransactionalDefaultRetryTest.java rename to spring-ydb-retry/src/test/java/tech/ydb/retry/TransactionalDefaultRetryTest.java diff --git a/spring-ydb/spring-ydb-retry/src/test/java/tech/ydb/retry/YdbDelayCalculatorTest.java b/spring-ydb-retry/src/test/java/tech/ydb/retry/YdbDelayCalculatorTest.java similarity index 100% rename from spring-ydb/spring-ydb-retry/src/test/java/tech/ydb/retry/YdbDelayCalculatorTest.java rename to spring-ydb-retry/src/test/java/tech/ydb/retry/YdbDelayCalculatorTest.java diff --git a/spring-ydb/spring-ydb-retry/src/test/java/tech/ydb/retry/YdbRetryPolicyConfigTest.java b/spring-ydb-retry/src/test/java/tech/ydb/retry/YdbRetryPolicyConfigTest.java similarity index 100% rename from spring-ydb/spring-ydb-retry/src/test/java/tech/ydb/retry/YdbRetryPolicyConfigTest.java rename to spring-ydb-retry/src/test/java/tech/ydb/retry/YdbRetryPolicyConfigTest.java diff --git a/spring-ydb/spring-ydb-retry/src/test/java/tech/ydb/retry/YdbRetryPolicyTest.java b/spring-ydb-retry/src/test/java/tech/ydb/retry/YdbRetryPolicyTest.java similarity index 100% rename from spring-ydb/spring-ydb-retry/src/test/java/tech/ydb/retry/YdbRetryPolicyTest.java rename to spring-ydb-retry/src/test/java/tech/ydb/retry/YdbRetryPolicyTest.java diff --git a/spring-ydb/spring-ydb-retry/src/test/java/tech/ydb/retry/YdbTransactionAutoConfigurationTest.java b/spring-ydb-retry/src/test/java/tech/ydb/retry/YdbTransactionAutoConfigurationTest.java similarity index 100% rename from spring-ydb/spring-ydb-retry/src/test/java/tech/ydb/retry/YdbTransactionAutoConfigurationTest.java rename to spring-ydb-retry/src/test/java/tech/ydb/retry/YdbTransactionAutoConfigurationTest.java diff --git a/spring-ydb/spring-ydb-retry/src/test/java/tech/ydb/retry/YdbTransactionInterceptorFactoryTest.java b/spring-ydb-retry/src/test/java/tech/ydb/retry/YdbTransactionInterceptorFactoryTest.java similarity index 100% rename from spring-ydb/spring-ydb-retry/src/test/java/tech/ydb/retry/YdbTransactionInterceptorFactoryTest.java rename to spring-ydb-retry/src/test/java/tech/ydb/retry/YdbTransactionInterceptorFactoryTest.java diff --git a/spring-ydb/spring-ydb-retry/src/test/java/tech/ydb/retry/YdbTransactionInterceptorInvocationTest.java b/spring-ydb-retry/src/test/java/tech/ydb/retry/YdbTransactionInterceptorInvocationTest.java similarity index 100% rename from spring-ydb/spring-ydb-retry/src/test/java/tech/ydb/retry/YdbTransactionInterceptorInvocationTest.java rename to spring-ydb-retry/src/test/java/tech/ydb/retry/YdbTransactionInterceptorInvocationTest.java diff --git a/spring-ydb/spring-ydb-retry/src/test/java/tech/ydb/retry/YdbTransactionInterceptorReplacerTest.java b/spring-ydb-retry/src/test/java/tech/ydb/retry/YdbTransactionInterceptorReplacerTest.java similarity index 100% rename from spring-ydb/spring-ydb-retry/src/test/java/tech/ydb/retry/YdbTransactionInterceptorReplacerTest.java rename to spring-ydb-retry/src/test/java/tech/ydb/retry/YdbTransactionInterceptorReplacerTest.java diff --git a/spring-ydb/spring-ydb-retry/src/test/java/tech/ydb/retry/YdbTransactionManagerResolutionTest.java b/spring-ydb-retry/src/test/java/tech/ydb/retry/YdbTransactionManagerResolutionTest.java similarity index 100% rename from spring-ydb/spring-ydb-retry/src/test/java/tech/ydb/retry/YdbTransactionManagerResolutionTest.java rename to spring-ydb-retry/src/test/java/tech/ydb/retry/YdbTransactionManagerResolutionTest.java diff --git a/spring-ydb/spring-ydb-retry/src/test/java/tech/ydb/retry/YdbTransactionalConfigOverrideTest.java b/spring-ydb-retry/src/test/java/tech/ydb/retry/YdbTransactionalConfigOverrideTest.java similarity index 100% rename from spring-ydb/spring-ydb-retry/src/test/java/tech/ydb/retry/YdbTransactionalConfigOverrideTest.java rename to spring-ydb-retry/src/test/java/tech/ydb/retry/YdbTransactionalConfigOverrideTest.java diff --git a/spring-ydb/spring-ydb-retry/src/test/java/tech/ydb/retry/integration/CombinedErrorIntegrationTest.java b/spring-ydb-retry/src/test/java/tech/ydb/retry/integration/CombinedErrorIntegrationTest.java similarity index 100% rename from spring-ydb/spring-ydb-retry/src/test/java/tech/ydb/retry/integration/CombinedErrorIntegrationTest.java rename to spring-ydb-retry/src/test/java/tech/ydb/retry/integration/CombinedErrorIntegrationTest.java diff --git a/spring-ydb/spring-ydb-retry/src/test/java/tech/ydb/retry/integration/CommitTransactionRetryTest.java b/spring-ydb-retry/src/test/java/tech/ydb/retry/integration/CommitTransactionRetryTest.java similarity index 100% rename from spring-ydb/spring-ydb-retry/src/test/java/tech/ydb/retry/integration/CommitTransactionRetryTest.java rename to spring-ydb-retry/src/test/java/tech/ydb/retry/integration/CommitTransactionRetryTest.java diff --git a/spring-ydb/spring-ydb-retry/src/test/java/tech/ydb/retry/integration/ConcurrentRunner.java b/spring-ydb-retry/src/test/java/tech/ydb/retry/integration/ConcurrentRunner.java similarity index 100% rename from spring-ydb/spring-ydb-retry/src/test/java/tech/ydb/retry/integration/ConcurrentRunner.java rename to spring-ydb-retry/src/test/java/tech/ydb/retry/integration/ConcurrentRunner.java diff --git a/spring-ydb/spring-ydb-retry/src/test/java/tech/ydb/retry/integration/ConcurrentWriteIntegrationTest.java b/spring-ydb-retry/src/test/java/tech/ydb/retry/integration/ConcurrentWriteIntegrationTest.java similarity index 100% rename from spring-ydb/spring-ydb-retry/src/test/java/tech/ydb/retry/integration/ConcurrentWriteIntegrationTest.java rename to spring-ydb-retry/src/test/java/tech/ydb/retry/integration/ConcurrentWriteIntegrationTest.java diff --git a/spring-ydb/spring-ydb-retry/src/test/java/tech/ydb/retry/integration/DeterministicErrorChannel.java b/spring-ydb-retry/src/test/java/tech/ydb/retry/integration/DeterministicErrorChannel.java similarity index 100% rename from spring-ydb/spring-ydb-retry/src/test/java/tech/ydb/retry/integration/DeterministicErrorChannel.java rename to spring-ydb-retry/src/test/java/tech/ydb/retry/integration/DeterministicErrorChannel.java diff --git a/spring-ydb/spring-ydb-retry/src/test/java/tech/ydb/retry/integration/DeterministicErrorChannelTest.java b/spring-ydb-retry/src/test/java/tech/ydb/retry/integration/DeterministicErrorChannelTest.java similarity index 100% rename from spring-ydb/spring-ydb-retry/src/test/java/tech/ydb/retry/integration/DeterministicErrorChannelTest.java rename to spring-ydb-retry/src/test/java/tech/ydb/retry/integration/DeterministicErrorChannelTest.java diff --git a/spring-ydb/spring-ydb-retry/src/test/java/tech/ydb/retry/integration/DisabledRetryIntegrationTest.java b/spring-ydb-retry/src/test/java/tech/ydb/retry/integration/DisabledRetryIntegrationTest.java similarity index 100% rename from spring-ydb/spring-ydb-retry/src/test/java/tech/ydb/retry/integration/DisabledRetryIntegrationTest.java rename to spring-ydb-retry/src/test/java/tech/ydb/retry/integration/DisabledRetryIntegrationTest.java diff --git a/spring-ydb/spring-ydb-retry/src/test/java/tech/ydb/retry/integration/ExecuteQueryRetryIntegrationTest.java b/spring-ydb-retry/src/test/java/tech/ydb/retry/integration/ExecuteQueryRetryIntegrationTest.java similarity index 100% rename from spring-ydb/spring-ydb-retry/src/test/java/tech/ydb/retry/integration/ExecuteQueryRetryIntegrationTest.java rename to spring-ydb-retry/src/test/java/tech/ydb/retry/integration/ExecuteQueryRetryIntegrationTest.java diff --git a/spring-ydb/spring-ydb-retry/src/test/java/tech/ydb/retry/integration/HappyPathIntegrationTest.java b/spring-ydb-retry/src/test/java/tech/ydb/retry/integration/HappyPathIntegrationTest.java similarity index 100% rename from spring-ydb/spring-ydb-retry/src/test/java/tech/ydb/retry/integration/HappyPathIntegrationTest.java rename to spring-ydb-retry/src/test/java/tech/ydb/retry/integration/HappyPathIntegrationTest.java diff --git a/spring-ydb/spring-ydb-retry/src/test/java/tech/ydb/retry/integration/IdempotentRetryIntegrationTest.java b/spring-ydb-retry/src/test/java/tech/ydb/retry/integration/IdempotentRetryIntegrationTest.java similarity index 100% rename from spring-ydb/spring-ydb-retry/src/test/java/tech/ydb/retry/integration/IdempotentRetryIntegrationTest.java rename to spring-ydb-retry/src/test/java/tech/ydb/retry/integration/IdempotentRetryIntegrationTest.java diff --git a/spring-ydb/spring-ydb-retry/src/test/java/tech/ydb/retry/integration/IntegrationEnvironmentTest.java b/spring-ydb-retry/src/test/java/tech/ydb/retry/integration/IntegrationEnvironmentTest.java similarity index 100% rename from spring-ydb/spring-ydb-retry/src/test/java/tech/ydb/retry/integration/IntegrationEnvironmentTest.java rename to spring-ydb-retry/src/test/java/tech/ydb/retry/integration/IntegrationEnvironmentTest.java diff --git a/spring-ydb/spring-ydb-retry/src/test/java/tech/ydb/retry/integration/MaxRetriesExhaustedTest.java b/spring-ydb-retry/src/test/java/tech/ydb/retry/integration/MaxRetriesExhaustedTest.java similarity index 100% rename from spring-ydb/spring-ydb-retry/src/test/java/tech/ydb/retry/integration/MaxRetriesExhaustedTest.java rename to spring-ydb-retry/src/test/java/tech/ydb/retry/integration/MaxRetriesExhaustedTest.java diff --git a/spring-ydb/spring-ydb-retry/src/test/java/tech/ydb/retry/integration/NonRetryableCommitIntegrationTest.java b/spring-ydb-retry/src/test/java/tech/ydb/retry/integration/NonRetryableCommitIntegrationTest.java similarity index 100% rename from spring-ydb/spring-ydb-retry/src/test/java/tech/ydb/retry/integration/NonRetryableCommitIntegrationTest.java rename to spring-ydb-retry/src/test/java/tech/ydb/retry/integration/NonRetryableCommitIntegrationTest.java diff --git a/spring-ydb/spring-ydb-retry/src/test/java/tech/ydb/retry/integration/YdbDockerTest.java b/spring-ydb-retry/src/test/java/tech/ydb/retry/integration/YdbDockerTest.java similarity index 100% rename from spring-ydb/spring-ydb-retry/src/test/java/tech/ydb/retry/integration/YdbDockerTest.java rename to spring-ydb-retry/src/test/java/tech/ydb/retry/integration/YdbDockerTest.java diff --git a/spring-ydb/spring-ydb-retry/src/test/java/tech/ydb/retry/integration/YdbIntegrationTest.java b/spring-ydb-retry/src/test/java/tech/ydb/retry/integration/YdbIntegrationTest.java similarity index 100% rename from spring-ydb/spring-ydb-retry/src/test/java/tech/ydb/retry/integration/YdbIntegrationTest.java rename to spring-ydb-retry/src/test/java/tech/ydb/retry/integration/YdbIntegrationTest.java diff --git a/spring-ydb/spring-ydb-retry/src/test/java/tech/ydb/retry/integration/app/SimpleUserRepository.java b/spring-ydb-retry/src/test/java/tech/ydb/retry/integration/app/SimpleUserRepository.java similarity index 100% rename from spring-ydb/spring-ydb-retry/src/test/java/tech/ydb/retry/integration/app/SimpleUserRepository.java rename to spring-ydb-retry/src/test/java/tech/ydb/retry/integration/app/SimpleUserRepository.java diff --git a/spring-ydb/spring-ydb-retry/src/test/java/tech/ydb/retry/integration/app/User.java b/spring-ydb-retry/src/test/java/tech/ydb/retry/integration/app/User.java similarity index 100% rename from spring-ydb/spring-ydb-retry/src/test/java/tech/ydb/retry/integration/app/User.java rename to spring-ydb-retry/src/test/java/tech/ydb/retry/integration/app/User.java diff --git a/spring-ydb/spring-ydb-retry/src/test/java/tech/ydb/retry/integration/app/UserApplication.java b/spring-ydb-retry/src/test/java/tech/ydb/retry/integration/app/UserApplication.java similarity index 100% rename from spring-ydb/spring-ydb-retry/src/test/java/tech/ydb/retry/integration/app/UserApplication.java rename to spring-ydb-retry/src/test/java/tech/ydb/retry/integration/app/UserApplication.java diff --git a/spring-ydb/spring-ydb-retry/src/test/java/tech/ydb/retry/integration/app/UserService.java b/spring-ydb-retry/src/test/java/tech/ydb/retry/integration/app/UserService.java similarity index 100% rename from spring-ydb/spring-ydb-retry/src/test/java/tech/ydb/retry/integration/app/UserService.java rename to spring-ydb-retry/src/test/java/tech/ydb/retry/integration/app/UserService.java diff --git a/spring-ydb/spring-ydb-retry/src/test/resources/application-disabled.properties b/spring-ydb-retry/src/test/resources/application-disabled.properties similarity index 100% rename from spring-ydb/spring-ydb-retry/src/test/resources/application-disabled.properties rename to spring-ydb-retry/src/test/resources/application-disabled.properties diff --git a/spring-ydb/spring-ydb-retry/src/test/resources/application-enabled.properties b/spring-ydb-retry/src/test/resources/application-enabled.properties similarity index 100% rename from spring-ydb/spring-ydb-retry/src/test/resources/application-enabled.properties rename to spring-ydb-retry/src/test/resources/application-enabled.properties diff --git a/spring-ydb/spring-ydb-retry/src/test/resources/application-ydb.properties b/spring-ydb-retry/src/test/resources/application-ydb.properties similarity index 100% rename from spring-ydb/spring-ydb-retry/src/test/resources/application-ydb.properties rename to spring-ydb-retry/src/test/resources/application-ydb.properties diff --git a/spring-ydb/spring-ydb-retry/src/test/resources/db/migration/V1__create_table.sql b/spring-ydb-retry/src/test/resources/db/migration/V1__create_table.sql similarity index 100% rename from spring-ydb/spring-ydb-retry/src/test/resources/db/migration/V1__create_table.sql rename to spring-ydb-retry/src/test/resources/db/migration/V1__create_table.sql diff --git a/spring-ydb/pom.xml b/spring-ydb/pom.xml deleted file mode 100644 index a4e80020..00000000 --- a/spring-ydb/pom.xml +++ /dev/null @@ -1,142 +0,0 @@ - - - - 4.0.0 - - tech.ydb - spring-ydb - 1.0.0-SNAPSHOT - - Spring YDB - Spring integration modules for YDB - https://github.com/ydb-platform/ydb-java-dialects - - pom - - - - Ekaterina Isaeva - ikaterina0909@gmail.com - YDB - https://ydb.tech/ - - - Kirill Kurdyukov - kurdyukov-kir@ydb.tech - YDB - https://ydb.tech/ - - - - - https://github.com/ydb-platform/ydb-java-dialects - scm:git:https://github.com/ydb-platform/ydb-java-dialects.git - scm:git:https://github.com/ydb-platform/ydb-java-dialects.git - - - - - Apache License, Version 2.0 - https://www.apache.org/licenses/LICENSE-2.0 - - - - - spring-ydb-retry - - - - 17 - 17 - 17 - 17 - UTF-8 - 6.2.0 - 3.4.0 - 2.3.22 - - - - - - org.springframework.boot - spring-boot-dependencies - ${spring-boot.version} - pom - import - - - tech.ydb.jdbc - ydb-jdbc-driver - ${ydb-jdbc.version} - - - - - - - spring-boot-minimal - - true - - - 3.4.0 - - - - spring-boot3 - - 3.5.7 - - - - spring-boot4 - - 4.0.0 - - - - ossrh-s01 - - false - - - - - - org.apache.maven.plugins - maven-gpg-plugin - 3.2.7 - - - sign-artifacts - verify - - sign - - - - - - --pinentry-mode - loopback - - - - - org.sonatype.central - central-publishing-maven-plugin - 0.7.0 - true - - ossrh-s01 - - - - - - - - diff --git a/spring-ydb/spring-ydb-retry/slo/Dockerfile b/spring-ydb/spring-ydb-retry/slo/Dockerfile deleted file mode 100644 index b1e79e2e..00000000 --- a/spring-ydb/spring-ydb-retry/slo/Dockerfile +++ /dev/null @@ -1,22 +0,0 @@ -FROM maven:3.9-eclipse-temurin-21 AS build - -WORKDIR /build - -COPY pom.xml ./pom.xml -RUN mvn install -N -B - -COPY spring-ydb-retry/pom.xml ./spring-ydb-retry/pom.xml -COPY spring-ydb-retry/src ./spring-ydb-retry/src -RUN mvn install -DskipTests -B -pl spring-ydb-retry || mvn install -DskipTests -B -pl spring-ydb-retry - -COPY spring-ydb-retry/slo/pom.xml ./spring-ydb-retry/slo/pom.xml -COPY spring-ydb-retry/slo/src ./spring-ydb-retry/slo/src -RUN cd spring-ydb-retry/slo && mvn package -DskipTests -B || mvn package -DskipTests -B - -FROM eclipse-temurin:21-jre - -WORKDIR /app -COPY --from=build /build/spring-ydb-retry/slo/target/ydb-slo-workload-1.0.0-SNAPSHOT-exec.jar app.jar - -EXPOSE 8080 -ENTRYPOINT ["java", "-jar", "app.jar"] From affb6e426f2c3911052ca54ba3fd2110447254ac Mon Sep 17 00:00:00 2001 From: Kirill Kurdyukov Date: Tue, 9 Jun 2026 14:06:28 +0300 Subject: [PATCH 2/2] dev: move module up level --- spring-ydb-retry/CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 spring-ydb-retry/CHANGELOG.md diff --git a/spring-ydb-retry/CHANGELOG.md b/spring-ydb-retry/CHANGELOG.md new file mode 100644 index 00000000..c30204f5 --- /dev/null +++ b/spring-ydb-retry/CHANGELOG.md @@ -0,0 +1,3 @@ +## 0.9.0 ## + +- First version of the plugin