Use lettuce-core 7.0.0-SNAPSHOT

  - feature branch now merged into lettuce-core use lettuce-core snapshot version

Author: ggivo

.github/workflows/integration.yaml

@@ -11,17 +11,8 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Checkout lettuce-test-app repository
+      - name: Checkout repository
         uses: actions/checkout@v4
-        with:
-          path: lettuce-test-app
-
-      - name: Checkout lettuce-core custom branch
-        uses: actions/checkout@v4
-        with:
-          repository: redis/lettuce
-          ref: feature/maintenance-events
-          path: lettuce-core
 
       - name: Set up JDK 17
         uses: actions/setup-java@v3
@@ -30,32 +21,15 @@ jobs:
           java-version: '17'
           cache: 'maven'
 
-      - name: Build and install custom lettuce-core
-        working-directory: lettuce-core
-        run: |
-          echo "Building REQUIRED custom lettuce-core from feature/maintenance-events branch"
-          mvn versions:set -DnewVersion=7.0.0.MAINT-SNAPSHOT
-          mvn -B clean install -DskipTests
-          echo "Custom lettuce-core 7.0.0.MAINT-SNAPSHOT installed to local repository"
-
-      - name: Verify lettuce-core installation
-        working-directory: lettuce-core
-        run: |
-          echo "Verifying lettuce-core installation:"
-          ls -la ~/.m2/repository/io/lettuce/lettuce-core/7.0.0.MAINT-SNAPSHOT/
-
       - name: Check code formatting
-        working-directory: lettuce-test-app
         run: mvn formatter:validate
 
-      - name: Build and verify lettuce-test-app with REQUIRED custom lettuce-core
-        working-directory: lettuce-test-app
+      - name: Build and verify lettuce-test-app
         run: |
-          echo "Building lettuce-test-app with REQUIRED custom lettuce-core version 7.0.0.MAINT-SNAPSHOT"
-          mvn -B clean verify -Dlettuce.version=7.0.0.MAINT-SNAPSHOT
+          echo "Building lettuce-test-app with lettuce-core snapshot version"
+          mvn -B clean verify
 
       - name: Run integration tests
-        working-directory: lettuce-test-app
         run: |
-          echo "Running integration tests with REQUIRED custom lettuce-core"
-          mvn test -Dlettuce.version=7.0.0.MAINT-SNAPSHOT
+          echo "Running integration tests"
+          mvn test

README.md

@@ -2,27 +2,40 @@
 
 A workload runner for testing Lettuce client fault tolerance against Redis database upgrades.
 
-> **⚠️ IMPORTANT**: This project requires a custom build of lettuce-core from the `feature/maintenance-events` branch. Use `./scripts/build.sh` to build the project correctly.
+> **ℹ️ NOTE**: This project uses lettuce-core 7.0.0-SNAPSHOT which includes the maintenance events features. The snapshot version is automatically downloaded from Maven repositories.
 
 ## Build
 
-> **⚠️ IMPORTANT**: This project REQUIRES a custom build of lettuce-core from the `feature/maintenance-events` branch to function properly. The standard lettuce-core release will not work.
-
 ### Building the Project
 
-Use the provided build script to automatically build and install the required custom lettuce-core version:
+Use the provided build script to build and test the project:
 
 ```sh
 ./scripts/build.sh
 ```
 
 The build script will:
-1. Clone the lettuce-core repository from the `feature/maintenance-events` branch
-2. Build and install the custom lettuce-core version (7.0.0.MAINT-SNAPSHOT) to your local Maven repository
-3. Build and test the lettuce-test-app using the custom lettuce-core version
+1. Check code formatting
+2. Build the lettuce-test-app using the lettuce-core version specified in pom.xml
+3. Run tests to verify everything works correctly
+
+### Manual Build
+
+You can also build manually using Maven:
+
+```sh
+# Check formatting
+mvn formatter:validate
+
+# Build and test
+mvn clean verify
+
+# Run tests
+mvn test
+```
 
 ### CI/CD Integration
