Skip to content

Commit 6648d74

Browse files
authored
Nit fix to changelogs (#2693)
1 parent 5ce50ae commit 6648d74

File tree

2 files changed

+28
-22
lines changed

2 files changed

+28
-22
lines changed

opentelemetry-sdk/CHANGELOG.md

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,37 @@
22

33
## vNext
44

5-
- Calls to `MeterProviderBuilder::with_resource`, `TracerProviderBuilder::with_resource`,
5+
- Calls to `MeterProviderBuilder::with_resource`, `TracerProviderBuilder::with_resource`,
66
`LoggerProviderBuilder::with_resource` are now additive ([#2677](https://github.com/open-telemetry/opentelemetry-rust/pull/2677)).
7-
- *Breaking*: Make `force_flush()` in `PushMetricExporter` synchronous
87
- Moved `ExportError` trait from `opentelemetry::trace::ExportError` to `opentelemetry_sdk::export::ExportError`
98
- Moved `TraceError` enum from `opentelemetry::trace::TraceError` to `opentelemetry_sdk::trace::TraceError`
109
- Moved `TraceResult` type alias from `opentelemetry::trace::TraceResult` to `opentelemetry_sdk::trace::TraceResult`
10+
- *Breaking*: Make `force_flush()` in `PushMetricExporter` synchronous
11+
- **Breaking Change:** Updated the `SpanExporter` trait method signature:
12+
13+
```rust
14+
fn export(&mut self, batch: Vec<SpanData>) -> BoxFuture<'static, OTelSdkResult>;
15+
```
16+
17+
to
18+
19+
```rust
20+
fn export(
21+
&mut self,
22+
batch: Vec<SpanData>,
23+
) -> impl std::future::Future<Output = OTelSdkResult> + Send;
24+
```
25+
26+
This affects anyone who writes custom exporters, as custom implementations of SpanExporter
27+
should now define export as an `async fn`:
28+
29+
```rust
30+
impl trace::SpanExporter for CustomExporter {
31+
async fn export(&mut self, batch: Vec<trace::SpanData>) -> OTelSdkResult {
32+
// Implementation here
33+
}
34+
}
35+
```
1136

1237
## 0.28.0
1338

opentelemetry/CHANGELOG.md

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,10 @@
22

33
## vNext
44

5-
- **Breaking Change:** Updated the `SpanExporter` trait method signature:
6-
```rust
7-
fn export(&mut self, batch: Vec<SpanData>) -> BoxFuture<'static, OTelSdkResult>;
8-
```
9-
to
10-
```rust
11-
fn export(
12-
&mut self,
13-
batch: Vec<SpanData>,
14-
) -> impl std::future::Future<Output = OTelSdkResult> + Send;
15-
```
16-
This affects the exporter devs, as custom implementations of SpanExporter
17-
should now define export as an `async fn`:
18-
```rust
19-
impl trace::SpanExporter for CustomExporter {
20-
async fn export(&mut self, batch: Vec<trace::SpanData>) -> OTelSdkResult {
21-
// Implementation here
22-
}
23-
}
24-
```
255
- *Breaking* Moved `ExportError` trait from `opentelemetry::trace::ExportError` to `opentelemetry_sdk::export::ExportError`
266
- *Breaking* Moved `TraceError` enum from `opentelemetry::trace::TraceError` to `opentelemetry_sdk::trace::TraceError`
277
- *Breaking* Moved `TraceResult` type alias from `opentelemetry::trace::TraceResult` to `opentelemetry_sdk::trace::TraceResult`
8+
- {PLACEHOLDER} - Remove the above completely. // TODO fill this when changes are actually in.
289

2910
## 0.28.0
3011

0 commit comments

Comments
 (0)