fix: Start counters with proper metadata (#1195)

Start counters with proper metadata

.github/workflows/manual_prod_build.yml

@@ -0,0 +1,170 @@
+name: Manual Build Production
+on:
+  workflow_dispatch:
+    inputs:
+      branch:
+        description: "Branch to run the workflow"
+        required: true
+        default: "main"
+      docker_tag:
+        description: "Tag to be used by the docker image on push"
+        required: true
+        default: "latest"
+jobs:
+  release:
+    runs-on: ubuntu-20.04
+    outputs:
+      published: ${{ steps.semantic.outputs.new_release_published }}
+      version: ${{ steps.semantic.outputs.new_release_version }}
+    steps:
+      - uses: actions/checkout@v3
+      - id: semantic
+        uses: cycjimmy/semantic-release-action@v3
+        with:
+          semantic_version: 18
+        env:
+          GITHUB_TOKEN: ${{ secrets.GH_TOKEN_PROJECT_ACTION }}
+
+  docker_x86_release:
+    needs: release
+    runs-on: ubuntu-20.04
+    if: needs.release.outputs.published == 'true'
+    timeout-minutes: 120
+    env:
+      arch: amd64
+    outputs:
+      image_digest: ${{ steps.build.outputs.digest }}
+    steps:
+      - id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: |
+            supabase/realtime
+          tags: |
+            type=raw,value=v${{ needs.release.outputs.version }}_${{ env.arch }}
+            type=raw,value=${{ github.event.inputs.docker_tag }}_${{ env.arch }}
+
+      - uses: docker/setup-buildx-action@v2
+
+      - uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - id: build
+        uses: docker/build-push-action@v3
+        with:
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          platforms: linux/${{ env.arch }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+
+  docker_arm_release:
+    needs: release
+    runs-on: arm-runner
+    if: needs.release.outputs.published == 'true'
+    timeout-minutes: 120
+    env:
+      arch: arm64
+    outputs:
+      image_digest: ${{ steps.build.outputs.digest }}
+    steps:
+      - uses: actions/checkout@v3
+
+      - id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: |
+            supabase/realtime
+          tags: |
+            type=raw,value=v${{ needs.release.outputs.version }}_${{ env.arch }}
+            type=raw,value=${{ github.event.inputs.docker_tag }}_${{ env.arch }}
+
+      - uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - uses: docker/setup-buildx-action@v2
+        with:
+          driver: docker
+          driver-opts: |
+            image=moby/buildkit:master
+            network=host
+
+      - id: build
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          platforms: linux/${{ env.arch }}
+          no-cache: true
+
+  merge_manifest:
+    needs: [release, docker_x86_release, docker_arm_release]
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+      id-token: write
+    steps:
+      - uses: docker/setup-buildx-action@v2
+
+      - uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Merge multi-arch manifests for versioned output
+        run: |
+          docker buildx imagetools create -t supabase/realtime:v${{ needs.release.outputs.version }} \
+          supabase/realtime@${{ needs.docker_x86_release.outputs.image_digest }} \
+          supabase/realtime@${{ needs.docker_arm_release.outputs.image_digest }}
+
+      - name: Merge multi-arch manifests for latest output
+        run: |
+          docker buildx imagetools create -t supabase/realtime:${{ github.event.inputs.docker_tag }} \
+          supabase/realtime@${{ needs.docker_x86_release.outputs.image_digest }} \
+          supabase/realtime@${{ needs.docker_arm_release.outputs.image_digest }}
+
+      - name: configure aws credentials
+        uses: aws-actions/configure-aws-credentials@v1
+        with:
+          role-to-assume: ${{ secrets.PROD_AWS_ROLE }}
+          aws-region: us-east-1
+
+      - name: Login to ECR
+        uses: docker/login-action@v2
+        with:
+          registry: public.ecr.aws
+
+      - name: Login to GHCR
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Mirror to ECR
+        uses: akhilerm/[email protected]
+        with:
+          src: docker.io/supabase/realtime:v${{ needs.release.outputs.version }}
+          dst: |
+            public.ecr.aws/supabase/realtime:v${{ needs.release.outputs.version }}
+            ghcr.io/supabase/realtime:v${{ needs.release.outputs.version }}
+
+  update-branch-name:
+    needs: [release, docker_x86_release, docker_arm_release, merge_manifest]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout branch
+        uses: actions/checkout@v2
+        with:
+          ref: refs/heads/main
+
+      - name: Update branch name
+        run: |
+          git branch -m main releases/v${{ needs.release.outputs.version }}
+          git push origin HEAD:releases/v${{ needs.release.outputs.version }}

lib/realtime/tenants/connect/start_counters.ex

@@ -36,7 +36,7 @@ defmodule Realtime.Tenants.Connect.StartCounters do
         telemetry: %{
           event_name: [:channel, :joins],
           measurements: %{limit: max_joins_per_second},
-          metadata: %{tenant: tenant}
+          metadata: %{tenant: tenant.external_id}
         }
       )
 
@@ -60,7 +60,7 @@ defmodule Realtime.Tenants.Connect.StartCounters do
         telemetry: %{
           event_name: [:channel, :events],
           measurements: %{limit: max_events_per_second},
-          metadata: %{tenant: tenant}
+          metadata: %{tenant: tenant.external_id}
         }
       )
 
@@ -81,7 +81,7 @@ defmodule Realtime.Tenants.Connect.StartCounters do
         telemetry: %{
           event_name: [:channel, :db_events],
           measurements: %{},
-          metadata: %{tenant: tenant}
+          metadata: %{tenant: tenant.external_id}
         }
       )
 

mix.exs

@@ -4,7 +4,7 @@ defmodule Realtime.MixProject do
   def project do
     [
       app: :realtime,
-      version: "2.33.23",
+      version: "2.33.24",
       elixir: "~> 1.16.0",
       elixirc_paths: elixirc_paths(Mix.env()),
       start_permanent: Mix.env() == :prod,