test: add timeouts to prevent integration tests from hanging

Author: karenc-bq

.github/workflows/integration_tests.yml

@@ -1,66 +1,68 @@
-name: Integration Tests
-
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - main
-
-permissions:
-  id-token: write   # This is required for requesting the JWT
-  contents: read    # This is required for actions/checkout
-
-jobs:
-  build-integration-tests:
-    name: Run Integration Tests
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        python-version: [ "3.8", "3.11" ]
-        engine-version: [ "lts", "latest"]
-        environment: ["mysql", "pg"]
-
-    steps:
-      - name: 'Clone repository'
-        uses: actions/checkout@v4
-
-      - name: 'Set up JDK 8'
-        uses: actions/setup-java@v4
-        with:
-          distribution: 'corretto'
-          java-version: 8
-
-      - name: Install poetry
-        shell: bash
-        run: |
-          pipx install poetry==1.8.2
-          poetry config virtualenvs.prefer-active-python true
-
-      - name: Install dependencies
-        run: poetry install
-
-      - name: 'Configure AWS Credentials'
-        uses: aws-actions/configure-aws-credentials@v4
-        with:
-          role-to-assume: arn:aws:iam::${{ secrets.AWS_ACCOUNT_ID }}:role/${{ secrets.AWS_DEPLOY_ROLE }}
-          role-session-name: python_integration_tests
-          role-duration-seconds: 21600
-          aws-region: ${{ secrets.AWS_DEFAULT_REGION }}
-
-      - name: 'Run Integration Tests'
-        run: |
-          ./gradlew --no-parallel --no-daemon test-python-${{ matrix.python-version }}-${{ matrix.environment }} --info
-        env:
-          RDS_CLUSTER_DOMAIN: ${{ secrets.DB_CONN_SUFFIX }}
-          RDS_DB_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
-          AURORA_MYSQL_DB_ENGINE_VERSION: ${{ matrix.engine-version }}
-          AURORA_PG_ENGINE_VERSION: ${{ matrix.engine-version }}
-
-      - name: 'Archive results'
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: pytest-integration-report-${{ matrix.python-version }}-${{ matrix.environment }}-${{ matrix.engine-version }}
-          path: ./tests/integration/container/reports
-          retention-days: 5
+name: Integration Tests
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - main
+      - test/hanging-efm2-integration-test
+
+permissions:
+  id-token: write   # This is required for requesting the JWT
+  contents: read    # This is required for actions/checkout
+
+jobs:
+  build-integration-tests:
+    name: Run Integration Tests
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: [ "3.11" ]
+        engine-version: [ "latest"]
+        environment: ["mysql", "pg"]
+
+    steps:
+      - name: 'Clone repository'
+        uses: actions/checkout@v4
+
+      - name: 'Set up JDK 8'
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'corretto'
+          java-version: 8
+
+      - name: Install poetry
+        shell: bash
+        run: |
+          pipx install poetry==1.8.2
+          poetry config virtualenvs.prefer-active-python true
+
+      - name: Install dependencies
+        run: poetry install
+
+      - name: 'Configure AWS Credentials'
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          role-to-assume: arn:aws:iam::${{ secrets.AWS_ACCOUNT_ID }}:role/${{ secrets.AWS_DEPLOY_ROLE }}
+          role-session-name: python_integration_tests
+          role-duration-seconds: 21600
+          aws-region: ${{ secrets.AWS_DEFAULT_REGION }}
+
+      - name: 'Run Integration Tests'
+        run: |
+          ./gradlew --no-parallel --no-daemon test-python-${{ matrix.python-version }}-${{ matrix.environment }} --info
+        env:
+          RDS_CLUSTER_DOMAIN: ${{ secrets.DB_CONN_SUFFIX }}
+          RDS_DB_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
+          AURORA_MYSQL_DB_ENGINE_VERSION: ${{ matrix.engine-version }}
+          AURORA_PG_ENGINE_VERSION: ${{ matrix.engine-version }}
+          FILTER: test_host_monitoring_v2_network_failure_detection
+
+      - name: 'Archive results'
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: pytest-integration-report-${{ matrix.python-version }}-${{ matrix.environment }}-${{ matrix.engine-version }}
+          path: ./tests/integration/container/reports
+          retention-days: 5

tests/integration/container/test_host_monitoring_v2.py

@@ -55,6 +55,8 @@ def props(self):
         p: Properties = Properties({"plugins": "host_monitoring_v2",
                                     "socket_timeout": 30,
                                     "connect_timeout": 10,
+                                    "monitoring-connect_timeout": 5,
+                                    "monitoring-socket_timeout": 5,
                                     "failure_detection_time_ms": 5_000,
                                     "failure_detection_interval_ms": 5_000,
                                     "failure_detection_count": 1,