Remove support for u64 and bytes values (see #317) (#323)

open-telemetry · Oct 31, 2020 · be76c0a · be76c0a
1 parent 396dd88
commit be76c0a
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 60 deletions.
diff --git a/benches/trace.rs b/benches/trace.rs
@@ -12,7 +12,6 @@ fn criterion_benchmark(c: &mut Criterion) {
         let span = tracer.start("foo");
         span.set_attribute(Key::new("key1").bool(false));
         span.set_attribute(Key::new("key2").string("hello"));
-        span.set_attribute(Key::new("key3").u64(123));
         span.set_attribute(Key::new("key4").f64(123.456));
         span.end();
     });
@@ -21,11 +20,9 @@ fn criterion_benchmark(c: &mut Criterion) {
         let span = tracer.start("foo");
         span.set_attribute(Key::new("key1").bool(false));
         span.set_attribute(Key::new("key2").string("hello"));
-        span.set_attribute(Key::new("key3").u64(123));
         span.set_attribute(Key::new("key4").f64(123.456));
         span.set_attribute(Key::new("key11").bool(false));
         span.set_attribute(Key::new("key12").string("hello"));
-        span.set_attribute(Key::new("key13").u64(123));
         span.set_attribute(Key::new("key14").f64(123.456));
         span.end();
     });
@@ -35,11 +32,7 @@ fn criterion_benchmark(c: &mut Criterion) {
         span.set_attribute(Key::new("key1").bool(false));
         span.set_attribute(Key::new("key2").string("hello"));
         span.set_attribute(Key::new("key3").i64(123));
-        span.set_attribute(Key::new("key4").u64(123));
         span.set_attribute(Key::new("key5").f64(123.456));
-        span.set_attribute(
-            Key::new("key6").bytes(vec![104, 101, 108, 108, 111, 32, 119, 111, 114, 108, 100]),
-        );
         span.end();
     });
 
@@ -48,19 +41,11 @@ fn criterion_benchmark(c: &mut Criterion) {
         span.set_attribute(Key::new("key1").bool(false));
         span.set_attribute(Key::new("key2").string("hello"));
         span.set_attribute(Key::new("key3").i64(123));
-        span.set_attribute(Key::new("key4").u64(123));
         span.set_attribute(Key::new("key5").f64(123.456));
-        span.set_attribute(
-            Key::new("key6").bytes(vec![104, 101, 108, 108, 111, 32, 119, 111, 114, 108, 100]),
-        );
         span.set_attribute(Key::new("key11").bool(false));
         span.set_attribute(Key::new("key12").string("hello"));
         span.set_attribute(Key::new("key13").i64(123));
-        span.set_attribute(Key::new("key14").u64(123));
         span.set_attribute(Key::new("key15").f64(123.456));
-        span.set_attribute(
-            Key::new("key16").bytes(vec![104, 101, 108, 108, 111, 32, 119, 111, 114, 108, 100]),
-        );
         span.end();
     });
 }

diff --git a/opentelemetry-jaeger/src/lib.rs b/opentelemetry-jaeger/src/lib.rs
@@ -478,9 +478,6 @@ impl Into<jaeger::Tag> for KeyValue {
             Value::F64(f) => jaeger::Tag::new(key.into(), jaeger::TagType::Double, None, Some(f.into()), None, None, None),
             Value::Bool(b) => jaeger::Tag::new(key.into(), jaeger::TagType::Bool, None, None, Some(b), None, None),
             Value::I64(i) => jaeger::Tag::new(key.into(), jaeger::TagType::Long, None, None, None, Some(i), None),
-            Value::Bytes(b) => jaeger::Tag::new(key.into(), jaeger::TagType::Binary, None, None, None, None, Some(b)),
-            // TODO: better u64 handling, jaeger thrift only has i64 support
-            Value::U64(u) => jaeger::Tag::new(key.into(), jaeger::TagType::String, Some(u.to_string()), None, None, None, None),
             // TODO: better Array handling, jaeger thrift doesn't support arrays
             v @ Value::Array(_) => jaeger::Tag::new(key.into(), jaeger::TagType::String, Some(v.into()), None, None, None, None),
         }

