fix: fix dependency chains on clickhouse in swarm

.devenv/docker/clickhouse/compose.yaml

@@ -41,31 +41,18 @@ services:
       interval: 30s
       timeout: 5s
       retries: 3
-  schema-migrator-sync:
-    image: signoz/signoz-schema-migrator:v0.142.0
-    container_name: schema-migrator-sync
+  telemetrystore-migrator:
+    image: signoz/signoz-otel-collector:v0.142.0
+    container_name: telemetrystore-migrator
     command:
-      - sync
-      - --cluster-name=cluster
-      - --dsn=tcp://clickhouse:9000
-      - --replication=true
-      - --up=
+    - -c
+    - |
+      /signoz-otel-collector migrate bootstrap --clickhouse-dsn tcp://clickhouse:9000 &&
+      /signoz-otel-collector migrate sync up --clickhouse-dsn tcp://clickhouse:9000 &&
+      /signoz-otel-collector migrate async up --clickhouse-dsn tcp://clickhouse:9000
     depends_on:
       clickhouse:
         condition: service_healthy
-    restart: on-failure
-  schema-migrator-async:
-    image: signoz/signoz-schema-migrator:v0.142.0
-    container_name: schema-migrator-async
-    command:
-      - async
-      - --cluster-name=cluster
-      - --dsn=tcp://clickhouse:9000
-      - --replication=true
-      - --up=
-    depends_on:
-      clickhouse:
-        condition: service_healthy
-      schema-migrator-sync:
-        condition: service_completed_successfully
+    entrypoint:
+    - /bin/sh
     restart: on-failure

deploy/docker-swarm/docker-compose.ha.yaml

@@ -61,7 +61,6 @@ x-db-depend: &db-depend
     - clickhouse
     - clickhouse-2
     - clickhouse-3
-    - schema-migrator
 services:
   init-clickhouse:
     !!merge <<: *common
@@ -207,6 +206,8 @@ services:
       interval: 30s
       timeout: 5s
       retries: 3
+    depends_on:
+      - telemetrystore-migrator
   otel-collector:
     !!merge <<: *db-depend
     image: signoz/signoz-otel-collector:v0.142.0
@@ -228,19 +229,18 @@ services:
       replicas: 3
     depends_on:
       - clickhouse
-      - schema-migrator
       - signoz
-  schema-migrator:
+  telemetrystore-migrator:
     !!merge <<: *common
-    image: signoz/signoz-schema-migrator:v0.142.0
-    deploy:
-      restart_policy:
-        condition: on-failure
-        delay: 5s
-    entrypoint: sh
+    image: signoz/signoz-otel-collector:${OTELCOL_TAG:-v0.142.0}
+    entrypoint:
+    - /bin/sh
     command:
-      - -c
-      - "/signoz-schema-migrator sync --dsn=tcp://clickhouse:9000 --up= && /signoz-schema-migrator async --dsn=tcp://clickhouse:9000 --up="
+    - -c
+    - |
+      /signoz-otel-collector migrate bootstrap --clickhouse-dsn tcp://clickhouse:9000 &&
+      /signoz-otel-collector migrate sync up --clickhouse-dsn tcp://clickhouse:9000 &&
+      /signoz-otel-collector migrate async up --clickhouse-dsn tcp://clickhouse:9000
     depends_on:
       - clickhouse
 networks:

deploy/docker-swarm/docker-compose.yaml

@@ -58,7 +58,6 @@ x-db-depend: &db-depend
   !!merge <<: *common
   depends_on:
     - clickhouse
-    - schema-migrator
 services:
   init-clickhouse:
     !!merge <<: *common
@@ -148,6 +147,8 @@ services:
       interval: 30s
       timeout: 5s
       retries: 3
+    depends_on:
+      - telemetrystore-migrator
   otel-collector:
     !!merge <<: *db-depend
     image: signoz/signoz-otel-collector:v0.142.0
@@ -171,21 +172,21 @@ services:
       replicas: 3
     depends_on:
       - clickhouse
-      - schema-migrator
       - signoz
-  schema-migrator:
+  telemetrystore-migrator:
     !!merge <<: *common
-    image: signoz/signoz-schema-migrator:v0.142.0
-    deploy:
-      restart_policy:
-        condition: on-failure
-        delay: 5s
-    entrypoint: sh
+    image: signoz/signoz-otel-collector:${OTELCOL_TAG:-v0.142.0}
+    entrypoint:
+    - /bin/sh
     command:
