Merge branch 'main' into flag-boilerplate

.github/workflows/docker-capture.yml → .github/workflows/docker-build.yml

@@ -1,17 +1,21 @@
-name: Build capture docker image
+name: Build container images
 
 on:
   workflow_dispatch:
   push:
     branches:
       - "main"
 
-permissions:
-  packages: write
-
 jobs:
   build:
-    name: build and publish capture image
+    name: Build and publish container image
+    strategy:
+      matrix:
+        image:
+          - capture
+          - hook-api
+          - hook-janitor
+          - hook-worker
     runs-on: depot-ubuntu-22.04-4
     permissions:
       id-token: write # allow issuing OIDC tokens for this workflow run
@@ -45,7 +49,7 @@ jobs:
         id: meta
         uses: docker/metadata-action@v4
         with:
-          images: ghcr.io/posthog/hog-rs/capture
+          images: ghcr.io/posthog/hog-rs/${{ matrix.image }}
           tags: |
             type=ref,event=pr
             type=ref,event=branch
@@ -57,8 +61,8 @@ jobs:
         id: buildx
         uses: docker/setup-buildx-action@v2
 
-      - name: Build and push capture
-        id: docker_build_capture
+      - name: Build and push image
+        id: docker_build
         uses: depot/build-push-action@v1
         with:
           context: ./
@@ -69,7 +73,7 @@ jobs:
           platforms: linux/arm64
           cache-from: type=gha
           cache-to: type=gha,mode=max
-          build-args: BIN=capture-server
+          build-args: BIN=${{ matrix.image }}
 
-      - name: Capture image digest
-        run: echo ${{ steps.docker_build_capture.outputs.digest }}
+      - name: Container image digest
+        run: echo ${{ steps.docker_build.outputs.digest }}

Cargo.toml

@@ -3,7 +3,6 @@ resolver = "2"
 
 members = [
   "capture",
-  "capture-server",
   "common/health",
   "feature-flags",
   "hook-api",
@@ -14,7 +13,7 @@ members = [
 
 [workspace.lints.rust]
 # See https://doc.rust-lang.org/stable/rustc/lints/listing/allowed-by-default.html
-unsafe_code = "forbid" # forbid cannot be ignored with an annotation
+unsafe_code = "forbid"            # forbid cannot be ignored with an annotation
 unstable_features = "forbid"
 macro_use_extern_crate = "forbid"
 let_underscore_drop = "deny"
@@ -45,6 +44,10 @@ http = { version = "1.1.0" }
 http-body-util = "0.1.0"
 metrics = "0.22.0"
 metrics-exporter-prometheus = "0.14.0"
+once_cell = "1.18.0"
+opentelemetry = { version = "0.22.0", features = ["trace"]}
+opentelemetry-otlp = "0.15.0"
+opentelemetry_sdk = { version = "0.22.1", features = ["trace", "rt-tokio"] }
 rand = "0.8.5"
 rdkafka = { version = "0.36.0", features = ["cmake-build", "ssl", "tracing"] }
 reqwest = { version = "0.12.3", features = ["json", "stream"] }
@@ -70,8 +73,9 @@ time = { version = "0.3.20", features = [
 thiserror = { version = "1.0" }
 tokio = { version = "1.34.0", features = ["full"] }
 tower = "0.4.13"
-tower-http = { version = "0.5.2", features = ["cors", "trace"] }
+tower-http = { version = "0.5.2", features = ["cors", "limit", "trace"] }
 tracing = "0.1.40"
-tracing-subscriber = "0.3.18"
+tracing-opentelemetry = "0.23.0"
+tracing-subscriber = { version="0.3.18", features = ["env-filter"] }
 url = { version = "2.5.0 " }
 uuid = { version = "1.6.1", features = ["v7", "serde"] }