fix valkey docker tests

Author: sightseeker

tests/opentelemetry-docker-tests/tests/check_availability.py

@@ -19,6 +19,7 @@
 import psycopg2
 import pymongo
 import pyodbc
+import redis
 import valkey
 
 MONGODB_COLLECTION_NAME = "test"
@@ -37,6 +38,8 @@
 POSTGRES_USER = os.getenv("POSTGRESQL_USER", "testuser")
 REDIS_HOST = os.getenv("REDIS_HOST", "localhost")
 REDIS_PORT = int(os.getenv("REDIS_PORT ", "6379"))
+VALKEY_HOST = os.getenv("VALKEY_HOST", "localhost")
+VALKEY_PORT = int(os.getenv("VALKEY_PORT ", "16379"))
 MSSQL_DB_NAME = os.getenv("MSSQL_DB_NAME", "opentelemetry-tests")
 MSSQL_HOST = os.getenv("MSSQL_HOST", "localhost")
 MSSQL_PORT = int(os.getenv("MSSQL_PORT", "1433"))
@@ -106,7 +109,12 @@ def check_postgres_connection():
 
 @retryable
 def check_redis_connection():
-    connection = valkey.Redis(host=REDIS_HOST, port=REDIS_PORT)
+    connection = redis.Redis(host=REDIS_HOST, port=REDIS_PORT)
+    connection.hgetall("*")
+    
+@retryable
+def check_valkey_connection():
+    connection = valkey.Valkey(host=VALKEY_HOST, port=VALKEY_PORT)
     connection.hgetall("*")
 
 
@@ -139,6 +147,7 @@ def check_docker_services_availability():
     check_mysql_connection()
     check_postgres_connection()
     check_redis_connection()
+    check_valkey_connection()
     check_mssql_connection()
     setup_mssql_db()
 

tests/opentelemetry-docker-tests/tests/docker-compose.yml

@@ -38,6 +38,11 @@ services:
           - "127.0.0.1:7003:7003"
           - "127.0.0.1:7004:7004"
           - "127.0.0.1:7005:7005"
+  otvalkey:
+      image: valkey/valkey:8.1.1
+      ports:
+        - "127.0.0.1:16379:6379"
+
   otjaeger:
     image: jaegertracing/all-in-one:1.8
     environment:

tests/opentelemetry-docker-tests/tests/test-requirements.txt

@@ -68,6 +68,7 @@ tomli==2.0.1
 typing_extensions==4.12.2
 tzdata==2024.1
 urllib3==1.26.19
+valkey[libvalkey]==6.1.0
 vine==5.1.0
 wcwidth==0.2.13
 websocket-client==0.59.0

tests/opentelemetry-docker-tests/tests/valkey/test_valkey_functional.py

@@ -17,10 +17,6 @@
 
 import valkey
 import valkey.asyncio
-from valkey.commands.search.field import (
-    TextField,
-    VectorField,
-)
 from valkey.commands.search.indexDefinition import IndexDefinition, IndexType
 from valkey.commands.search.query import Query
 from valkey.exceptions import ResponseError
@@ -34,7 +30,7 @@
 class TestValkeyInstrument(TestBase):
     def setUp(self):
         super().setUp()
-        self.valkey_client = valkey.Valkey(port=6379)
+        self.valkey_client = valkey.Valkey(port=16379)
         self.valkey_client.flushall()
         ValkeyInstrumentor().instrument(tracer_provider=self.tracer_provider)
 
@@ -51,7 +47,7 @@ def _check_span(self, span, name):
         self.assertEqual(
             span.attributes[SpanAttributes.NET_PEER_NAME], "localhost"
         )
-        self.assertEqual(span.attributes[SpanAttributes.NET_PEER_PORT], 6379)
+        self.assertEqual(span.attributes[SpanAttributes.NET_PEER_PORT], 16379)
 
     def test_long_command_sanitized(self):
         ValkeyInstrumentor().uninstrument()
@@ -280,7 +276,7 @@ def async_call(coro):
 class TestAsyncValkeyInstrument(TestBase):
     def setUp(self):
         super().setUp()
-        self.valkey_client = valkey.asyncio.Valkey(port=6379)
+        self.valkey_client = valkey.asyncio.Valkey(port=16379)
         async_call(self.valkey_client.flushall())
         ValkeyInstrumentor().instrument(tracer_provider=self.tracer_provider)
 
