Use 128bit traceids in envoy (istio#10811)

* Use 128bit traceids in envoy * Update unit test golden files for bootstrap config
xun1009 · Jan 10, 2019 · ec7d9ca · ec7d9ca
1 parent da8864b
commit ec7d9ca
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/pkg/bootstrap/testdata/all_golden.json b/pkg/bootstrap/testdata/all_golden.json
@@ -239,7 +239,8 @@
       "name": "envoy.zipkin",
       "config": {
         "collector_cluster": "zipkin",
-        "collector_endpoint": "/api/v1/spans"
+        "collector_endpoint": "/api/v1/spans",
+        "trace_id_128bit":"true"
       }
     }
   }

diff --git a/pkg/bootstrap/testdata/running_golden.json b/pkg/bootstrap/testdata/running_golden.json
@@ -239,7 +239,8 @@
       "name": "envoy.zipkin",
       "config": {
         "collector_cluster": "zipkin",
-        "collector_endpoint": "/api/v1/spans"
+        "collector_endpoint": "/api/v1/spans",
+        "trace_id_128bit":"true"
       }
     }
   }

diff --git a/pkg/bootstrap/testdata/tracing_zipkin_golden.json b/pkg/bootstrap/testdata/tracing_zipkin_golden.json
@@ -213,7 +213,8 @@
       "name": "envoy.zipkin",
       "config": {
         "collector_cluster": "zipkin",
-        "collector_endpoint": "/api/v1/spans"
+        "collector_endpoint": "/api/v1/spans",
+        "trace_id_128bit":"true"
       }
     }
   }

diff --git a/tools/deb/envoy_bootstrap_v2.json b/tools/deb/envoy_bootstrap_v2.json
@@ -279,7 +279,8 @@
       "name": "envoy.zipkin",
       "config": {
         "collector_cluster": "zipkin",
-        "collector_endpoint": "/api/v1/spans"
+        "collector_endpoint": "/api/v1/spans",
+        "trace_id_128bit": "true"
       }
     }
   }