Skip to content

Commit a4c24d9

Browse files
Replace Serde error by Serialization error
1 parent 4ccb22b commit a4c24d9

File tree

2 files changed

+14
-7
lines changed

2 files changed

+14
-7
lines changed

data-pipeline-ffi/src/error.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ impl From<TraceExporterError> for ExporterError {
119119
ExporterErrorCode::HttpUnknown
120120
}
121121
}
122-
TraceExporterError::Serde(_) => ExporterErrorCode::Serde,
122+
TraceExporterError::Serialization(_) => ExporterErrorCode::Serde,
123123
};
124124
ExporterError::new(code, &value.to_string())
125125
}

data-pipeline/src/trace_exporter/error.rs

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use crate::telemetry::error::TelemetryError;
55
use crate::trace_exporter::msgpack_decoder::v04::error::DecodeError;
66
use hyper::http::StatusCode;
77
use hyper::Error as HyperError;
8-
use serde_json::error::Error as SerdeError;
8+
use rmp_serde::encode::Error as EncodeError;
99
use std::error::Error;
1010
use std::fmt::{Debug, Display};
1111

@@ -111,18 +111,25 @@ impl RequestError {
111111
/// TraceExporterError holds different types of errors that occur when handling traces.
112112
#[derive(Debug)]
113113
pub enum TraceExporterError {
114+
/// Error in agent response processing.
114115
Agent(AgentErrorKind),
116+
/// Invalid builder input.
115117
Builder(BuilderErrorKind),
118+
/// Error in deserialization of incoming trace payload.
116119
Deserialization(DecodeError),
120+
/// Generic IO error.
117121
Io(std::io::Error),
122+
/// Network related error (i.e. hyper error).
118123
Network(NetworkError),
124+
/// Agent responded with an error code.
119125
Request(RequestError),
120-
Serde(SerdeError),
126+
/// Error in serialization of processed trace payload.
127+
Serialization(EncodeError),
121128
}
122129

123-
impl From<serde_json::error::Error> for TraceExporterError {
124-
fn from(value: SerdeError) -> Self {
125-
TraceExporterError::Serde(value)
130+
impl From<EncodeError> for TraceExporterError {
131+
fn from(value: EncodeError) -> Self {
132+
TraceExporterError::Serialization(value)
126133
}
127134
}
128135

@@ -188,7 +195,7 @@ impl Display for TraceExporterError {
188195
TraceExporterError::Io(e) => std::fmt::Display::fmt(e, f),
189196
TraceExporterError::Network(e) => std::fmt::Display::fmt(e, f),
190197
TraceExporterError::Request(e) => std::fmt::Display::fmt(e, f),
191-
TraceExporterError::Serde(e) => std::fmt::Display::fmt(e, f),
198+
TraceExporterError::Serialization(e) => std::fmt::Display::fmt(e, f),
192199
}
193200
}
194201
}

0 commit comments

Comments
 (0)