diff --git a/opentelemetry-otlp/src/transform/common.rs b/opentelemetry-otlp/src/transform/common.rs
@@ -43,10 +43,8 @@ impl From<Value> for AnyValue {
         match value {
             Value::Bool(val) => any_value.set_bool_value(val),
             Value::I64(val) => any_value.set_int_value(val),
-            Value::U64(val) => any_value.set_int_value(val as i64),
             Value::F64(val) => any_value.set_double_value(val),
             Value::String(val) => any_value.set_string_value(val),
-            Value::Bytes(_val) => any_value.set_string_value("INVALID".to_string()),
             Value::Array(vals) => any_value.set_array_value({
                 let mut array_value = ArrayValue::new();
                 array_value.set_values(RepeatedField::from_vec(

diff --git a/src/api/core.rs b/src/api/core.rs
@@ -35,14 +35,6 @@ impl Key {
         }
     }
 
-    /// Create a `KeyValue` pair for `u64` values.
-    pub fn u64(&self, value: u64) -> KeyValue {
-        KeyValue {
-            key: self.clone(),
-            value: Value::U64(value),
-        }
-    }
-
     /// Create a `KeyValue` pair for `f64` values.
     pub fn f64(&self, value: f64) -> KeyValue {
         KeyValue {
@@ -59,14 +51,6 @@ impl Key {
         }
     }
 
-    /// Create a `KeyValue` pair for byte arrays.
-    pub fn bytes<T: Into<Vec<u8>>>(&self, value: T) -> KeyValue {
-        KeyValue {
-            key: self.clone(),
-            value: Value::Bytes(value.into()),
-        }
-    }
-
     /// Create a `KeyValue` pair for arrays.
     pub fn array<T: Into<Vec<Value>>>(&self, value: T) -> KeyValue {
         KeyValue {
@@ -110,14 +94,10 @@ pub enum Value {
     Bool(bool),
     /// i64 values
     I64(i64),
-    /// u64 values
-    U64(u64),
     /// f64 values
     F64(f64),
     /// String values
     String(String),
-    /// Byte array values
-    Bytes(Vec<u8>),
     /// Array of homogeneous values
     Array(Vec<Value>),
 }
@@ -141,10 +121,8 @@ macro_rules! from_values {
 from_values!(
     (bool, Value::Bool);
     (i64, Value::I64);
-    (u64, Value::U64);
     (f64, Value::F64);
     (String, Value::String);
-    (Vec<u8>, Value::Bytes);
     (Vec<Value>, Value::Array);
 );
 
@@ -162,10 +140,8 @@ impl From<Value> for String {
         match value {
             Value::Bool(value) => value.to_string(),
             Value::I64(value) => value.to_string(),
-            Value::U64(value) => value.to_string(),
             Value::F64(value) => value.to_string(),
             Value::String(value) => value,
-            Value::Bytes(value) => String::from_utf8(value).unwrap_or_else(|_| String::new()),
             Value::Array(value) => format_value_array_as_string(&value),
         }
     }
@@ -178,12 +154,8 @@ impl From<&Value> for String {
         match value {
             Value::Bool(value) => value.to_string(),
             Value::I64(value) => value.to_string(),
-            Value::U64(value) => value.to_string(),
             Value::F64(value) => value.to_string(),
             Value::String(value) => value.clone(),
-            Value::Bytes(value) => {
-                String::from_utf8(value.clone()).unwrap_or_else(|_| String::new())
-            }
             Value::Array(value) => format_value_array_as_string(value),
         }
     }
@@ -194,7 +166,7 @@ fn format_value_array_as_string(v: &[Value]) -> String {
         "[{}]",
         v.iter()
             .map(|elem| match elem {
-                v @ Value::String(_) | v @ Value::Bytes(_) => format!(r#""{}""#, String::from(v)),
+                Value::String(s) => format!(r#""{}""#, s),
                 v => String::from(v),
             })
             .collect::<Vec<_>>()

diff --git a/src/api/labels/mod.rs b/src/api/labels/mod.rs
@@ -77,13 +77,11 @@ fn hash_value<H: Hasher>(state: &mut H, value: &Value) {
     match value {
         Value::Bool(b) => b.hash(state),
         Value::I64(i) => i.hash(state),
-        Value::U64(u) => u.hash(state),
         Value::F64(f) => {
             // FIXME: f64 does not impl hash, this impl may have incorrect outcomes.
             f.to_bits().hash(state)
         }
         Value::String(s) => s.hash(state),
-        Value::Bytes(b) => state.write(b),
         Value::Array(arr) => {
             // recursively hash array values
             for val in arr {

diff --git a/src/api/trace/span.rs b/src/api/trace/span.rs
@@ -247,6 +247,6 @@ pub enum StatusCode {
     Ok = 0,
     /// The default status.
     Unset = 1,
-    /// The operation contains an error. 
+    /// The operation contains an error.
     Error = 2,
 }
diff --git a/src/sdk/propagation/baggage.rs b/src/sdk/propagation/baggage.rs
@@ -31,7 +31,7 @@
 //! }
 //!
 //! // Add new baggage
-//! let cx_with_additions = cx.with_baggage(vec![Key::new("server_id").u64(42)]);
+//! let cx_with_additions = cx.with_baggage(vec![Key::new("server_id").i64(42)]);
 //!
 //! // Inject aggage into http request
 //! propagator.inject_context(&cx_with_additions, &mut headers);
@@ -88,7 +88,7 @@ lazy_static::lazy_static! {
 /// }
 ///
 /// // Add new baggage
-/// let cx_with_additions = cx.with_baggage(vec![Key::new("server_id").u64(42)]);
+/// let cx_with_additions = cx.with_baggage(vec![Key::new("server_id").i64(42)]);
 ///
 /// // Inject aggage into http request
 /// propagator.inject_context(&cx_with_additions, &mut headers);
@@ -233,14 +233,12 @@ mod tests {
                 vec![
                     KeyValue::new("key1", true),
                     KeyValue::new("key2", Value::I64(123)),
-                    KeyValue::new("key3", Value::U64(123)),
-                    KeyValue::new("key4", Value::F64(123.567)),
+                    KeyValue::new("key3", Value::F64(123.567)),
                 ],
                 vec![
                     "key1=true",
                     "key2=123",
-                    "key3=123",
-                    "key4=123.567",
+                    "key3=123.567",
                 ],
             ),
             // "values of array types"
@@ -249,13 +247,11 @@ mod tests {
                     KeyValue::new("key1", Value::Array(vec![Value::Bool(true), Value::Bool(false)])),
                     KeyValue::new("key2", Value::Array(vec![Value::I64(123), Value::I64(456)])),
                     KeyValue::new("key3", Value::Array(vec![Value::String("val1".to_string()), Value::String("val2".to_string())])),
-                    KeyValue::new("key4", Value::Array(vec![Value::Bytes(vec![118, 97, 108, 49]), Value::Bytes(vec![118, 97, 108, 50])])),
                 ],
                 vec![
                     "key1=[true%2Cfalse]",
                     "key2=[123%2C456]",
                     "key3=[%22val1%22%2C%22val2%22]",
-                    "key4=[%22val1%22%2C%22val2%22]",
                 ],
             ),
         ]