@@ -297,7 +293,7 @@ def _check_span(self, span, name):
         self.assertEqual(
             span.attributes[SpanAttributes.NET_PEER_NAME], "localhost"
         )
-        self.assertEqual(span.attributes[SpanAttributes.NET_PEER_PORT], 6379)
+        self.assertEqual(span.attributes[SpanAttributes.NET_PEER_PORT], 16379)
 
     def test_long_command(self):
         async_call(self.valkey_client.mget(*range(1000)))
@@ -593,7 +589,7 @@ def test_parent(self):
 class TestValkeyDBIndexInstrument(TestBase):
     def setUp(self):
         super().setUp()
-        self.valkey_client = valkey.Valkey(port=6379, db=10)
+        self.valkey_client = valkey.Valkey(port=16379, db=10)
         self.valkey_client.flushall()
         ValkeyInstrumentor().instrument(tracer_provider=self.tracer_provider)
 
@@ -607,7 +603,7 @@ def _check_span(self, span, name):
         self.assertEqual(
             span.attributes[SpanAttributes.NET_PEER_NAME], "localhost"
         )
-        self.assertEqual(span.attributes[SpanAttributes.NET_PEER_PORT], 6379)
+        self.assertEqual(span.attributes[SpanAttributes.NET_PEER_PORT], 16379)
         self.assertEqual(
             span.attributes["db.valkey.database_index"], 10
         )
@@ -621,73 +617,3 @@ def test_get(self):
         self.assertEqual(
             span.attributes.get(SpanAttributes.DB_STATEMENT), "GET ?"
         )
-
-
-class TestValkeyearchInstrument(TestBase):
-    def setUp(self):
-        super().setUp()
-        self.valkey_client = valkey.Valkey(port=6379)
-        self.valkey_client.flushall()
-        self.embedding_dim = 256
-        ValkeyInstrumentor().instrument(tracer_provider=self.tracer_provider)
-        self.prepare_data()
-        self.create_index()
-
-    def tearDown(self):
-        ValkeyInstrumentor().uninstrument()
-        super().tearDown()
-
-    def prepare_data(self):
-        try:
-            self.valkey_client.ft("idx:test_vss").dropindex(True)
-        except ResponseError:
-            print("No such index")
-        item = {
-            "name": "test",
-            "value": "test_value",
-            "embeddings": [0.1] * 256,
-        }
-        pipeline = self.valkey_client.pipeline()
-        pipeline.json().set("test:001", "$", item)
-        res = pipeline.execute()
-        assert False not in res
-
-    def create_index(self):
-        schema = (
-            TextField("$.name", no_stem=True, as_name="name"),
-            TextField("$.value", no_stem=True, as_name="value"),
-            VectorField(
-                "$.embeddings",
-                "FLAT",
-                {
-                    "TYPE": "FLOAT32",
-                    "DIM": self.embedding_dim,
-                    "DISTANCE_METRIC": "COSINE",
-                },
-                as_name="vector",
-            ),
-        )
-        definition = IndexDefinition(
-            prefix=["test:"], index_type=IndexType.JSON
-        )
-        res = self.valkey_client.ft("idx:test_vss").create_index(
-            fields=schema, definition=definition
-        )
-        assert "OK" in str(res)
-
-    def test_valkey_create_index(self):
-        spans = self.memory_exporter.get_finished_spans()
-        span = next(
-            span for span in spans if span.name == "valkey.create_index"
-        )
-        assert "valkey.create_index.fields" in span.attributes
-
-    def test_valkey_query(self):
-        query = "@name:test"
-        self.valkey_client.ft("idx:test_vss").search(Query(query))
-
-        spans = self.memory_exporter.get_finished_spans()
-        span = next(span for span in spans if span.name == "valkey.search")
-
-        assert span.attributes.get("valkey.search.query") == query
-        assert span.attributes.get("valkey.search.total") == 1

tox.ini

@@ -993,6 +993,7 @@ deps =
   -e {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlalchemy
   -e {toxinidir}/instrumentation/opentelemetry-instrumentation-aiopg
   -e {toxinidir}/instrumentation/opentelemetry-instrumentation-redis
+  -e {toxinidir}/instrumentation/opentelemetry-instrumentation-valkey
   -e {toxinidir}/instrumentation/opentelemetry-instrumentation-remoulade
   opentelemetry-exporter-opencensus@{env:CORE_REPO}\#egg=opentelemetry-exporter-opencensus&subdirectory=exporter/opentelemetry-exporter-opencensus