bring in Sankey fix from shared-core (#212)

bitdriftlabs · Feb 6, 2025 · 2f811df · 2f811df
1 parent bf75ff6
commit 2f811df
Show file tree

Hide file tree

Showing 9 changed files with 1,570 additions and 561 deletions.
diff --git a/Cargo.Bazel.lock b/Cargo.Bazel.lock
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -16,32 +16,32 @@ resolver = "2"
 android_logger = { version = "0.14.1", default-features = false }
 anyhow = "1.0.95"
 assert_matches = "1.5.0"
-async-trait = "0.1.84"
-bd-api = { git = "https://github.com/bitdriftlabs/shared-core.git", rev = "cb2fdb173fb76880c7f0918fdb73c91060f1a6ea" }
-bd-buffer = { git = "https://github.com/bitdriftlabs/shared-core.git", rev = "cb2fdb173fb76880c7f0918fdb73c91060f1a6ea" }
-bd-client-common = { git = "https://github.com/bitdriftlabs/shared-core.git", rev = "cb2fdb173fb76880c7f0918fdb73c91060f1a6ea" }
-bd-client-stats-store = { git = "https://github.com/bitdriftlabs/shared-core.git", rev = "cb2fdb173fb76880c7f0918fdb73c91060f1a6ea" }
-bd-device = { git = "https://github.com/bitdriftlabs/shared-core.git", rev = "cb2fdb173fb76880c7f0918fdb73c91060f1a6ea" }
-bd-grpc = { git = "https://github.com/bitdriftlabs/shared-core.git", rev = "cb2fdb173fb76880c7f0918fdb73c91060f1a6ea" }
-bd-hyper-network = { git = "https://github.com/bitdriftlabs/shared-core.git", rev = "cb2fdb173fb76880c7f0918fdb73c91060f1a6ea" }
-bd-key-value = { git = "https://github.com/bitdriftlabs/shared-core.git", rev = "cb2fdb173fb76880c7f0918fdb73c91060f1a6ea" }
-bd-log = { git = "https://github.com/bitdriftlabs/shared-core.git", rev = "cb2fdb173fb76880c7f0918fdb73c91060f1a6ea" }
-bd-log-metadata = { git = "https://github.com/bitdriftlabs/shared-core.git", rev = "cb2fdb173fb76880c7f0918fdb73c91060f1a6ea" }
-bd-log-primitives = { git = "https://github.com/bitdriftlabs/shared-core.git", rev = "cb2fdb173fb76880c7f0918fdb73c91060f1a6ea" }
-bd-logger = { git = "https://github.com/bitdriftlabs/shared-core.git", rev = "cb2fdb173fb76880c7f0918fdb73c91060f1a6ea" }
-bd-noop-network = { git = "https://github.com/bitdriftlabs/shared-core.git", rev = "cb2fdb173fb76880c7f0918fdb73c91060f1a6ea" }
-bd-proto = { git = "https://github.com/bitdriftlabs/shared-core.git", rev = "cb2fdb173fb76880c7f0918fdb73c91060f1a6ea" }
-bd-runtime = { git = "https://github.com/bitdriftlabs/shared-core.git", rev = "cb2fdb173fb76880c7f0918fdb73c91060f1a6ea" }
-bd-session = { git = "https://github.com/bitdriftlabs/shared-core.git", rev = "cb2fdb173fb76880c7f0918fdb73c91060f1a6ea" }
-bd-shutdown = { git = "https://github.com/bitdriftlabs/shared-core.git", rev = "cb2fdb173fb76880c7f0918fdb73c91060f1a6ea" }
-bd-test-helpers = { git = "https://github.com/bitdriftlabs/shared-core.git", rev = "cb2fdb173fb76880c7f0918fdb73c91060f1a6ea", default-features = false }
-bd-time = { git = "https://github.com/bitdriftlabs/shared-core.git", rev = "cb2fdb173fb76880c7f0918fdb73c91060f1a6ea" }
+async-trait = "0.1.86"
+bd-api = { git = "https://github.com/bitdriftlabs/shared-core.git", rev = "48fbd7b48cd0b9e95304ea66241c93e9da3bdbdc" }
+bd-buffer = { git = "https://github.com/bitdriftlabs/shared-core.git", rev = "48fbd7b48cd0b9e95304ea66241c93e9da3bdbdc" }
+bd-client-common = { git = "https://github.com/bitdriftlabs/shared-core.git", rev = "48fbd7b48cd0b9e95304ea66241c93e9da3bdbdc" }
+bd-client-stats-store = { git = "https://github.com/bitdriftlabs/shared-core.git", rev = "48fbd7b48cd0b9e95304ea66241c93e9da3bdbdc" }
+bd-device = { git = "https://github.com/bitdriftlabs/shared-core.git", rev = "48fbd7b48cd0b9e95304ea66241c93e9da3bdbdc" }
+bd-grpc = { git = "https://github.com/bitdriftlabs/shared-core.git", rev = "48fbd7b48cd0b9e95304ea66241c93e9da3bdbdc" }
+bd-hyper-network = { git = "https://github.com/bitdriftlabs/shared-core.git", rev = "48fbd7b48cd0b9e95304ea66241c93e9da3bdbdc" }
+bd-key-value = { git = "https://github.com/bitdriftlabs/shared-core.git", rev = "48fbd7b48cd0b9e95304ea66241c93e9da3bdbdc" }
+bd-log = { git = "https://github.com/bitdriftlabs/shared-core.git", rev = "48fbd7b48cd0b9e95304ea66241c93e9da3bdbdc" }
+bd-log-metadata = { git = "https://github.com/bitdriftlabs/shared-core.git", rev = "48fbd7b48cd0b9e95304ea66241c93e9da3bdbdc" }
+bd-log-primitives = { git = "https://github.com/bitdriftlabs/shared-core.git", rev = "48fbd7b48cd0b9e95304ea66241c93e9da3bdbdc" }
+bd-logger = { git = "https://github.com/bitdriftlabs/shared-core.git", rev = "48fbd7b48cd0b9e95304ea66241c93e9da3bdbdc" }
+bd-noop-network = { git = "https://github.com/bitdriftlabs/shared-core.git", rev = "48fbd7b48cd0b9e95304ea66241c93e9da3bdbdc" }
+bd-proto = { git = "https://github.com/bitdriftlabs/shared-core.git", rev = "48fbd7b48cd0b9e95304ea66241c93e9da3bdbdc" }
+bd-runtime = { git = "https://github.com/bitdriftlabs/shared-core.git", rev = "48fbd7b48cd0b9e95304ea66241c93e9da3bdbdc" }
+bd-session = { git = "https://github.com/bitdriftlabs/shared-core.git", rev = "48fbd7b48cd0b9e95304ea66241c93e9da3bdbdc" }
+bd-shutdown = { git = "https://github.com/bitdriftlabs/shared-core.git", rev = "48fbd7b48cd0b9e95304ea66241c93e9da3bdbdc" }
+bd-test-helpers = { git = "https://github.com/bitdriftlabs/shared-core.git", rev = "48fbd7b48cd0b9e95304ea66241c93e9da3bdbdc", default-features = false }
+bd-time = { git = "https://github.com/bitdriftlabs/shared-core.git", rev = "48fbd7b48cd0b9e95304ea66241c93e9da3bdbdc" }
 chrono = "0.4.39"
-clap = { version = "4.5.23", features = ["derive", "env"] }
+clap = { version = "4.5.28", features = ["derive", "env"] }
 ctor = "0.2.9"
 env_logger = { version = "0.11.6", default-features = false }
 jni = "0.21.1"
-log = { version = "0.4.22", features = ["max_level_trace", "release_max_level_info"] }
+log = { version = "0.4.25", features = ["max_level_trace", "release_max_level_info"] }
 objc = "0.2.7"
 objc-foundation = "0.1.1"
 parameterized = "2.0.0"
@@ -58,10 +58,10 @@ rand = "0.8.5"
 rand_distr = "0.4.3"
 regex = "1.11.1"
 serde = { version = "1", features = ["derive"] }
-serde_json = "1.0.134"
+serde_json = "1.0.138"
 tempdir = "0.3.7"
 time = { version = "0.3.37", features = ["serde-well-known", "macros"] }
-tokio = { version = "1.42.0", features = ["full", "test-util"] }
+tokio = { version = "1.43.0", features = ["full", "test-util"] }
 tracing = { version = "0.1.41", features = ["log"] }
 tracing-subscriber = { version = "0.3.19", features = ["env-filter"] }
-uuid = { version = "1.11.0", features = ["v4"] }
+uuid = { version = "1.13.1", features = ["v4"] }
diff --git a/Makefile b/Makefile
@@ -38,7 +38,7 @@ format: lint-shell ktlint rustfmt buildifier fix-swift lint-yaml
 
 .PHONY: repin
 repin:
-	CARGO_BAZEL_REPIN=1 ./bazelw sync --only=crate_index
+	CARGO_BAZEL_REPIN=true ./bazelw sync --only=crate_index
 
 .PHONY: push-additional-images
 push-additional-images:
diff --git a/platform/jvm/src/jni.rs b/platform/jvm/src/jni.rs
@@ -687,7 +687,7 @@ pub extern "system" fn Java_io_bitdrift_capture_CaptureJniLibrary_createLogger(
         network: network_manager,
         static_metadata,
       })