-The GitHub Actions workflow automatically builds with the custom lettuce-core version from the `feature/maintenance-events` branch. See `.github/workflows/integration.yaml` for details.
+The GitHub Actions workflow automatically builds and tests the project. See `.github/workflows/integration.yaml` for details.
 ## Usage
 Basic usage with specified runner configuration file and custom log directory:
 ```sh
@@ -166,16 +179,16 @@ Example query for visualising throughput per second of get on 10s window
  | `redis.operations.total`      | Counter   | Counts the number of total Redis command API calls completed successfully or with an error.                                                                                                      | `command`: Redis command (e.g., `GET`, `SET`), status: (SUCCESS, ERROR)                 |
 
 ### Lettuce App Custom Metrics
-This project uses a modified version of lettuce-core with additional metrics from the `feature/maintenance-events` branch.
+This project uses lettuce-core 7.0.0-SNAPSHOT which includes additional metrics from the maintenance events features that were merged into the main branch.
 
-**Building with Custom Lettuce-Core:**
-The build script automatically handles building and using the required custom lettuce-core version:
+**Building the Project:**
+Use the build script to build and test the project:
 
 ```shell
 ./scripts/build.sh
 ```
 
-This is the only supported way to build the project, as it requires the custom lettuce-core implementation.
+The lettuce-core snapshot version with maintenance events features is automatically downloaded from Maven repositories.
 
 Additional metrics aer enabled/disabled via configuration property in the `runner-config.yaml` file:
 ```yaml

pom.xml

@@ -17,7 +17,7 @@
     <properties>
         <java.version>17</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <lettuce.version>7.0.0.MAINT-SNAPSHOT</lettuce.version>
+        <lettuce.version>7.0.0-SNAPSHOT</lettuce.version>
     </properties>
 
     <repositories>

runner-config.yaml

@@ -39,8 +39,8 @@ runner:
       commandLatencyMonitoring: true # Enables Lettuce internal command latency monitoring
       connectionMonitoring: true     # Enables Additional metrics for connection inactive time. Note supported with GA build of lettuce, and required custom Lettuce client build.  See README.md for instruction ho to enable them
     autoReconnect: true
-    maintenanceEventsConfig:
-      enabled: true
+    #maintenanceEventsConfig:
+    #  enabled: true
     #  movingEndpointAddressType: EXTERNAL_IP # INTERNAL_IP, INTERNAL_FQDN, EXTERNAL_IP, EXTERNAL_FQDN
     #reconnectOptions:
     #  fixedDelay: PT1S # 1s Configures constant delay between re-connection attempts

scripts/build.sh

@@ -1,74 +1,41 @@
 #!/bin/bash
 
-# Script to build lettuce-test-app with REQUIRED custom lettuce-core from feature/maintenance-events branch
-# This project REQUIRES the custom lettuce-core build to function properly
+# Script to build lettuce-test-app with lettuce-core snapshot version
+# Uses the publicly available lettuce-core version specified in pom.xml
 # Usage: ./scripts/build.sh
 
 set -e
 
 # Configuration
-LETTUCE_REPO="https://github.com/redis/lettuce.git"
-LETTUCE_BRANCH="feature/maintenance-events"
-LETTUCE_VERSION="7.0.0.MAINT-SNAPSHOT"
-TEMP_DIR="$(mktemp -d)"
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 PROJECT_ROOT="$(dirname "$SCRIPT_DIR")"
 
+# Get lettuce version from pom.xml
+LETTUCE_VERSION=$(mvn -f "$PROJECT_ROOT/pom.xml" help:evaluate -Dexpression=lettuce.version -q -DforceStdout 2>/dev/null)
+
 echo "=========================================="
-echo "Building lettuce-test-app with REQUIRED custom lettuce-core"
+echo "Building lettuce-test-app with lettuce-core"
 echo "=========================================="
-echo "Lettuce repository: $LETTUCE_REPO"
-echo "Lettuce branch: $LETTUCE_BRANCH"
-echo "Lettuce version: $LETTUCE_VERSION"
-echo "Temp directory: $TEMP_DIR"
+echo "Lettuce version: $LETTUCE_VERSION (from pom.xml)"
 echo "Project root: $PROJECT_ROOT"
 echo "=========================================="
 
