Add the patch to hack/update-deps.sh.

knative · Sep 27, 2019 · 706da38 · 706da38
1 parent e21bc0a
commit 706da38
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/hack/set-span-id.patch b/hack/set-span-id.patch
@@ -0,0 +1,16 @@
+diff --git a/vendor/go.opencensus.io/trace/trace.go b/vendor/go.opencensus.io/trace/trace.go
+index 38ead7bf..9e6fe483 100644
+--- a/vendor/go.opencensus.io/trace/trace.go
++++ b/vendor/go.opencensus.io/trace/trace.go
+@@ -261,6 +261,11 @@ func startSpanInternal(name string, hasParent bool, parent SpanContext, remotePa
+ 	return span
+ }
+
++func (s *Span) SetSpanID(spanID SpanID) {
++	s.data.SpanID = spanID
++	s.spanContext.SpanID = spanID
++}
++
+ // End ends the span.
+ func (s *Span) End() {
+ 	if s == nil {
diff --git a/hack/update-deps.sh b/hack/update-deps.sh
@@ -33,3 +33,9 @@ rm -rf $(find vendor/ -name 'BUILD.bazel')
 update_licenses third_party/VENDOR-LICENSE \
   $(find . -name "*.go" | grep -v vendor | xargs grep "package main" | cut -d: -f1 | xargs -n1 dirname | uniq)
 
+# HACK HACK HACK
+# The only way we found to create a consistent Trace tree without any missing Spans is to
+# artificially set the SpanId. See pkg/tracing/traceparent.go for more details.
+# Produced with:
+# git diff origin/master HEAD -- vendor/go.opencensus.io/trace/trace.go > ./hack/set-span-id.patch
+git apply ${REPO_ROOT_DIR}/hack/k8s-dynamic-fake-simple.patch