Move all github.com instrumentation plugins down one level in directory hierarchy (#118)

* Moved all github.com instrumentation plugins below github.com

Fix up all example docker-compose/Dockerfile

* Add doc.go to labstack/echo for consistency with other plugins

* Fix up CHANGELOG

Author: evantorrie

CHANGELOG.md

@@ -8,9 +8,13 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 ## [Unreleased]
 
-### Changed
+### Additions
 
 - Add `emicklei/go-restful/v3` trace instrumentation. (#115)
+
+### Changed
+
+- Move all github.com package instrumentation under a github.com directory. (#118)
 - Update `CONTRIBUTING.md` to ask for updates to `CHANGELOG.md` with each pull request. (#114)
 - Create this `CHANGELOG.md`. (#114)
 

instrumentation/gin-gonic/gin/doc.go renamed to instrumentation/github.com/gin-gonic/gin/doc.go

@@ -19,4 +19,4 @@
 // instrumenting the routing of a received message (the Middleware
 // function) and instrumenting the response generation through
 // template evaluation (the HTML function).
-package gin // import "go.opentelemetry.io/contrib/instrumentation/gin-gonic/gin"
+package gin // import "go.opentelemetry.io/contrib/instrumentation/github.com/gin-gonic/gin"

instrumentation/gin-gonic/gin/example/Dockerfile renamed to instrumentation/github.com/gin-gonic/gin/example/Dockerfile

@@ -13,7 +13,7 @@
 # limitations under the License.
 FROM golang:alpine AS base
 COPY . /src/
-WORKDIR /src/instrumentation/gin-gonic/gin
+WORKDIR /src/instrumentation/github.com/gin-gonic/gin
 
 FROM base AS gin-server
 RUN go install ./example/server.go

instrumentation/gin-gonic/gin/example/README.md renamed to instrumentation/github.com/gin-gonic/gin/example/README.md

@@ -26,7 +26,7 @@ services:
   gin-server:
     build:
       dockerfile: $PWD/Dockerfile
-      context: ../../../..
+      context: ../../../../..
     ports:
       - "8080:80"
     command:

instrumentation/gin-gonic/gin/example/docker-compose.yml renamed to instrumentation/github.com/gin-gonic/gin/example/docker-compose.yml

@@ -22,7 +22,7 @@ import (
 
 	"github.com/gin-gonic/gin"
 
-	gintrace "go.opentelemetry.io/contrib/instrumentation/gin-gonic/gin"
+	gintrace "go.opentelemetry.io/contrib/instrumentation/github.com/gin-gonic/gin"
 	otelglobal "go.opentelemetry.io/otel/api/global"
 	"go.opentelemetry.io/otel/api/kv"
 	oteltrace "go.opentelemetry.io/otel/api/trace"

instrumentation/gin-gonic/gin/example/server.go renamed to instrumentation/github.com/gin-gonic/gin/example/server.go

@@ -31,7 +31,7 @@ import (
 
 const (
 	tracerKey  = "otel-go-contrib-tracer"
-	tracerName = "go.opentelemetry.io/contrib/instrumentation/gin-gonic/gin"
+	tracerName = "go.opentelemetry.io/contrib/instrumentation/github.com/gin-gonic/gin"
 )
 
 // Middleware returns middleware that will trace incoming requests.

instrumentation/gin-gonic/gin/gintrace.go renamed to instrumentation/github.com/gin-gonic/gin/gintrace.go

@@ -52,7 +52,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/gin-gonic/gin", mockTracer.Name)
+		assert.Equal(t, "go.opentelemetry.io/contrib/instrumentation/github.com/gin-gonic/gin", mockTracer.Name)
 	})
 
 	r := httptest.NewRequest("GET", "/user/123", nil)

instrumentation/gin-gonic/gin/gintrace_test.go renamed to instrumentation/github.com/gin-gonic/gin/gintrace_test.go

@@ -1,8 +1,8 @@
-module go.opentelemetry.io/contrib/instrumentation/gin-gonic/gin
+module go.opentelemetry.io/contrib/instrumentation/github.com/gin-gonic/gin
 
 go 1.14
 
-replace go.opentelemetry.io/contrib => ../../..
+replace go.opentelemetry.io/contrib => ../../../..
 
 require (
 	github.com/gin-gonic/gin v1.6.3