From e87e071d1c4564caa975902e7be345dbdb9591e6 Mon Sep 17 00:00:00 2001
From: Johan Book <13253042+johanbook@users.noreply.github.com>
Date: Sat, 10 May 2025 15:46:15 +0200
Subject: [PATCH 1/3] chore(repo): bump traefik to v3

---
 docker-compose.shared.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.shared.yaml b/docker-compose.shared.yaml
index 8a63bf223..1863b6f6a 100644
--- a/docker-compose.shared.yaml
+++ b/docker-compose.shared.yaml
@@ -1,6 +1,6 @@
 services:
   traefik:
-    image: "traefik:v2.10"
+    image: "traefik:v3.4.0"
     container_name: "traefik"
     command:
       - "--accesslog=true"

From 8b0591164983959ae156bdb20b89219e182f5c30 Mon Sep 17 00:00:00 2001
From: Johan Book <13253042+johanbook@users.noreply.github.com>
Date: Sat, 10 May 2025 15:56:12 +0200
Subject: [PATCH 2/3] chore(repo): remove jeager option

---
 docker-compose.prod.yaml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/docker-compose.prod.yaml b/docker-compose.prod.yaml
index 7ec42d450..8d862d8ab 100644
--- a/docker-compose.prod.yaml
+++ b/docker-compose.prod.yaml
@@ -33,10 +33,6 @@ services:
       - "--certificatesresolvers.letsencrypt.acme.httpchallenge.entrypoint=webinsecure"
       - "--certificatesresolvers.letsencrypt.acme.email=$EMAIL"
       - "--certificatesresolvers.letsencrypt.acme.storage=/letsencrypt/acme.json"
-
-      # Adds correlation id
-      - "--tracing.jaeger.samplingparam=0"
-      - "--tracing.jaeger.tracecontextheadername=x-correlation-id"
     ports:
       - "80:80"
       - "443:443"

From 05bb8ffad12e2ea132457aca18c7a8d4b60b6005 Mon Sep 17 00:00:00 2001
From: Johan Book <13253042+johanbook@users.noreply.github.com>
Date: Fri, 20 Jun 2025 12:03:20 +0200
Subject: [PATCH 3/3] chore(repo): add correlation id plugin

---
 docker-compose.prod.yaml   |  8 ++++++++
 docker-compose.shared.yaml | 10 +++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/docker-compose.prod.yaml b/docker-compose.prod.yaml
index 512888850..8b6679e89 100644
--- a/docker-compose.prod.yaml
+++ b/docker-compose.prod.yaml
@@ -26,13 +26,21 @@ services:
       - "--entrypoints.webinsecure.address=:80"
       - "--entrypoints.webinsecure.http.redirections.entrypoint.to=web"
       - "--entrypoints.webinsecure.http.redirections.entrypoint.scheme=https"
+      - "--entrypoints.webinsecure.http.middlewares=correlation@docker"
       - "--entrypoints.web.address=:443"
       - "--entrypoints.web.http.tls.certresolver=letsencrypt"
+      - "--entrypoints.web.http.middlewares=correlation@docker"
+
+      # Adds correlation id middleware
+      - "--experimental.plugins.correlation.moduleName=github.com/saman-jafari/correlation-id-traefik"
+      - "--experimental.plugins.correlation.version=v0.2.0"
 
       - "--certificatesresolvers.letsencrypt.acme.httpchallenge=true"
       - "--certificatesresolvers.letsencrypt.acme.httpchallenge.entrypoint=webinsecure"
       - "--certificatesresolvers.letsencrypt.acme.email=$EMAIL"
       - "--certificatesresolvers.letsencrypt.acme.storage=/letsencrypt/acme.json"
+    labels:
+      - "traefik.http.middlewares.correlation.plugin.correlation.headerName=x-correlation-id"
     ports:
       - "80:80"
       - "443:443"
diff --git a/docker-compose.shared.yaml b/docker-compose.shared.yaml
index 2f34bdfd4..52fbc3794 100644
--- a/docker-compose.shared.yaml
+++ b/docker-compose.shared.yaml
@@ -11,15 +11,19 @@ services:
       - "--providers.docker.exposedbydefault=false"
 
       - "--entrypoints.web.address=:80"
+      - "--entrypoints.web.http.middlewares=correlation@docker"
+      - "--entrypoints.websecure.http.middlewares=correlation@docker"
 
-      # Adds correlation id
-      - "--tracing.jaeger.samplingparam=0"
-      - "--tracing.jaeger.tracecontextheadername=x-correlation-id"
+      # Adds correlation id middleware
+      - "--experimental.plugins.correlation.moduleName=github.com/saman-jafari/correlation-id-traefik"
+      - "--experimental.plugins.correlation.version=v0.2.0"
 
     labels:
       - "traefik.enable=true"
       - "traefik.http.middlewares.basicauth.basicauth.usersfile=/etc/traefik/usersfile"
 
+      - "traefik.http.middlewares.correlation.plugin.correlation.headerName=x-correlation-id"
+
       - "traefik.http.routers.edge-router.entrypoints=web"
       - "traefik.http.routers.edge-router.rule=Host(`traefik.console.$DOMAIN`)"
       - "traefik.http.routers.edge-router.middlewares=basicauth"