diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 436cf9738df..3c64d9e5cb2 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -91,18 +91,18 @@ merge**. ## Adding a new Contrib package -To add a new contrib package follow an existing one. An empty Sample plugin +To add a new contrib package follow an existing one. An empty Sample instrumentation provides base structure with an example and a test. Each contrib package should be its own module. A contrib package may contain more than one go package. ### Folder Structure -- plugins/\ (**Common**) -- plugins/\/trace (**specific to trace**) -- plugins/\/metrics (**specific to metrics**) +- instrumentation/\ (**Common**) +- instrumentation/\/trace (**specific to trace**) +- instrumentation/\/metrics (**specific to metrics**) #### Example -- plugins/gorm/trace -- plugins/kafka/metrics +- instrumentation/gorm/trace +- instrumentation/kafka/metrics ## Approvers and Maintainers diff --git a/doc.go b/doc.go index 1f4a3dcee6d..122f50f1577 100644 --- a/doc.go +++ b/doc.go @@ -1,6 +1,6 @@ // This package provides all of its functionality through its // submodules. The submodules in the exporters directory provide // implementations for trace and metric exporters for third-party -// collectors, and submodules in the plugins directory provide the +// collectors, and submodules in the instrumentation directory provide the // instrumentation for the popular go libraries. package contrib diff --git a/plugins/gin-gonic/gin/doc.go b/instrumentation/gin-gonic/gin/doc.go similarity index 92% rename from plugins/gin-gonic/gin/doc.go rename to instrumentation/gin-gonic/gin/doc.go index 507803a581b..4ee598c9019 100644 --- a/plugins/gin-gonic/gin/doc.go +++ b/instrumentation/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/plugins/gin-gonic/gin" +package gin // import "go.opentelemetry.io/contrib/instrumentation/gin-gonic/gin" diff --git a/plugins/gin-gonic/gin/example/Dockerfile b/instrumentation/gin-gonic/gin/example/Dockerfile similarity index 94% rename from plugins/gin-gonic/gin/example/Dockerfile rename to instrumentation/gin-gonic/gin/example/Dockerfile index 591128b6cf6..b8ed4646d50 100644 --- a/plugins/gin-gonic/gin/example/Dockerfile +++ b/instrumentation/gin-gonic/gin/example/Dockerfile @@ -13,7 +13,7 @@ # limitations under the License. FROM golang:alpine AS base COPY . /src/ -WORKDIR /src/plugins/gin-gonic/gin +WORKDIR /src/instrumentation/gin-gonic/gin FROM base AS gin-server RUN go install ./example/server.go diff --git a/plugins/gin-gonic/gin/example/README.md b/instrumentation/gin-gonic/gin/example/README.md similarity index 100% rename from plugins/gin-gonic/gin/example/README.md rename to instrumentation/gin-gonic/gin/example/README.md diff --git a/plugins/gin-gonic/gin/example/docker-compose.yml b/instrumentation/gin-gonic/gin/example/docker-compose.yml similarity index 100% rename from plugins/gin-gonic/gin/example/docker-compose.yml rename to instrumentation/gin-gonic/gin/example/docker-compose.yml diff --git a/plugins/gin-gonic/gin/example/server.go b/instrumentation/gin-gonic/gin/example/server.go similarity index 96% rename from plugins/gin-gonic/gin/example/server.go rename to instrumentation/gin-gonic/gin/example/server.go index fdf080ba4e8..b2ec88ab134 100644 --- a/plugins/gin-gonic/gin/example/server.go +++ b/instrumentation/gin-gonic/gin/example/server.go @@ -22,7 +22,7 @@ import ( "github.com/gin-gonic/gin" - gintrace "go.opentelemetry.io/contrib/plugins/gin-gonic/gin" + gintrace "go.opentelemetry.io/contrib/instrumentation/gin-gonic/gin" otelglobal "go.opentelemetry.io/otel/api/global" "go.opentelemetry.io/otel/api/kv" oteltrace "go.opentelemetry.io/otel/api/trace" diff --git a/plugins/gin-gonic/gin/gintrace.go b/instrumentation/gin-gonic/gin/gintrace.go similarity index 98% rename from plugins/gin-gonic/gin/gintrace.go rename to instrumentation/gin-gonic/gin/gintrace.go index c1551e58e90..ea6ade60dfb 100644 --- a/plugins/gin-gonic/gin/gintrace.go +++ b/instrumentation/gin-gonic/gin/gintrace.go @@ -31,7 +31,7 @@ import ( const ( tracerKey = "otel-go-contrib-tracer" - tracerName = "go.opentelemetry.io/contrib/plugins/gin-gonic/gin" + tracerName = "go.opentelemetry.io/contrib/instrumentation/gin-gonic/gin" ) // Middleware returns middleware that will trace incoming requests. diff --git a/plugins/gin-gonic/gin/gintrace_test.go b/instrumentation/gin-gonic/gin/gintrace_test.go similarity index 98% rename from plugins/gin-gonic/gin/gintrace_test.go rename to instrumentation/gin-gonic/gin/gintrace_test.go index 43e40cd8926..a47adf17b32 100644 --- a/plugins/gin-gonic/gin/gintrace_test.go +++ b/instrumentation/gin-gonic/gin/gintrace_test.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/plugins/gin-gonic/gin", mockTracer.Name) + assert.Equal(t, "go.opentelemetry.io/contrib/instrumentation/gin-gonic/gin", mockTracer.Name) }) r := httptest.NewRequest("GET", "/user/123", nil) diff --git a/plugins/gin-gonic/gin/go.mod b/instrumentation/gin-gonic/gin/go.mod similarity index 80% rename from plugins/gin-gonic/gin/go.mod rename to instrumentation/gin-gonic/gin/go.mod index 850ab2d0dfe..a5779daab6c 100644 --- a/plugins/gin-gonic/gin/go.mod +++ b/instrumentation/gin-gonic/gin/go.mod @@ -1,4 +1,4 @@ -module go.opentelemetry.io/contrib/plugins/gin-gonic/gin +module go.opentelemetry.io/contrib/instrumentation/gin-gonic/gin go 1.14 diff --git a/plugins/gin-gonic/gin/go.sum b/instrumentation/gin-gonic/gin/go.sum similarity index 100% rename from plugins/gin-gonic/gin/go.sum rename to instrumentation/gin-gonic/gin/go.sum diff --git a/plugins/gin-gonic/gin/option.go b/instrumentation/gin-gonic/gin/option.go similarity index 95% rename from plugins/gin-gonic/gin/option.go rename to instrumentation/gin-gonic/gin/option.go index 603a02cb8d1..01206e3ff35 100644 --- a/plugins/gin-gonic/gin/option.go +++ b/instrumentation/gin-gonic/gin/option.go @@ -31,7 +31,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/plugins/gin-gonic/gin" from the global +// "go.opentelemetry.io/contrib/instrumentation/gin-gonic/gin" from the global // provider is used. func WithTracer(tracer oteltrace.Tracer) Option { return func(cfg *Config) { diff --git a/plugins/go.mongodb.org/mongo-driver/config.go b/instrumentation/go.mongodb.org/mongo-driver/config.go similarity index 88% rename from plugins/go.mongodb.org/mongo-driver/config.go rename to instrumentation/go.mongodb.org/mongo-driver/config.go index f5ebb474c81..b4941fa0d55 100644 --- a/plugins/go.mongodb.org/mongo-driver/config.go +++ b/instrumentation/go.mongodb.org/mongo-driver/config.go @@ -20,7 +20,7 @@ import ( ) const ( - defaultTracerName = "go.opentelemetry.io/contrib/plugins/go.mongodb.org/mongo-driver" + defaultTracerName = "go.opentelemetry.io/contrib/instrumentation/go.mongodb.org/mongo-driver" ) // Config is used to configure the mongo tracer. @@ -45,7 +45,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/plugins/go.mongodb.org/mongo-driver" +// "go.opentelemetry.io/contrib/instrumentation/go.mongodb.org/mongo-driver" // from the global provider is used. func WithTracer(tracer trace.Tracer) Option { return func(cfg *Config) { diff --git a/plugins/go.mongodb.org/mongo-driver/db.go b/instrumentation/go.mongodb.org/mongo-driver/db.go similarity index 100% rename from plugins/go.mongodb.org/mongo-driver/db.go rename to instrumentation/go.mongodb.org/mongo-driver/db.go diff --git a/plugins/go.mongodb.org/mongo-driver/doc.go b/instrumentation/go.mongodb.org/mongo-driver/doc.go similarity index 92% rename from plugins/go.mongodb.org/mongo-driver/doc.go rename to instrumentation/go.mongodb.org/mongo-driver/doc.go index 64992aecbae..dbeac5d5623 100644 --- a/plugins/go.mongodb.org/mongo-driver/doc.go +++ b/instrumentation/go.mongodb.org/mongo-driver/doc.go @@ -22,4 +22,4 @@ // This code was originally based on the following: // - https://github.com/DataDog/dd-trace-go/tree/02f0449efa3cb382d499fadc873957385dcb2192/contrib/go.mongodb.org/mongo-driver/mongo // - https://github.com/DataDog/dd-trace-go/tree/v1.23.3/ddtrace/ext -package mongo // import "go.opentelemetry.io/contrib/plugins/go.mongodb.org/mongo-driver" +package mongo // import "go.opentelemetry.io/contrib/instrumentation/go.mongodb.org/mongo-driver" diff --git a/plugins/go.mongodb.org/mongo-driver/example_test.go b/instrumentation/go.mongodb.org/mongo-driver/example_test.go similarity index 94% rename from plugins/go.mongodb.org/mongo-driver/example_test.go rename to instrumentation/go.mongodb.org/mongo-driver/example_test.go index a20ecb04172..7eba4d9dddc 100644 --- a/plugins/go.mongodb.org/mongo-driver/example_test.go +++ b/instrumentation/go.mongodb.org/mongo-driver/example_test.go @@ -21,7 +21,7 @@ import ( "go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo/options" - mongotrace "go.opentelemetry.io/contrib/plugins/go.mongodb.org/mongo-driver" + mongotrace "go.opentelemetry.io/contrib/instrumentation/go.mongodb.org/mongo-driver" ) func Example() { diff --git a/plugins/go.mongodb.org/mongo-driver/go.mod b/instrumentation/go.mongodb.org/mongo-driver/go.mod similarity index 84% rename from plugins/go.mongodb.org/mongo-driver/go.mod rename to instrumentation/go.mongodb.org/mongo-driver/go.mod index 18a3a1bc953..22a0554df5d 100644 --- a/plugins/go.mongodb.org/mongo-driver/go.mod +++ b/instrumentation/go.mongodb.org/mongo-driver/go.mod @@ -1,4 +1,4 @@ -module go.opentelemetry.io/contrib/plugins/go.mongodb.org/mongo-driver +module go.opentelemetry.io/contrib/instrumentation/go.mongodb.org/mongo-driver go 1.13 diff --git a/plugins/go.mongodb.org/mongo-driver/go.sum b/instrumentation/go.mongodb.org/mongo-driver/go.sum similarity index 100% rename from plugins/go.mongodb.org/mongo-driver/go.sum rename to instrumentation/go.mongodb.org/mongo-driver/go.sum diff --git a/plugins/go.mongodb.org/mongo-driver/mongo.go b/instrumentation/go.mongodb.org/mongo-driver/mongo.go similarity index 100% rename from plugins/go.mongodb.org/mongo-driver/mongo.go rename to instrumentation/go.mongodb.org/mongo-driver/mongo.go diff --git a/plugins/go.mongodb.org/mongo-driver/mongo_test.go b/instrumentation/go.mongodb.org/mongo-driver/mongo_test.go similarity index 100% rename from plugins/go.mongodb.org/mongo-driver/mongo_test.go rename to instrumentation/go.mongodb.org/mongo-driver/mongo_test.go diff --git a/plugins/go.mongodb.org/mongo-driver/peer.go b/instrumentation/go.mongodb.org/mongo-driver/peer.go similarity index 100% rename from plugins/go.mongodb.org/mongo-driver/peer.go rename to instrumentation/go.mongodb.org/mongo-driver/peer.go diff --git a/plugins/go.mongodb.org/mongo-driver/tags.go b/instrumentation/go.mongodb.org/mongo-driver/tags.go similarity index 100% rename from plugins/go.mongodb.org/mongo-driver/tags.go rename to instrumentation/go.mongodb.org/mongo-driver/tags.go diff --git a/plugins/gorilla/mux/config.go b/instrumentation/gorilla/mux/config.go similarity index 95% rename from plugins/gorilla/mux/config.go rename to instrumentation/gorilla/mux/config.go index eaeac29fadc..816fb8d55de 100644 --- a/plugins/gorilla/mux/config.go +++ b/instrumentation/gorilla/mux/config.go @@ -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/plugins/gorilla/mux" from the global +// "go.opentelemetry.io/contrib/instrumentation/gorilla/mux" from the global // provider is used. func WithTracer(tracer oteltrace.Tracer) Option { return func(cfg *Config) { diff --git a/plugins/gorilla/mux/doc.go b/instrumentation/gorilla/mux/doc.go similarity index 91% rename from plugins/gorilla/mux/doc.go rename to instrumentation/gorilla/mux/doc.go index 4a1ba73b60f..bc68ccec8e9 100644 --- a/plugins/gorilla/mux/doc.go +++ b/instrumentation/gorilla/mux/doc.go @@ -17,4 +17,4 @@ // // Currently only the routing of a received message can be // instrumented. To do it, use the Middleware function. -package mux // import "go.opentelemetry.io/contrib/plugins/gorilla/mux" +package mux // import "go.opentelemetry.io/contrib/instrumentation/gorilla/mux" diff --git a/plugins/gorilla/mux/example/Dockerfile b/instrumentation/gorilla/mux/example/Dockerfile similarity index 94% rename from plugins/gorilla/mux/example/Dockerfile rename to instrumentation/gorilla/mux/example/Dockerfile index 23a8e9b5465..36a2c212114 100644 --- a/plugins/gorilla/mux/example/Dockerfile +++ b/instrumentation/gorilla/mux/example/Dockerfile @@ -13,7 +13,7 @@ # limitations under the License. FROM golang:alpine AS base COPY . /src/ -WORKDIR /src/plugins/gorilla/mux +WORKDIR /src/instrumentation/gorilla/mux FROM base AS mux-server RUN go install ./example/server.go diff --git a/plugins/gorilla/mux/example/README.md b/instrumentation/gorilla/mux/example/README.md similarity index 100% rename from plugins/gorilla/mux/example/README.md rename to instrumentation/gorilla/mux/example/README.md diff --git a/plugins/gorilla/mux/example/docker-compose.yml b/instrumentation/gorilla/mux/example/docker-compose.yml similarity index 100% rename from plugins/gorilla/mux/example/docker-compose.yml rename to instrumentation/gorilla/mux/example/docker-compose.yml diff --git a/plugins/gorilla/mux/example/server.go b/instrumentation/gorilla/mux/example/server.go similarity index 96% rename from plugins/gorilla/mux/example/server.go rename to instrumentation/gorilla/mux/example/server.go index 3d94b423cd3..a73f9915154 100644 --- a/plugins/gorilla/mux/example/server.go +++ b/instrumentation/gorilla/mux/example/server.go @@ -22,7 +22,7 @@ import ( "github.com/gorilla/mux" - muxtrace "go.opentelemetry.io/contrib/plugins/gorilla/mux" + muxtrace "go.opentelemetry.io/contrib/instrumentation/gorilla/mux" otelglobal "go.opentelemetry.io/otel/api/global" otelkv "go.opentelemetry.io/otel/api/kv" oteltrace "go.opentelemetry.io/otel/api/trace" diff --git a/plugins/gorilla/mux/go.mod b/instrumentation/gorilla/mux/go.mod similarity index 78% rename from plugins/gorilla/mux/go.mod rename to instrumentation/gorilla/mux/go.mod index 2a2f64ff21e..f6d601c8cda 100644 --- a/plugins/gorilla/mux/go.mod +++ b/instrumentation/gorilla/mux/go.mod @@ -1,4 +1,4 @@ -module go.opentelemetry.io/contrib/plugins/gorilla/mux +module go.opentelemetry.io/contrib/instrumentation/gorilla/mux go 1.14 diff --git a/plugins/gorilla/mux/go.sum b/instrumentation/gorilla/mux/go.sum similarity index 100% rename from plugins/gorilla/mux/go.sum rename to instrumentation/gorilla/mux/go.sum diff --git a/plugins/gorilla/mux/mux.go b/instrumentation/gorilla/mux/mux.go similarity index 98% rename from plugins/gorilla/mux/mux.go rename to instrumentation/gorilla/mux/mux.go index b96ba44238e..83f5223e690 100644 --- a/plugins/gorilla/mux/mux.go +++ b/instrumentation/gorilla/mux/mux.go @@ -28,7 +28,7 @@ import ( ) const ( - tracerName = "go.opentelemetry.io/contrib/plugins/gorilla/mux" + tracerName = "go.opentelemetry.io/contrib/instrumentation/gorilla/mux" ) // Middleware sets up a handler to start tracing the incoming diff --git a/plugins/gorilla/mux/mux_test.go b/instrumentation/gorilla/mux/mux_test.go similarity index 98% rename from plugins/gorilla/mux/mux_test.go rename to instrumentation/gorilla/mux/mux_test.go index 0262e2be637..e3ee06def72 100644 --- a/plugins/gorilla/mux/mux_test.go +++ b/instrumentation/gorilla/mux/mux_test.go @@ -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/plugins/gorilla/mux", mockTracer.Name) + assert.Equal(t, "go.opentelemetry.io/contrib/instrumentation/gorilla/mux", mockTracer.Name) w.WriteHeader(http.StatusOK) })) diff --git a/plugins/labstack/echo/config.go b/instrumentation/labstack/echo/config.go similarity index 94% rename from plugins/labstack/echo/config.go rename to instrumentation/labstack/echo/config.go index 47b718a1ddc..07614bc52f7 100644 --- a/plugins/labstack/echo/config.go +++ b/instrumentation/labstack/echo/config.go @@ -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/plugins/labstack/echo" from the global +// "go.opentelemetry.io/contrib/instrumentation/labstack/echo" from the global // provider is used. func WithTracer(tracer oteltrace.Tracer) Option { return func(cfg *Config) { diff --git a/plugins/labstack/echo/echo.go b/instrumentation/labstack/echo/echo.go similarity index 97% rename from plugins/labstack/echo/echo.go rename to instrumentation/labstack/echo/echo.go index d24c73b94a9..a8a1f6288fb 100644 --- a/plugins/labstack/echo/echo.go +++ b/instrumentation/labstack/echo/echo.go @@ -28,7 +28,7 @@ import ( const ( tracerKey = "otel-go-contrib-tracer-labstack-echo" - tracerName = "go.opentelemetry.io/contrib/plugins/labstack/echo" + tracerName = "go.opentelemetry.io/contrib/instrumentation/labstack/echo" ) // Middleware returns echo middleware which will trace incoming requests. diff --git a/plugins/labstack/echo/echo_test.go b/instrumentation/labstack/echo/echo_test.go similarity index 98% rename from plugins/labstack/echo/echo_test.go rename to instrumentation/labstack/echo/echo_test.go index e0f6c02d96a..0a78087c612 100644 --- a/plugins/labstack/echo/echo_test.go +++ b/instrumentation/labstack/echo/echo_test.go @@ -48,7 +48,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/plugins/labstack/echo", mockTracer.Name) + assert.Equal(t, "go.opentelemetry.io/contrib/instrumentation/labstack/echo", mockTracer.Name) return c.NoContent(200) }) diff --git a/plugins/labstack/echo/example/Dockerfile b/instrumentation/labstack/echo/example/Dockerfile similarity index 94% rename from plugins/labstack/echo/example/Dockerfile rename to instrumentation/labstack/echo/example/Dockerfile index c95044a415d..9e9a8b40dab 100644 --- a/plugins/labstack/echo/example/Dockerfile +++ b/instrumentation/labstack/echo/example/Dockerfile @@ -13,7 +13,7 @@ # limitations under the License. FROM golang:alpine AS base COPY . /src/ -WORKDIR /src/plugins/labstack/echo +WORKDIR /src/instrumentation/labstack/echo FROM base AS echo-server RUN go install ./example/server.go diff --git a/plugins/labstack/echo/example/README.md b/instrumentation/labstack/echo/example/README.md similarity index 100% rename from plugins/labstack/echo/example/README.md rename to instrumentation/labstack/echo/example/README.md diff --git a/plugins/labstack/echo/example/docker-compose.yml b/instrumentation/labstack/echo/example/docker-compose.yml similarity index 100% rename from plugins/labstack/echo/example/docker-compose.yml rename to instrumentation/labstack/echo/example/docker-compose.yml diff --git a/plugins/labstack/echo/example/server.go b/instrumentation/labstack/echo/example/server.go similarity index 96% rename from plugins/labstack/echo/example/server.go rename to instrumentation/labstack/echo/example/server.go index 2af8aed7816..142fe577a34 100644 --- a/plugins/labstack/echo/example/server.go +++ b/instrumentation/labstack/echo/example/server.go @@ -21,7 +21,7 @@ import ( "github.com/labstack/echo/v4" - echotrace "go.opentelemetry.io/contrib/plugins/labstack/echo" + echotrace "go.opentelemetry.io/contrib/instrumentation/labstack/echo" otelglobal "go.opentelemetry.io/otel/api/global" "go.opentelemetry.io/otel/api/kv" oteltrace "go.opentelemetry.io/otel/api/trace" diff --git a/plugins/labstack/echo/go.mod b/instrumentation/labstack/echo/go.mod similarity index 80% rename from plugins/labstack/echo/go.mod rename to instrumentation/labstack/echo/go.mod index 01def54a9cb..91a3d2e9e24 100644 --- a/plugins/labstack/echo/go.mod +++ b/instrumentation/labstack/echo/go.mod @@ -1,4 +1,4 @@ -module go.opentelemetry.io/contrib/plugins/labstack/echo +module go.opentelemetry.io/contrib/instrumentation/labstack/echo go 1.14 diff --git a/plugins/labstack/echo/go.sum b/instrumentation/labstack/echo/go.sum similarity index 100% rename from plugins/labstack/echo/go.sum rename to instrumentation/labstack/echo/go.sum diff --git a/plugins/macaron/config.go b/instrumentation/macaron/config.go similarity index 95% rename from plugins/macaron/config.go rename to instrumentation/macaron/config.go index f2c4cbd4126..809d78f332d 100644 --- a/plugins/macaron/config.go +++ b/instrumentation/macaron/config.go @@ -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/plugins/macaron" from the global +// "go.opentelemetry.io/contrib/instrumentation/macaron" from the global // provider is used. func WithTracer(tracer trace.Tracer) Option { return func(cfg *Config) { diff --git a/plugins/macaron/doc.go b/instrumentation/macaron/doc.go similarity index 91% rename from plugins/macaron/doc.go rename to instrumentation/macaron/doc.go index 795d6cf7144..801a03efa48 100644 --- a/plugins/macaron/doc.go +++ b/instrumentation/macaron/doc.go @@ -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/plugins/macaron" +package macaron // import "go.opentelemetry.io/contrib/instrumentation/macaron" diff --git a/plugins/macaron/example/Dockerfile b/instrumentation/macaron/example/Dockerfile similarity index 95% rename from plugins/macaron/example/Dockerfile rename to instrumentation/macaron/example/Dockerfile index a4a7d293265..d9890183514 100644 --- a/plugins/macaron/example/Dockerfile +++ b/instrumentation/macaron/example/Dockerfile @@ -13,7 +13,7 @@ # limitations under the License. FROM golang:alpine AS base COPY . /src/ -WORKDIR /src/plugins/macaron +WORKDIR /src/instrumentation/macaron FROM base AS macaron-server RUN go install ./example/server.go diff --git a/plugins/macaron/example/README.md b/instrumentation/macaron/example/README.md similarity index 100% rename from plugins/macaron/example/README.md rename to instrumentation/macaron/example/README.md diff --git a/plugins/macaron/example/docker-compose.yml b/instrumentation/macaron/example/docker-compose.yml similarity index 100% rename from plugins/macaron/example/docker-compose.yml rename to instrumentation/macaron/example/docker-compose.yml diff --git a/plugins/macaron/example/server.go b/instrumentation/macaron/example/server.go similarity index 96% rename from plugins/macaron/example/server.go rename to instrumentation/macaron/example/server.go index b73048648f7..059aee45623 100644 --- a/plugins/macaron/example/server.go +++ b/instrumentation/macaron/example/server.go @@ -20,7 +20,7 @@ import ( "gopkg.in/macaron.v1" - macarontrace "go.opentelemetry.io/contrib/plugins/macaron" + macarontrace "go.opentelemetry.io/contrib/instrumentation/macaron" otelglobal "go.opentelemetry.io/otel/api/global" otelkv "go.opentelemetry.io/otel/api/kv" diff --git a/plugins/macaron/go.mod b/instrumentation/macaron/go.mod similarity index 77% rename from plugins/macaron/go.mod rename to instrumentation/macaron/go.mod index 1bafef98547..42d5b46b8da 100644 --- a/plugins/macaron/go.mod +++ b/instrumentation/macaron/go.mod @@ -1,4 +1,4 @@ -module go.opentelemetry.io/contrib/plugins/macaron +module go.opentelemetry.io/contrib/instrumentation/macaron go 1.14 diff --git a/plugins/macaron/go.sum b/instrumentation/macaron/go.sum similarity index 100% rename from plugins/macaron/go.sum rename to instrumentation/macaron/go.sum diff --git a/plugins/macaron/macaron.go b/instrumentation/macaron/macaron.go similarity index 97% rename from plugins/macaron/macaron.go rename to instrumentation/macaron/macaron.go index 074a22496de..abb2d172eb9 100644 --- a/plugins/macaron/macaron.go +++ b/instrumentation/macaron/macaron.go @@ -27,7 +27,7 @@ import ( ) const ( - tracerName = "go.opentelemetry.io/contrib/plugins/macaron" + tracerName = "go.opentelemetry.io/contrib/instrumentation/macaron" ) // Middleware returns a macaron Handler to trace requests to the server. diff --git a/plugins/macaron/macaron_test.go b/instrumentation/macaron/macaron_test.go similarity index 98% rename from plugins/macaron/macaron_test.go rename to instrumentation/macaron/macaron_test.go index 0df71c13e4b..33519115242 100644 --- a/plugins/macaron/macaron_test.go +++ b/instrumentation/macaron/macaron_test.go @@ -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/plugins/macaron", mockTracer.Name) + assert.Equal(t, "go.opentelemetry.io/contrib/instrumentation/macaron", mockTracer.Name) ctx.Resp.WriteHeader(http.StatusOK) }) diff --git a/plugins/runtime/doc.go b/instrumentation/runtime/doc.go similarity index 100% rename from plugins/runtime/doc.go rename to instrumentation/runtime/doc.go diff --git a/plugins/runtime/example/main.go b/instrumentation/runtime/example/main.go similarity index 96% rename from plugins/runtime/example/main.go rename to instrumentation/runtime/example/main.go index b64532079d9..25f81e538fd 100644 --- a/plugins/runtime/example/main.go +++ b/instrumentation/runtime/example/main.go @@ -25,7 +25,7 @@ import ( metricstdout "go.opentelemetry.io/otel/exporters/metric/stdout" "go.opentelemetry.io/otel/sdk/metric/controller/push" - "go.opentelemetry.io/contrib/plugins/runtime" + "go.opentelemetry.io/contrib/instrumentation/runtime" ) func initMeter() *push.Controller { diff --git a/plugins/runtime/go.mod b/instrumentation/runtime/go.mod similarity index 69% rename from plugins/runtime/go.mod rename to instrumentation/runtime/go.mod index 9170b42d93f..5b8fa1a9fa0 100644 --- a/plugins/runtime/go.mod +++ b/instrumentation/runtime/go.mod @@ -1,4 +1,4 @@ -module go.opentelemetry.io/contrib/plugins/runtime +module go.opentelemetry.io/contrib/instrumentation/runtime go 1.14 diff --git a/plugins/runtime/go.sum b/instrumentation/runtime/go.sum similarity index 100% rename from plugins/runtime/go.sum rename to instrumentation/runtime/go.sum diff --git a/plugins/runtime/runtime.go b/instrumentation/runtime/runtime.go similarity index 98% rename from plugins/runtime/runtime.go rename to instrumentation/runtime/runtime.go index f227cdf5b50..7fd6c45d120 100644 --- a/plugins/runtime/runtime.go +++ b/instrumentation/runtime/runtime.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package runtime // import "go.opentelemetry.io/contrib/plugins/runtime" +package runtime // import "go.opentelemetry.io/contrib/instrumentation/runtime" import ( "context" diff --git a/plugins/runtime/runtime_test.go b/instrumentation/runtime/runtime_test.go similarity index 94% rename from plugins/runtime/runtime_test.go rename to instrumentation/runtime/runtime_test.go index a314f438a5f..1116b84684e 100644 --- a/plugins/runtime/runtime_test.go +++ b/instrumentation/runtime/runtime_test.go @@ -20,7 +20,7 @@ import ( "github.com/stretchr/testify/assert" - "go.opentelemetry.io/contrib/plugins/runtime" + "go.opentelemetry.io/contrib/instrumentation/runtime" "go.opentelemetry.io/otel/api/global" )