From 4ebbfd35017868f24ebce06d9f4f151f0054fbab Mon Sep 17 00:00:00 2001
From: Alexander <zavorotynskiy@pm.me>
Date: Thu, 6 Mar 2025 14:12:49 +0100
Subject: [PATCH] feat(canvases): improved performance

---
 backend/Dockerfile                            |  2 +-
 .../cmd/{canvas-handler => canvases}/main.go  | 32 +++++++-
 .../{canvas-handler => canvases}/service.go   | 77 +++++++++++++------
 .../{canvas-handler => canvases}/config.go    |  6 +-
 .../templates/tests/test-connection.yaml      | 15 ----
 .../{canvas-handler => canvases}/.helmignore  |  0
 .../{canvas-handler => canvases}/Chart.yaml   |  2 +-
 .../templates/NOTES.txt                       |  8 +-
 .../templates/_helpers.tpl                    | 20 ++---
 .../templates/deployment.yaml                 | 10 +--
 .../templates/hpa.yaml                        |  6 +-
 .../templates/ingress.yaml                    |  4 +-
 .../templates/service.yaml                    |  6 +-
 .../templates/serviceMonitor.yaml             |  6 +-
 .../templates/serviceaccount.yaml             |  4 +-
 .../templates/tests/test-connection.yaml      | 15 ++++
 .../{canvas-handler => canvases}/values.yaml  |  6 +-
 17 files changed, 138 insertions(+), 81 deletions(-)
 rename backend/cmd/{canvas-handler => canvases}/main.go (69%)
 rename backend/internal/{canvas-handler => canvases}/service.go (61%)
 rename backend/internal/config/{canvas-handler => canvases}/config.go (76%)
 delete mode 100644 scripts/helmcharts/openreplay/charts/canvas-handler/templates/tests/test-connection.yaml
 rename scripts/helmcharts/openreplay/charts/{canvas-handler => canvases}/.helmignore (100%)
 rename scripts/helmcharts/openreplay/charts/{canvas-handler => canvases}/Chart.yaml (98%)
 rename scripts/helmcharts/openreplay/charts/{canvas-handler => canvases}/templates/NOTES.txt (76%)
 rename scripts/helmcharts/openreplay/charts/{canvas-handler => canvases}/templates/_helpers.tpl (74%)
 rename scripts/helmcharts/openreplay/charts/{canvas-handler => canvases}/templates/deployment.yaml (93%)
 rename scripts/helmcharts/openreplay/charts/{canvas-handler => canvases}/templates/hpa.yaml (84%)
 rename scripts/helmcharts/openreplay/charts/{canvas-handler => canvases}/templates/ingress.yaml (94%)
 rename scripts/helmcharts/openreplay/charts/{canvas-handler => canvases}/templates/service.yaml (64%)
 rename scripts/helmcharts/openreplay/charts/{canvas-handler => canvases}/templates/serviceMonitor.yaml (73%)
 rename scripts/helmcharts/openreplay/charts/{canvas-handler => canvases}/templates/serviceaccount.yaml (68%)
 create mode 100644 scripts/helmcharts/openreplay/charts/canvases/templates/tests/test-connection.yaml
 rename scripts/helmcharts/openreplay/charts/{canvas-handler => canvases}/values.yaml (96%)

diff --git a/backend/Dockerfile b/backend/Dockerfile
index 99eb7ce5c..0b021a5ff 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -116,7 +116,7 @@ RUN if [ "$SERVICE_NAME" = "http" ]; then \
       wget https://static.openreplay.com/geoip/GeoLite2-City.mmdb -O "$MAXMINDDB_FILE"; \
     elif [ "$SERVICE_NAME" = "imagestorage" ]; then \
       apk add --no-cache zstd; \
-    elif [ "$SERVICE_NAME" = "canvas-handler" ]; then \
+    elif [ "$SERVICE_NAME" = "canvases" ]; then \
           apk add --no-cache zstd; \
     elif [ "$SERVICE_NAME" = "spot" ]; then \
           apk add --no-cache ffmpeg; \
