Skip to content

Commit 5781174

Browse files
authored
Merge branch 'main' into cijothomas/inmemory-span-move
2 parents 694f84b + 97cf951 commit 5781174

File tree

2 files changed

+1
-32
lines changed

2 files changed

+1
-32
lines changed

opentelemetry/CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
- Bump msrv to 1.75.0.
66
- **Breaking** `opentelemetry::global::shutdown_tracer_provider()` Removed from this crate, should now use `tracer_provider.shutdown()` see [#2369](https://github.com/open-telemetry/opentelemetry-rust/pull/2369) for a migration example.
7+
- *Breaking* Removed unused `opentelemetry::PropagationError` struct.
78

89
## 0.27.1
910

opentelemetry/src/propagation/mod.rs

-32
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
//! [`Context`]: crate::Context
2121
2222
use std::collections::HashMap;
23-
use thiserror::Error;
2423

2524
pub mod composite;
2625
pub mod text_map_propagator;
@@ -62,37 +61,6 @@ impl<S: std::hash::BuildHasher> Extractor for HashMap<String, String, S> {
6261
}
6362
}
6463

65-
/// Error when extracting or injecting context data(i.e propagating) across application boundaries.
66-
#[derive(Error, Debug)]
67-
#[error("Cannot {} from {}, {}", ops, message, propagator_name)]
68-
pub struct PropagationError {
69-
message: &'static str,
70-
// which propagator does this error comes from
71-
propagator_name: &'static str,
72-
// are we extracting or injecting information across application boundaries
73-
ops: &'static str,
74-
}
75-
76-
impl PropagationError {
77-
/// Error happens when extracting information
78-
pub fn extract(message: &'static str, propagator_name: &'static str) -> Self {
79-
PropagationError {
80-
message,
81-
propagator_name,
82-
ops: "extract",
83-
}
84-
}
85-
86-
/// Error happens when extracting information
87-
pub fn inject(message: &'static str, propagator_name: &'static str) -> Self {
88-
PropagationError {
89-
message,
90-
propagator_name,
91-
ops: "inject",
92-
}
93-
}
94-
}
95-
9664
#[cfg(test)]
9765
mod tests {
9866
use super::*;

0 commit comments

Comments
 (0)