-      .with_mobile_features(true)
+      .with_client_stats(true)
       .with_internal_logger(true)
       .build()
       .map(|(logger, _, future)| LoggerHolder::new(logger, future))?;

diff --git a/platform/shared/src/metadata.rs b/platform/shared/src/metadata.rs
@@ -44,6 +44,10 @@ impl bd_api::Metadata for Mobile {
     self.os.clone()
   }
 
+  fn device_id(&self) -> String {
+    self.device.id()
+  }
+
   #[must_use]
   fn collect_inner(&self) -> HashMap<String, String> {
     let mut metadata_map = HashMap::new();
@@ -56,7 +60,6 @@ impl bd_api::Metadata for Mobile {
       metadata_map.insert("app_version".to_string(), app_version.to_string());
     }
 
-    metadata_map.insert("device_id".to_string(), self.device.id());
     metadata_map.insert("model".to_string(), self.model.clone());
 
     metadata_map

diff --git a/platform/swift/source/Cargo.toml b/platform/swift/source/Cargo.toml
@@ -31,3 +31,6 @@ uuid.workspace               = true
 [dev-dependencies]
 bd-test-helpers.workspace   = true
 pretty_assertions.workspace = true
+
+[features]
+cargo-clippy = []
diff --git a/platform/swift/source/src/bridge.rs b/platform/swift/source/src/bridge.rs
@@ -516,7 +516,7 @@ extern "C" fn capture_create_logger(
         device,
         static_metadata,
       })
-      .with_mobile_features(true)
+      .with_client_stats(true)
       .with_internal_logger(true)
       .build()
       .map(|(logger, _, future)| LoggerHolder::new(logger, future))?;

diff --git a/test/platform/swift/bridging/Cargo.toml b/test/platform/swift/bridging/Cargo.toml
@@ -13,9 +13,12 @@ bd-logger                 = { workspace = true }
 bd-proto                  = { workspace = true }
 bd-test-helpers           = { workspace = true }
 ctor                      = { workspace = true }
-objc-foundation.workspace = true
 objc.workspace            = true
+objc-foundation.workspace = true
 platform_test_helpers     = { path = "../../../../platform/test_helpers" }
 protobuf.workspace        = true
 swift_bridge              = { path = "../../../../platform/swift/source" }
 time.workspace            = true
+
+[features]
+cargo-clippy = []