diff --git a/.github/dependabot.yml b/.github/dependabot.yml index de7125cd5bf..8d55afaac38 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -128,7 +128,7 @@ updates: interval: weekly - package-ecosystem: gomod - directory: /exporters/metric/prometheus + directory: /exporters/prometheus labels: - dependencies - go @@ -158,7 +158,7 @@ updates: interval: weekly - package-ecosystem: gomod - directory: /exporters/trace/jaeger + directory: /exporters/jaeger labels: - dependencies - go @@ -168,7 +168,7 @@ updates: interval: weekly - package-ecosystem: gomod - directory: /exporters/trace/zipkin + directory: /exporters/zipkin labels: - dependencies - go @@ -206,6 +206,16 @@ updates: schedule: day: sunday interval: weekly + - + package-ecosystem: gomod + directory: /metric + labels: + - dependencies + - go + - "Skip Changelog" + schedule: + day: sunday + interval: weekly - package-ecosystem: gomod directory: /sdk/export/metric @@ -276,3 +286,13 @@ updates: schedule: day: sunday interval: weekly + - + package-ecosystem: gomod + directory: /trace + labels: + - dependencies + - go + - "Skip Changelog" + schedule: + day: sunday + interval: weekly diff --git a/CHANGELOG.md b/CHANGELOG.md index a97fa679285..1de4dc5ae00 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -82,6 +82,9 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm - Rename `NewUnstartedExporter` to `NewUnstarted` in the `go.opentelemetry.io/otel/exporters/otlp` package. (#1985) - The `go.opentelemetry.io/otel/semconv` package has been moved to `go.opentelemetry.io/otel/semconv/v1.4.0` to allow for multiple [telemetry schema](https://github.com/open-telemetry/oteps/blob/main/text/0152-telemetry-schemas.md) versions to be used concurrently. (#1987) - Metrics test helpers in `go.opentelemetry.io/otel/oteltest` have been moved to `go.opentelemetry.io/otel/metric/metrictest`. (#1988) +- The `go.opentelemetry.io/otel/exporters/metric/prometheus` is renamed to `go.opentelemetry.io/otel/exporters/prometheus`. (#TBD) +- The `go.opentelemetry.io/otel/exporters/trace/jaeger` is renamed to `go.opentelemetry.io/otel/exporters/jaeger`. (#TBD) +- The `go.opentelemetry.io/otel/exporters/trace/zipkin` is renamed to `go.opentelemetry.io/otel/exporters/zipkin`. (#TBD) ### Deprecated diff --git a/Makefile b/Makefile index 356912c8612..6960b7f4e05 100644 --- a/Makefile +++ b/Makefile @@ -162,7 +162,7 @@ license-check: dependabot-check: @result=$$( \ for f in $$( find . -type f -name go.mod -exec dirname {} \; | sed 's/^.\/\?/\//' ); \ - do grep -q "$$f" .github/dependabot.yml \ + do grep -q "directory: \+$$f" .github/dependabot.yml \ || echo "$$f"; \ done; \ ); \ diff --git a/README.md b/README.md index c83ee8be7aa..a4852f9f19f 100644 --- a/README.md +++ b/README.md @@ -89,15 +89,17 @@ practical uses of this process. Now that your application is instrumented to collect telemetry, it needs an export pipeline to send that telemetry to an observability platform. -You can find officially supported exporters [here](./exporters/) and in the -companion [contrib -repository](https://github.com/open-telemetry/opentelemetry-go-contrib/tree/main/exporters/metric). -Additionally, there are many vendor specific or 3rd party exporters for -OpenTelemetry. These exporters are broken down by -[trace](https://pkg.go.dev/go.opentelemetry.io/otel/sdk/export/trace?tab=importedby) -and -[metric](https://pkg.go.dev/go.opentelemetry.io/otel/sdk/export/metric?tab=importedby) -support. +All officially supported exporters for the OpenTelemetry project are contained in the [exporters directory](./exporters). + +| Exporter | Metrics | Traces | +| :-----------------------------------: | :-----: | :----: | +| [Jaeger](./exporters/jaeger/) | | ✓ | +| [OTLP](./exporters/otlp/) | ✓ | ✓ | +| [Prometheus](./exporters/prometheus/) | ✓ | | +| [stdout](./exporters/stdout/) | ✓ | ✓ | +| [Zipkin](./exporters/zipkin/) | | ✓ | + +Additionally, OpenTelemetry community supported exporters can be found in the [contrib repository](https://github.com/open-telemetry/opentelemetry-go-contrib/tree/main/exporters). ## Contributing diff --git a/bridge/opencensus/go.mod b/bridge/opencensus/go.mod index 5852214116f..4de1674eee1 100644 --- a/bridge/opencensus/go.mod +++ b/bridge/opencensus/go.mod @@ -32,15 +32,15 @@ replace go.opentelemetry.io/otel/example/prometheus => ../../example/prometheus replace go.opentelemetry.io/otel/example/zipkin => ../../example/zipkin -replace go.opentelemetry.io/otel/exporters/metric/prometheus => ../../exporters/metric/prometheus +replace go.opentelemetry.io/otel/exporters/prometheus => ../../exporters/prometheus replace go.opentelemetry.io/otel/exporters/otlp => ../../exporters/otlp replace go.opentelemetry.io/otel/exporters/stdout => ../../exporters/stdout -replace go.opentelemetry.io/otel/exporters/trace/jaeger => ../../exporters/trace/jaeger +replace go.opentelemetry.io/otel/exporters/jaeger => ../../exporters/jaeger -replace go.opentelemetry.io/otel/exporters/trace/zipkin => ../../exporters/trace/zipkin +replace go.opentelemetry.io/otel/exporters/zipkin => ../../exporters/zipkin replace go.opentelemetry.io/otel/internal/tools => ../../internal/tools diff --git a/bridge/opentracing/go.mod b/bridge/opentracing/go.mod index 1e3e825a70c..42d6e70b810 100644 --- a/bridge/opentracing/go.mod +++ b/bridge/opentracing/go.mod @@ -28,15 +28,15 @@ replace go.opentelemetry.io/otel/example/prometheus => ../../example/prometheus replace go.opentelemetry.io/otel/example/zipkin => ../../example/zipkin -replace go.opentelemetry.io/otel/exporters/metric/prometheus => ../../exporters/metric/prometheus +replace go.opentelemetry.io/otel/exporters/prometheus => ../../exporters/prometheus replace go.opentelemetry.io/otel/exporters/otlp => ../../exporters/otlp replace go.opentelemetry.io/otel/exporters/stdout => ../../exporters/stdout -replace go.opentelemetry.io/otel/exporters/trace/jaeger => ../../exporters/trace/jaeger +replace go.opentelemetry.io/otel/exporters/jaeger => ../../exporters/jaeger -replace go.opentelemetry.io/otel/exporters/trace/zipkin => ../../exporters/trace/zipkin +replace go.opentelemetry.io/otel/exporters/zipkin => ../../exporters/zipkin replace go.opentelemetry.io/otel/internal/tools => ../../internal/tools diff --git a/example/jaeger/go.mod b/example/jaeger/go.mod index ff9d694e0f5..89b74998cbe 100644 --- a/example/jaeger/go.mod +++ b/example/jaeger/go.mod @@ -4,13 +4,13 @@ go 1.15 replace ( go.opentelemetry.io/otel => ../.. - go.opentelemetry.io/otel/exporters/trace/jaeger => ../../exporters/trace/jaeger + go.opentelemetry.io/otel/exporters/jaeger => ../../exporters/jaeger go.opentelemetry.io/otel/sdk => ../../sdk ) require ( go.opentelemetry.io/otel v0.20.0 - go.opentelemetry.io/otel/exporters/trace/jaeger v0.20.0 + go.opentelemetry.io/otel/exporters/jaeger v0.20.0 go.opentelemetry.io/otel/sdk v0.20.0 ) @@ -32,13 +32,13 @@ replace go.opentelemetry.io/otel/example/prometheus => ../prometheus replace go.opentelemetry.io/otel/example/zipkin => ../zipkin -replace go.opentelemetry.io/otel/exporters/metric/prometheus => ../../exporters/metric/prometheus +replace go.opentelemetry.io/otel/exporters/prometheus => ../../exporters/prometheus replace go.opentelemetry.io/otel/exporters/otlp => ../../exporters/otlp replace go.opentelemetry.io/otel/exporters/stdout => ../../exporters/stdout -replace go.opentelemetry.io/otel/exporters/trace/zipkin => ../../exporters/trace/zipkin +replace go.opentelemetry.io/otel/exporters/zipkin => ../../exporters/zipkin replace go.opentelemetry.io/otel/internal/tools => ../../internal/tools diff --git a/example/jaeger/main.go b/example/jaeger/main.go index 97e4bacf70b..146e276d0be 100644 --- a/example/jaeger/main.go +++ b/example/jaeger/main.go @@ -24,7 +24,7 @@ import ( "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/attribute" - "go.opentelemetry.io/otel/exporters/trace/jaeger" + "go.opentelemetry.io/otel/exporters/jaeger" "go.opentelemetry.io/otel/sdk/resource" tracesdk "go.opentelemetry.io/otel/sdk/trace" semconv "go.opentelemetry.io/otel/semconv/v1.4.0" diff --git a/example/namedtracer/go.mod b/example/namedtracer/go.mod index 35245f151de..9a8c9bc6b97 100644 --- a/example/namedtracer/go.mod +++ b/example/namedtracer/go.mod @@ -33,13 +33,13 @@ replace go.opentelemetry.io/otel/example/prometheus => ../prometheus replace go.opentelemetry.io/otel/example/zipkin => ../zipkin -replace go.opentelemetry.io/otel/exporters/metric/prometheus => ../../exporters/metric/prometheus +replace go.opentelemetry.io/otel/exporters/prometheus => ../../exporters/prometheus replace go.opentelemetry.io/otel/exporters/otlp => ../../exporters/otlp -replace go.opentelemetry.io/otel/exporters/trace/jaeger => ../../exporters/trace/jaeger +replace go.opentelemetry.io/otel/exporters/jaeger => ../../exporters/jaeger -replace go.opentelemetry.io/otel/exporters/trace/zipkin => ../../exporters/trace/zipkin +replace go.opentelemetry.io/otel/exporters/zipkin => ../../exporters/zipkin replace go.opentelemetry.io/otel/internal/tools => ../../internal/tools diff --git a/example/opencensus/go.mod b/example/opencensus/go.mod index c3193709d52..566a4b8037d 100644 --- a/example/opencensus/go.mod +++ b/example/opencensus/go.mod @@ -34,13 +34,13 @@ replace go.opentelemetry.io/otel/example/prometheus => ../prometheus replace go.opentelemetry.io/otel/example/zipkin => ../zipkin -replace go.opentelemetry.io/otel/exporters/metric/prometheus => ../../exporters/metric/prometheus +replace go.opentelemetry.io/otel/exporters/prometheus => ../../exporters/prometheus replace go.opentelemetry.io/otel/exporters/otlp => ../../exporters/otlp -replace go.opentelemetry.io/otel/exporters/trace/jaeger => ../../exporters/trace/jaeger +replace go.opentelemetry.io/otel/exporters/jaeger => ../../exporters/jaeger -replace go.opentelemetry.io/otel/exporters/trace/zipkin => ../../exporters/trace/zipkin +replace go.opentelemetry.io/otel/exporters/zipkin => ../../exporters/zipkin replace go.opentelemetry.io/otel/internal/tools => ../../internal/tools diff --git a/example/otel-collector/go.mod b/example/otel-collector/go.mod index f8f54302e9e..7e0c6be6d04 100644 --- a/example/otel-collector/go.mod +++ b/example/otel-collector/go.mod @@ -36,13 +36,13 @@ replace go.opentelemetry.io/otel/example/prometheus => ../prometheus replace go.opentelemetry.io/otel/example/zipkin => ../zipkin -replace go.opentelemetry.io/otel/exporters/metric/prometheus => ../../exporters/metric/prometheus +replace go.opentelemetry.io/otel/exporters/prometheus => ../../exporters/prometheus replace go.opentelemetry.io/otel/exporters/stdout => ../../exporters/stdout -replace go.opentelemetry.io/otel/exporters/trace/jaeger => ../../exporters/trace/jaeger +replace go.opentelemetry.io/otel/exporters/jaeger => ../../exporters/jaeger -replace go.opentelemetry.io/otel/exporters/trace/zipkin => ../../exporters/trace/zipkin +replace go.opentelemetry.io/otel/exporters/zipkin => ../../exporters/zipkin replace go.opentelemetry.io/otel/internal/tools => ../../internal/tools diff --git a/example/passthrough/go.mod b/example/passthrough/go.mod index 7c6da39c3b3..59f67d2d6fe 100644 --- a/example/passthrough/go.mod +++ b/example/passthrough/go.mod @@ -36,13 +36,13 @@ replace go.opentelemetry.io/otel/example/prometheus => ../prometheus replace go.opentelemetry.io/otel/example/zipkin => ../zipkin -replace go.opentelemetry.io/otel/exporters/metric/prometheus => ../../exporters/metric/prometheus +replace go.opentelemetry.io/otel/exporters/prometheus => ../../exporters/prometheus replace go.opentelemetry.io/otel/exporters/otlp => ../../exporters/otlp -replace go.opentelemetry.io/otel/exporters/trace/jaeger => ../../exporters/trace/jaeger +replace go.opentelemetry.io/otel/exporters/jaeger => ../../exporters/jaeger -replace go.opentelemetry.io/otel/exporters/trace/zipkin => ../../exporters/trace/zipkin +replace go.opentelemetry.io/otel/exporters/zipkin => ../../exporters/zipkin replace go.opentelemetry.io/otel/internal/tools => ../../internal/tools diff --git a/example/prom-collector/go.mod b/example/prom-collector/go.mod index 717c031a877..6822393999c 100644 --- a/example/prom-collector/go.mod +++ b/example/prom-collector/go.mod @@ -4,15 +4,15 @@ go 1.15 replace ( go.opentelemetry.io/otel => ../.. - go.opentelemetry.io/otel/exporters/metric/prometheus => ../../exporters/metric/prometheus go.opentelemetry.io/otel/exporters/otlp => ../../exporters/otlp + go.opentelemetry.io/otel/exporters/prometheus => ../../exporters/prometheus go.opentelemetry.io/otel/sdk => ../../sdk ) require ( go.opentelemetry.io/otel v0.20.0 - go.opentelemetry.io/otel/exporters/metric/prometheus v0.20.0 go.opentelemetry.io/otel/exporters/otlp v0.20.0 + go.opentelemetry.io/otel/exporters/prometheus v0.20.0 go.opentelemetry.io/otel/metric v0.20.0 go.opentelemetry.io/otel/sdk v0.20.0 go.opentelemetry.io/otel/sdk/metric v0.20.0 @@ -39,9 +39,9 @@ replace go.opentelemetry.io/otel/example/zipkin => ../zipkin replace go.opentelemetry.io/otel/exporters/stdout => ../../exporters/stdout -replace go.opentelemetry.io/otel/exporters/trace/jaeger => ../../exporters/trace/jaeger +replace go.opentelemetry.io/otel/exporters/jaeger => ../../exporters/jaeger -replace go.opentelemetry.io/otel/exporters/trace/zipkin => ../../exporters/trace/zipkin +replace go.opentelemetry.io/otel/exporters/zipkin => ../../exporters/zipkin replace go.opentelemetry.io/otel/internal/tools => ../../internal/tools diff --git a/example/prom-collector/main.go b/example/prom-collector/main.go index 570f4b50f68..06fedd6db77 100644 --- a/example/prom-collector/main.go +++ b/example/prom-collector/main.go @@ -24,9 +24,9 @@ import ( "google.golang.org/grpc" "go.opentelemetry.io/otel/attribute" - "go.opentelemetry.io/otel/exporters/metric/prometheus" "go.opentelemetry.io/otel/exporters/otlp" "go.opentelemetry.io/otel/exporters/otlp/otlpgrpc" + "go.opentelemetry.io/otel/exporters/prometheus" "go.opentelemetry.io/otel/metric" "go.opentelemetry.io/otel/metric/global" "go.opentelemetry.io/otel/sdk/metric/aggregator/histogram" diff --git a/example/prometheus/go.mod b/example/prometheus/go.mod index 26629cb3f0d..ad040b80a03 100644 --- a/example/prometheus/go.mod +++ b/example/prometheus/go.mod @@ -4,13 +4,13 @@ go 1.15 replace ( go.opentelemetry.io/otel => ../.. - go.opentelemetry.io/otel/exporters/metric/prometheus => ../../exporters/metric/prometheus + go.opentelemetry.io/otel/exporters/prometheus => ../../exporters/prometheus go.opentelemetry.io/otel/sdk => ../../sdk ) require ( go.opentelemetry.io/otel v0.20.0 - go.opentelemetry.io/otel/exporters/metric/prometheus v0.20.0 + go.opentelemetry.io/otel/exporters/prometheus v0.20.0 go.opentelemetry.io/otel/metric v0.20.0 go.opentelemetry.io/otel/sdk/export/metric v0.20.0 go.opentelemetry.io/otel/sdk/metric v0.20.0 @@ -38,9 +38,9 @@ replace go.opentelemetry.io/otel/exporters/otlp => ../../exporters/otlp replace go.opentelemetry.io/otel/exporters/stdout => ../../exporters/stdout -replace go.opentelemetry.io/otel/exporters/trace/jaeger => ../../exporters/trace/jaeger +replace go.opentelemetry.io/otel/exporters/jaeger => ../../exporters/jaeger -replace go.opentelemetry.io/otel/exporters/trace/zipkin => ../../exporters/trace/zipkin +replace go.opentelemetry.io/otel/exporters/zipkin => ../../exporters/zipkin replace go.opentelemetry.io/otel/internal/tools => ../../internal/tools diff --git a/example/prometheus/main.go b/example/prometheus/main.go index 6241b92ec8d..81cce5cda0f 100644 --- a/example/prometheus/main.go +++ b/example/prometheus/main.go @@ -23,7 +23,7 @@ import ( "time" "go.opentelemetry.io/otel/attribute" - "go.opentelemetry.io/otel/exporters/metric/prometheus" + "go.opentelemetry.io/otel/exporters/prometheus" "go.opentelemetry.io/otel/metric" "go.opentelemetry.io/otel/metric/global" export "go.opentelemetry.io/otel/sdk/export/metric" diff --git a/example/zipkin/go.mod b/example/zipkin/go.mod index c57da075adf..e97efe965de 100644 --- a/example/zipkin/go.mod +++ b/example/zipkin/go.mod @@ -4,13 +4,13 @@ go 1.15 replace ( go.opentelemetry.io/otel => ../.. - go.opentelemetry.io/otel/exporters/trace/zipkin => ../../exporters/trace/zipkin + go.opentelemetry.io/otel/exporters/zipkin => ../../exporters/zipkin go.opentelemetry.io/otel/sdk => ../../sdk ) require ( go.opentelemetry.io/otel v0.20.0 - go.opentelemetry.io/otel/exporters/trace/zipkin v0.20.0 + go.opentelemetry.io/otel/exporters/zipkin v0.20.0 go.opentelemetry.io/otel/sdk v0.20.0 go.opentelemetry.io/otel/trace v0.20.0 ) @@ -33,13 +33,13 @@ replace go.opentelemetry.io/otel/example/prometheus => ../prometheus replace go.opentelemetry.io/otel/example/zipkin => ./ -replace go.opentelemetry.io/otel/exporters/metric/prometheus => ../../exporters/metric/prometheus +replace go.opentelemetry.io/otel/exporters/prometheus => ../../exporters/prometheus replace go.opentelemetry.io/otel/exporters/otlp => ../../exporters/otlp replace go.opentelemetry.io/otel/exporters/stdout => ../../exporters/stdout -replace go.opentelemetry.io/otel/exporters/trace/jaeger => ../../exporters/trace/jaeger +replace go.opentelemetry.io/otel/exporters/jaeger => ../../exporters/jaeger replace go.opentelemetry.io/otel/internal/tools => ../../internal/tools diff --git a/example/zipkin/main.go b/example/zipkin/main.go index badec69d0e7..08689854d93 100644 --- a/example/zipkin/main.go +++ b/example/zipkin/main.go @@ -24,7 +24,7 @@ import ( "time" "go.opentelemetry.io/otel" - "go.opentelemetry.io/otel/exporters/trace/zipkin" + "go.opentelemetry.io/otel/exporters/zipkin" "go.opentelemetry.io/otel/sdk/resource" sdktrace "go.opentelemetry.io/otel/sdk/trace" semconv "go.opentelemetry.io/otel/semconv/v1.4.0" diff --git a/exporters/README.md b/exporters/README.md deleted file mode 100644 index 136b30dc2db..00000000000 --- a/exporters/README.md +++ /dev/null @@ -1,17 +0,0 @@ -# Exporters - -Included in this directory are exporters that export both metric and trace telemetry. - -- [stdout](./stdout): Writes telemetry to a specified local output as structured JSON. -- [otlp](./otlp): Sends telemetry to an OpenTelemetry collector as OTLP. - -Additionally, there are [metric](./metric) and [trace](./trace) only exporters. - -## Metric Telemetry Only - -- [prometheus](./metric/prometheus): Exposes metric telemetry as Prometheus metrics. - -## Trace Telemetry Only - -- [jaeger](./trace/jaeger): Sends properly transformed trace telemetry to a Jaeger endpoint. -- [zipkin](./trace/zipkin): Sends properly transformed trace telemetry to a Zipkin endpoint. diff --git a/exporters/trace/jaeger/README.md b/exporters/jaeger/README.md similarity index 83% rename from exporters/trace/jaeger/README.md rename to exporters/jaeger/README.md index a1174ec18dc..56ad4747275 100644 --- a/exporters/trace/jaeger/README.md +++ b/exporters/jaeger/README.md @@ -5,7 +5,7 @@ OpenTelemetry Jaeger exporter ## Installation ``` -go get -u go.opentelemetry.io/otel/exporters/trace/jaeger +go get -u go.opentelemetry.io/otel/exporters/jaeger ``` ## Maintenance diff --git a/exporters/trace/jaeger/agent.go b/exporters/jaeger/agent.go similarity index 94% rename from exporters/trace/jaeger/agent.go rename to exporters/jaeger/agent.go index 27db0e14a62..80cc1d2f628 100644 --- a/exporters/trace/jaeger/agent.go +++ b/exporters/jaeger/agent.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package jaeger // import "go.opentelemetry.io/otel/exporters/trace/jaeger" +package jaeger // import "go.opentelemetry.io/otel/exporters/jaeger" import ( "context" @@ -23,10 +23,10 @@ import ( "strings" "time" - "go.opentelemetry.io/otel/exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift" + "go.opentelemetry.io/otel/exporters/jaeger/internal/third_party/thrift/lib/go/thrift" - genAgent "go.opentelemetry.io/otel/exporters/trace/jaeger/internal/gen-go/agent" - gen "go.opentelemetry.io/otel/exporters/trace/jaeger/internal/gen-go/jaeger" + genAgent "go.opentelemetry.io/otel/exporters/jaeger/internal/gen-go/agent" + gen "go.opentelemetry.io/otel/exporters/jaeger/internal/gen-go/jaeger" ) // udpPacketMaxLength is the max size of UDP packet we want to send, synced with jaeger-agent diff --git a/exporters/trace/jaeger/agent_test.go b/exporters/jaeger/agent_test.go similarity index 100% rename from exporters/trace/jaeger/agent_test.go rename to exporters/jaeger/agent_test.go diff --git a/exporters/trace/jaeger/assertsocketbuffersize.go b/exporters/jaeger/assertsocketbuffersize.go similarity index 100% rename from exporters/trace/jaeger/assertsocketbuffersize.go rename to exporters/jaeger/assertsocketbuffersize.go diff --git a/exporters/trace/jaeger/assertsocketbuffersize_windows.go b/exporters/jaeger/assertsocketbuffersize_windows.go similarity index 100% rename from exporters/trace/jaeger/assertsocketbuffersize_windows.go rename to exporters/jaeger/assertsocketbuffersize_windows.go diff --git a/exporters/trace/jaeger/doc.go b/exporters/jaeger/doc.go similarity index 92% rename from exporters/trace/jaeger/doc.go rename to exporters/jaeger/doc.go index 57bb0dac8eb..c91f7d6a8b1 100644 --- a/exporters/trace/jaeger/doc.go +++ b/exporters/jaeger/doc.go @@ -17,4 +17,4 @@ // This package is currently in a pre-GA phase. Backwards incompatible changes // may be introduced in subsequent minor version releases as we work to track // the evolving OpenTelemetry specification and user feedback. -package jaeger // import "go.opentelemetry.io/otel/exporters/trace/jaeger" +package jaeger // import "go.opentelemetry.io/otel/exporters/jaeger" diff --git a/exporters/trace/jaeger/env.go b/exporters/jaeger/env.go similarity index 95% rename from exporters/trace/jaeger/env.go rename to exporters/jaeger/env.go index 96f2d51c2f1..75eada8253c 100644 --- a/exporters/trace/jaeger/env.go +++ b/exporters/jaeger/env.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package jaeger // import "go.opentelemetry.io/otel/exporters/trace/jaeger" +package jaeger // import "go.opentelemetry.io/otel/exporters/jaeger" import ( "os" diff --git a/exporters/trace/jaeger/env_test.go b/exporters/jaeger/env_test.go similarity index 100% rename from exporters/trace/jaeger/env_test.go rename to exporters/jaeger/env_test.go diff --git a/exporters/jaeger/go.mod b/exporters/jaeger/go.mod new file mode 100644 index 00000000000..55c34b06c65 --- /dev/null +++ b/exporters/jaeger/go.mod @@ -0,0 +1,65 @@ +module go.opentelemetry.io/otel/exporters/jaeger + +go 1.15 + +require ( + github.com/google/go-cmp v0.5.6 + github.com/stretchr/testify v1.7.0 + go.opentelemetry.io/otel v0.20.0 + go.opentelemetry.io/otel/sdk v0.20.0 + go.opentelemetry.io/otel/trace v0.20.0 +) + +replace go.opentelemetry.io/otel/bridge/opencensus => ../../bridge/opencensus + +replace go.opentelemetry.io/otel/bridge/opentracing => ../../bridge/opentracing + +replace go.opentelemetry.io/otel/example/jaeger => ../../example/jaeger + +replace go.opentelemetry.io/otel/example/namedtracer => ../../example/namedtracer + +replace go.opentelemetry.io/otel/example/opencensus => ../../example/opencensus + +replace go.opentelemetry.io/otel/example/otel-collector => ../../example/otel-collector + +replace go.opentelemetry.io/otel/example/prom-collector => ../../example/prom-collector + +replace go.opentelemetry.io/otel/example/prometheus => ../../example/prometheus + +replace go.opentelemetry.io/otel/example/zipkin => ../../example/zipkin + +replace go.opentelemetry.io/otel/exporters/prometheus => ../prometheus + +replace go.opentelemetry.io/otel/exporters/otlp => ../otlp + +replace go.opentelemetry.io/otel/exporters/stdout => ../stdout + +replace go.opentelemetry.io/otel/exporters/jaeger => ./ + +replace go.opentelemetry.io/otel/internal/tools => ../../internal/tools + +replace go.opentelemetry.io/otel/metric => ../../metric + +replace go.opentelemetry.io/otel/oteltest => ../../oteltest + +replace go.opentelemetry.io/otel/sdk/export/metric => ../../sdk/export/metric + +replace go.opentelemetry.io/otel/sdk/metric => ../../sdk/metric + +replace go.opentelemetry.io/otel/trace => ../../trace + +replace go.opentelemetry.io/otel/example/passthrough => ../../example/passthrough + +replace go.opentelemetry.io/otel/exporters/otlp/otlptrace => ../otlp/otlptrace + +replace go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc => ../otlp/otlptrace/otlptracegrpc + +replace go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp => ../otlp/otlptrace/otlptracehttp + +replace go.opentelemetry.io/otel/internal/metric => ../../internal/metric + +replace go.opentelemetry.io/otel => ../.. + +replace go.opentelemetry.io/otel/exporters/zipkin => ../zipkin + +replace go.opentelemetry.io/otel/sdk => ../../sdk diff --git a/exporters/trace/jaeger/go.sum b/exporters/jaeger/go.sum similarity index 100% rename from exporters/trace/jaeger/go.sum rename to exporters/jaeger/go.sum diff --git a/exporters/trace/jaeger/internal/gen-go/agent/GoUnusedProtection__.go b/exporters/jaeger/internal/gen-go/agent/GoUnusedProtection__.go similarity index 100% rename from exporters/trace/jaeger/internal/gen-go/agent/GoUnusedProtection__.go rename to exporters/jaeger/internal/gen-go/agent/GoUnusedProtection__.go diff --git a/exporters/trace/jaeger/internal/gen-go/agent/agent-consts.go b/exporters/jaeger/internal/gen-go/agent/agent-consts.go similarity index 61% rename from exporters/trace/jaeger/internal/gen-go/agent/agent-consts.go rename to exporters/jaeger/internal/gen-go/agent/agent-consts.go index 62c0c6f4bac..3b96e3222ee 100644 --- a/exporters/trace/jaeger/internal/gen-go/agent/agent-consts.go +++ b/exporters/jaeger/internal/gen-go/agent/agent-consts.go @@ -6,10 +6,11 @@ import ( "bytes" "context" "fmt" - "go.opentelemetry.io/otel/exporters/trace/jaeger/internal/gen-go/jaeger" - "go.opentelemetry.io/otel/exporters/trace/jaeger/internal/gen-go/zipkincore" - "go.opentelemetry.io/otel/exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift" "time" + + "go.opentelemetry.io/otel/exporters/jaeger/internal/gen-go/jaeger" + "go.opentelemetry.io/otel/exporters/jaeger/internal/gen-go/zipkincore" + "go.opentelemetry.io/otel/exporters/jaeger/internal/third_party/thrift/lib/go/thrift" ) // (needed to ensure safety because of naive import list construction.) diff --git a/exporters/trace/jaeger/internal/gen-go/agent/agent-remote/agent-remote.go b/exporters/jaeger/internal/gen-go/agent/agent-remote/agent-remote.go similarity index 94% rename from exporters/trace/jaeger/internal/gen-go/agent/agent-remote/agent-remote.go rename to exporters/jaeger/internal/gen-go/agent/agent-remote/agent-remote.go index 68967240286..9ec0d40a865 100755 --- a/exporters/trace/jaeger/internal/gen-go/agent/agent-remote/agent-remote.go +++ b/exporters/jaeger/internal/gen-go/agent/agent-remote/agent-remote.go @@ -6,16 +6,17 @@ import ( "context" "flag" "fmt" - "go.opentelemetry.io/otel/exporters/trace/jaeger/internal/gen-go/agent" - "go.opentelemetry.io/otel/exporters/trace/jaeger/internal/gen-go/jaeger" - "go.opentelemetry.io/otel/exporters/trace/jaeger/internal/gen-go/zipkincore" - "go.opentelemetry.io/otel/exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift" "math" "net" "net/url" "os" "strconv" "strings" + + "go.opentelemetry.io/otel/exporters/jaeger/internal/gen-go/agent" + "go.opentelemetry.io/otel/exporters/jaeger/internal/gen-go/jaeger" + "go.opentelemetry.io/otel/exporters/jaeger/internal/gen-go/zipkincore" + "go.opentelemetry.io/otel/exporters/jaeger/internal/third_party/thrift/lib/go/thrift" ) var _ = jaeger.GoUnusedProtection__ diff --git a/exporters/trace/jaeger/internal/gen-go/agent/agent.go b/exporters/jaeger/internal/gen-go/agent/agent.go similarity index 97% rename from exporters/trace/jaeger/internal/gen-go/agent/agent.go rename to exporters/jaeger/internal/gen-go/agent/agent.go index aa4a1bfb028..c7c8e9ca3e6 100644 --- a/exporters/trace/jaeger/internal/gen-go/agent/agent.go +++ b/exporters/jaeger/internal/gen-go/agent/agent.go @@ -6,10 +6,11 @@ import ( "bytes" "context" "fmt" - "go.opentelemetry.io/otel/exporters/trace/jaeger/internal/gen-go/jaeger" - "go.opentelemetry.io/otel/exporters/trace/jaeger/internal/gen-go/zipkincore" - "go.opentelemetry.io/otel/exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift" "time" + + "go.opentelemetry.io/otel/exporters/jaeger/internal/gen-go/jaeger" + "go.opentelemetry.io/otel/exporters/jaeger/internal/gen-go/zipkincore" + "go.opentelemetry.io/otel/exporters/jaeger/internal/third_party/thrift/lib/go/thrift" ) // (needed to ensure safety because of naive import list construction.) diff --git a/exporters/trace/jaeger/internal/gen-go/jaeger/GoUnusedProtection__.go b/exporters/jaeger/internal/gen-go/jaeger/GoUnusedProtection__.go similarity index 100% rename from exporters/trace/jaeger/internal/gen-go/jaeger/GoUnusedProtection__.go rename to exporters/jaeger/internal/gen-go/jaeger/GoUnusedProtection__.go diff --git a/exporters/trace/jaeger/internal/gen-go/jaeger/collector-remote/collector-remote.go b/exporters/jaeger/internal/gen-go/jaeger/collector-remote/collector-remote.go similarity index 96% rename from exporters/trace/jaeger/internal/gen-go/jaeger/collector-remote/collector-remote.go rename to exporters/jaeger/internal/gen-go/jaeger/collector-remote/collector-remote.go index 247f4544ad4..cacf75d00f5 100755 --- a/exporters/trace/jaeger/internal/gen-go/jaeger/collector-remote/collector-remote.go +++ b/exporters/jaeger/internal/gen-go/jaeger/collector-remote/collector-remote.go @@ -6,14 +6,15 @@ import ( "context" "flag" "fmt" - "go.opentelemetry.io/otel/exporters/trace/jaeger/internal/gen-go/jaeger" - "go.opentelemetry.io/otel/exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift" "math" "net" "net/url" "os" "strconv" "strings" + + "go.opentelemetry.io/otel/exporters/jaeger/internal/gen-go/jaeger" + "go.opentelemetry.io/otel/exporters/jaeger/internal/third_party/thrift/lib/go/thrift" ) var _ = jaeger.GoUnusedProtection__ diff --git a/exporters/trace/jaeger/internal/gen-go/jaeger/jaeger-consts.go b/exporters/jaeger/internal/gen-go/jaeger/jaeger-consts.go similarity index 77% rename from exporters/trace/jaeger/internal/gen-go/jaeger/jaeger-consts.go rename to exporters/jaeger/internal/gen-go/jaeger/jaeger-consts.go index 40e23218f4f..10162857fbb 100644 --- a/exporters/trace/jaeger/internal/gen-go/jaeger/jaeger-consts.go +++ b/exporters/jaeger/internal/gen-go/jaeger/jaeger-consts.go @@ -6,8 +6,9 @@ import ( "bytes" "context" "fmt" - "go.opentelemetry.io/otel/exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift" "time" + + "go.opentelemetry.io/otel/exporters/jaeger/internal/third_party/thrift/lib/go/thrift" ) // (needed to ensure safety because of naive import list construction.) diff --git a/exporters/trace/jaeger/internal/gen-go/jaeger/jaeger.go b/exporters/jaeger/internal/gen-go/jaeger/jaeger.go similarity index 99% rename from exporters/trace/jaeger/internal/gen-go/jaeger/jaeger.go rename to exporters/jaeger/internal/gen-go/jaeger/jaeger.go index 32e85cfae49..b1fe26c57d9 100644 --- a/exporters/trace/jaeger/internal/gen-go/jaeger/jaeger.go +++ b/exporters/jaeger/internal/gen-go/jaeger/jaeger.go @@ -8,8 +8,9 @@ import ( "database/sql/driver" "errors" "fmt" - "go.opentelemetry.io/otel/exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift" "time" + + "go.opentelemetry.io/otel/exporters/jaeger/internal/third_party/thrift/lib/go/thrift" ) // (needed to ensure safety because of naive import list construction.) diff --git a/exporters/trace/jaeger/internal/gen-go/zipkincore/GoUnusedProtection__.go b/exporters/jaeger/internal/gen-go/zipkincore/GoUnusedProtection__.go similarity index 100% rename from exporters/trace/jaeger/internal/gen-go/zipkincore/GoUnusedProtection__.go rename to exporters/jaeger/internal/gen-go/zipkincore/GoUnusedProtection__.go diff --git a/exporters/trace/jaeger/internal/gen-go/zipkincore/zipkin_collector-remote/zipkin_collector-remote.go b/exporters/jaeger/internal/gen-go/zipkincore/zipkin_collector-remote/zipkin_collector-remote.go similarity index 96% rename from exporters/trace/jaeger/internal/gen-go/zipkincore/zipkin_collector-remote/zipkin_collector-remote.go rename to exporters/jaeger/internal/gen-go/zipkincore/zipkin_collector-remote/zipkin_collector-remote.go index a9c519883a6..127f67d05a1 100755 --- a/exporters/trace/jaeger/internal/gen-go/zipkincore/zipkin_collector-remote/zipkin_collector-remote.go +++ b/exporters/jaeger/internal/gen-go/zipkincore/zipkin_collector-remote/zipkin_collector-remote.go @@ -6,14 +6,15 @@ import ( "context" "flag" "fmt" - "go.opentelemetry.io/otel/exporters/trace/jaeger/internal/gen-go/zipkincore" - "go.opentelemetry.io/otel/exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift" "math" "net" "net/url" "os" "strconv" "strings" + + "go.opentelemetry.io/otel/exporters/jaeger/internal/gen-go/zipkincore" + "go.opentelemetry.io/otel/exporters/jaeger/internal/third_party/thrift/lib/go/thrift" ) var _ = zipkincore.GoUnusedProtection__ diff --git a/exporters/trace/jaeger/internal/gen-go/zipkincore/zipkincore-consts.go b/exporters/jaeger/internal/gen-go/zipkincore/zipkincore-consts.go similarity index 89% rename from exporters/trace/jaeger/internal/gen-go/zipkincore/zipkincore-consts.go rename to exporters/jaeger/internal/gen-go/zipkincore/zipkincore-consts.go index 16f23e285cf..043ecba9626 100644 --- a/exporters/trace/jaeger/internal/gen-go/zipkincore/zipkincore-consts.go +++ b/exporters/jaeger/internal/gen-go/zipkincore/zipkincore-consts.go @@ -6,8 +6,9 @@ import ( "bytes" "context" "fmt" - "go.opentelemetry.io/otel/exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift" "time" + + "go.opentelemetry.io/otel/exporters/jaeger/internal/third_party/thrift/lib/go/thrift" ) // (needed to ensure safety because of naive import list construction.) diff --git a/exporters/trace/jaeger/internal/gen-go/zipkincore/zipkincore.go b/exporters/jaeger/internal/gen-go/zipkincore/zipkincore.go similarity index 99% rename from exporters/trace/jaeger/internal/gen-go/zipkincore/zipkincore.go rename to exporters/jaeger/internal/gen-go/zipkincore/zipkincore.go index 704e450f0b1..7f46810e0d3 100644 --- a/exporters/trace/jaeger/internal/gen-go/zipkincore/zipkincore.go +++ b/exporters/jaeger/internal/gen-go/zipkincore/zipkincore.go @@ -8,8 +8,9 @@ import ( "database/sql/driver" "errors" "fmt" - "go.opentelemetry.io/otel/exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift" "time" + + "go.opentelemetry.io/otel/exporters/jaeger/internal/third_party/thrift/lib/go/thrift" ) // (needed to ensure safety because of naive import list construction.) diff --git a/exporters/trace/jaeger/internal/third_party/thrift/LICENSE b/exporters/jaeger/internal/third_party/thrift/LICENSE similarity index 100% rename from exporters/trace/jaeger/internal/third_party/thrift/LICENSE rename to exporters/jaeger/internal/third_party/thrift/LICENSE diff --git a/exporters/trace/jaeger/internal/third_party/thrift/NOTICE b/exporters/jaeger/internal/third_party/thrift/NOTICE similarity index 100% rename from exporters/trace/jaeger/internal/third_party/thrift/NOTICE rename to exporters/jaeger/internal/third_party/thrift/NOTICE diff --git a/exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/application_exception.go b/exporters/jaeger/internal/third_party/thrift/lib/go/thrift/application_exception.go similarity index 100% rename from exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/application_exception.go rename to exporters/jaeger/internal/third_party/thrift/lib/go/thrift/application_exception.go diff --git a/exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/binary_protocol.go b/exporters/jaeger/internal/third_party/thrift/lib/go/thrift/binary_protocol.go similarity index 100% rename from exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/binary_protocol.go rename to exporters/jaeger/internal/third_party/thrift/lib/go/thrift/binary_protocol.go diff --git a/exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/buffered_transport.go b/exporters/jaeger/internal/third_party/thrift/lib/go/thrift/buffered_transport.go similarity index 100% rename from exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/buffered_transport.go rename to exporters/jaeger/internal/third_party/thrift/lib/go/thrift/buffered_transport.go diff --git a/exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/client.go b/exporters/jaeger/internal/third_party/thrift/lib/go/thrift/client.go similarity index 100% rename from exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/client.go rename to exporters/jaeger/internal/third_party/thrift/lib/go/thrift/client.go diff --git a/exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/compact_protocol.go b/exporters/jaeger/internal/third_party/thrift/lib/go/thrift/compact_protocol.go similarity index 100% rename from exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/compact_protocol.go rename to exporters/jaeger/internal/third_party/thrift/lib/go/thrift/compact_protocol.go diff --git a/exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/configuration.go b/exporters/jaeger/internal/third_party/thrift/lib/go/thrift/configuration.go similarity index 100% rename from exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/configuration.go rename to exporters/jaeger/internal/third_party/thrift/lib/go/thrift/configuration.go diff --git a/exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/context.go b/exporters/jaeger/internal/third_party/thrift/lib/go/thrift/context.go similarity index 100% rename from exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/context.go rename to exporters/jaeger/internal/third_party/thrift/lib/go/thrift/context.go diff --git a/exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/debug_protocol.go b/exporters/jaeger/internal/third_party/thrift/lib/go/thrift/debug_protocol.go similarity index 100% rename from exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/debug_protocol.go rename to exporters/jaeger/internal/third_party/thrift/lib/go/thrift/debug_protocol.go diff --git a/exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/deserializer.go b/exporters/jaeger/internal/third_party/thrift/lib/go/thrift/deserializer.go similarity index 100% rename from exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/deserializer.go rename to exporters/jaeger/internal/third_party/thrift/lib/go/thrift/deserializer.go diff --git a/exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/exception.go b/exporters/jaeger/internal/third_party/thrift/lib/go/thrift/exception.go similarity index 100% rename from exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/exception.go rename to exporters/jaeger/internal/third_party/thrift/lib/go/thrift/exception.go diff --git a/exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/framed_transport.go b/exporters/jaeger/internal/third_party/thrift/lib/go/thrift/framed_transport.go similarity index 100% rename from exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/framed_transport.go rename to exporters/jaeger/internal/third_party/thrift/lib/go/thrift/framed_transport.go diff --git a/exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/header_context.go b/exporters/jaeger/internal/third_party/thrift/lib/go/thrift/header_context.go similarity index 100% rename from exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/header_context.go rename to exporters/jaeger/internal/third_party/thrift/lib/go/thrift/header_context.go diff --git a/exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/header_protocol.go b/exporters/jaeger/internal/third_party/thrift/lib/go/thrift/header_protocol.go similarity index 100% rename from exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/header_protocol.go rename to exporters/jaeger/internal/third_party/thrift/lib/go/thrift/header_protocol.go diff --git a/exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/header_transport.go b/exporters/jaeger/internal/third_party/thrift/lib/go/thrift/header_transport.go similarity index 100% rename from exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/header_transport.go rename to exporters/jaeger/internal/third_party/thrift/lib/go/thrift/header_transport.go diff --git a/exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/http_client.go b/exporters/jaeger/internal/third_party/thrift/lib/go/thrift/http_client.go similarity index 100% rename from exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/http_client.go rename to exporters/jaeger/internal/third_party/thrift/lib/go/thrift/http_client.go diff --git a/exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/http_transport.go b/exporters/jaeger/internal/third_party/thrift/lib/go/thrift/http_transport.go similarity index 100% rename from exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/http_transport.go rename to exporters/jaeger/internal/third_party/thrift/lib/go/thrift/http_transport.go diff --git a/exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/iostream_transport.go b/exporters/jaeger/internal/third_party/thrift/lib/go/thrift/iostream_transport.go similarity index 100% rename from exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/iostream_transport.go rename to exporters/jaeger/internal/third_party/thrift/lib/go/thrift/iostream_transport.go diff --git a/exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/json_protocol.go b/exporters/jaeger/internal/third_party/thrift/lib/go/thrift/json_protocol.go similarity index 100% rename from exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/json_protocol.go rename to exporters/jaeger/internal/third_party/thrift/lib/go/thrift/json_protocol.go diff --git a/exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/logger.go b/exporters/jaeger/internal/third_party/thrift/lib/go/thrift/logger.go similarity index 100% rename from exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/logger.go rename to exporters/jaeger/internal/third_party/thrift/lib/go/thrift/logger.go diff --git a/exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/memory_buffer.go b/exporters/jaeger/internal/third_party/thrift/lib/go/thrift/memory_buffer.go similarity index 100% rename from exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/memory_buffer.go rename to exporters/jaeger/internal/third_party/thrift/lib/go/thrift/memory_buffer.go diff --git a/exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/messagetype.go b/exporters/jaeger/internal/third_party/thrift/lib/go/thrift/messagetype.go similarity index 100% rename from exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/messagetype.go rename to exporters/jaeger/internal/third_party/thrift/lib/go/thrift/messagetype.go diff --git a/exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/middleware.go b/exporters/jaeger/internal/third_party/thrift/lib/go/thrift/middleware.go similarity index 100% rename from exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/middleware.go rename to exporters/jaeger/internal/third_party/thrift/lib/go/thrift/middleware.go diff --git a/exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/multiplexed_protocol.go b/exporters/jaeger/internal/third_party/thrift/lib/go/thrift/multiplexed_protocol.go similarity index 100% rename from exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/multiplexed_protocol.go rename to exporters/jaeger/internal/third_party/thrift/lib/go/thrift/multiplexed_protocol.go diff --git a/exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/numeric.go b/exporters/jaeger/internal/third_party/thrift/lib/go/thrift/numeric.go similarity index 100% rename from exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/numeric.go rename to exporters/jaeger/internal/third_party/thrift/lib/go/thrift/numeric.go diff --git a/exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/pointerize.go b/exporters/jaeger/internal/third_party/thrift/lib/go/thrift/pointerize.go similarity index 100% rename from exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/pointerize.go rename to exporters/jaeger/internal/third_party/thrift/lib/go/thrift/pointerize.go diff --git a/exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/processor_factory.go b/exporters/jaeger/internal/third_party/thrift/lib/go/thrift/processor_factory.go similarity index 100% rename from exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/processor_factory.go rename to exporters/jaeger/internal/third_party/thrift/lib/go/thrift/processor_factory.go diff --git a/exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/protocol.go b/exporters/jaeger/internal/third_party/thrift/lib/go/thrift/protocol.go similarity index 100% rename from exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/protocol.go rename to exporters/jaeger/internal/third_party/thrift/lib/go/thrift/protocol.go diff --git a/exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/protocol_exception.go b/exporters/jaeger/internal/third_party/thrift/lib/go/thrift/protocol_exception.go similarity index 100% rename from exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/protocol_exception.go rename to exporters/jaeger/internal/third_party/thrift/lib/go/thrift/protocol_exception.go diff --git a/exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/protocol_factory.go b/exporters/jaeger/internal/third_party/thrift/lib/go/thrift/protocol_factory.go similarity index 100% rename from exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/protocol_factory.go rename to exporters/jaeger/internal/third_party/thrift/lib/go/thrift/protocol_factory.go diff --git a/exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/response_helper.go b/exporters/jaeger/internal/third_party/thrift/lib/go/thrift/response_helper.go similarity index 100% rename from exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/response_helper.go rename to exporters/jaeger/internal/third_party/thrift/lib/go/thrift/response_helper.go diff --git a/exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/rich_transport.go b/exporters/jaeger/internal/third_party/thrift/lib/go/thrift/rich_transport.go similarity index 100% rename from exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/rich_transport.go rename to exporters/jaeger/internal/third_party/thrift/lib/go/thrift/rich_transport.go diff --git a/exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/serializer.go b/exporters/jaeger/internal/third_party/thrift/lib/go/thrift/serializer.go similarity index 100% rename from exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/serializer.go rename to exporters/jaeger/internal/third_party/thrift/lib/go/thrift/serializer.go diff --git a/exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/server.go b/exporters/jaeger/internal/third_party/thrift/lib/go/thrift/server.go similarity index 100% rename from exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/server.go rename to exporters/jaeger/internal/third_party/thrift/lib/go/thrift/server.go diff --git a/exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/server_socket.go b/exporters/jaeger/internal/third_party/thrift/lib/go/thrift/server_socket.go similarity index 100% rename from exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/server_socket.go rename to exporters/jaeger/internal/third_party/thrift/lib/go/thrift/server_socket.go diff --git a/exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/server_transport.go b/exporters/jaeger/internal/third_party/thrift/lib/go/thrift/server_transport.go similarity index 100% rename from exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/server_transport.go rename to exporters/jaeger/internal/third_party/thrift/lib/go/thrift/server_transport.go diff --git a/exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/simple_json_protocol.go b/exporters/jaeger/internal/third_party/thrift/lib/go/thrift/simple_json_protocol.go similarity index 100% rename from exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/simple_json_protocol.go rename to exporters/jaeger/internal/third_party/thrift/lib/go/thrift/simple_json_protocol.go diff --git a/exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/simple_server.go b/exporters/jaeger/internal/third_party/thrift/lib/go/thrift/simple_server.go similarity index 100% rename from exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/simple_server.go rename to exporters/jaeger/internal/third_party/thrift/lib/go/thrift/simple_server.go diff --git a/exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/socket.go b/exporters/jaeger/internal/third_party/thrift/lib/go/thrift/socket.go similarity index 100% rename from exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/socket.go rename to exporters/jaeger/internal/third_party/thrift/lib/go/thrift/socket.go diff --git a/exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/socket_conn.go b/exporters/jaeger/internal/third_party/thrift/lib/go/thrift/socket_conn.go similarity index 100% rename from exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/socket_conn.go rename to exporters/jaeger/internal/third_party/thrift/lib/go/thrift/socket_conn.go diff --git a/exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/socket_unix_conn.go b/exporters/jaeger/internal/third_party/thrift/lib/go/thrift/socket_unix_conn.go similarity index 100% rename from exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/socket_unix_conn.go rename to exporters/jaeger/internal/third_party/thrift/lib/go/thrift/socket_unix_conn.go diff --git a/exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/socket_windows_conn.go b/exporters/jaeger/internal/third_party/thrift/lib/go/thrift/socket_windows_conn.go similarity index 100% rename from exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/socket_windows_conn.go rename to exporters/jaeger/internal/third_party/thrift/lib/go/thrift/socket_windows_conn.go diff --git a/exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/ssl_server_socket.go b/exporters/jaeger/internal/third_party/thrift/lib/go/thrift/ssl_server_socket.go similarity index 100% rename from exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/ssl_server_socket.go rename to exporters/jaeger/internal/third_party/thrift/lib/go/thrift/ssl_server_socket.go diff --git a/exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/ssl_socket.go b/exporters/jaeger/internal/third_party/thrift/lib/go/thrift/ssl_socket.go similarity index 100% rename from exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/ssl_socket.go rename to exporters/jaeger/internal/third_party/thrift/lib/go/thrift/ssl_socket.go diff --git a/exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/transport.go b/exporters/jaeger/internal/third_party/thrift/lib/go/thrift/transport.go similarity index 100% rename from exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/transport.go rename to exporters/jaeger/internal/third_party/thrift/lib/go/thrift/transport.go diff --git a/exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/transport_exception.go b/exporters/jaeger/internal/third_party/thrift/lib/go/thrift/transport_exception.go similarity index 100% rename from exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/transport_exception.go rename to exporters/jaeger/internal/third_party/thrift/lib/go/thrift/transport_exception.go diff --git a/exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/transport_factory.go b/exporters/jaeger/internal/third_party/thrift/lib/go/thrift/transport_factory.go similarity index 100% rename from exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/transport_factory.go rename to exporters/jaeger/internal/third_party/thrift/lib/go/thrift/transport_factory.go diff --git a/exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/type.go b/exporters/jaeger/internal/third_party/thrift/lib/go/thrift/type.go similarity index 100% rename from exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/type.go rename to exporters/jaeger/internal/third_party/thrift/lib/go/thrift/type.go diff --git a/exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/zlib_transport.go b/exporters/jaeger/internal/third_party/thrift/lib/go/thrift/zlib_transport.go similarity index 100% rename from exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift/zlib_transport.go rename to exporters/jaeger/internal/third_party/thrift/lib/go/thrift/zlib_transport.go diff --git a/exporters/trace/jaeger/jaeger.go b/exporters/jaeger/jaeger.go similarity index 98% rename from exporters/trace/jaeger/jaeger.go rename to exporters/jaeger/jaeger.go index b7a388b39fd..10ef350dc1d 100644 --- a/exporters/trace/jaeger/jaeger.go +++ b/exporters/jaeger/jaeger.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package jaeger // import "go.opentelemetry.io/otel/exporters/trace/jaeger" +package jaeger // import "go.opentelemetry.io/otel/exporters/jaeger" import ( "context" @@ -23,7 +23,7 @@ import ( "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/codes" - gen "go.opentelemetry.io/otel/exporters/trace/jaeger/internal/gen-go/jaeger" + gen "go.opentelemetry.io/otel/exporters/jaeger/internal/gen-go/jaeger" "go.opentelemetry.io/otel/sdk/resource" sdktrace "go.opentelemetry.io/otel/sdk/trace" semconv "go.opentelemetry.io/otel/semconv/v1.4.0" diff --git a/exporters/trace/jaeger/jaeger_benchmark_test.go b/exporters/jaeger/jaeger_benchmark_test.go similarity index 100% rename from exporters/trace/jaeger/jaeger_benchmark_test.go rename to exporters/jaeger/jaeger_benchmark_test.go diff --git a/exporters/trace/jaeger/jaeger_test.go b/exporters/jaeger/jaeger_test.go similarity index 99% rename from exporters/trace/jaeger/jaeger_test.go rename to exporters/jaeger/jaeger_test.go index 5034c8d00a6..4db4a36ddef 100644 --- a/exporters/trace/jaeger/jaeger_test.go +++ b/exporters/jaeger/jaeger_test.go @@ -29,7 +29,7 @@ import ( "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/codes" - gen "go.opentelemetry.io/otel/exporters/trace/jaeger/internal/gen-go/jaeger" + gen "go.opentelemetry.io/otel/exporters/jaeger/internal/gen-go/jaeger" ottest "go.opentelemetry.io/otel/internal/internaltest" "go.opentelemetry.io/otel/sdk/instrumentation" "go.opentelemetry.io/otel/sdk/resource" diff --git a/exporters/trace/jaeger/reconnecting_udp_client.go b/exporters/jaeger/reconnecting_udp_client.go similarity index 98% rename from exporters/trace/jaeger/reconnecting_udp_client.go rename to exporters/jaeger/reconnecting_udp_client.go index 1560ee6cc46..ae4bf87f586 100644 --- a/exporters/trace/jaeger/reconnecting_udp_client.go +++ b/exporters/jaeger/reconnecting_udp_client.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package jaeger // import "go.opentelemetry.io/otel/exporters/trace/jaeger" +package jaeger // import "go.opentelemetry.io/otel/exporters/jaeger" import ( "fmt" diff --git a/exporters/trace/jaeger/reconnecting_udp_client_test.go b/exporters/jaeger/reconnecting_udp_client_test.go similarity index 100% rename from exporters/trace/jaeger/reconnecting_udp_client_test.go rename to exporters/jaeger/reconnecting_udp_client_test.go diff --git a/exporters/trace/jaeger/uploader.go b/exporters/jaeger/uploader.go similarity index 97% rename from exporters/trace/jaeger/uploader.go rename to exporters/jaeger/uploader.go index 5f7bd4e32dd..452b3aeb5de 100644 --- a/exporters/trace/jaeger/uploader.go +++ b/exporters/jaeger/uploader.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package jaeger // import "go.opentelemetry.io/otel/exporters/trace/jaeger" +package jaeger // import "go.opentelemetry.io/otel/exporters/jaeger" import ( "bytes" @@ -24,9 +24,9 @@ import ( "net/http" "time" - "go.opentelemetry.io/otel/exporters/trace/jaeger/internal/third_party/thrift/lib/go/thrift" + "go.opentelemetry.io/otel/exporters/jaeger/internal/third_party/thrift/lib/go/thrift" - gen "go.opentelemetry.io/otel/exporters/trace/jaeger/internal/gen-go/jaeger" + gen "go.opentelemetry.io/otel/exporters/jaeger/internal/gen-go/jaeger" ) // batchUploader send a batch of spans to Jaeger diff --git a/exporters/metric/prometheus/go.mod b/exporters/metric/prometheus/go.mod deleted file mode 100644 index 78802ce873f..00000000000 --- a/exporters/metric/prometheus/go.mod +++ /dev/null @@ -1,68 +0,0 @@ -module go.opentelemetry.io/otel/exporters/metric/prometheus - -go 1.15 - -replace ( - go.opentelemetry.io/otel => ../../.. - go.opentelemetry.io/otel/sdk => ../../../sdk -) - -require ( - github.com/prometheus/client_golang v1.11.0 - github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/otel v0.20.0 - go.opentelemetry.io/otel/metric v0.20.0 - go.opentelemetry.io/otel/sdk v0.20.0 - go.opentelemetry.io/otel/sdk/export/metric v0.20.0 - go.opentelemetry.io/otel/sdk/metric v0.20.0 -) - -replace go.opentelemetry.io/otel/bridge/opencensus => ../../../bridge/opencensus - -replace go.opentelemetry.io/otel/bridge/opentracing => ../../../bridge/opentracing - -replace go.opentelemetry.io/otel/example/jaeger => ../../../example/jaeger - -replace go.opentelemetry.io/otel/example/namedtracer => ../../../example/namedtracer - -replace go.opentelemetry.io/otel/example/opencensus => ../../../example/opencensus - -replace go.opentelemetry.io/otel/example/otel-collector => ../../../example/otel-collector - -replace go.opentelemetry.io/otel/example/prom-collector => ../../../example/prom-collector - -replace go.opentelemetry.io/otel/example/prometheus => ../../../example/prometheus - -replace go.opentelemetry.io/otel/example/zipkin => ../../../example/zipkin - -replace go.opentelemetry.io/otel/exporters/metric/prometheus => ./ - -replace go.opentelemetry.io/otel/exporters/otlp => ../../otlp - -replace go.opentelemetry.io/otel/exporters/stdout => ../../stdout - -replace go.opentelemetry.io/otel/exporters/trace/jaeger => ../../trace/jaeger - -replace go.opentelemetry.io/otel/exporters/trace/zipkin => ../../trace/zipkin - -replace go.opentelemetry.io/otel/internal/tools => ../../../internal/tools - -replace go.opentelemetry.io/otel/metric => ../../../metric - -replace go.opentelemetry.io/otel/oteltest => ../../../oteltest - -replace go.opentelemetry.io/otel/sdk/export/metric => ../../../sdk/export/metric - -replace go.opentelemetry.io/otel/sdk/metric => ../../../sdk/metric - -replace go.opentelemetry.io/otel/trace => ../../../trace - -replace go.opentelemetry.io/otel/example/passthrough => ../../../example/passthrough - -replace go.opentelemetry.io/otel/exporters/otlp/otlptrace => ../../otlp/otlptrace - -replace go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc => ../../otlp/otlptrace/otlptracegrpc - -replace go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp => ../../otlp/otlptrace/otlptracehttp - -replace go.opentelemetry.io/otel/internal/metric => ../../../internal/metric diff --git a/exporters/otlp/go.mod b/exporters/otlp/go.mod index acdf29f12d1..3a265596e0d 100644 --- a/exporters/otlp/go.mod +++ b/exporters/otlp/go.mod @@ -42,15 +42,15 @@ replace go.opentelemetry.io/otel/example/prometheus => ../../example/prometheus replace go.opentelemetry.io/otel/example/zipkin => ../../example/zipkin -replace go.opentelemetry.io/otel/exporters/metric/prometheus => ../metric/prometheus +replace go.opentelemetry.io/otel/exporters/prometheus => ../prometheus replace go.opentelemetry.io/otel/exporters/otlp => ./ replace go.opentelemetry.io/otel/exporters/stdout => ../stdout -replace go.opentelemetry.io/otel/exporters/trace/jaeger => ../trace/jaeger +replace go.opentelemetry.io/otel/exporters/jaeger => ../jaeger -replace go.opentelemetry.io/otel/exporters/trace/zipkin => ../trace/zipkin +replace go.opentelemetry.io/otel/exporters/zipkin => ../zipkin replace go.opentelemetry.io/otel/internal/tools => ../../internal/tools diff --git a/exporters/otlp/otlptrace/go.mod b/exporters/otlp/otlptrace/go.mod index 64c4366c853..8234b1807e4 100644 --- a/exporters/otlp/otlptrace/go.mod +++ b/exporters/otlp/otlptrace/go.mod @@ -46,7 +46,7 @@ replace go.opentelemetry.io/otel/example/prometheus => ../../../example/promethe replace go.opentelemetry.io/otel/example/zipkin => ../../../example/zipkin -replace go.opentelemetry.io/otel/exporters/metric/prometheus => ../../metric/prometheus +replace go.opentelemetry.io/otel/exporters/prometheus => ../../prometheus replace go.opentelemetry.io/otel/exporters/otlp/otlptrace => ./ @@ -54,9 +54,9 @@ replace go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc => ./otl replace go.opentelemetry.io/otel/exporters/stdout => ../../stdout -replace go.opentelemetry.io/otel/exporters/trace/jaeger => ../../trace/jaeger +replace go.opentelemetry.io/otel/exporters/jaeger => ../../jaeger -replace go.opentelemetry.io/otel/exporters/trace/zipkin => ../../trace/zipkin +replace go.opentelemetry.io/otel/exporters/zipkin => ../../zipkin replace go.opentelemetry.io/otel/internal/tools => ../../../internal/tools diff --git a/exporters/otlp/otlptrace/otlptracegrpc/go.mod b/exporters/otlp/otlptrace/otlptracegrpc/go.mod index 9a3b5cd8c08..b9355fd9980 100644 --- a/exporters/otlp/otlptrace/otlptracegrpc/go.mod +++ b/exporters/otlp/otlptrace/otlptracegrpc/go.mod @@ -45,15 +45,15 @@ replace go.opentelemetry.io/otel/example/prometheus => ../../../../example/prome replace go.opentelemetry.io/otel/example/zipkin => ../../../../example/zipkin -replace go.opentelemetry.io/otel/exporters/metric/prometheus => ../../../metric/prometheus +replace go.opentelemetry.io/otel/exporters/prometheus => ../../../prometheus replace go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc => ./ replace go.opentelemetry.io/otel/exporters/stdout => ../../../stdout -replace go.opentelemetry.io/otel/exporters/trace/jaeger => ../../../trace/jaeger +replace go.opentelemetry.io/otel/exporters/jaeger => ../../../jaeger -replace go.opentelemetry.io/otel/exporters/trace/zipkin => ../../../trace/zipkin +replace go.opentelemetry.io/otel/exporters/zipkin => ../../../zipkin replace go.opentelemetry.io/otel/internal/tools => ../../../../internal/tools diff --git a/exporters/otlp/otlptrace/otlptracehttp/go.mod b/exporters/otlp/otlptrace/otlptracehttp/go.mod index f9ecba64c6c..4d896d9de96 100644 --- a/exporters/otlp/otlptrace/otlptracehttp/go.mod +++ b/exporters/otlp/otlptrace/otlptracehttp/go.mod @@ -34,7 +34,7 @@ replace go.opentelemetry.io/otel/example/prometheus => ../../../../example/prome replace go.opentelemetry.io/otel/example/zipkin => ../../../../example/zipkin -replace go.opentelemetry.io/otel/exporters/metric/prometheus => ../../../metric/prometheus +replace go.opentelemetry.io/otel/exporters/prometheus => ../../../prometheus replace go.opentelemetry.io/otel/exporters/otlp => ../.. @@ -44,9 +44,9 @@ replace go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp => ./ replace go.opentelemetry.io/otel/exporters/stdout => ../../../stdout -replace go.opentelemetry.io/otel/exporters/trace/jaeger => ../../../trace/jaeger +replace go.opentelemetry.io/otel/exporters/jaeger => ../../../jaeger -replace go.opentelemetry.io/otel/exporters/trace/zipkin => ../../../trace/zipkin +replace go.opentelemetry.io/otel/exporters/zipkin => ../../../zipkin replace go.opentelemetry.io/otel/internal/tools => ../../../../internal/tools diff --git a/exporters/metric/prometheus/README.md b/exporters/prometheus/README.md similarity index 61% rename from exporters/metric/prometheus/README.md rename to exporters/prometheus/README.md index deb5ca4e0f1..ccded2f2829 100644 --- a/exporters/metric/prometheus/README.md +++ b/exporters/prometheus/README.md @@ -5,5 +5,5 @@ OpenTelemetry Prometheus exporter ## Installation ``` -go get -u go.opentelemetry.io/otel/exporters/metric/prometheus +go get -u go.opentelemetry.io/otel/exporters/prometheus ``` diff --git a/exporters/prometheus/go.mod b/exporters/prometheus/go.mod new file mode 100644 index 00000000000..76312e3bedd --- /dev/null +++ b/exporters/prometheus/go.mod @@ -0,0 +1,67 @@ +module go.opentelemetry.io/otel/exporters/prometheus + +go 1.15 + +require ( + github.com/prometheus/client_golang v1.11.0 + github.com/stretchr/testify v1.7.0 + go.opentelemetry.io/otel v0.20.0 + go.opentelemetry.io/otel/metric v0.20.0 + go.opentelemetry.io/otel/sdk v0.20.0 + go.opentelemetry.io/otel/sdk/export/metric v0.20.0 + go.opentelemetry.io/otel/sdk/metric v0.20.0 +) + +replace go.opentelemetry.io/otel => ../.. + +replace go.opentelemetry.io/otel/bridge/opencensus => ../../bridge/opencensus + +replace go.opentelemetry.io/otel/bridge/opentracing => ../../bridge/opentracing + +replace go.opentelemetry.io/otel/example/jaeger => ../../example/jaeger + +replace go.opentelemetry.io/otel/example/namedtracer => ../../example/namedtracer + +replace go.opentelemetry.io/otel/example/opencensus => ../../example/opencensus + +replace go.opentelemetry.io/otel/example/otel-collector => ../../example/otel-collector + +replace go.opentelemetry.io/otel/example/passthrough => ../../example/passthrough + +replace go.opentelemetry.io/otel/example/prom-collector => ../../example/prom-collector + +replace go.opentelemetry.io/otel/example/prometheus => ../../example/prometheus + +replace go.opentelemetry.io/otel/example/zipkin => ../../example/zipkin + +replace go.opentelemetry.io/otel/exporters/otlp => ../otlp + +replace go.opentelemetry.io/otel/exporters/otlp/otlptrace => ../otlp/otlptrace + +replace go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc => ../otlp/otlptrace/otlptracegrpc + +replace go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp => ../otlp/otlptrace/otlptracehttp + +replace go.opentelemetry.io/otel/exporters/prometheus => ./ + +replace go.opentelemetry.io/otel/exporters/stdout => ../stdout + +replace go.opentelemetry.io/otel/exporters/jaeger => ../jaeger + +replace go.opentelemetry.io/otel/exporters/zipkin => ../zipkin + +replace go.opentelemetry.io/otel/internal/metric => ../../internal/metric + +replace go.opentelemetry.io/otel/internal/tools => ../../internal/tools + +replace go.opentelemetry.io/otel/metric => ../../metric + +replace go.opentelemetry.io/otel/oteltest => ../../oteltest + +replace go.opentelemetry.io/otel/sdk => ../../sdk + +replace go.opentelemetry.io/otel/sdk/export/metric => ../../sdk/export/metric + +replace go.opentelemetry.io/otel/sdk/metric => ../../sdk/metric + +replace go.opentelemetry.io/otel/trace => ../../trace diff --git a/exporters/metric/prometheus/go.sum b/exporters/prometheus/go.sum similarity index 100% rename from exporters/metric/prometheus/go.sum rename to exporters/prometheus/go.sum diff --git a/exporters/metric/prometheus/prometheus.go b/exporters/prometheus/prometheus.go similarity index 99% rename from exporters/metric/prometheus/prometheus.go rename to exporters/prometheus/prometheus.go index a1b3ec4d1a9..c9dbe6c922f 100644 --- a/exporters/metric/prometheus/prometheus.go +++ b/exporters/prometheus/prometheus.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package prometheus // import "go.opentelemetry.io/otel/exporters/metric/prometheus" +package prometheus // import "go.opentelemetry.io/otel/exporters/prometheus" // Note that this package does not support a way to export Prometheus // Summary data points, removed in PR#1412. diff --git a/exporters/metric/prometheus/prometheus_test.go b/exporters/prometheus/prometheus_test.go similarity index 99% rename from exporters/metric/prometheus/prometheus_test.go rename to exporters/prometheus/prometheus_test.go index 1245cd2582a..0f3895813c7 100644 --- a/exporters/metric/prometheus/prometheus_test.go +++ b/exporters/prometheus/prometheus_test.go @@ -25,7 +25,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/otel/attribute" - "go.opentelemetry.io/otel/exporters/metric/prometheus" + "go.opentelemetry.io/otel/exporters/prometheus" "go.opentelemetry.io/otel/metric" export "go.opentelemetry.io/otel/sdk/export/metric" "go.opentelemetry.io/otel/sdk/metric/aggregator/histogram" diff --git a/exporters/metric/prometheus/sanitize.go b/exporters/prometheus/sanitize.go similarity index 98% rename from exporters/metric/prometheus/sanitize.go rename to exporters/prometheus/sanitize.go index f4eac5ccb24..cc9eff358cc 100644 --- a/exporters/metric/prometheus/sanitize.go +++ b/exporters/prometheus/sanitize.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package prometheus // import "go.opentelemetry.io/otel/exporters/metric/prometheus" +package prometheus // import "go.opentelemetry.io/otel/exporters/prometheus" import ( "strings" diff --git a/exporters/metric/prometheus/sanitize_test.go b/exporters/prometheus/sanitize_test.go similarity index 100% rename from exporters/metric/prometheus/sanitize_test.go rename to exporters/prometheus/sanitize_test.go diff --git a/exporters/stdout/go.mod b/exporters/stdout/go.mod index 94fef1a7567..24a09233f88 100644 --- a/exporters/stdout/go.mod +++ b/exporters/stdout/go.mod @@ -36,15 +36,15 @@ replace go.opentelemetry.io/otel/example/prometheus => ../../example/prometheus replace go.opentelemetry.io/otel/example/zipkin => ../../example/zipkin -replace go.opentelemetry.io/otel/exporters/metric/prometheus => ../metric/prometheus +replace go.opentelemetry.io/otel/exporters/prometheus => ../prometheus replace go.opentelemetry.io/otel/exporters/otlp => ../otlp replace go.opentelemetry.io/otel/exporters/stdout => ./ -replace go.opentelemetry.io/otel/exporters/trace/jaeger => ../trace/jaeger +replace go.opentelemetry.io/otel/exporters/jaeger => ../jaeger -replace go.opentelemetry.io/otel/exporters/trace/zipkin => ../trace/zipkin +replace go.opentelemetry.io/otel/exporters/zipkin => ../zipkin replace go.opentelemetry.io/otel/internal/tools => ../../internal/tools diff --git a/exporters/trace/jaeger/go.mod b/exporters/trace/jaeger/go.mod deleted file mode 100644 index 045826d53eb..00000000000 --- a/exporters/trace/jaeger/go.mod +++ /dev/null @@ -1,66 +0,0 @@ -module go.opentelemetry.io/otel/exporters/trace/jaeger - -go 1.15 - -replace ( - go.opentelemetry.io/otel => ../../.. - go.opentelemetry.io/otel/sdk => ../../../sdk -) - -require ( - github.com/google/go-cmp v0.5.6 - github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/otel v0.20.0 - go.opentelemetry.io/otel/sdk v0.20.0 - go.opentelemetry.io/otel/trace v0.20.0 -) - -replace go.opentelemetry.io/otel/bridge/opencensus => ../../../bridge/opencensus - -replace go.opentelemetry.io/otel/bridge/opentracing => ../../../bridge/opentracing - -replace go.opentelemetry.io/otel/example/jaeger => ../../../example/jaeger - -replace go.opentelemetry.io/otel/example/namedtracer => ../../../example/namedtracer - -replace go.opentelemetry.io/otel/example/opencensus => ../../../example/opencensus - -replace go.opentelemetry.io/otel/example/otel-collector => ../../../example/otel-collector - -replace go.opentelemetry.io/otel/example/prom-collector => ../../../example/prom-collector - -replace go.opentelemetry.io/otel/example/prometheus => ../../../example/prometheus - -replace go.opentelemetry.io/otel/example/zipkin => ../../../example/zipkin - -replace go.opentelemetry.io/otel/exporters/metric/prometheus => ../../metric/prometheus - -replace go.opentelemetry.io/otel/exporters/otlp => ../../otlp - -replace go.opentelemetry.io/otel/exporters/stdout => ../../stdout - -replace go.opentelemetry.io/otel/exporters/trace/jaeger => ./ - -replace go.opentelemetry.io/otel/exporters/trace/zipkin => ../zipkin - -replace go.opentelemetry.io/otel/internal/tools => ../../../internal/tools - -replace go.opentelemetry.io/otel/metric => ../../../metric - -replace go.opentelemetry.io/otel/oteltest => ../../../oteltest - -replace go.opentelemetry.io/otel/sdk/export/metric => ../../../sdk/export/metric - -replace go.opentelemetry.io/otel/sdk/metric => ../../../sdk/metric - -replace go.opentelemetry.io/otel/trace => ../../../trace - -replace go.opentelemetry.io/otel/example/passthrough => ../../../example/passthrough - -replace go.opentelemetry.io/otel/exporters/otlp/otlptrace => ../../otlp/otlptrace - -replace go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc => ../../otlp/otlptrace/otlptracegrpc - -replace go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp => ../../otlp/otlptrace/otlptracehttp - -replace go.opentelemetry.io/otel/internal/metric => ../../../internal/metric diff --git a/exporters/trace/zipkin/go.mod b/exporters/trace/zipkin/go.mod deleted file mode 100644 index 921db6c4947..00000000000 --- a/exporters/trace/zipkin/go.mod +++ /dev/null @@ -1,67 +0,0 @@ -module go.opentelemetry.io/otel/exporters/trace/zipkin - -go 1.15 - -replace ( - go.opentelemetry.io/otel => ../../.. - go.opentelemetry.io/otel/sdk => ../../../sdk -) - -require ( - github.com/google/go-cmp v0.5.6 - github.com/openzipkin/zipkin-go v0.2.5 - github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/otel v0.20.0 - go.opentelemetry.io/otel/sdk v0.20.0 - go.opentelemetry.io/otel/trace v0.20.0 -) - -replace go.opentelemetry.io/otel/bridge/opencensus => ../../../bridge/opencensus - -replace go.opentelemetry.io/otel/bridge/opentracing => ../../../bridge/opentracing - -replace go.opentelemetry.io/otel/example/jaeger => ../../../example/jaeger - -replace go.opentelemetry.io/otel/example/namedtracer => ../../../example/namedtracer - -replace go.opentelemetry.io/otel/example/opencensus => ../../../example/opencensus - -replace go.opentelemetry.io/otel/example/otel-collector => ../../../example/otel-collector - -replace go.opentelemetry.io/otel/example/prom-collector => ../../../example/prom-collector - -replace go.opentelemetry.io/otel/example/prometheus => ../../../example/prometheus - -replace go.opentelemetry.io/otel/example/zipkin => ../../../example/zipkin - -replace go.opentelemetry.io/otel/exporters/metric/prometheus => ../../metric/prometheus - -replace go.opentelemetry.io/otel/exporters/otlp => ../../otlp - -replace go.opentelemetry.io/otel/exporters/stdout => ../../stdout - -replace go.opentelemetry.io/otel/exporters/trace/jaeger => ../jaeger - -replace go.opentelemetry.io/otel/exporters/trace/zipkin => ./ - -replace go.opentelemetry.io/otel/internal/tools => ../../../internal/tools - -replace go.opentelemetry.io/otel/metric => ../../../metric - -replace go.opentelemetry.io/otel/oteltest => ../../../oteltest - -replace go.opentelemetry.io/otel/sdk/export/metric => ../../../sdk/export/metric - -replace go.opentelemetry.io/otel/sdk/metric => ../../../sdk/metric - -replace go.opentelemetry.io/otel/trace => ../../../trace - -replace go.opentelemetry.io/otel/example/passthrough => ../../../example/passthrough - -replace go.opentelemetry.io/otel/exporters/otlp/otlptrace => ../../otlp/otlptrace - -replace go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc => ../../otlp/otlptrace/otlptracegrpc - -replace go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp => ../../otlp/otlptrace/otlptracehttp - -replace go.opentelemetry.io/otel/internal/metric => ../../../internal/metric diff --git a/exporters/trace/zipkin/doc.go b/exporters/zipkin/doc.go similarity index 92% rename from exporters/trace/zipkin/doc.go rename to exporters/zipkin/doc.go index 83a7b7631db..94683a611ad 100644 --- a/exporters/trace/zipkin/doc.go +++ b/exporters/zipkin/doc.go @@ -17,4 +17,4 @@ // This package is currently in a pre-GA phase. Backwards incompatible changes // may be introduced in subsequent minor version releases as we work to track // the evolving OpenTelemetry specification and user feedback. -package zipkin // import "go.opentelemetry.io/otel/exporters/trace/zipkin" +package zipkin // import "go.opentelemetry.io/otel/exporters/zipkin" diff --git a/exporters/zipkin/go.mod b/exporters/zipkin/go.mod new file mode 100644 index 00000000000..4b0ae95e749 --- /dev/null +++ b/exporters/zipkin/go.mod @@ -0,0 +1,66 @@ +module go.opentelemetry.io/otel/exporters/zipkin + +go 1.15 + +require ( + github.com/google/go-cmp v0.5.6 + github.com/openzipkin/zipkin-go v0.2.5 + github.com/stretchr/testify v1.7.0 + go.opentelemetry.io/otel v0.20.0 + go.opentelemetry.io/otel/sdk v0.20.0 + go.opentelemetry.io/otel/trace v0.20.0 +) + +replace go.opentelemetry.io/otel/bridge/opencensus => ../../bridge/opencensus + +replace go.opentelemetry.io/otel/bridge/opentracing => ../../bridge/opentracing + +replace go.opentelemetry.io/otel/example/jaeger => ../../example/jaeger + +replace go.opentelemetry.io/otel/example/namedtracer => ../../example/namedtracer + +replace go.opentelemetry.io/otel/example/opencensus => ../../example/opencensus + +replace go.opentelemetry.io/otel/example/otel-collector => ../../example/otel-collector + +replace go.opentelemetry.io/otel/example/prom-collector => ../../example/prom-collector + +replace go.opentelemetry.io/otel/example/prometheus => ../../example/prometheus + +replace go.opentelemetry.io/otel/example/zipkin => ../../example/zipkin + +replace go.opentelemetry.io/otel/exporters/prometheus => ../prometheus + +replace go.opentelemetry.io/otel/exporters/otlp => ../otlp + +replace go.opentelemetry.io/otel/exporters/stdout => ../stdout + +replace go.opentelemetry.io/otel/exporters/jaeger => ../jaeger + +replace go.opentelemetry.io/otel/exporters/zipkin => ./ + +replace go.opentelemetry.io/otel/internal/tools => ../../internal/tools + +replace go.opentelemetry.io/otel/metric => ../../metric + +replace go.opentelemetry.io/otel/oteltest => ../../oteltest + +replace go.opentelemetry.io/otel/sdk/export/metric => ../../sdk/export/metric + +replace go.opentelemetry.io/otel/sdk/metric => ../../sdk/metric + +replace go.opentelemetry.io/otel/trace => ../../trace + +replace go.opentelemetry.io/otel/example/passthrough => ../../example/passthrough + +replace go.opentelemetry.io/otel/exporters/otlp/otlptrace => ../otlp/otlptrace + +replace go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc => ../otlp/otlptrace/otlptracegrpc + +replace go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp => ../otlp/otlptrace/otlptracehttp + +replace go.opentelemetry.io/otel/internal/metric => ../../internal/metric + +replace go.opentelemetry.io/otel => ../.. + +replace go.opentelemetry.io/otel/sdk => ../../sdk diff --git a/exporters/trace/zipkin/go.sum b/exporters/zipkin/go.sum similarity index 100% rename from exporters/trace/zipkin/go.sum rename to exporters/zipkin/go.sum diff --git a/exporters/trace/zipkin/model.go b/exporters/zipkin/model.go similarity index 99% rename from exporters/trace/zipkin/model.go rename to exporters/zipkin/model.go index f8d4a357472..55c991fb3ff 100644 --- a/exporters/trace/zipkin/model.go +++ b/exporters/zipkin/model.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package zipkin // import "go.opentelemetry.io/otel/exporters/trace/zipkin" +package zipkin // import "go.opentelemetry.io/otel/exporters/zipkin" import ( "encoding/binary" diff --git a/exporters/trace/zipkin/model_test.go b/exporters/zipkin/model_test.go similarity index 100% rename from exporters/trace/zipkin/model_test.go rename to exporters/zipkin/model_test.go diff --git a/exporters/trace/zipkin/zipkin.go b/exporters/zipkin/zipkin.go similarity index 98% rename from exporters/trace/zipkin/zipkin.go rename to exporters/zipkin/zipkin.go index 8c6c3a52ed9..5d09a47355a 100644 --- a/exporters/trace/zipkin/zipkin.go +++ b/exporters/zipkin/zipkin.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package zipkin // import "go.opentelemetry.io/otel/exporters/trace/zipkin" +package zipkin // import "go.opentelemetry.io/otel/exporters/zipkin" import ( "bytes" diff --git a/exporters/trace/zipkin/zipkin_test.go b/exporters/zipkin/zipkin_test.go similarity index 100% rename from exporters/trace/zipkin/zipkin_test.go rename to exporters/zipkin/zipkin_test.go diff --git a/go.mod b/go.mod index 9dad82a25a4..52ab4229c3f 100644 --- a/go.mod +++ b/go.mod @@ -29,15 +29,15 @@ replace go.opentelemetry.io/otel/example/prometheus => ./example/prometheus replace go.opentelemetry.io/otel/example/zipkin => ./example/zipkin -replace go.opentelemetry.io/otel/exporters/metric/prometheus => ./exporters/metric/prometheus +replace go.opentelemetry.io/otel/exporters/prometheus => ./exporters/prometheus replace go.opentelemetry.io/otel/exporters/otlp => ./exporters/otlp replace go.opentelemetry.io/otel/exporters/stdout => ./exporters/stdout -replace go.opentelemetry.io/otel/exporters/trace/jaeger => ./exporters/trace/jaeger +replace go.opentelemetry.io/otel/exporters/jaeger => ./exporters/jaeger -replace go.opentelemetry.io/otel/exporters/trace/zipkin => ./exporters/trace/zipkin +replace go.opentelemetry.io/otel/exporters/zipkin => ./exporters/zipkin replace go.opentelemetry.io/otel/internal/tools => ./internal/tools diff --git a/internal/metric/go.mod b/internal/metric/go.mod index a605bfe85ab..b8f88a0dec5 100644 --- a/internal/metric/go.mod +++ b/internal/metric/go.mod @@ -34,7 +34,7 @@ replace go.opentelemetry.io/otel/example/prometheus => ../../example/prometheus replace go.opentelemetry.io/otel/example/zipkin => ../../example/zipkin -replace go.opentelemetry.io/otel/exporters/metric/prometheus => ../../exporters/metric/prometheus +replace go.opentelemetry.io/otel/exporters/prometheus => ../../exporters/prometheus replace go.opentelemetry.io/otel/exporters/otlp => ../../exporters/otlp @@ -46,9 +46,9 @@ replace go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp => ../.. replace go.opentelemetry.io/otel/exporters/stdout => ../../exporters/stdout -replace go.opentelemetry.io/otel/exporters/trace/jaeger => ../../exporters/trace/jaeger +replace go.opentelemetry.io/otel/exporters/jaeger => ../../exporters/jaeger -replace go.opentelemetry.io/otel/exporters/trace/zipkin => ../../exporters/trace/zipkin +replace go.opentelemetry.io/otel/exporters/zipkin => ../../exporters/zipkin replace go.opentelemetry.io/otel/internal/tools => ../tools diff --git a/internal/tools/go.mod b/internal/tools/go.mod index a2850a14b8c..8d2f1b4acaf 100644 --- a/internal/tools/go.mod +++ b/internal/tools/go.mod @@ -32,15 +32,15 @@ replace go.opentelemetry.io/otel/example/prometheus => ../../example/prometheus replace go.opentelemetry.io/otel/example/zipkin => ../../example/zipkin -replace go.opentelemetry.io/otel/exporters/metric/prometheus => ../../exporters/metric/prometheus +replace go.opentelemetry.io/otel/exporters/prometheus => ../../exporters/prometheus replace go.opentelemetry.io/otel/exporters/otlp => ../../exporters/otlp replace go.opentelemetry.io/otel/exporters/stdout => ../../exporters/stdout -replace go.opentelemetry.io/otel/exporters/trace/jaeger => ../../exporters/trace/jaeger +replace go.opentelemetry.io/otel/exporters/jaeger => ../../exporters/jaeger -replace go.opentelemetry.io/otel/exporters/trace/zipkin => ../../exporters/trace/zipkin +replace go.opentelemetry.io/otel/exporters/zipkin => ../../exporters/zipkin replace go.opentelemetry.io/otel/internal/tools => ./ diff --git a/metric/go.mod b/metric/go.mod index 096fd460914..26295491308 100644 --- a/metric/go.mod +++ b/metric/go.mod @@ -22,15 +22,15 @@ replace go.opentelemetry.io/otel/example/prometheus => ../example/prometheus replace go.opentelemetry.io/otel/example/zipkin => ../example/zipkin -replace go.opentelemetry.io/otel/exporters/metric/prometheus => ../exporters/metric/prometheus +replace go.opentelemetry.io/otel/exporters/prometheus => ../exporters/prometheus replace go.opentelemetry.io/otel/exporters/otlp => ../exporters/otlp replace go.opentelemetry.io/otel/exporters/stdout => ../exporters/stdout -replace go.opentelemetry.io/otel/exporters/trace/jaeger => ../exporters/trace/jaeger +replace go.opentelemetry.io/otel/exporters/jaeger => ../exporters/jaeger -replace go.opentelemetry.io/otel/exporters/trace/zipkin => ../exporters/trace/zipkin +replace go.opentelemetry.io/otel/exporters/zipkin => ../exporters/zipkin replace go.opentelemetry.io/otel/internal/tools => ../internal/tools diff --git a/oteltest/go.mod b/oteltest/go.mod index c6e2342f678..ef28140cfed 100644 --- a/oteltest/go.mod +++ b/oteltest/go.mod @@ -22,15 +22,15 @@ replace go.opentelemetry.io/otel/example/prometheus => ../example/prometheus replace go.opentelemetry.io/otel/example/zipkin => ../example/zipkin -replace go.opentelemetry.io/otel/exporters/metric/prometheus => ../exporters/metric/prometheus +replace go.opentelemetry.io/otel/exporters/prometheus => ../exporters/prometheus replace go.opentelemetry.io/otel/exporters/otlp => ../exporters/otlp replace go.opentelemetry.io/otel/exporters/stdout => ../exporters/stdout -replace go.opentelemetry.io/otel/exporters/trace/jaeger => ../exporters/trace/jaeger +replace go.opentelemetry.io/otel/exporters/jaeger => ../exporters/jaeger -replace go.opentelemetry.io/otel/exporters/trace/zipkin => ../exporters/trace/zipkin +replace go.opentelemetry.io/otel/exporters/zipkin => ../exporters/zipkin replace go.opentelemetry.io/otel/internal/tools => ../internal/tools diff --git a/sdk/export/metric/go.mod b/sdk/export/metric/go.mod index 422805c7af7..af6c71e2e9e 100644 --- a/sdk/export/metric/go.mod +++ b/sdk/export/metric/go.mod @@ -22,15 +22,15 @@ replace go.opentelemetry.io/otel/example/prometheus => ../../../example/promethe replace go.opentelemetry.io/otel/example/zipkin => ../../../example/zipkin -replace go.opentelemetry.io/otel/exporters/metric/prometheus => ../../../exporters/metric/prometheus +replace go.opentelemetry.io/otel/exporters/prometheus => ../../../exporters/prometheus replace go.opentelemetry.io/otel/exporters/otlp => ../../../exporters/otlp replace go.opentelemetry.io/otel/exporters/stdout => ../../../exporters/stdout -replace go.opentelemetry.io/otel/exporters/trace/jaeger => ../../../exporters/trace/jaeger +replace go.opentelemetry.io/otel/exporters/jaeger => ../../../exporters/jaeger -replace go.opentelemetry.io/otel/exporters/trace/zipkin => ../../../exporters/trace/zipkin +replace go.opentelemetry.io/otel/exporters/zipkin => ../../../exporters/zipkin replace go.opentelemetry.io/otel/internal/tools => ../../../internal/tools diff --git a/sdk/go.mod b/sdk/go.mod index 42c0abfcbf1..517ee982731 100644 --- a/sdk/go.mod +++ b/sdk/go.mod @@ -30,15 +30,15 @@ replace go.opentelemetry.io/otel/example/prometheus => ../example/prometheus replace go.opentelemetry.io/otel/example/zipkin => ../example/zipkin -replace go.opentelemetry.io/otel/exporters/metric/prometheus => ../exporters/metric/prometheus +replace go.opentelemetry.io/otel/exporters/prometheus => ../exporters/prometheus replace go.opentelemetry.io/otel/exporters/otlp => ../exporters/otlp replace go.opentelemetry.io/otel/exporters/stdout => ../exporters/stdout -replace go.opentelemetry.io/otel/exporters/trace/jaeger => ../exporters/trace/jaeger +replace go.opentelemetry.io/otel/exporters/jaeger => ../exporters/jaeger -replace go.opentelemetry.io/otel/exporters/trace/zipkin => ../exporters/trace/zipkin +replace go.opentelemetry.io/otel/exporters/zipkin => ../exporters/zipkin replace go.opentelemetry.io/otel/internal/tools => ../internal/tools diff --git a/sdk/metric/go.mod b/sdk/metric/go.mod index e2e908ccf2a..4abd9870ea2 100644 --- a/sdk/metric/go.mod +++ b/sdk/metric/go.mod @@ -22,15 +22,15 @@ replace go.opentelemetry.io/otel/example/prometheus => ../../example/prometheus replace go.opentelemetry.io/otel/example/zipkin => ../../example/zipkin -replace go.opentelemetry.io/otel/exporters/metric/prometheus => ../../exporters/metric/prometheus +replace go.opentelemetry.io/otel/exporters/prometheus => ../../exporters/prometheus replace go.opentelemetry.io/otel/exporters/otlp => ../../exporters/otlp replace go.opentelemetry.io/otel/exporters/stdout => ../../exporters/stdout -replace go.opentelemetry.io/otel/exporters/trace/jaeger => ../../exporters/trace/jaeger +replace go.opentelemetry.io/otel/exporters/jaeger => ../../exporters/jaeger -replace go.opentelemetry.io/otel/exporters/trace/zipkin => ../../exporters/trace/zipkin +replace go.opentelemetry.io/otel/exporters/zipkin => ../../exporters/zipkin replace go.opentelemetry.io/otel/internal/tools => ../../internal/tools diff --git a/trace/go.mod b/trace/go.mod index 01069d8ca8a..e20b258e48d 100644 --- a/trace/go.mod +++ b/trace/go.mod @@ -22,15 +22,15 @@ replace go.opentelemetry.io/otel/example/prometheus => ../example/prometheus replace go.opentelemetry.io/otel/example/zipkin => ../example/zipkin -replace go.opentelemetry.io/otel/exporters/metric/prometheus => ../exporters/metric/prometheus +replace go.opentelemetry.io/otel/exporters/prometheus => ../exporters/prometheus replace go.opentelemetry.io/otel/exporters/otlp => ../exporters/otlp replace go.opentelemetry.io/otel/exporters/stdout => ../exporters/stdout -replace go.opentelemetry.io/otel/exporters/trace/jaeger => ../exporters/trace/jaeger +replace go.opentelemetry.io/otel/exporters/jaeger => ../exporters/jaeger -replace go.opentelemetry.io/otel/exporters/trace/zipkin => ../exporters/trace/zipkin +replace go.opentelemetry.io/otel/exporters/zipkin => ../exporters/zipkin replace go.opentelemetry.io/otel/internal/tools => ../internal/tools diff --git a/website_docs/exporting_data.md b/website_docs/exporting_data.md index 0d4cab5b18f..c01dc0c460e 100644 --- a/website_docs/exporting_data.md +++ b/website_docs/exporting_data.md @@ -53,12 +53,12 @@ Please find more documentation on [GitHub](https://github.com/open-telemetry/ope # Jaeger Exporter -Jaeger export is available in the `go.opentelemetry.io/otel/exporters/trace/jaeger` package. +Jaeger export is available in the `go.opentelemetry.io/otel/exporters/jaeger` package. -Please find more documentation on [GitHub](https://github.com/open-telemetry/opentelemetry-go/tree/main/exporters/trace/jaeger) +Please find more documentation on [GitHub](https://github.com/open-telemetry/opentelemetry-go/tree/main/exporters/jaeger) # Prometheus Exporter -Prometheus export is available in the `go.opentelemetry.io/otel/exporters/metric/prometheus` package. +Prometheus export is available in the `go.opentelemetry.io/otel/exporters/prometheus` package. -Please find more documentation on [GitHub](https://github.com/open-telemetry/opentelemetry-go/tree/main/exporters/metric/prometheus) +Please find more documentation on [GitHub](https://github.com/open-telemetry/opentelemetry-go/tree/main/exporters/prometheus)