-# Function to cleanup temp directory
-cleanup() {
-    echo "Cleaning up temporary directory: $TEMP_DIR"
-    rm -rf "$TEMP_DIR"
-}
-trap cleanup EXIT
-
-# Step 1: Clone lettuce-core repository
-echo "Step 1: Cloning lettuce-core repository..."
-cd "$TEMP_DIR"
-git clone --branch "$LETTUCE_BRANCH" --depth 1 "$LETTUCE_REPO" lettuce-core
-cd lettuce-core
-
-# Step 2: Build and install custom lettuce-core
-echo "Step 2: Building and installing custom lettuce-core..."
-echo "Setting version to $LETTUCE_VERSION"
-mvn versions:set -DnewVersion="$LETTUCE_VERSION" -DgenerateBackupPoms=false
-
-echo "Building and installing lettuce-core..."
-mvn clean install -DskipTests -B
-
-echo "Verifying installation..."
-if [ -d "$HOME/.m2/repository/io/lettuce/lettuce-core/$LETTUCE_VERSION" ]; then
-    echo "✅ Custom lettuce-core $LETTUCE_VERSION successfully installed"
-    ls -la "$HOME/.m2/repository/io/lettuce/lettuce-core/$LETTUCE_VERSION/"
-else
-    echo "❌ Failed to install custom lettuce-core"
-    exit 1
-fi
-
-# Step 3: Build lettuce-test-app with custom version
-echo "Step 3: Building lettuce-test-app with custom lettuce-core..."
+# Step 1: Check code formatting
+echo "Step 1: Checking code formatting..."
 cd "$PROJECT_ROOT"
-
-echo "Checking code formatting..."
 mvn formatter:validate
 
+# Step 2: Build lettuce-test-app
+echo "Step 2: Building lettuce-test-app..."
 echo "Building lettuce-test-app with lettuce.version=$LETTUCE_VERSION..."
-mvn clean verify -Dlettuce.version="$LETTUCE_VERSION" -B
+mvn clean verify -B
 
-echo "Running tests..."
-mvn test -Dlettuce.version="$LETTUCE_VERSION"
+# Step 3: Run tests
+echo "Step 3: Running tests..."
+mvn test
 
 echo "=========================================="
-echo "✅ Successfully built lettuce-test-app with custom lettuce-core $LETTUCE_VERSION"
+echo "✅ Successfully built lettuce-test-app with lettuce-core $LETTUCE_VERSION"
 echo "=========================================="
 echo ""
 echo "To run the application with the custom lettuce-core version:"

src/main/java/io/lettuce/test/workloads/cluster/RedisCommandsClusterAsyncWorkload.java

@@ -2,8 +2,6 @@
 
 import io.lettuce.core.LettuceFutures;
 import io.lettuce.core.RedisFuture;
-import io.lettuce.core.api.StatefulRedisConnection;
-import io.lettuce.core.api.async.RedisAsyncCommands;
 import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
 import io.lettuce.core.cluster.api.async.RedisClusterAsyncCommands;
 import io.lettuce.test.CommonWorkloadOptions;

src/main/resources/runner-config-defaults.yaml

@@ -35,8 +35,8 @@ runner:
 
   clientOptions:
     #autoReconnect: true
-    maintenanceEventsConfig:
-      enabled: true
+    #maintenanceEventsConfig:
+    #  enabled: true
     #  movingEndpointAddressType: EXTERNAL_IP # INTERNAL_IP, INTERNAL_FQDN, EXTERNAL_IP, EXTERNAL_FQDN
     #reconnectOptions:
     #  fixedDelay: PT1S # 1s Configures constant delay between re-connection attempts
@@ -47,7 +47,7 @@ runner:
     #disconnectedBehavior: REJECT_COMMANDS  #Options: DEFAULT, ACCEPT_COMMANDS, REJECT_COMMANDS
     timeoutOptions: # Options to configure command timeouts
         fixedTimeout: PT0.200S # 200 ms
-        timeoutsRelaxingDuringMaintenance: PT1S # 1 s
+    #    timeoutsRelaxingDuringMaintenance: PT1S # 1 s
     #socketOptions:  # Options to configure low-level socket options for the connections kept to Redis servers.
     #  connectTimeout: PT10S # 10 s
     #  tcpUserTimeoutOptions: