apollographql · bnjjj · Nov 21, 2023 · Oct 25, 2023 · Oct 26, 2023 · Oct 26, 2023
diff --git a/Cargo.lock b/Cargo.lock
@@ -400,6 +400,7 @@ dependencies = [
  "test-span",
  "thiserror",
  "tikv-jemallocator",
+ "time",
  "tokio",
  "tokio-rustls",
  "tokio-stream",
@@ -416,6 +417,7 @@ dependencies = [
  "tracing-core",
  "tracing-futures",
  "tracing-opentelemetry",
+ "tracing-serde",
  "tracing-subscriber",
  "tracing-test",
  "trust-dns-resolver",
@@ -2220,9 +2222,13 @@ dependencies = [
 
 [[package]]
 name = "deranged"
-version = "0.3.8"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946"
+checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3"
+dependencies = [
+ "powerfmt",
+ "serde",
+]
 
 [[package]]
 name = "derivative"
@@ -4906,6 +4912,12 @@ dependencies = [
  "universal-hash",
 ]
 
+[[package]]
+name = "powerfmt"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
+
 [[package]]
 name = "ppv-lite86"
 version = "0.2.17"
@@ -6657,28 +6669,29 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.25"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0fdd63d58b18d663fbdf70e049f00a22c8e42be082203be7f26589213cd75ea"
+checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5"
 dependencies = [
  "deranged",
  "itoa",
+ "powerfmt",
  "serde",
  "time-core",
  "time-macros",
 ]
 
 [[package]]
 name = "time-core"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
+checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
 
 [[package]]
 name = "time-macros"
-version = "0.2.11"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb71511c991639bb078fd5bf97757e03914361c48100d52878b8e52b46fb92cd"
+checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20"
 dependencies = [
  "time-core",
 ]

@@ -254,6 +254,8 @@ aws-credential-types = "0.56.1"
 aws-config = "0.56.1"
 aws-types = "0.56.1"
 sha1 = "0.10.6"
+tracing-serde = "0.1.3"
+time = { version = "0.3.30", features = ["serde"] }
 
 [target.'cfg(macos)'.dependencies]
 uname = "0.1.1"

@@ -23,6 +23,7 @@ pub(crate) mod extensions;
 
 /// The key of the resolved operation name. This is subject to change and should not be relied on.
 pub(crate) const OPERATION_NAME: &str = "operation_name";
+pub(crate) const OPERATION_KIND: &str = "operation_kind";
 
 /// Holds [`Context`] entries.
 pub(crate) type Entries = Arc<DashMap<String, Value>>;

@@ -784,6 +784,7 @@ mod test {
                 .expect("expecting valid request"),
             operation_kind: OperationKind::Query,
             context: ctx,
+            subgraph_name: String::from("test").into(),
             subscription_stream: None,
             connection_closed_signal: None,
         }

@@ -71,7 +71,6 @@ pub(crate) struct Conf {
     #[cfg(feature = "telemetry_next")]
     /// Event configuration
     pub(crate) events: config_new::events::Events,
-    #[cfg(feature = "telemetry_next")]
     /// Span configuration
     pub(crate) spans: config_new::spans::Spans,
     #[cfg(feature = "telemetry_next")]
@@ -453,6 +452,8 @@ pub(crate) enum AttributeValue {
     Bool(bool),
     /// i64 values
     I64(i64),
+    /// u128 values
+    U128(u128),
     /// f64 values
     F64(f64),
     /// String values
@@ -461,6 +462,19 @@ pub(crate) enum AttributeValue {
     Array(AttributeArray),
 }
 
+impl std::fmt::Display for AttributeValue {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            AttributeValue::Bool(val) => write!(f, "{val}"),
+            AttributeValue::I64(val) => write!(f, "{val}"),
+            AttributeValue::U128(val) => write!(f, "{val}"),
+            AttributeValue::F64(val) => write!(f, "{val}"),
+            AttributeValue::String(val) => write!(f, "{val}"),
+            AttributeValue::Array(val) => write!(f, "{val}"),
+        }
+    }
+}
+
 impl TryFrom<serde_json::Value> for AttributeValue {
     type Error = ();
     fn try_from(value: serde_json::Value) -> Result<Self, Self::Error> {
@@ -470,6 +484,9 @@ impl TryFrom<serde_json::Value> for AttributeValue {
             serde_json::Value::Number(v) if v.is_i64() => {
                 Ok(AttributeValue::I64(v.as_i64().expect("i64 checked")))
             }
+            serde_json::Value::Number(v) if v.is_u64() => Ok(AttributeValue::U128(
+                v.as_u64().expect("u64 checked") as u128,
+            )),
             serde_json::Value::Number(v) if v.is_f64() => {
                 Ok(AttributeValue::F64(v.as_f64().expect("f64 checked")))
             }
@@ -514,13 +531,26 @@ impl From<AttributeValue> for opentelemetry::Value {
         match value {
             AttributeValue::Bool(v) => Value::Bool(v),
             AttributeValue::I64(v) => Value::I64(v),
+            AttributeValue::U128(v) => Value::I64(v as i64),
             AttributeValue::F64(v) => Value::F64(v),
             AttributeValue::String(v) => Value::String(v.into()),
             AttributeValue::Array(v) => Value::Array(v.into()),
         }
     }
 }
 
+impl From<opentelemetry::Value> for AttributeValue {
+    fn from(value: opentelemetry::Value) -> Self {
+        match value {
+            opentelemetry::Value::Bool(v) => AttributeValue::Bool(v),
+            opentelemetry::Value::I64(v) => AttributeValue::I64(v),
+            opentelemetry::Value::F64(v) => AttributeValue::F64(v),
+            opentelemetry::Value::String(v) => AttributeValue::String(v.into()),
+            opentelemetry::Value::Array(v) => AttributeValue::Array(v.into()),
+        }
+    }
+}
+
 #[derive(Debug, Clone, Deserialize, Serialize, JsonSchema, PartialEq)]
 #[serde(untagged, deny_unknown_fields)]
 pub(crate) enum AttributeArray {
@@ -534,6 +564,17 @@ pub(crate) enum AttributeArray {
     String(Vec<String>),
 }
 
+impl std::fmt::Display for AttributeArray {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            AttributeArray::Bool(val) => write!(f, "{val:?}"),
+            AttributeArray::I64(val) => write!(f, "{val:?}"),
+            AttributeArray::F64(val) => write!(f, "{val:?}"),
+            AttributeArray::String(val) => write!(f, "{val:?}"),
+        }
+    }
+}
+
 impl From<AttributeArray> for opentelemetry::Array {
     fn from(array: AttributeArray) -> Self {
         match array {
@@ -545,6 +586,19 @@ impl From<AttributeArray> for opentelemetry::Array {
     }
 }
 
+impl From<opentelemetry::Array> for AttributeArray {
+    fn from(array: opentelemetry::Array) -> Self {
+        match array {
+            opentelemetry::Array::Bool(v) => AttributeArray::Bool(v),
+            opentelemetry::Array::I64(v) => AttributeArray::I64(v),
+            opentelemetry::Array::F64(v) => AttributeArray::F64(v),
+            opentelemetry::Array::String(v) => {
+                AttributeArray::String(v.into_iter().map(|v| v.into()).collect())
+            }
+        }
+    }
+}
+
 #[derive(Clone, Debug, Deserialize, JsonSchema)]
 #[serde(deny_unknown_fields, untagged)]
 pub(crate) enum SamplerOption {