Merge remote-tracking branch 'origin/main' into feature-log-event-labels

newrelic · Nov 4, 2024 · e124b79 · e124b79
2 parents a460cda + b550b0d
commit e124b79
Show file tree

Hide file tree

Showing 16 changed files with 2,557 additions and 6 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -49,6 +49,7 @@ jobs:
       - redis
       - rediscluster
       - solr
+      - valkey
 
     steps:
       - name: Success
@@ -1198,3 +1199,65 @@ jobs:
           name: coverage-${{ github.job }}-${{ strategy.job-index }}
           path: ./**/.coverage.*
           retention-days: 1
+
+  valkey:
+    env:
+      TOTAL_GROUPS: 2
+
+    strategy:
+      fail-fast: false
+      matrix:
+        group-number: [1, 2]
+
+    runs-on: ubuntu-latest
+    container:
+      image: ghcr.io/newrelic/newrelic-python-agent-ci:latest
+      options: >-
+        --add-host=host.docker.internal:host-gateway
+    timeout-minutes: 30
+    services:
+      valkey:
+        image: valkey/valkey:latest
+        ports:
+          - 8080:6379
+          - 8081:6379
+        # Set health checks to wait until valkey has started
+        options: >-
+          --health-cmd "valkey-cli ping"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+
+    steps:
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # 4.1.1
+
+      - name: Fetch git tags
+        run: |
+          git config --global --add safe.directory "$GITHUB_WORKSPACE"
+          git fetch --tags origin
+
+      - name: Configure pip cache
+        run: |
+          mkdir -p /github/home/.cache/pip
+          chown -R $(whoami) /github/home/.cache/pip
+
+      - name: Get Environments
+        id: get-envs
+        run: |
+          echo "envs=$(tox -l | grep '^${{ github.job }}\-' | ./.github/workflows/get-envs.py)" >> $GITHUB_OUTPUT
+        env:
+          GROUP_NUMBER: ${{ matrix.group-number }}
+
+      - name: Test
+        run: |
+          tox -vv -e ${{ steps.get-envs.outputs.envs }} -p auto
+        env:
+          TOX_PARALLEL_NO_SPINNER: 1
+          PY_COLORS: 0
+
+      - name: Upload Coverage Artifacts
+        uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # 4.3.1
+        with:
+          name: coverage-${{ github.job }}-${{ strategy.job-index }}
+          path: ./**/.coverage.*
+          retention-days: 1
diff --git a/newrelic/config.py b/newrelic/config.py
@@ -3629,6 +3629,61 @@ def _process_module_builtin_defaults():
         "redis.commands.graph.commands", "newrelic.hooks.datastore_redis", "instrument_redis_commands_graph_commands"
     )
 
+    _process_module_definition(
+        "valkey.asyncio.client", "newrelic.hooks.datastore_valkey", "instrument_asyncio_valkey_client"
+    )
+
+    _process_module_definition(
+        "valkey.asyncio.commands", "newrelic.hooks.datastore_valkey", "instrument_asyncio_valkey_client"
+    )
+
+    _process_module_definition(
+        "valkey.asyncio.connection", "newrelic.hooks.datastore_valkey", "instrument_asyncio_valkey_connection"
+    )
+
+    _process_module_definition(
+        "valkey.connection",
+        "newrelic.hooks.datastore_valkey",
+        "instrument_valkey_connection",
+    )
+    _process_module_definition("valkey.client", "newrelic.hooks.datastore_valkey", "instrument_valkey_client")
+
+    _process_module_definition(
+        "valkey.commands.cluster", "newrelic.hooks.datastore_valkey", "instrument_valkey_commands_cluster"
+    )
+
+    _process_module_definition(
+        "valkey.commands.core", "newrelic.hooks.datastore_valkey", "instrument_valkey_commands_core"
+    )
+
+    _process_module_definition(
+        "valkey.commands.sentinel", "newrelic.hooks.datastore_valkey", "instrument_valkey_commands_sentinel"
+    )
+
+    _process_module_definition(
+        "valkey.commands.json.commands", "newrelic.hooks.datastore_valkey", "instrument_valkey_commands_json_commands"
+    )
+
+    _process_module_definition(
+        "valkey.commands.search.commands",
+        "newrelic.hooks.datastore_valkey",
+        "instrument_valkey_commands_search_commands",
+    )
+
+    _process_module_definition(
+        "valkey.commands.timeseries.commands",
+        "newrelic.hooks.datastore_valkey",
+        "instrument_valkey_commands_timeseries_commands",
+    )
+
+    _process_module_definition(
+        "valkey.commands.bf.commands", "newrelic.hooks.datastore_valkey", "instrument_valkey_commands_bf_commands"
+    )
+
+    _process_module_definition(
+        "valkey.commands.graph.commands", "newrelic.hooks.datastore_valkey", "instrument_valkey_commands_graph_commands"
+    )
+
     _process_module_definition("motor", "newrelic.hooks.datastore_motor", "patch_motor")
 
     _process_module_definition(