Disable shared span context by default (istio#11281)

xun1009 · Jan 28, 2019 · d9a51f0 · d9a51f0
1 parent 9324b62
commit d9a51f0
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
@@ -240,7 +240,8 @@
       "config": {
         "collector_cluster": "zipkin",
         "collector_endpoint": "/api/v1/spans",
-        "trace_id_128bit":"true"
+        "trace_id_128bit":"true",
+        "shared_span_context": "false"
       }
     }
   }

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

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

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