chore: merge capture & capture-server crates (#36)

PostHog · May 6, 2024 · 7715f46 · 7715f46
1 parent ee769d9
commit 7715f46
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 53 deletions.
diff --git a/.github/workflows/docker-capture.yml b/.github/workflows/docker-capture.yml
@@ -69,7 +69,7 @@ jobs:
           platforms: linux/arm64
           cache-from: type=gha
           cache-to: type=gha,mode=max
-          build-args: BIN=capture-server
+          build-args: BIN=capture
 
       - name: Capture image digest
         run: echo ${{ steps.docker_build_capture.outputs.digest }}
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -3,7 +3,6 @@ resolver = "2"
 
 members = [
   "capture",
-  "capture-server",
   "common/health",
   "hook-api",
   "hook-common",
@@ -44,6 +43,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 = ["stream"] }
@@ -71,6 +74,7 @@ tokio = { version = "1.34.0", features = ["full"] }
 tower = "0.4.13"
 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"] }
diff --git a/capture-server/Cargo.toml b/capture-server/Cargo.toml
diff --git a/capture/Cargo.toml b/capture/Cargo.toml
@@ -19,6 +19,9 @@ governor = { workspace = true }
 health = { path = "../common/health" }
 metrics = { workspace = true }
 metrics-exporter-prometheus = { workspace = true }
+opentelemetry = { workspace = true }
+opentelemetry-otlp = { workspace = true }
+opentelemetry_sdk = { workspace = true }
 rand = { workspace = true }
 rdkafka = { workspace = true }
 redis = { version = "0.23.3", features = [
@@ -34,8 +37,17 @@ time = { workspace = true }
 tokio = { workspace = true }
 tower-http = { workspace = true }
 tracing = { workspace = true }
+tracing-opentelemetry = { workspace = true }
+tracing-subscriber = { workspace = true }
 uuid = { workspace = true }
 
 [dev-dependencies]
 assert-json-diff = { workspace = true }
 axum-test-helper = { git = "https://github.com/posthog/axum-test-helper.git" } # TODO: remove, directly use reqwest like capture-server tests
+anyhow = { workspace = true }
+futures = { workspace = true }
+once_cell = { workspace = true }
+rand = { workspace = true }
+rdkafka = { workspace = true }
+reqwest = { workspace = true }
+serde_json = { workspace = true }
diff --git a/capture-server/src/main.rs → capture/src/main.rs b/capture-server/src/main.rs → capture/src/main.rs
diff --git a/capture-server/tests/common.rs → capture/tests/common.rs b/capture-server/tests/common.rs → capture/tests/common.rs
diff --git a/capture-server/tests/events.rs → capture/tests/events.rs b/capture-server/tests/events.rs → capture/tests/events.rs