Skip to content

Commit 19be05c

Browse files
authored
Include emicklei/go-restful in directory move (#120)
1 parent 370078e commit 19be05c

File tree

10 files changed

+10
-9
lines changed

10 files changed

+10
-9
lines changed

instrumentation/emicklei/go-restful/doc.go renamed to instrumentation/github.com/emicklei/go-restful/doc.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@
1818
// Instrumentation of an incoming request is achieved via a go-restful
1919
// FilterFunc which may be applied at the container level, at the
2020
// webservice level or at a route level
21-
package restful // import "go.opentelemetry.io/contrib/instrumentation/emicklei/go-restful"
21+
package restful // import "go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful"

instrumentation/emicklei/go-restful/example/Dockerfile renamed to instrumentation/github.com/emicklei/go-restful/example/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# limitations under the License.
1414
FROM golang:1.14-alpine AS base
1515
COPY . /src/
16-
WORKDIR /src/instrumentation/emicklei/go-restful
16+
WORKDIR /src/instrumentation/github.com/emicklei/go-restful
1717

1818
FROM base AS go-restful-server
1919
RUN go install ./example/server.go

instrumentation/emicklei/go-restful/example/docker-compose.yml renamed to instrumentation/github.com/emicklei/go-restful/example/docker-compose.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ services:
2626
go-restful-server:
2727
build:
2828
dockerfile: $PWD/Dockerfile
29-
context: ../../../..
29+
context: ../../../../..
3030
ports:
3131
- "8080:80"
3232
command:

instrumentation/emicklei/go-restful/example/server.go renamed to instrumentation/github.com/emicklei/go-restful/example/server.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121

2222
"github.com/emicklei/go-restful/v3"
2323

24-
restfultrace "go.opentelemetry.io/contrib/instrumentation/emicklei/go-restful"
24+
restfultrace "go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful"
2525
otelglobal "go.opentelemetry.io/otel/api/global"
2626
otelkv "go.opentelemetry.io/otel/api/kv"
2727
oteltrace "go.opentelemetry.io/otel/api/trace"

instrumentation/emicklei/go-restful/go.mod renamed to instrumentation/github.com/emicklei/go-restful/go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
module go.opentelemetry.io/contrib/instrumentation/emicklei/go-restful
1+
module go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful
22

33
go 1.14
44

5-
replace go.opentelemetry.io/contrib => ../../..
5+
replace go.opentelemetry.io/contrib => ../../../..
66

77
require (
88
github.com/emicklei/go-restful/v3 v3.0.0

instrumentation/emicklei/go-restful/restful.go renamed to instrumentation/github.com/emicklei/go-restful/restful.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
)
2525

2626
const (
27-
tracerName = "go.opentelemetry.io/contrib/instrumentation/emicklei/go-restful"
27+
tracerName = "go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful"
2828
tracerVersion = "1.0"
2929
)
3030

instrumentation/emicklei/go-restful/restful_test.go renamed to instrumentation/github.com/emicklei/go-restful/restful_test.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ import (
2424
"github.com/stretchr/testify/assert"
2525
"github.com/stretchr/testify/require"
2626

27-
restfultrace "go.opentelemetry.io/contrib/instrumentation/emicklei/go-restful"
27+
restfultrace "go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful"
28+
2829
mocktrace "go.opentelemetry.io/contrib/internal/trace"
2930
otelglobal "go.opentelemetry.io/otel/api/global"
3031
otelvalue "go.opentelemetry.io/otel/api/kv/value"
@@ -42,7 +43,7 @@ func TestChildSpanFromGlobalTracer(t *testing.T) {
4243
spanTracer := span.Tracer()
4344
mockTracer, ok := spanTracer.(*mocktrace.Tracer)
4445
require.True(t, ok)
45-
assert.Equal(t, "go.opentelemetry.io/contrib/instrumentation/emicklei/go-restful", mockTracer.Name)
46+
assert.Equal(t, "go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful", mockTracer.Name)
4647
resp.WriteHeader(http.StatusOK)
4748
}
4849
ws := &restful.WebService{}

0 commit comments

Comments
 (0)