From c96ad6738e74418609a23e5e66ec5a98c133bc86 Mon Sep 17 00:00:00 2001 From: Will Date: Wed, 9 Dec 2020 11:03:34 -0800 Subject: [PATCH 1/2] Corrects span StatusCode ordering --- opentelemetry/src/api/trace/span.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/opentelemetry/src/api/trace/span.rs b/opentelemetry/src/api/trace/span.rs index 098a99a419..390993ddf2 100644 --- a/opentelemetry/src/api/trace/span.rs +++ b/opentelemetry/src/api/trace/span.rs @@ -243,10 +243,10 @@ impl fmt::Display for SpanKind { #[cfg_attr(feature = "serialize", derive(Deserialize, Serialize))] #[derive(Clone, Debug, PartialEq)] pub enum StatusCode { - /// OK is returned on success. - Ok = 0, /// The default status. - Unset = 1, + Unset = 0, + /// OK is returned on success. + Ok = 1, /// The operation contains an error. Error = 2, } From 9a262e1d1efa9304584c8e2f38e7ff7ccaa063c7 Mon Sep 17 00:00:00 2001 From: Will Roberts Date: Wed, 9 Dec 2020 11:14:58 -0800 Subject: [PATCH 2/2] Updates tests --- opentelemetry-contrib/src/trace/exporter/datadog/model/mod.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/opentelemetry-contrib/src/trace/exporter/datadog/model/mod.rs b/opentelemetry-contrib/src/trace/exporter/datadog/model/mod.rs index 39e80ca1a2..ccfccffd7e 100644 --- a/opentelemetry-contrib/src/trace/exporter/datadog/model/mod.rs +++ b/opentelemetry-contrib/src/trace/exporter/datadog/model/mod.rs @@ -130,7 +130,7 @@ mod tests { let spans = get_spans(); let encoded = base64::encode(ApiVersion::Version03.encode("service_name", spans)?); - assert_eq!(encoded.as_str(), "kZGLpHR5cGWjd2Vip3NlcnZpY2Wsc2VydmljZV9uYW1lpG5hbWWpY29tcG9uZW50qHJlc291cmNlqHJlc291cmNlqHRyYWNlX2lkzwAAAAAAAAAHp3NwYW5faWTPAAAAAAAAAGOpcGFyZW50X2lkzwAAAAAAAAABpXN0YXJ00wAAAAAAAAAAqGR1cmF0aW9u0wAAAAA7msoApWVycm9y0gAAAACkbWV0YYGpc3Bhbi50eXBlo3dlYg=="); + assert_eq!(encoded.as_str(), "kZGLpHR5cGWjd2Vip3NlcnZpY2Wsc2VydmljZV9uYW1lpG5hbWWpY29tcG9uZW50qHJlc291cmNlqHJlc291cmNlqHRyYWNlX2lkzwAAAAAAAAAHp3NwYW5faWTPAAAAAAAAAGOpcGFyZW50X2lkzwAAAAAAAAABpXN0YXJ00wAAAAAAAAAAqGR1cmF0aW9u0wAAAAA7msoApWVycm9y0gAAAAGkbWV0YYGpc3Bhbi50eXBlo3dlYg=="); Ok(()) } @@ -140,7 +140,7 @@ mod tests { let spans = get_spans(); let encoded = base64::encode(ApiVersion::Version05.encode("service_name", spans)?); - assert_eq!(encoded.as_str(), "kpWsc2VydmljZV9uYW1lo3dlYqljb21wb25lbnSocmVzb3VyY2Wpc3Bhbi50eXBlkZGczgAAAADOAAAAAs4AAAADzwAAAAAAAAAHzwAAAAAAAABjzwAAAAAAAAAB0wAAAAAAAAAA0wAAAAA7msoA0gAAAACBzgAAAATOAAAAAYDOAAAAAQ=="); + assert_eq!(encoded.as_str(), "kpWsc2VydmljZV9uYW1lo3dlYqljb21wb25lbnSocmVzb3VyY2Wpc3Bhbi50eXBlkZGczgAAAADOAAAAAs4AAAADzwAAAAAAAAAHzwAAAAAAAABjzwAAAAAAAAAB0wAAAAAAAAAA0wAAAAA7msoA0gAAAAGBzgAAAATOAAAAAYDOAAAAAQ=="); Ok(()) }