Upgrade CN ioredis and redis to v6.2.7 (#4415)

AudiusProject · Dec 2, 2022 · 1b996ea · 1b996ea
1 parent 3ec9e8e
commit 1b996ea
Show file tree

Hide file tree

Showing 6 changed files with 79 additions and 89 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -596,7 +596,7 @@ jobs:
         environment:
           POSTGRES_USER: postgres
           POSTGRES_DB: audius_creator_node_test
-      - image: redis:5.0.4
+      - image: redis:6.2.7
     steps:
       - checkout
       - diff-if-necessary:

diff --git a/creator-node/Dockerfile b/creator-node/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.13 AS base
+FROM alpine:3.14 AS base
 
 WORKDIR /usr/src/app
 
@@ -14,7 +14,7 @@ RUN echo 'http://dl-cdn.alpinelinux.org/alpine/v3.10/main' >> /etc/apk/repositor
     apk add \
         bash=5.1.16-r0 \
         curl \
-        docker=20.10.3-r1 \
+        docker=20.10.11-r1 \
         libpq=11.12-r0 \
         nodejs=14.20.1-r0 \
         npm \
@@ -25,7 +25,7 @@ RUN echo 'http://dl-cdn.alpinelinux.org/alpine/v3.10/main' >> /etc/apk/repositor
         py3-pip \
         python3 \
         python3-dev \
-        redis=6.0.16-r0 \
+        redis=6.2.7-r0 \
         rsyslog=8.2012.0-r3 \
         sudo=1.9.5p2-r0
 
@@ -38,7 +38,7 @@ RUN echo 'http://mirror.leaseweb.com/alpine/v3.13/community' >> /etc/apk/reposit
     MAJOR_VER=`echo $VERSION_ID | sed 's/\.[0-9]\+$//'` && \
     echo "http://openresty.org/package/alpine/v$MAJOR_VER/main" | tee -a /etc/apk/repositories && \
     apk update && \
-    apk add openresty=1.19.3.2-r0 && \
+    apk add openresty=1.21.4.1-r0 && \
     mkdir /usr/local/openresty/conf && \
     mkdir /usr/local/openresty/logs && \
     mkdir /usr/local/openresty/cache

diff --git a/creator-node/compose/docker-compose.yml b/creator-node/compose/docker-compose.yml
@@ -50,7 +50,7 @@ services:
     networks:
       - audius_dev
   creator-node-redis:
-    image: redis:5.0.4
+    image: redis:6.2.7
     ports:
       - '${CREATOR_NODE_REDIS_HOST_PORT}:6379'
     networks:

diff --git a/creator-node/package-lock.json b/creator-node/package-lock.json
diff --git a/creator-node/package.json b/creator-node/package.json
@@ -27,15 +27,15 @@
     "@audius/sdk": "1.0.13",
     "@bull-board/api": "4.6.3",
     "@bull-board/express": "4.6.3",
-    "@opentelemetry/api": "^1.2.0",
+    "@opentelemetry/api": "1.3.0",
     "@opentelemetry/exporter-trace-otlp-http": "^0.32.0",
-    "@opentelemetry/instrumentation": "^0.31.0",
+    "@opentelemetry/instrumentation": "0.34.0",
     "@opentelemetry/instrumentation-bunyan": "^0.29.0",
     "@opentelemetry/instrumentation-express": "^0.30.0",
     "@opentelemetry/instrumentation-fs": "^0.5.0",
     "@opentelemetry/instrumentation-http": "^0.31.0",
+    "@opentelemetry/instrumentation-ioredis": "^0.33.0",
     "@opentelemetry/instrumentation-pg": "^0.30.0",
-    "@opentelemetry/instrumentation-redis": "^0.32.0",
     "@opentelemetry/resources": "^1.7.0",
     "@opentelemetry/sdk-trace-base": "^1.5.0",
     "@opentelemetry/sdk-trace-node": "^1.5.0",
@@ -74,7 +74,7 @@
     "form-data": "^3.0.1",
     "fs-extra": "^9.1.0",
     "hashids": "2.2.10",
-    "ioredis": "^4.27.5",
+    "ioredis": "5.2.4",
     "jimp": "^0.6.1",
     "lodash": "4.17.21",
     "multer": "^1.4.0",
@@ -103,7 +103,7 @@
     "@types/express": "4.17.12",
     "@types/ffmpeg-static": "^3.0.1",
     "@types/fs-extra": "^9.0.13",
-    "@types/ioredis": "^4.28.10",
+    "@types/ioredis": "5.0.0",
     "@types/lodash": "^4.14.182",
     "@types/mocha": "^9.1.1",
     "@types/node": "^18.7.9",

diff --git a/creator-node/src/tracer.ts b/creator-node/src/tracer.ts
@@ -16,12 +16,12 @@ import {
   SemanticResourceAttributes as ResourceAttributesSC
 } from '@opentelemetry/semantic-conventions'
 import { FsInstrumentation } from '@opentelemetry/instrumentation-fs'
-import { RedisInstrumentation } from '@opentelemetry/instrumentation-redis'
 import { ExpressInstrumentation } from '@opentelemetry/instrumentation-express'
 import { HttpInstrumentation } from '@opentelemetry/instrumentation-http'
 import { BunyanInstrumentation } from '@opentelemetry/instrumentation-bunyan'
 import { BatchSpanProcessor } from '@opentelemetry/sdk-trace-base'
 import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-http'
+import { IORedisInstrumentation } from '@opentelemetry/instrumentation-ioredis'
 
 import config from './config'
 
@@ -64,6 +64,9 @@ export const setupTracing = () => {
     })
   })
 
+  // Initialize the OpenTelemetry APIs to use the NodeTracerProvider bindings
+  provider.register()
+
   /**
    * prebuilt tracing instrumentations are registered
    * in order to add trace information and context to
@@ -83,7 +86,7 @@ export const setupTracing = () => {
       new ExpressInstrumentation(),
 
       // Adds spans to redis operations
-      new RedisInstrumentation(),
+      new IORedisInstrumentation({}),
 
       // Adds spans to filesystem operatioons
       new FsInstrumentation(),
@@ -117,9 +120,6 @@ export const setupTracing = () => {
     url: COLLECTOR_URL
   })
   provider.addSpanProcessor(new BatchSpanProcessor(exporter))
-
-  // Initialize the OpenTelemetry APIs to use the NodeTracerProvider bindings
-  provider.register()
 }
 
 /**