Merge pull request #1 from etolbakov/fmassot-feedback

Review.
quickwit-oss · Dec 10, 2023 · b759a64 · b759a64
2 parents 2153182 + b9a3380
commit b759a64
Show file tree

Hide file tree

Showing 6 changed files with 552 additions and 163 deletions.
diff --git a/quickwit/Cargo.lock b/quickwit/Cargo.lock
diff --git a/quickwit/quickwit-serve/Cargo.toml b/quickwit/quickwit-serve/Cargo.toml
@@ -12,12 +12,14 @@ documentation = "https://quickwit.io/docs/"
 [dependencies]
 anyhow = { workspace = true }
 async-trait = { workspace = true }
+base64 = { workspace = true }
 bytes = { workspace = true }
 bytesize = { workspace = true }
 elasticsearch-dsl = "0.4.15"
 futures = { workspace = true }
 futures-util = { workspace = true }
 go-parse-duration = "0.1.1"
+hex = { workspace = true }
 humantime = { workspace = true }
 http-serde = { workspace = true }
 hyper = { workspace = true }

diff --git a/quickwit/quickwit-serve/resources/tests/jaeger_ui_trace.json b/quickwit/quickwit-serve/resources/tests/jaeger_ui_trace.json
@@ -0,0 +1,168 @@
+{
+    "traceID": "0000000000000001",
+    "spans": [
+      {
+        "traceID": "0000000000000001",
+        "spanID": "0000000000000001",
+        "operationName": "test-general-conversion",
+        "references": [],
+        "startTime": 1485467191639875,
+        "duration": 5,
+        "flags": 0,
+        "tags": [],
+        "logs": [
+          {
+            "timestamp": 1485467191639875,
+            "fields": [
+              {
+                "key": "event",
+                "type": "string",
+                "value": "some-event"
+              }
+            ]
+          },
+          {
+            "timestamp": 1485467191639875,
+            "fields": [
+              {
+                "key": "x",
+                "type": "string",
+                "value": "y"
+              }
+            ]
+          }
+        ],
+        "processID": "p1",
+        "warnings": []
+      },
+      {
+        "traceID": "0000000000000001",
+        "spanID": "0000000000000002",
+        "operationName": "some-operation",
+        "references": [],
+        "flags": 0,
+        "startTime": 1485467191639875,
+        "duration": 5,
+        "tags": [
+          {
+            "key": "peer.service",
+            "type": "string",
+            "value": "service-y"
+          },
+          {
+            "key": "peer.ipv4",
+            "type": "int64",
+            "value": 23456
+          },
+          {
+            "key": "error",
+            "type": "bool",
+            "value": true
+          },
+          {
+            "key": "temperature",
+            "type": "float64",
+            "value": 72.5
+          },
+          {
+            "key": "javascript_limit",
+            "type": "int64",
+            "value": "9223372036854775222"
+          },
+          {
+            "key": "blob",
+            "type": "binary",
+            "value": "AAAwOQ=="
+          }
+        ],
+        "logs": [],
+        "processID": "p1",
+        "warnings": []
+      },
+      {
+        "traceID": "0000000000000001",
+        "spanID": "0000000000000003",
+        "operationName": "some-operation",
+        "flags": 0,
+        "references": [
+          {
+            "refType": "CHILD_OF",
+            "traceID": "0000000000000001",
+            "spanID": "0000000000000002"
+          }
+        ],
+        "startTime": 1485467191639875,
+        "duration": 5,
+        "tags": [],
+        "logs": [],
+        "processID": "p2",
+        "warnings": []
+      },
+      {
+        "traceID": "0000000000000001",
+        "spanID": "0000000000000004",
+        "operationName": "reference-test",
+        "flags": 0,
+        "references": [
+          {
+            "refType": "CHILD_OF",
+            "traceID": "00000000000000ff",
+            "spanID": "00000000000000ff"
+          },
+          {
+            "refType": "CHILD_OF",
+            "traceID": "0000000000000001",
+            "spanID": "0000000000000002"
+          },
+          {
+            "refType": "FOLLOWS_FROM",
+            "traceID": "0000000000000001",
+            "spanID": "0000000000000002"
+          }
+        ],
+        "startTime": 1485467191639875,
+        "duration": 5,
+        "tags": [],
+        "logs": [],
+        "processID": "p2",
+        "warnings": [
+          "some span warning"
+        ]
+      },
+      {
+        "traceID": "0000000000000001",
+        "spanID": "0000000000000005",
+        "operationName": "preserveParentID-test",
+        "flags": 0,
+        "references": [
+          {
+            "refType": "CHILD_OF",
+            "traceID": "0000000000000001",
+            "spanID": "0000000000000004"
+          }
+        ],
+        "startTime": 1485467191639875,
+        "duration": 4,
+        "tags": [],
+        "logs": [],
+        "processID": "p2",
+        "warnings": [
+          "some span warning"
+        ]
+      }
+    ],
+    "processes": {
+      "p1": {
+        "serviceName": "service-x",
+        "key": "p1",
+        "tags": []
+      },
+      "p2": {
+        "serviceName": "service-y",
+        "key": "p2",
+        "tags": []
+      }
+    },
+    "warnings": [
+    ]
+  }