E2E Tracing test - Strong trace assertions #1972
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||
|---|---|---|---|---|
| @@ -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 | ||||
| } | ||||
|
|
||||
|
There was a problem hiding this comment. Remove trailing whitespace:
Suggested change
|
||||
| +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 { | ||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,110 @@ | ||
| /* | ||
| Copyright 2019 The Knative Authors | ||
|
|
||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
|
|
||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
|
|
||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package tracing | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
| "regexp" | ||
| "strconv" | ||
|
|
||
| cloudevents "github.com/cloudevents/sdk-go" | ||
| "go.opencensus.io/plugin/ochttp/propagation/b3" | ||
| "go.opencensus.io/trace" | ||
| ) | ||
|
|
||
| const ( | ||
| // traceparentAttribute is the name of the CloudEvents attribute that contains the trace state. | ||
| // See | ||
| // https://github.com/cloudevents/spec/blob/v1.0-rc1/extensions/distributed-tracing.md#traceparent | ||
| traceparentAttribute = "traceparent" | ||
| ) | ||
|
|
||
| // AddTraceparentAttributeFromContext returns a CloudEvent that is identical to the input event, | ||
| // with the traceparent CloudEvents extension attribute added. The value for that attribute is the | ||
| // Span stored in the context. | ||
| // | ||
| // The context is expected to have passed through the OpenCensus HTTP Handler, so that the Span has | ||
| // been added to it. | ||
| func AddTraceparentAttributeFromContext(ctx context.Context, event cloudevents.Event) cloudevents.Event { | ||
| span := trace.FromContext(ctx) | ||
| if span != nil { | ||
| event.SetExtension(traceparentAttribute, traceparentAttributeValue(span)) | ||
| } | ||
| return event | ||
| } | ||
|
|
||
| func traceparentAttributeValue(span *trace.Span) string { | ||
| flags := "00" | ||
| if span.SpanContext().IsSampled() { | ||
| flags = "01" | ||
| } | ||
| return fmt.Sprintf("00-%s-%s-%s", | ||
| span.SpanContext().TraceID.String(), | ||
| span.SpanContext().SpanID.String(), | ||
| flags) | ||
| } | ||
|
|
||
| // AddSpanFromTraceparentAttribute extracts the traceparent extension attribute from the CloudEvent | ||
| // and returns a context with that span set. If the traceparent extension attribute is not found or | ||
| // cannot be parsed, then an error is returned. | ||
| func AddSpanFromTraceparentAttribute(ctx context.Context, name string, event cloudevents.Event) (context.Context, error) { | ||
| tp, ok := event.Extensions()[traceparentAttribute] | ||
| if !ok { | ||
| return ctx, fmt.Errorf("extension attributes did not contain %q", traceparentAttribute) | ||
| } | ||
| tps, ok := tp.(string) | ||
| if !ok { | ||
| return ctx, fmt.Errorf("extention attribute %q's value was not a string: %T", traceparentAttribute, tps) | ||
| } | ||
| sc, err := parseTraceparent(tps) | ||
| if err != nil { | ||
| return ctx, err | ||
| } | ||
| // Create a fake Span with the saved information. In order to ensure any requests made with this | ||
| // context have a parent of the saved Span, set the SpanID to the one saved in the traceparent. | ||
| // Normally, a new SpanID is generated and because this Span is never reported would create a | ||
| // hole in the Span tree. | ||
| _, span := trace.StartSpanWithRemoteParent(ctx, name, sc) | ||
| span.SetSpanID(sc.SpanID) | ||
| return trace.NewContext(ctx, span), nil | ||
| } | ||
|
|
||
| func parseTraceparent(tp string) (trace.SpanContext, error) { | ||
| re := regexp.MustCompile("^00-([a-f0-9]{32})-([a-f0-9]{16})-([a-f0-9]{2})$") | ||
| m := re.FindStringSubmatch(tp) | ||
| if len(m) == 0 { | ||
| return trace.SpanContext{}, fmt.Errorf("could not parse traceparent: %q", tp) | ||
| } | ||
| traceID, ok := b3.ParseTraceID(m[1]) | ||
| if !ok { | ||
| return trace.SpanContext{}, fmt.Errorf("could not parse traceID: %q", tp) | ||
| } | ||
| spanID, ok := b3.ParseSpanID(m[2]) | ||
| if !ok { | ||
| return trace.SpanContext{}, fmt.Errorf("could not parse spanID: %q", tp) | ||
| } | ||
| options, err := strconv.ParseUint(m[3], 16, 32) | ||
| if err != nil { | ||
| return trace.SpanContext{}, fmt.Errorf("could not parse options: %q", tp) | ||
| } | ||
| return trace.SpanContext{ | ||
| TraceID: traceID, | ||
| SpanID: spanID, | ||
| TraceOptions: trace.TraceOptions(options), | ||
| }, nil | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
is that until some update?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nope. I just couldn't find a better way to do it. There probably is one, but I wasn't able to find it.
In theory, we will move to some OpenTelemetry libraries when they go 1.0, at which point I hope we don't need a similar hack :)