Include emicklei/go-restful in directory move (#120)

open-telemetry · Jul 2, 2020 · 19be05c · 19be05c
1 parent 370078e
commit 19be05c
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 9 deletions.
diff --git a/...rumentation/emicklei/go-restful/config.go → .../github.com/emicklei/go-restful/config.go b/...rumentation/emicklei/go-restful/config.go → .../github.com/emicklei/go-restful/config.go
diff --git a/instrumentation/emicklei/go-restful/doc.go → ...ion/github.com/emicklei/go-restful/doc.go b/instrumentation/emicklei/go-restful/doc.go → ...ion/github.com/emicklei/go-restful/doc.go
@@ -18,4 +18,4 @@
 // Instrumentation of an incoming request is achieved via a go-restful
 // FilterFunc which may be applied at the container level, at the
 // webservice level or at a route level
-package restful // import "go.opentelemetry.io/contrib/instrumentation/emicklei/go-restful"
+package restful // import "go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful"
diff --git a/...on/emicklei/go-restful/example/Dockerfile → ...om/emicklei/go-restful/example/Dockerfile b/...on/emicklei/go-restful/example/Dockerfile → ...om/emicklei/go-restful/example/Dockerfile
@@ -13,7 +13,7 @@
 # limitations under the License.
 FROM golang:1.14-alpine AS base
 COPY . /src/
-WORKDIR /src/instrumentation/emicklei/go-restful
+WORKDIR /src/instrumentation/github.com/emicklei/go-restful
 
 FROM base AS go-restful-server
 RUN go install ./example/server.go

diff --git a/...ion/emicklei/go-restful/example/README.md → ...com/emicklei/go-restful/example/README.md b/...ion/emicklei/go-restful/example/README.md → ...com/emicklei/go-restful/example/README.md
diff --git a/...lei/go-restful/example/docker-compose.yml → ...lei/go-restful/example/docker-compose.yml b/...lei/go-restful/example/docker-compose.yml → ...lei/go-restful/example/docker-compose.yml
@@ -26,7 +26,7 @@ services:
   go-restful-server:
     build:
       dockerfile: $PWD/Dockerfile
-      context: ../../../..
+      context: ../../../../..
     ports:
       - "8080:80"
     command:

diff --git a/...ion/emicklei/go-restful/example/server.go → ...com/emicklei/go-restful/example/server.go b/...ion/emicklei/go-restful/example/server.go → ...com/emicklei/go-restful/example/server.go
@@ -21,7 +21,7 @@ import (
 
 	"github.com/emicklei/go-restful/v3"
 
-	restfultrace "go.opentelemetry.io/contrib/instrumentation/emicklei/go-restful"
+	restfultrace "go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful"
 	otelglobal "go.opentelemetry.io/otel/api/global"
 	otelkv "go.opentelemetry.io/otel/api/kv"
 	oteltrace "go.opentelemetry.io/otel/api/trace"

diff --git a/instrumentation/emicklei/go-restful/go.mod → ...ion/github.com/emicklei/go-restful/go.mod b/instrumentation/emicklei/go-restful/go.mod → ...ion/github.com/emicklei/go-restful/go.mod
@@ -1,8 +1,8 @@
-module go.opentelemetry.io/contrib/instrumentation/emicklei/go-restful
+module go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful
 
 go 1.14
 
-replace go.opentelemetry.io/contrib => ../../..
+replace go.opentelemetry.io/contrib => ../../../..
 
 require (
 	github.com/emicklei/go-restful/v3 v3.0.0

diff --git a/instrumentation/emicklei/go-restful/go.sum → ...ion/github.com/emicklei/go-restful/go.sum b/instrumentation/emicklei/go-restful/go.sum → ...ion/github.com/emicklei/go-restful/go.sum
diff --git a/...umentation/emicklei/go-restful/restful.go → ...github.com/emicklei/go-restful/restful.go b/...umentation/emicklei/go-restful/restful.go → ...github.com/emicklei/go-restful/restful.go
@@ -24,7 +24,7 @@ import (
 )
 
 const (
-	tracerName    = "go.opentelemetry.io/contrib/instrumentation/emicklei/go-restful"
+	tracerName    = "go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful"
 	tracerVersion = "1.0"
 )
 

diff --git a/...ation/emicklei/go-restful/restful_test.go → ...b.com/emicklei/go-restful/restful_test.go b/...ation/emicklei/go-restful/restful_test.go → ...b.com/emicklei/go-restful/restful_test.go
@@ -24,7 +24,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	restfultrace "go.opentelemetry.io/contrib/instrumentation/emicklei/go-restful"
+	restfultrace "go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful"
+
 	mocktrace "go.opentelemetry.io/contrib/internal/trace"
 	otelglobal "go.opentelemetry.io/otel/api/global"
 	otelvalue "go.opentelemetry.io/otel/api/kv/value"
@@ -42,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/emicklei/go-restful", mockTracer.Name)
+		assert.Equal(t, "go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful", mockTracer.Name)
 		resp.WriteHeader(http.StatusOK)
 	}
 	ws := &restful.WebService{}
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,7 +24,7 @@ import ( @@
     )
     const (
-    	tracerName    = "go.opentelemetry.io/contrib/instrumentation/emicklei/go-restful"
+    	tracerName    = "go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful"
     	tracerVersion = "1.0"
     )
@@ Expand Down @@