diff --git a/backend/cmd/canvas-handler/main.go b/backend/cmd/canvases/main.go
similarity index 69%
rename from backend/cmd/canvas-handler/main.go
rename to backend/cmd/canvases/main.go
index 92666ebc7..94296ef26 100644
--- a/backend/cmd/canvas-handler/main.go
+++ b/backend/cmd/canvases/main.go
@@ -8,8 +8,8 @@ import (
 	"syscall"
 	"time"
 
-	"openreplay/backend/internal/canvas-handler"
-	config "openreplay/backend/internal/config/canvas-handler"
+	"openreplay/backend/internal/canvases"
+	config "openreplay/backend/internal/config/canvases"
 	"openreplay/backend/pkg/logger"
 	"openreplay/backend/pkg/messages"
 	"openreplay/backend/pkg/metrics"
@@ -29,7 +29,10 @@ func main() {
 		log.Fatal(ctx, "can't init object storage: %s", err)
 	}
 
-	srv, err := canvas_handler.New(cfg, log, objStore)
+	producer := queue.NewProducer(cfg.MessageSizeLimit, true)
+	defer producer.Close(15000)
+
+	srv, err := canvases.New(cfg, log, objStore, producer)
 	if err != nil {
 		log.Fatal(ctx, "can't init canvas service: %s", err)
 	}
@@ -38,6 +41,7 @@ func main() {
 		cfg.GroupCanvasImage,
 		[]string{
 			cfg.TopicCanvasImages,
+			cfg.TopicCanvasTrigger,
 		},
 		messages.NewImagesMessageIterator(func(data []byte, sessID uint64) {
 			isSessionEnd := func(data []byte) bool {
@@ -55,14 +59,34 @@ func main() {
 				}
 				return true
 			}
+			isTriggerEvent := func(data []byte) (string, string, bool) {
+				reader := messages.NewBytesReader(data)
+				msgType, err := reader.ReadUint()
+				if err != nil {
+					return "", "", false
+				}
+				if msgType != messages.MsgCustomEvent {
+					return "", "", false
+				}
+				msg, err := messages.ReadMessage(msgType, reader)
+				if err != nil {
+					return "", "", false
+				}
+				customEvent := msg.(*messages.CustomEvent)
+				return customEvent.Payload, customEvent.Name, true
+			}
 			sessCtx := context.WithValue(context.Background(), "sessionID", sessID)
 
 			if isSessionEnd(data) {
-				if err := srv.PackSessionCanvases(sessCtx, sessID); err != nil {
+				if err := srv.PrepareSessionCanvases(sessCtx, sessID); err != nil {
 					if !strings.Contains(err.Error(), "no such file or directory") {
 						log.Error(sessCtx, "can't pack session's canvases: %s", err)
 					}
 				}
+			} else if path, name, ok := isTriggerEvent(data); ok {
+				if err := srv.ProcessSessionCanvas(sessCtx, sessID, path, name); err != nil {
+					log.Error(sessCtx, "can't process session's canvas: %s", err)
+				}
 			} else {
 				if err := srv.SaveCanvasToDisk(sessCtx, sessID, data); err != nil {
 					log.Error(sessCtx, "can't process canvas image: %s", err)
diff --git a/backend/internal/canvas-handler/service.go b/backend/internal/canvases/service.go
similarity index 61%
rename from backend/internal/canvas-handler/service.go
rename to backend/internal/canvases/service.go
index 69bfc834e..8e5b20ee8 100644
--- a/backend/internal/canvas-handler/service.go
+++ b/backend/internal/canvases/service.go
@@ -1,4 +1,4 @@
-package canvas_handler
+package canvases
 
 import (
 	"bytes"
@@ -12,10 +12,12 @@ import (
 	"strings"
 	"time"
 
-	config "openreplay/backend/internal/config/canvas-handler"
+	config "openreplay/backend/internal/config/canvases"
 	"openreplay/backend/pkg/logger"
+	"openreplay/backend/pkg/messages"
 	"openreplay/backend/pkg/objectstorage"
 	"openreplay/backend/pkg/pool"
+	"openreplay/backend/pkg/queue/types"
 )
 
 type ImageStorage struct {
@@ -23,8 +25,10 @@ type ImageStorage struct {
 	log          logger.Logger
 	basePath     string
 	saverPool    pool.WorkerPool
+	packerPool   pool.WorkerPool
 	uploaderPool pool.WorkerPool
 	objStorage   objectstorage.ObjectStorage
+	producer     types.Producer
 }
 
 type saveTask struct {
@@ -34,13 +38,20 @@ type saveTask struct {
 	image     *bytes.Buffer
 }
 
+type packTask struct {
+	ctx       context.Context
+	sessionID uint64
+	path      string
+	name      string
+}
+
 type uploadTask struct {
 	ctx  context.Context
 	path string
 	name string
 }
 
-func New(cfg *config.Config, log logger.Logger, objStorage objectstorage.ObjectStorage) (*ImageStorage, error) {
+func New(cfg *config.Config, log logger.Logger, objStorage objectstorage.ObjectStorage, producer types.Producer) (*ImageStorage, error) {
 	switch {
 	case cfg == nil:
 		return nil, fmt.Errorf("config is empty")
@@ -54,9 +65,11 @@ func New(cfg *config.Config, log logger.Logger, objStorage objectstorage.ObjectS
 		log:        log,
 		basePath:   path,
 		objStorage: objStorage,
+		producer:   producer,
 	}
-	s.saverPool = pool.NewPool(4, 8, s.writeToDisk)
-	s.uploaderPool = pool.NewPool(4, 8, s.sendToS3)
+	s.saverPool = pool.NewPool(2, 2, s.writeToDisk)
+	s.packerPool = pool.NewPool(8, 16, s.packCanvas)
+	s.uploaderPool = pool.NewPool(8, 16, s.sendToS3)
 	return s, nil
 }
 
@@ -101,7 +114,8 @@ func (v *ImageStorage) writeToDisk(payload interface{}) {
 	return
 }
 
-func (v *ImageStorage) PackSessionCanvases(ctx context.Context, sessID uint64) error {
+func (v *ImageStorage) PrepareSessionCanvases(ctx context.Context, sessID uint64) error {
+	start := time.Now()
 	path := fmt.Sprintf("%s%d/", v.basePath, sessID)
 
 	// Check that the directory exists
@@ -131,26 +145,46 @@ func (v *ImageStorage) PackSessionCanvases(ctx context.Context, sessID uint64) e
 		names[canvasID] = true
 	}
 
-	sessionID := strconv.FormatUint(sessID, 10)
 	for name := range names {
-		// Save to archives
-		archPath := fmt.Sprintf("%s%s.tar.zst", path, name)
-		fullCmd := fmt.Sprintf("find %s -type f -name '%s*' ! -name '*.tar.zst' | tar -cf - --files-from=- | zstd -f -o %s",
-			path, name, archPath)
-		cmd := exec.Command("sh", "-c", fullCmd)
-		var stdout, stderr bytes.Buffer
-		cmd.Stdout = &stdout
-		cmd.Stderr = &stderr
-
-		err := cmd.Run()
-		if err != nil {
-			return fmt.Errorf("failed to execute command, err: %s, stderr: %v", err, stderr.String())
+		msg := &messages.CustomEvent{
+			Name:    name,
+			Payload: path,
+		}
+		if err := v.producer.Produce(v.cfg.TopicCanvasTrigger, sessID, msg.Encode()); err != nil {
+			v.log.Error(ctx, "can't send canvas trigger: %s", err)
 		}
-		v.uploaderPool.Submit(&uploadTask{ctx: ctx, path: archPath, name: sessionID + "/" + name + ".tar.zst"})
 	}
+	v.log.Info(ctx, "session canvases (%d) prepared in %.3fs, session: %d", len(names), time.Since(start).Seconds(), sessID)
 	return nil
 }
 
+func (v *ImageStorage) ProcessSessionCanvas(ctx context.Context, sessID uint64, path, name string) error {
+	v.packerPool.Submit(&packTask{ctx: ctx, sessionID: sessID, path: path, name: name})
+	return nil
+}
+
+func (v *ImageStorage) packCanvas(payload interface{}) {
+	task := payload.(*packTask)
+	start := time.Now()
+	sessionID := strconv.FormatUint(task.sessionID, 10)
+
+	// Save to archives
+	archPath := fmt.Sprintf("%s%s.tar.zst", task.path, task.name)
+	fullCmd := fmt.Sprintf("find %s -type f -name '%s*' ! -name '*.tar.zst' | tar -cf - --files-from=- | zstd -f -o %s",
+		task.path, task.name, archPath)
+	cmd := exec.Command("sh", "-c", fullCmd)
+	var stdout, stderr bytes.Buffer
+	cmd.Stdout = &stdout
+	cmd.Stderr = &stderr
+
+	err := cmd.Run()
+	if err != nil {
+		v.log.Fatal(task.ctx, "failed to execute command, err: %s, stderr: %v", err, stderr.String())
+	}
+	v.log.Info(task.ctx, "canvas packed successfully in %.3fs, session: %d", time.Since(start).Seconds(), task.sessionID)
+	v.uploaderPool.Submit(&uploadTask{ctx: task.ctx, path: archPath, name: sessionID + "/" + task.name + ".tar.zst"})
+}
+
 func (v *ImageStorage) sendToS3(payload interface{}) {
 	task := payload.(*uploadTask)
 	start := time.Now()
@@ -161,6 +195,5 @@ func (v *ImageStorage) sendToS3(payload interface{}) {
 	if err := v.objStorage.Upload(bytes.NewReader(video), task.name, "application/octet-stream", objectstorage.NoContentEncoding, objectstorage.Zstd); err != nil {
 		v.log.Fatal(task.ctx, "failed to upload canvas to storage: %s", err)
 	}
-	v.log.Info(task.ctx, "replay file (size: %d) uploaded successfully in %v", len(video), time.Since(start))
-	return
+	v.log.Info(task.ctx, "replay file (size: %d) uploaded successfully in %.3fs", len(video), time.Since(start).Seconds())
 }
diff --git a/backend/internal/config/canvas-handler/config.go b/backend/internal/config/canvases/config.go
similarity index 76%
rename from backend/internal/config/canvas-handler/config.go
rename to backend/internal/config/canvases/config.go
index 307852f01..244e936ab 100644
--- a/backend/internal/config/canvas-handler/config.go
+++ b/backend/internal/config/canvases/config.go
@@ -1,4 +1,4 @@
-package canvas_handler
+package canvases
 
 import (
 	"openreplay/backend/internal/config/common"
@@ -12,8 +12,8 @@ type Config struct {
 	objectstorage.ObjectsConfig
 	FSDir              string `env:"FS_DIR,required"`
 	CanvasDir          string `env:"CANVAS_DIR,default=canvas"`
-	TopicCanvasImages  string `env:"TOPIC_CANVAS_IMAGES,required"`
-	TopicCanvasTrigger string `env:"TOPIC_CANVAS_TRIGGER,required"`
+	TopicCanvasImages  string `env:"TOPIC_CANVAS_IMAGES,required"`  // For canvas images and sessionEnd events from ender
+	TopicCanvasTrigger string `env:"TOPIC_CANVAS_TRIGGER,required"` // For trigger events to start processing (archive and upload)
 	GroupCanvasImage   string `env:"GROUP_CANVAS_IMAGE,required"`
 	UseProfiler        bool   `env:"PROFILER_ENABLED,default=false"`
 }
diff --git a/scripts/helmcharts/openreplay/charts/canvas-handler/templates/tests/test-connection.yaml b/scripts/helmcharts/openreplay/charts/canvas-handler/templates/tests/test-connection.yaml
deleted file mode 100644
index 3fb4e667d..000000000
--- a/scripts/helmcharts/openreplay/charts/canvas-handler/templates/tests/test-connection.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: "{{ include "canvas-handler.fullname" . }}-test-connection"
-  labels:
-    {{- include "canvas-handler.labels" . | nindent 4 }}
-  annotations:
-    "helm.sh/hook": test
-spec:
-  containers:
-    - name: wget
-      image: busybox
-      command: ['wget']
-      args: ['{{ include "canvas-handler.fullname" . }}:{{ .Values.service.port }}']
-  restartPolicy: Never
diff --git a/scripts/helmcharts/openreplay/charts/canvas-handler/.helmignore b/scripts/helmcharts/openreplay/charts/canvases/.helmignore
similarity index 100%
rename from scripts/helmcharts/openreplay/charts/canvas-handler/.helmignore
rename to scripts/helmcharts/openreplay/charts/canvases/.helmignore
diff --git a/scripts/helmcharts/openreplay/charts/canvas-handler/Chart.yaml b/scripts/helmcharts/openreplay/charts/canvases/Chart.yaml
similarity index 98%
rename from scripts/helmcharts/openreplay/charts/canvas-handler/Chart.yaml
rename to scripts/helmcharts/openreplay/charts/canvases/Chart.yaml
index a93ae0ba4..8e8e0e0c2 100644
--- a/scripts/helmcharts/openreplay/charts/canvas-handler/Chart.yaml
+++ b/scripts/helmcharts/openreplay/charts/canvases/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-name: canvas-handler
+name: canvases
 description: A Helm chart for Kubernetes
 
 # A chart can be either an 'application' or a 'library' chart.
diff --git a/scripts/helmcharts/openreplay/charts/canvas-handler/templates/NOTES.txt b/scripts/helmcharts/openreplay/charts/canvases/templates/NOTES.txt
similarity index 76%
rename from scripts/helmcharts/openreplay/charts/canvas-handler/templates/NOTES.txt
rename to scripts/helmcharts/openreplay/charts/canvases/templates/NOTES.txt
index 96b287832..a298f4678 100644
--- a/scripts/helmcharts/openreplay/charts/canvas-handler/templates/NOTES.txt
+++ b/scripts/helmcharts/openreplay/charts/canvases/templates/NOTES.txt
@@ -6,16 +6,16 @@
   {{- end }}
 {{- end }}
 {{- else if contains "NodePort" .Values.service.type }}
-  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "canvas-handler.fullname" . }})
+  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "canvases.fullname" . }})
   export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
   echo http://$NODE_IP:$NODE_PORT
 {{- else if contains "LoadBalancer" .Values.service.type }}
      NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-           You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "canvas-handler.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "canvas-handler.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
+           You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "canvases.fullname" . }}'
+  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "canvases.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
   echo http://$SERVICE_IP:{{ .Values.service.port }}
 {{- else if contains "ClusterIP" .Values.service.type }}
-  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "canvas-handler.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "canvases.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
   export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}")
   echo "Visit http://127.0.0.1:8080 to use your application"
   kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT
diff --git a/scripts/helmcharts/openreplay/charts/canvas-handler/templates/_helpers.tpl b/scripts/helmcharts/openreplay/charts/canvases/templates/_helpers.tpl
similarity index 74%
rename from scripts/helmcharts/openreplay/charts/canvas-handler/templates/_helpers.tpl
rename to scripts/helmcharts/openreplay/charts/canvases/templates/_helpers.tpl
index a0c186c7e..b824508f3 100644
--- a/scripts/helmcharts/openreplay/charts/canvas-handler/templates/_helpers.tpl
+++ b/scripts/helmcharts/openreplay/charts/canvases/templates/_helpers.tpl
@@ -1,7 +1,7 @@
 {{/*
 Expand the name of the chart.
 */}}
-{{- define "canvas-handler.name" -}}
+{{- define "canvases.name" -}}
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
@@ -10,7 +10,7 @@ Create a default fully qualified app name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 If release name contains chart name it will be used as a full name.
 */}}
-{{- define "canvas-handler.fullname" -}}
+{{- define "canvases.fullname" -}}
 {{- if .Values.fullnameOverride }}
 {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
 {{- else }}
@@ -26,16 +26,16 @@ If release name contains chart name it will be used as a full name.
 {{/*
 Create chart name and version as used by the chart label.
 */}}
-{{- define "canvas-handler.chart" -}}
+{{- define "canvases.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
 {{/*
 Common labels
 */}}
-{{- define "canvas-handler.labels" -}}
-helm.sh/chart: {{ include "canvas-handler.chart" . }}
-{{ include "canvas-handler.selectorLabels" . }}
+{{- define "canvases.labels" -}}
+helm.sh/chart: {{ include "canvases.chart" . }}
+{{ include "canvases.selectorLabels" . }}
 {{- if .Chart.AppVersion }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
@@ -48,17 +48,17 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{/*
 Selector labels
 */}}
-{{- define "canvas-handler.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "canvas-handler.name" . }}
+{{- define "canvases.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "canvases.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
 
 {{/*
 Create the name of the service account to use
 */}}
-{{- define "canvas-handler.serviceAccountName" -}}
+{{- define "canvases.serviceAccountName" -}}
 {{- if .Values.serviceAccount.create }}
-{{- default (include "canvas-handler.fullname" .) .Values.serviceAccount.name }}
+{{- default (include "canvases.fullname" .) .Values.serviceAccount.name }}
 {{- else }}
 {{- default "default" .Values.serviceAccount.name }}
 {{- end }}
diff --git a/scripts/helmcharts/openreplay/charts/canvas-handler/templates/deployment.yaml b/scripts/helmcharts/openreplay/charts/canvases/templates/deployment.yaml
similarity index 93%
rename from scripts/helmcharts/openreplay/charts/canvas-handler/templates/deployment.yaml
rename to scripts/helmcharts/openreplay/charts/canvases/templates/deployment.yaml
index 2492dddfd..428d58897 100644
--- a/scripts/helmcharts/openreplay/charts/canvas-handler/templates/deployment.yaml
+++ b/scripts/helmcharts/openreplay/charts/canvases/templates/deployment.yaml
@@ -1,17 +1,17 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "canvas-handler.fullname" . }}
+  name: {{ include "canvases.fullname" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    {{- include "canvas-handler.labels" . | nindent 4 }}
+    {{- include "canvases.labels" . | nindent 4 }}
 spec:
   {{- if not .Values.autoscaling.enabled }}
   replicas: {{ .Values.replicaCount }}
   {{- end }}
   selector:
     matchLabels:
-      {{- include "canvas-handler.selectorLabels" . | nindent 6 }}
+      {{- include "canvases.selectorLabels" . | nindent 6 }}
   template:
     metadata:
       {{- with .Values.podAnnotations }}
@@ -19,13 +19,13 @@ spec:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       labels:
-        {{- include "canvas-handler.selectorLabels" . | nindent 8 }}
+        {{- include "canvases.selectorLabels" . | nindent 8 }}
     spec:
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      serviceAccountName: {{ include "canvas-handler.serviceAccountName" . }}
+      serviceAccountName: {{ include "canvases.serviceAccountName" . }}
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
       shareProcessNamespace: true
diff --git a/scripts/helmcharts/openreplay/charts/canvas-handler/templates/hpa.yaml b/scripts/helmcharts/openreplay/charts/canvases/templates/hpa.yaml
similarity index 84%
rename from scripts/helmcharts/openreplay/charts/canvas-handler/templates/hpa.yaml
rename to scripts/helmcharts/openreplay/charts/canvases/templates/hpa.yaml
index 6fa784aec..e8b3894f9 100644
--- a/scripts/helmcharts/openreplay/charts/canvas-handler/templates/hpa.yaml
+++ b/scripts/helmcharts/openreplay/charts/canvases/templates/hpa.yaml
@@ -2,15 +2,15 @@
 apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
 metadata:
-  name: {{ include "canvas-handler.fullname" . }}
+  name: {{ include "canvases.fullname" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    {{- include "canvas-handler.labels" . | nindent 4 }}
+    {{- include "canvases.labels" . | nindent 4 }}
 spec:
   scaleTargetRef:
     apiVersion: apps/v1
     kind: Deployment
-    name: {{ include "canvas-handler.fullname" . }}
+    name: {{ include "canvases.fullname" . }}
   minReplicas: {{ .Values.autoscaling.minReplicas }}
   maxReplicas: {{ .Values.autoscaling.maxReplicas }}
   metrics:
diff --git a/scripts/helmcharts/openreplay/charts/canvas-handler/templates/ingress.yaml b/scripts/helmcharts/openreplay/charts/canvases/templates/ingress.yaml
similarity index 94%
rename from scripts/helmcharts/openreplay/charts/canvas-handler/templates/ingress.yaml
rename to scripts/helmcharts/openreplay/charts/canvases/templates/ingress.yaml
index b4956e41d..e4d0bc94b 100644
--- a/scripts/helmcharts/openreplay/charts/canvas-handler/templates/ingress.yaml
+++ b/scripts/helmcharts/openreplay/charts/canvases/templates/ingress.yaml
@@ -1,5 +1,5 @@
 {{- if .Values.ingress.enabled -}}
-{{- $fullName := include "canvas-handler.fullname" . -}}
+{{- $fullName := include "canvases.fullname" . -}}
 {{- $svcPort := .Values.service.ports.http -}}
 {{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }}
   {{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }}
@@ -18,7 +18,7 @@ metadata:
   name: {{ $fullName }}
   namespace: {{ .Release.Namespace }}
   labels:
-    {{- include "canvas-handler.labels" . | nindent 4 }}
+    {{- include "canvases.labels" . | nindent 4 }}
   {{- with .Values.ingress.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
diff --git a/scripts/helmcharts/openreplay/charts/canvas-handler/templates/service.yaml b/scripts/helmcharts/openreplay/charts/canvases/templates/service.yaml
similarity index 64%
rename from scripts/helmcharts/openreplay/charts/canvas-handler/templates/service.yaml
rename to scripts/helmcharts/openreplay/charts/canvases/templates/service.yaml
index 6153fce30..1d1498e03 100644
--- a/scripts/helmcharts/openreplay/charts/canvas-handler/templates/service.yaml
+++ b/scripts/helmcharts/openreplay/charts/canvases/templates/service.yaml
@@ -1,10 +1,10 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "canvas-handler.fullname" . }}
+  name: {{ include "canvases.fullname" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    {{- include "canvas-handler.labels" . | nindent 4 }}
+    {{- include "canvases.labels" . | nindent 4 }}
 spec:
   type: {{ .Values.service.type }}
   ports:
@@ -15,4 +15,4 @@ spec:
       name: {{ $key }}
     {{- end}}
   selector:
-    {{- include "canvas-handler.selectorLabels" . | nindent 4 }}
+    {{- include "canvases.selectorLabels" . | nindent 4 }}
diff --git a/scripts/helmcharts/openreplay/charts/canvas-handler/templates/serviceMonitor.yaml b/scripts/helmcharts/openreplay/charts/canvases/templates/serviceMonitor.yaml
similarity index 73%
rename from scripts/helmcharts/openreplay/charts/canvas-handler/templates/serviceMonitor.yaml
rename to scripts/helmcharts/openreplay/charts/canvases/templates/serviceMonitor.yaml
index a1d73413c..1fe88d9ee 100644
--- a/scripts/helmcharts/openreplay/charts/canvas-handler/templates/serviceMonitor.yaml
+++ b/scripts/helmcharts/openreplay/charts/canvases/templates/serviceMonitor.yaml
@@ -2,10 +2,10 @@
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
-  name: {{ include "canvas-handler.fullname" . }}
+  name: {{ include "canvases.fullname" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    {{- include "canvas-handler.labels" . | nindent 4 }}
+    {{- include "canvases.labels" . | nindent 4 }}
   {{- if .Values.serviceMonitor.additionalLabels }}
     {{- toYaml .Values.serviceMonitor.additionalLabels | nindent 4 }}
   {{- end }}
@@ -14,5 +14,5 @@ spec:
     {{- .Values.serviceMonitor.scrapeConfigs | toYaml | nindent 4 }}
   selector:
     matchLabels:
-      {{- include "canvas-handler.selectorLabels" . | nindent 6 }}
+      {{- include "canvases.selectorLabels" . | nindent 6 }}
 {{- end }}
diff --git a/scripts/helmcharts/openreplay/charts/canvas-handler/templates/serviceaccount.yaml b/scripts/helmcharts/openreplay/charts/canvases/templates/serviceaccount.yaml
similarity index 68%
rename from scripts/helmcharts/openreplay/charts/canvas-handler/templates/serviceaccount.yaml
rename to scripts/helmcharts/openreplay/charts/canvases/templates/serviceaccount.yaml
index ce641f58d..864ead29b 100644
--- a/scripts/helmcharts/openreplay/charts/canvas-handler/templates/serviceaccount.yaml
+++ b/scripts/helmcharts/openreplay/charts/canvases/templates/serviceaccount.yaml
@@ -2,10 +2,10 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: {{ include "canvas-handler.serviceAccountName" . }}
+  name: {{ include "canvases.serviceAccountName" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    {{- include "canvas-handler.labels" . | nindent 4 }}
+    {{- include "canvases.labels" . | nindent 4 }}
   {{- with .Values.serviceAccount.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
diff --git a/scripts/helmcharts/openreplay/charts/canvases/templates/tests/test-connection.yaml b/scripts/helmcharts/openreplay/charts/canvases/templates/tests/test-connection.yaml
new file mode 100644
index 000000000..c1d2b2b78
--- /dev/null
+++ b/scripts/helmcharts/openreplay/charts/canvases/templates/tests/test-connection.yaml
@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: "{{ include "canvases.fullname" . }}-test-connection"
+  labels:
+    {{- include "canvases.labels" . | nindent 4 }}
+  annotations:
+    "helm.sh/hook": test
+spec:
+  containers:
+    - name: wget
+      image: busybox
+      command: ['wget']
+      args: ['{{ include "canvases.fullname" . }}:{{ .Values.service.port }}']
+  restartPolicy: Never
diff --git a/scripts/helmcharts/openreplay/charts/canvas-handler/values.yaml b/scripts/helmcharts/openreplay/charts/canvases/values.yaml
similarity index 96%
rename from scripts/helmcharts/openreplay/charts/canvas-handler/values.yaml
rename to scripts/helmcharts/openreplay/charts/canvases/values.yaml
index 152287787..ad047e67d 100644
--- a/scripts/helmcharts/openreplay/charts/canvas-handler/values.yaml
+++ b/scripts/helmcharts/openreplay/charts/canvases/values.yaml
@@ -5,14 +5,14 @@
 replicaCount: 1
 
 image:
-  repository: "{{ .Values.global.openReplayContainerRegistry }}/canvas-handler"
+  repository: "{{ .Values.global.openReplayContainerRegistry }}/canvases"
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
   tag: ""
 
 imagePullSecrets: []
-nameOverride: "canvas-handler"
-fullnameOverride: "canvas-handler-openreplay"
+nameOverride: "canvases"
+fullnameOverride: "canvases-openreplay"
 
 serviceAccount:
   # Specifies whether a service account should be created