From e0819780f9d4ea1e8169109cd71b848fe08f788c Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Fri, 20 Nov 2020 22:34:40 +0100 Subject: [PATCH] Move opencensus example to the example directory (#1359) And update .gitignore, so the built binary does not show up in git status. --- .github/dependabot.yml | 8 ++++---- .gitignore | 1 + CHANGELOG.md | 4 ++++ bridge/opencensus/examples/bridge/go.mod | 18 ------------------ example/opencensus/go.mod | 18 ++++++++++++++++++ .../bridge => example/opencensus}/go.sum | 0 .../bridge => example/opencensus}/main.go | 0 7 files changed, 27 insertions(+), 22 deletions(-) delete mode 100644 bridge/opencensus/examples/bridge/go.mod create mode 100644 example/opencensus/go.mod rename {bridge/opencensus/examples/bridge => example/opencensus}/go.sum (100%) rename {bridge/opencensus/examples/bridge => example/opencensus}/main.go (100%) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 18207ca99fe7..7c5633720916 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -48,7 +48,7 @@ updates: interval: weekly - package-ecosystem: gomod - directory: /bridge/opencensus/examples/bridge + directory: /example/basic labels: - dependencies - go @@ -58,7 +58,7 @@ updates: interval: weekly - package-ecosystem: gomod - directory: /example/basic + directory: /example/jaeger labels: - dependencies - go @@ -68,7 +68,7 @@ updates: interval: weekly - package-ecosystem: gomod - directory: /example/jaeger + directory: /example/namedtracer labels: - dependencies - go @@ -78,7 +78,7 @@ updates: interval: weekly - package-ecosystem: gomod - directory: /example/namedtracer + directory: /example/opencensus labels: - dependencies - go diff --git a/.gitignore b/.gitignore index cbef19714a7c..90bd682fde4f 100644 --- a/.gitignore +++ b/.gitignore @@ -17,6 +17,7 @@ gen/ /example/http/server/server /example/jaeger/jaeger /example/namedtracer/namedtracer +/example/opencensus/opencensus /example/prometheus/prometheus /example/zipkin/zipkin /example/otel-collector/otel-collector diff --git a/CHANGELOG.md b/CHANGELOG.md index b892f8b216c0..347742c0b116 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,10 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm ## [Unreleased] +### Changed + +- Move the OpenCensus example into `example` directory. (#1359) + ## [0.14.0] - 2020-11-19 ### Added diff --git a/bridge/opencensus/examples/bridge/go.mod b/bridge/opencensus/examples/bridge/go.mod deleted file mode 100644 index da49395daf96..000000000000 --- a/bridge/opencensus/examples/bridge/go.mod +++ /dev/null @@ -1,18 +0,0 @@ -module go.opentelemetry.io/otel/bridge/opencensus/examples/bridge - -go 1.14 - -replace ( - go.opentelemetry.io/otel => ../../../.. - go.opentelemetry.io/otel/bridge/opencensus => ../.. - go.opentelemetry.io/otel/exporters/stdout => ../../../../exporters/stdout - go.opentelemetry.io/otel/sdk => ../../../../sdk -) - -require ( - go.opencensus.io v0.22.6-0.20201102222123-380f4078db9f - go.opentelemetry.io/otel v0.14.0 - go.opentelemetry.io/otel/bridge/opencensus v0.14.0 - go.opentelemetry.io/otel/exporters/stdout v0.14.0 - go.opentelemetry.io/otel/sdk v0.14.0 -) diff --git a/example/opencensus/go.mod b/example/opencensus/go.mod new file mode 100644 index 000000000000..2c9fc02ae037 --- /dev/null +++ b/example/opencensus/go.mod @@ -0,0 +1,18 @@ +module go.opentelemetry.io/otel/example/opencensus + +go 1.14 + +replace ( + go.opentelemetry.io/otel => ../.. + go.opentelemetry.io/otel/bridge/opencensus => ../../bridge/opencensus + go.opentelemetry.io/otel/exporters/stdout => ../../exporters/stdout + go.opentelemetry.io/otel/sdk => ../../sdk +) + +require ( + go.opencensus.io v0.22.6-0.20201102222123-380f4078db9f + go.opentelemetry.io/otel v0.14.0 + go.opentelemetry.io/otel/bridge/opencensus v0.14.0 + go.opentelemetry.io/otel/exporters/stdout v0.14.0 + go.opentelemetry.io/otel/sdk v0.14.0 +) diff --git a/bridge/opencensus/examples/bridge/go.sum b/example/opencensus/go.sum similarity index 100% rename from bridge/opencensus/examples/bridge/go.sum rename to example/opencensus/go.sum diff --git a/bridge/opencensus/examples/bridge/main.go b/example/opencensus/main.go similarity index 100% rename from bridge/opencensus/examples/bridge/main.go rename to example/opencensus/main.go