Synchronous log function

src/dataset.rs

@@ -747,10 +747,8 @@ impl<S: SpanSubmitter + DatasetRegistrar + DatasetFetcher + DatasetSummarizer +
                 object_id: metadata.dataset_id.clone(),
             };
 
-            let _ = self
-                .submitter
-                .submit(self.token.clone(), payload, Some(parent_info))
-                .await;
+            self.submitter
+                .submit(self.token.clone(), payload, Some(parent_info));
         }
 
         Ok(())

src/eval/runner.rs

@@ -92,7 +92,7 @@ where
             log_builder = log_builder.tags(tags.clone());
         }
 
-        root_span.log(log_builder.build().unwrap()).await;
+        root_span.log(log_builder.build().unwrap());
 
         // Get dataset ID if available
         let dataset_id = opts.dataset.id();
@@ -163,7 +163,7 @@ where
         }
 
         // End root span
-        root_span.end().await;
+        root_span.end();
 
         // Compute statistics
         let score_stats = EvalSummary::<I, O>::compute_stats(&results);
@@ -232,7 +232,7 @@ where
             log_builder = log_builder.tags(tags.clone());
         }
 
-        case_span.log(log_builder.build().unwrap()).await;
+        case_span.log(log_builder.build().unwrap());
 
         // Create hooks for the task
         let hooks = TaskHooks::new(&case_span, case.expected.as_ref());
@@ -242,15 +242,13 @@ where
             Ok(output) => output,
             Err(e) => {
                 // Log error to span
-                case_span
-                    .log(
-                        crate::SpanLog::builder()
-                            .error(json!(e.to_string()))
-                            .build()
-                            .unwrap(),
-                    )
-                    .await;
-                case_span.end().await;
+                case_span.log(
+                    crate::SpanLog::builder()
+                        .error(json!(e.to_string()))
+                        .build()
+                        .unwrap(),
+                );
+                case_span.end();
 
                 return Ok(EvalResult {
                     input: case.input.clone(),
@@ -267,14 +265,12 @@ where
 
         // Set output in span
         if let Ok(output_json) = serde_json::to_value(&output) {
-            case_span
-                .log(
-                    crate::SpanLog::builder()
-                        .output(output_json)
-                        .build()
-                        .unwrap(),
-                )
-                .await;
+            case_span.log(
+                crate::SpanLog::builder()
+                    .output(output_json)
+                    .build()
+                    .unwrap(),
+            );
         }
 
         // Run scorers in parallel
@@ -324,9 +320,9 @@ where
         if let Some(tags) = &final_tags {
             final_log = final_log.tags(tags.clone());
         }
-        case_span.log(final_log.build().unwrap()).await;
+        case_span.log(final_log.build().unwrap());
 
-        case_span.end().await;
+        case_span.end();
 
         if !quiet {
             let score_str = all_scores

src/experiments/experiment.rs

@@ -127,7 +127,7 @@ impl<
 
         // Convert ExperimentLog to SpanLog and log
         let span_log = event.into_span_log();
-        span.log(span_log).await;
+        span.log(span_log);
 
         // Record end time for next log() call
         let end_time = SystemTime::now()
@@ -205,8 +205,7 @@ impl<
         };
 
         self.submitter
-            .submit(self.token.clone(), payload, Some(parent_info))
-            .await;
+            .submit(self.token.clone(), payload, Some(parent_info));
     }
 
     /// Get a summary of the experiment's performance.
@@ -339,7 +338,7 @@ impl<
     ///
     /// ```ignore
     /// let result = experiment.traced(|span| async move {
-    ///     span.log(SpanLog::builder().input(json!({"x": 1})).build().unwrap()).await;
+    ///     span.log(SpanLog::builder().input(json!({"x": 1})).build().unwrap());
     ///     compute_result()
     /// }).await;
     /// ```
@@ -392,8 +391,7 @@ impl<
         };
 
         self.submitter
-            .submit(self.token.clone(), payload, Some(parent_info))
-            .await;
+            .submit(self.token.clone(), payload, Some(parent_info));
     }
 
     /// Fetch the base experiment used for comparison.

src/logger.rs

@@ -561,7 +561,7 @@ impl BraintrustClient {
     /// Update an existing span using explicit credentials instead of shared login state.
     ///
     /// This is the safe entrypoint for multi-tenant `skip_login` clients.
-    pub async fn update_span_with_credentials(
+    pub fn update_span_with_credentials(
         &self,
         token: impl Into<String>,
         org_id: impl Into<String>,
@@ -904,17 +904,16 @@ impl Drop for BraintrustClient {
 
 #[async_trait::async_trait]
 impl SpanSubmitter for BraintrustClient {
-    async fn submit(
-        &self,
-        token: String,
-        payload: SpanPayload,
-        parent_info: Option<ParentSpanInfo>,
-    ) {
+    fn submit(&self, token: String, payload: SpanPayload, parent_info: Option<ParentSpanInfo>) {
         self.submit_payload(token, payload, parent_info)
     }
 
+    async fn flush(&self) -> Result<()> {
+        BraintrustClient::flush(self).await
+    }
+
     async fn trigger_flush(&self) -> Result<()> {
-        self.trigger_flush().await
+        BraintrustClient::trigger_flush(self).await
     }
 }
 
@@ -1463,8 +1462,7 @@ mod tests {
                     .input(Value::String("hello".into()))
                     .build()
                     .expect("build"),
-            )
-            .await;
+            );
             span.flush().await.expect("flush");
             client.flush().await.expect("client flush");
         }
@@ -1524,8 +1522,7 @@ mod tests {
                 .input(Value::String("input".into()))
                 .build()
                 .expect("build"),
-        )
-        .await;
+        );
         span.flush().await.expect("flush");
         client.flush().await.expect("client flush");
 
@@ -1753,8 +1750,7 @@ mod tests {
         span.log(SpanLog {
             input: Some(Value::String("test".into())),
             ..Default::default()
-        })
-        .await;
+        });
         span.flush().await.expect("flush");
         client.flush().await.expect("client flush");
 
@@ -1811,8 +1807,7 @@ mod tests {
         span.log(SpanLog {
             input: Some(Value::String("test".into())),
             ..Default::default()
-        })
-        .await;
+        });
         span.flush().await.expect("flush");
         client.flush().await.expect("client flush");
 
@@ -1889,8 +1884,7 @@ mod tests {
         span.log(SpanLog {
             input: Some(Value::String("test".into())),
             ..Default::default()
-        })
-        .await;
+        });
         span.flush().await.expect("flush");
         client.flush().await.expect("client flush");