Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Misc fixes from PR 381 #443

Merged
merged 3 commits into from
Jan 30, 2020
Merged

Misc fixes from PR 381 #443

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3aadb4d
Remove Vendor constants from tracing plugins
jmacd Jan 16, 2020
1f18a73
Simplify current span key declaration
jmacd Jan 17, 2020
e695cd1
Fix typo
jmacd Jan 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions api/trace/current.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,7 @@ import (

type currentSpanKeyType struct{}

var (
currentSpanKey = &currentSpanKeyType{}
)
var currentSpanKey = &currentSpanKeyType{}

func ContextWithSpan(ctx context.Context, span Span) context.Context {
return context.WithValue(ctx, currentSpanKey, span)
Expand Down
5 changes: 0 additions & 5 deletions plugin/grpctrace/grpctrace.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,6 @@ import (
"go.opentelemetry.io/otel/api/trace"
)

const (
// Vendor is the integration provider
Vendor = "ot"
)

var (
propagator = trace.TraceContext{}
)
Expand Down
4 changes: 0 additions & 4 deletions plugin/httptrace/httptrace.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,6 @@ import (
"go.opentelemetry.io/otel/api/trace"
)

const (
Vendor = "ot"
)

var (
HostKey = key.New("http.host")
URLKey = key.New("http.url")
Expand Down
2 changes: 1 addition & 1 deletion plugin/othttp/handler_example_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ func ExampleNewHandler() {
func(w http.ResponseWriter, r *http.Request) {
ctx := r.Context()
var name string
// Wrap another function in it's own span
// Wrap another function in its own span
if err := trace.SpanFromContext(ctx).Tracer().WithSpan(ctx, "figureOutName",
func(ctx context.Context) error {
var err error
Expand Down