Skip to content

updated macaron go module declaration #356

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

Merged
merged 2 commits into from
Sep 22, 2020
Merged

updated macaron go module declaration #356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd2c6bf
updated macaron go module declaration
Sep 21, 2020
bd10fc2
updated macaron package location in all areas
Sep 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
2 changes: 1 addition & 1 deletion instrumentation/gopkg.in/macaron.v1/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ type Option func(*config)

// WithTracer specifies a tracer to use for creating spans. If none is
// specified, a tracer named
// "go.opentelemetry.io/contrib/instrumentation/macaron" from the global
// "go.opentelemetry.io/contrib/instrumentation/gopkg.in/macaron.v1" from the global
// provider is used.
func WithTracer(tracer trace.Tracer) Option {
return func(cfg *config) {
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/gopkg.in/macaron.v1/doc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@
//
// Currently only the routing of a received message can be
// instrumented. To do it, use the Middleware function.
package macaron // import "go.opentelemetry.io/contrib/instrumentation/macaron"
package macaron // import "go.opentelemetry.io/contrib/instrumentation/gopkg.in/macaron.v1"
2 changes: 1 addition & 1 deletion instrumentation/gopkg.in/macaron.v1/example/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (

"gopkg.in/macaron.v1"

macarontrace "go.opentelemetry.io/contrib/instrumentation/macaron"
macarontrace "go.opentelemetry.io/contrib/instrumentation/gopkg.in/macaron.v1"

otelglobal "go.opentelemetry.io/otel/api/global"
oteltrace "go.opentelemetry.io/otel/api/trace"
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/gopkg.in/macaron.v1/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module go.opentelemetry.io/contrib/instrumentation/macaron
module go.opentelemetry.io/contrib/instrumentation/gopkg.in/macaron.v1

go 1.14

Expand Down
2 changes: 1 addition & 1 deletion instrumentation/gopkg.in/macaron.v1/macaron.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
)

const (
tracerName = "go.opentelemetry.io/contrib/instrumentation/macaron"
tracerName = "go.opentelemetry.io/contrib/instrumentation/gopkg.in/macaron.v1"
)

// Middleware returns a macaron Handler to trace requests to the server.
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/gopkg.in/macaron.v1/macaron_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ func TestChildSpanFromGlobalTracer(t *testing.T) {
spanTracer := span.Tracer()
mockTracer, ok := spanTracer.(*mocktrace.Tracer)
require.True(t, ok)
assert.Equal(t, "go.opentelemetry.io/contrib/instrumentation/macaron", mockTracer.Name)
assert.Equal(t, "go.opentelemetry.io/contrib/instrumentation/gopkg.in/macaron.v1", mockTracer.Name)
ctx.Resp.WriteHeader(http.StatusOK)
})

Expand Down