Merge branch 'main' into ci-lambda-image

Author: aryamohanan

.tekton/assets/sidecars.json

@@ -100,7 +100,7 @@
     },
     {
       "name": "redis",
-      "image": "redis:5.0.14"
+      "image": "redis:7.4.3"
     },
     {
       "name": "localstack",

.tekton/tasks/test-groups/test-ci-collector-tracing-database-task.yaml

@@ -18,7 +18,7 @@ spec:
           - name: "xpack.security.enabled"
             value: "false"
     - name: redis
-      image: redis:5.0.14
+      image: redis:7.4.3
     - name: couchbase
       image: couchbase/server:7.1.4
       readinessProbe:

.tekton/tasks/test-groups/test-ci-collector-tracing-messaging-task.yaml

@@ -52,7 +52,7 @@ spec:
           periodSeconds: 2
           timeoutSeconds: 60
     - name: redis
-      image: redis:5.0.14
+      image: redis:7.4.3
     - name: nats
       image: nats:2.9.14-linux
     - name: nats-streaming

.tekton/tasks/test-groups/test-ci-collector-tracing-misc-task.yaml

@@ -5,7 +5,7 @@ metadata:
 spec:
   sidecars:
     - name: redis
-      image: redis:5.0.14
+      image: redis:7.4.3
   envFrom:
     - configMapRef:
         name: environment-properties  

currencies.json

@@ -186,6 +186,17 @@
     "note": "",
     "core": false
   },
+  {
+    "name": "@redis/client",
+    "policy": "45-days",
+    "lastSupportedVersion": "",
+    "latestVersion": "",
+    "cloudNative": false,
+    "isBeta": false,
+    "ignoreUpdates": false,
+    "note": "",
+    "core": false
+  },
   {
     "name": "amqplib",
     "policy": "45-days",

docker-compose-base.yaml

@@ -1,7 +1,7 @@
 version: '2'
 services:
   redis:
-    image: redis:5.0.14
+    image: redis:7.4.3
     ports:
       - 6379:6379
 

package-lock.json

@@ -92,11 +92,11 @@
     "@aws-sdk/client-sqs": "^3.812.0",
     "@aws-sdk/client-sqs-v3": "npm:@aws-sdk/[email protected]",
     "@aws-sdk/client-ssm": "^3.679.0",
-    "@aws-sdk/lib-dynamodb": "^3.812.0",
+    "@aws-sdk/lib-dynamodb": "^3.814.0",
     "@azure/storage-blob": "^12.27.0",
     "@commitlint/cli": "^14.1.0",
     "@commitlint/config-conventional": "^14.1.0",
-    "@elastic/elasticsearch": "^9.0.1",
+    "@elastic/elasticsearch": "^9.0.2",
     "@elastic/elasticsearch-v7.17.0": "npm:@elastic/elasticsearch@^7.17.0",
     "@elastic/elasticsearch-v7.9.0": "npm:@elastic/[email protected]",
     "@google-cloud/pubsub": "^5.0.0",
@@ -111,6 +111,8 @@
     "@opentelemetry/instrumentation": "0.50.0",
     "@opentelemetry/sdk-node": "^0.49.1",
     "@opentelemetry/sdk-trace-base": "^1.22.0",
+    "@redis/client": "^5.0.1",
+    "@redis/client-v4": "npm:@redis/[email protected]",
     "@types/chai": "^4.3.0",
     "@types/detect-libc": "^1.0.0",
     "@types/event-loop-lag": "^1.0.30",
@@ -224,8 +226,9 @@
     "proxyquire": "^2.1.3",
     "read-pkg-up": "^7.0.1",
     "recursive-copy": "^2.0.14",
-    "redis": "^4.7.0",
+    "redis": "^5.0.1",
     "redis-v3": "npm:redis@^3.1.2",
+    "redis-v4": "npm:redis@^4.7.0",
     "restify": "^11.1.0",
     "rimraf": "^3.0.2",
     "semver": "^7.5.4",

package.json

@@ -19,7 +19,8 @@ require('../../../..')({
 const redis = require(process.env.REDIS_PKG);
 const { delay } = require('@instana/core/test/test_util');
 
-const logPrefix = `Redis allowRootExitSpan App (version: ${process.env.REDIS_VERSION}, 
+const redisVersion = process.env.REDIS_VERSION;
+const logPrefix = `Redis allowRootExitSpan App (version: ${redisVersion}, 
 require: ${process.env.REDIS_PKG}):\t`;
 
 log(logPrefix);
@@ -41,7 +42,12 @@ let client;
     const result = await client.multi().set('key', 'value').get('key').exec();
     log('value:', result);
 
-    await client.quit();
+    // In v5, the quit is replaced by close
+    if (redisVersion === 'latest') {
+      await client.close();
+    } else {
+      await client.quit();
+    }
   } catch (err) {
     log('Failed to connect to Redis:', err);
   }