experiment

xmtp · Jul 3, 2024 · 75911ed · 75911ed
1 parent df53d91
commit 75911ed
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/.github/workflows/test-ffi-bindings.yml b/.github/workflows/test-ffi-bindings.yml
@@ -1,10 +1,8 @@
 name: Test FFI Bindings
-
 on:
   push:
     branches:
       - main
-
   pull_request:
     # only run tests when related changes are made
     paths:
@@ -21,27 +19,22 @@ on:
       - "Cargo.toml"
       - "Cargo.lock"
       - "rust-toolchain"
-
 jobs:
   test:
     name: Test
     runs-on: warp-ubuntu-latest-x64-16x
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-
       - name: Update rust toolchains
         run: rustup update
-
       - uses: Swatinem/rust-cache@v2
         with:
           workspaces: |
             .
             bindings_ffi
-
       - name: Start Docker containers
         run: dev/up
-
       - name: Setup Kotlin
         run: |
           sudo apt update -q
@@ -50,8 +43,7 @@ jobs:
           cd bindings_ffi
           make install-jar
           echo "$(make echo-jar | tail -n 1 | sed -e 's/\.*export //')" >> "$GITHUB_ENV"
-
       - name: Run cargo test on FFI bindings
         run: |
           export CLASSPATH="${{ env.CLASSPATH }}"
-          cargo test --manifest-path bindings_ffi/Cargo.toml -- --test-threads=2
+          RUST_LOG=info,mls::tests=debug cargo test --manifest-path bindings_ffi/Cargo.toml -- --test-threads=2
diff --git a/bindings_ffi/Cargo.toml b/bindings_ffi/Cargo.toml
@@ -23,6 +23,7 @@ xmtp_proto = { path = "../xmtp_proto", features = ["proto_full", "grpc"] }
 xmtp_user_preferences = { path = "../xmtp_user_preferences" }
 xmtp_v2 = { path = "../xmtp_v2" }
 
+tracing-subscriber = { "0.3", features = ["env-filter"] }
 # NOTE: A regression in openssl-sys exists where libatomic is dynamically linked 
 # for i686-linux-android targets. https://github.com/sfackler/rust-openssl/issues/2163
 #

diff --git a/bindings_ffi/src/mls.rs b/bindings_ffi/src/mls.rs
@@ -81,7 +81,12 @@ pub async fn create_client(
     legacy_signed_private_key_proto: Option<Vec<u8>>,
     history_sync_url: Option<String>,
 ) -> Result<Arc<FfiXmtpClient>, GenericError> {
-    init_logger(logger);
+    use tracing_subscriber::prelude::*;
+    //init_logger(logger);
+    let _ = tracing_subscriber::registry()
+        .with(tracing_subscriber::fmt::layer())
+        .with(tracing_subscriber::EnvFilter::from_default_env())
+        .try_init();
     log::info!(
         "Creating API client for host: {}, isSecure: {}",
         host,
@@ -1933,16 +1938,19 @@ mod tests {
 
         let stream_callback = RustStreamCallback::default();
         let stream_closer = group.stream(Box::new(stream_callback.clone()));
+        log::info!("WAITING FOR READY");
         stream_closer.wait_for_ready().await;
 
         group.send("hello".as_bytes().to_vec()).await.unwrap();
+        log::info!("SEND HELLO");
         stream_callback.wait_for_delivery().await;
 
         group.send("goodbye".as_bytes().to_vec()).await.unwrap();
+        log::info!("SEND GOODBYE");
         stream_callback.wait_for_delivery().await;
 
         assert_eq!(stream_callback.message_count(), 5);
-        println!("WAITING FOR STREAM TO END");
+        log::info!("STREAM CLSOER");
         stream_closer.end_and_wait().await.unwrap();
     }