Redo packages and directories #314
Conversation
newrelic-eheinlein
requested review from
Aneurysm9,
evantorrie,
jmacd,
lizthegrey and
MrAlias
as code owners
There was a problem hiding this comment.
Thanks for digging into this, it looks tedious. There are some details I think we need to address still.
WORKDIR needs to be updated (couldn't comment on a zero change file) in DOCKERFILE:
opentelemetry-go-contrib/instrumentation/github.com/Shopify/sarama/otelsarama/example/producer/Dockerfileopentelemetry-go-contrib/instrumentation/github.com/emicklei/go-restful/otelrestful/example/Dockerfileopentelemetry-go-contrib/instrumentation/github.com/gin-gonic/gin/otelgin/example/Dockerfileopentelemetry-go-contrib/instrumentation/github.com/gorilla/mux/otelmux/example/Dockerfileopentelemetry-go-contrib/instrumentation/github.com/labstack/echo/otelecho/example/Dockerfileopentelemetry-go-contrib/instrumentation/gopkg.in/macaron.v1/otelmacaron/example/Dockerfileopentelemetry-go-contrib/instrumentation/net/http/httptrace/otelhttptrace/example/Dockerfileopentelemetry-go-contrib/instrumentation/net/http/otelhttp/example/Dockerfile
Also, the runtime package looks to have been renamed, but I thought the goal was to keep this preserved.
| - `go.opentelemetry.io/contrib/instrumentation/database/sql` | ||
| - `go.opentelemetry.io/contrib/instrumentation/github.com/gorilla/mux/otelmux` | ||
| - `go.opentelemetry.io/contrib/instrumentation/gopkg.in/macaron.v1/otelmacaron` | ||
| - `go.opentelemetry.io/contrib/instrumentation/database/sql/otelsql` | ||
|
|
||
| Consequentially, this means that all instrumentation MUST be contained in a sub-directory structure matching the package name. |
There was a problem hiding this comment.
We might want to add the caveat about things like the runtime package that doesn't instrument any particular package and how they are the exception to the rule.
| // trace and metrics to beego web apps. | ||
| type OTelBeegoHandler struct { | ||
| type BeegoHandler struct { |
There was a problem hiding this comment.
Was there a conflict that motivated this change?
| module go.opentelemetry.io/contrib/instrumentation/macaron/otelmacaron | ||
|
|
||
| go 1.14 | ||
|
|
||
| replace go.opentelemetry.io/contrib => ../../../.. | ||
|
|
||
| require ( | ||
| github.com/stretchr/testify v1.6.1 | ||
| go.opentelemetry.io/contrib v0.11.0 | ||
| go.opentelemetry.io/otel v0.11.0 | ||
| go.opentelemetry.io/otel/exporters/stdout v0.11.0 | ||
| go.opentelemetry.io/otel/sdk v0.11.0 | ||
| gopkg.in/macaron.v1 v1.3.9 | ||
| ) |
There was a problem hiding this comment.
Interesting that this was empty. This looks like a bug fix.
There was a problem hiding this comment.
Hmm, looks like git thought the old version was moved to another package.
| @@ -1,13 +0,0 @@ | |||
| module go.opentelemetry.io/contrib/instrumentation/runtime | |||
There was a problem hiding this comment.
It looks like this file was erroneous deleted.
| @@ -29,4 +29,4 @@ | |||
| // runtime.go.mem.heap_sys (bytes) Bytes of heap memory obtained from the OS | |||
| // runtime.go.mem.live_objects - Number of live objects is the number of cumulative Mallocs - Frees | |||
| // runtime.uptime (ms) Milliseconds since application was initialized | |||
| package runtime // import "go.opentelemetry.io/contrib/instrumentation/runtime" | |||
There was a problem hiding this comment.
I thought the plan was to not change the runtime package given it does not instrument a package. Was there a different decision made?
| @@ -1,4 +1,4 @@ | |||
| module go.opentelemetry.io/contrib/instrumentation/macaron | |||
There was a problem hiding this comment.
Ah, this looks like git interpreted the macaron go.mod to be moved here which looks incorrect. This change graph should be fixed.
MrAlias
added
area: instrumentation
Co-authored-by: Tyler Yahn <MrAlias@users.noreply.github.com>
|
Going to give this another go instead of updating given the large number of conflicts. |
* clean dead code from noop tracer * rename arguments from the Tracer interface's methods * remove service, resources and component options from sdk/tracer and mock tracer * remove unused fields from sdk/tracer
Addresses #164 to add a directory to each contrib packages to include "otel{PACKAGE}" in the name.
Resolves #164