-      - -c
-      - "/signoz-schema-migrator sync --dsn=tcp://clickhouse:9000 --up= && /signoz-schema-migrator async --dsn=tcp://clickhouse:9000 --up="
+    - -c
+    - |
+      /signoz-otel-collector migrate bootstrap --clickhouse-dsn tcp://clickhouse:9000 &&
+      /signoz-otel-collector migrate sync up --clickhouse-dsn tcp://clickhouse:9000 &&
+      /signoz-otel-collector migrate async up --clickhouse-dsn tcp://clickhouse:9000
     depends_on:
       - clickhouse
+    restart: on-failure
 networks:
   signoz-net:
     name: signoz-net

deploy/docker/docker-compose.ha.yaml

@@ -62,8 +62,6 @@ x-db-depend: &db-depend
   depends_on:
     clickhouse:
       condition: service_healthy
-    schema-migrator-sync:
-      condition: service_completed_successfully
 services:
   init-clickhouse:
     !!merge <<: *common
@@ -210,6 +208,9 @@ services:
       interval: 30s
       timeout: 5s
       retries: 3
+    depends_on:
+      telemetrystore-migrator:
+        condition: service_completed_successfully
   # TODO: support otel-collector multiple replicas. Nginx/Traefik for loadbalancing?
   otel-collector:
     !!merge <<: *db-depend
@@ -232,29 +233,23 @@ services:
     depends_on:
       clickhouse:
         condition: service_healthy
-      schema-migrator-sync:
-        condition: service_completed_successfully
       signoz:
         condition: service_healthy
-  schema-migrator-sync:
+  telemetrystore-migrator:
     !!merge <<: *common
-    image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-v0.142.0}
-    container_name: schema-migrator-sync
+    image: signoz/signoz-otel-collector:${OTELCOL_TAG:-v0.142.0}
+    container_name: telemetrystore-migrator
     command:
-      - sync
-      - --dsn=tcp://clickhouse:9000
-      - --up=
+    - -c
+    - |
+      /signoz-otel-collector migrate bootstrap --clickhouse-dsn tcp://clickhouse:9000 &&
+      /signoz-otel-collector migrate sync up --clickhouse-dsn tcp://clickhouse:9000 &&
+      /signoz-otel-collector migrate async up --clickhouse-dsn tcp://clickhouse:9000
     depends_on:
       clickhouse:
         condition: service_healthy
-  schema-migrator-async:
-    !!merge <<: *db-depend
-    image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-v0.142.0}
-    container_name: schema-migrator-async
-    command:
-      - async
-      - --dsn=tcp://clickhouse:9000
-      - --up=
+    entrypoint:
+    - /bin/sh
     restart: on-failure
 networks:
   signoz-net:

deploy/docker/docker-compose.yaml

@@ -57,8 +57,6 @@ x-db-depend: &db-depend
   depends_on:
     clickhouse:
       condition: service_healthy
-    schema-migrator-sync:
-      condition: service_completed_successfully
 services:
   init-clickhouse:
     !!merge <<: *common
@@ -142,6 +140,9 @@ services:
       interval: 30s
       timeout: 5s
       retries: 3
+    depends_on:
+      telemetrystore-migrator:
+        condition: service_completed_successfully
   otel-collector:
     !!merge <<: *db-depend
     image: signoz/signoz-otel-collector:${OTELCOL_TAG:-v0.142.0}
@@ -163,26 +164,21 @@ services:
     depends_on:
       signoz:
         condition: service_healthy
-  schema-migrator-sync:
+  telemetrystore-migrator:
     !!merge <<: *common
-    image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-v0.142.0}
-    container_name: schema-migrator-sync
+    image: signoz/signoz-otel-collector:${OTELCOL_TAG:-v0.142.0}
+    container_name: telemetrystore-migrator
     command:
-      - sync
-      - --dsn=tcp://clickhouse:9000
-      - --up=
+    - -c 
+    - |
+      /signoz-otel-collector migrate bootstrap --clickhouse-dsn tcp://clickhouse:9000 &&
+      /signoz-otel-collector migrate sync up --clickhouse-dsn tcp://clickhouse:9000 &&
+      /signoz-otel-collector migrate async up --clickhouse-dsn tcp://clickhouse:9000
     depends_on:
       clickhouse:
         condition: service_healthy
-    restart: on-failure
-  schema-migrator-async:
-    !!merge <<: *db-depend
-    image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-v0.142.0}
-    container_name: schema-migrator-async
-    command:
-      - async
-      - --dsn=tcp://clickhouse:9000
-      - --up=
+    entrypoint:
+    - /bin/sh
     restart: on-failure
 networks:
   signoz-net: