Merge branch 'main' into modify-batchProcessor-test-use-flush-instead-of-sleeptime

Author: cijothomas

opentelemetry-sdk/CHANGELOG.md

@@ -2,12 +2,37 @@
 
 ## vNext
 
-- Calls to `MeterProviderBuilder::with_resource`, `TracerProviderBuilder::with_resource`, 
+- Calls to `MeterProviderBuilder::with_resource`, `TracerProviderBuilder::with_resource`,
   `LoggerProviderBuilder::with_resource` are now additive ([#2677](https://github.com/open-telemetry/opentelemetry-rust/pull/2677)).
-- *Breaking*: Make `force_flush()` in `PushMetricExporter` synchronous
 - Moved `ExportError` trait from `opentelemetry::trace::ExportError` to `opentelemetry_sdk::export::ExportError`
 - Moved `TraceError` enum from `opentelemetry::trace::TraceError` to `opentelemetry_sdk::trace::TraceError`
 - Moved `TraceResult` type alias from `opentelemetry::trace::TraceResult` to `opentelemetry_sdk::trace::TraceResult`
+- *Breaking*: Make `force_flush()` in `PushMetricExporter` synchronous
+- **Breaking Change:** Updated the `SpanExporter` trait method signature:
+
+```rust
+  fn export(&mut self, batch: Vec<SpanData>) -> BoxFuture<'static, OTelSdkResult>;
+```
+
+  to
+
+```rust
+  fn export(
+    &mut self,
+    batch: Vec<SpanData>,
+) -> impl std::future::Future<Output = OTelSdkResult> + Send;
+```
+
+  This affects anyone who writes custom exporters, as custom implementations of SpanExporter
+  should now define export as an `async fn`:
+
+```rust
+  impl trace::SpanExporter for CustomExporter {
+    async fn export(&mut self, batch: Vec<trace::SpanData>) -> OTelSdkResult {
+        // Implementation here
+    }
+}
+```
 
 ## 0.28.0
 

opentelemetry-sdk/src/logs/log_processor.rs

@@ -88,12 +88,8 @@ pub(crate) mod tests {
     }
 
     impl LogExporter for MockLogExporter {
-        #[allow(clippy::manual_async_fn)]
-        fn export(
-            &self,
-            _batch: LogBatch<'_>,
-        ) -> impl std::future::Future<Output = OTelSdkResult> + Send {
-            async { Ok(()) }
+        async fn export(&self, _batch: LogBatch<'_>) -> OTelSdkResult {
+            Ok(())
         }
 
         fn shutdown(&mut self) -> OTelSdkResult {

opentelemetry-sdk/src/logs/log_processor_with_async_runtime.rs

@@ -317,12 +317,8 @@ mod tests {
     }
 
     impl LogExporter for MockLogExporter {
-        #[allow(clippy::manual_async_fn)]
-        fn export(
-            &self,
-            _batch: LogBatch<'_>,
-        ) -> impl std::future::Future<Output = OTelSdkResult> + Send {
-            async { Ok(()) }
+        async fn export(&self, _batch: LogBatch<'_>) -> OTelSdkResult {
+            Ok(())
         }
 
         fn shutdown(&mut self) -> OTelSdkResult {

opentelemetry-sdk/src/logs/simple_log_processor.rs

@@ -168,20 +168,14 @@ mod tests {
     }
 
     impl LogExporter for LogExporterThatRequiresTokio {
-        #[allow(clippy::manual_async_fn)]
-        fn export(
-            &self,
-            batch: LogBatch<'_>,
-        ) -> impl std::future::Future<Output = OTelSdkResult> + Send {
+        async fn export(&self, batch: LogBatch<'_>) -> OTelSdkResult {
             // Simulate minimal dependency on tokio by sleeping asynchronously for a short duration
-            async move {
-                tokio::time::sleep(Duration::from_millis(50)).await;
+            tokio::time::sleep(Duration::from_millis(50)).await;
 
-                for _ in batch.iter() {
-                    self.export_count.fetch_add(1, Ordering::Acquire);
-                }
-                Ok(())
+            for _ in batch.iter() {
+                self.export_count.fetch_add(1, Ordering::Acquire);
             }
+            Ok(())
         }
     }
 

opentelemetry/CHANGELOG.md

@@ -2,29 +2,10 @@
 
 ## vNext
 
-- **Breaking Change:** Updated the `SpanExporter` trait method signature:
- ```rust
-  fn export(&mut self, batch: Vec<SpanData>) -> BoxFuture<'static, OTelSdkResult>;
-```
-  to
-```rust
-  fn export(
-    &mut self,
-    batch: Vec<SpanData>,
-) -> impl std::future::Future<Output = OTelSdkResult> + Send;
-```
-  This affects the exporter devs, as custom implementations of SpanExporter 
-  should now define export as an `async fn`:
-```rust
-  impl trace::SpanExporter for CustomExporter {
-    async fn export(&mut self, batch: Vec<trace::SpanData>) -> OTelSdkResult {
-        // Implementation here
-    }
-}
-```
 - *Breaking* Moved `ExportError` trait from `opentelemetry::trace::ExportError` to `opentelemetry_sdk::export::ExportError`
 - *Breaking* Moved `TraceError` enum from `opentelemetry::trace::TraceError` to `opentelemetry_sdk::trace::TraceError`
 - *Breaking* Moved `TraceResult` type alias from `opentelemetry::trace::TraceResult` to `opentelemetry_sdk::trace::TraceResult`
+- {PLACEHOLDER} - Remove the above completely. // TODO fill this when changes are actually in.
 
 ## 0.28.0