Make tests work.

quickwit-oss · Dec 10, 2023 · b9a3380 · b9a3380
1 parent 18b8e1f
commit b9a3380
Show file tree

Hide file tree

Showing 6 changed files with 262 additions and 105 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
@@ -3,11 +3,12 @@
     "spans": [
       {
         "traceID": "0000000000000001",
-        "spanID": "0000000000000002",
+        "spanID": "0000000000000001",
         "operationName": "test-general-conversion",
         "references": [],
         "startTime": 1485467191639875,
         "duration": 5,
+        "flags": 0,
         "tags": [],
         "logs": [
           {
@@ -32,13 +33,14 @@
           }
         ],
         "processID": "p1",
-        "warnings": null
+        "warnings": []
       },
       {
         "traceID": "0000000000000001",
         "spanID": "0000000000000002",
         "operationName": "some-operation",
         "references": [],
+        "flags": 0,
         "startTime": 1485467191639875,
         "duration": 5,
         "tags": [
@@ -75,12 +77,13 @@
         ],
         "logs": [],
         "processID": "p1",
-        "warnings": null
+        "warnings": []
       },
       {
         "traceID": "0000000000000001",
         "spanID": "0000000000000003",
         "operationName": "some-operation",
+        "flags": 0,
         "references": [
           {
             "refType": "CHILD_OF",
@@ -93,12 +96,13 @@
         "tags": [],
         "logs": [],
         "processID": "p2",
-        "warnings": null
+        "warnings": []
       },
       {
         "traceID": "0000000000000001",
         "spanID": "0000000000000004",
         "operationName": "reference-test",
+        "flags": 0,
         "references": [
           {
             "refType": "CHILD_OF",
@@ -129,6 +133,7 @@
         "traceID": "0000000000000001",
         "spanID": "0000000000000005",
         "operationName": "preserveParentID-test",
+        "flags": 0,
         "references": [
           {
             "refType": "CHILD_OF",
@@ -149,14 +154,15 @@
     "processes": {
       "p1": {
         "serviceName": "service-x",
+        "key": "p1",
         "tags": []
       },
       "p2": {
         "serviceName": "service-y",
+        "key": "p2",
         "tags": []
       }
     },
     "warnings": [
-      "some trace warning"
     ]
   }