From 2e221fdf3e1539b68f79c4b1254c7ee1b4149692 Mon Sep 17 00:00:00 2001 From: Anthony Mirabella Date: Wed, 9 Sep 2020 12:14:03 -0400 Subject: [PATCH] Move tools package under internal (#1141) It is not user-facing, so there is no reason to leave it in an importable location. Fixes #1126. --- .github/dependabot.yml | 3 +-- CHANGELOG.md | 1 + Makefile | 2 +- {tools => internal/tools}/go.mod | 2 +- {tools => internal/tools}/go.sum | 0 {tools => internal/tools}/tools.go | 0 tag.sh | 2 +- 7 files changed, 5 insertions(+), 5 deletions(-) rename {tools => internal/tools}/go.mod (80%) rename {tools => internal/tools}/go.sum (100%) rename {tools => internal/tools}/tools.go (100%) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 9ff04a266..203e1e762 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -83,8 +83,7 @@ updates: interval: "weekly" day: "sunday" - package-ecosystem: "gomod" - directory: "/tools" + directory: "/internal/tools" schedule: interval: "weekly" day: "sunday" - diff --git a/CHANGELOG.md b/CHANGELOG.md index bee7b4f5f..825981820 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,6 +29,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm This removal of the propagators is reflective of the OpenTelemetry specification for these propagators as well as cleans up the `go.opentelemetry.io/otel/api/trace` API. (#1118) - Rename Jaeger tags used for instrumentation library information to reflect changes in OpenTelemetry specification. (#1119) - Rename `ProbabilitySampler` to `TraceIDRatioBased` and change semantics to ignore parent span sampling status. (#1115) +- Move `tools` package under `internal`. (#1141) ## [0.11.0] - 2020-08-24 diff --git a/Makefile b/Makefile index 4eb1660fc..a6a17f9c8 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,7 @@ # limitations under the License. EXAMPLES := $(shell ./get_main_pkgs.sh ./example) -TOOLS_MOD_DIR := ./tools +TOOLS_MOD_DIR := ./internal/tools # All source code and documents. Used in spell check. ALL_DOCS := $(shell find . -name '*.md' -type f | sort) diff --git a/tools/go.mod b/internal/tools/go.mod similarity index 80% rename from tools/go.mod rename to internal/tools/go.mod index ff02c2551..c1596d318 100644 --- a/tools/go.mod +++ b/internal/tools/go.mod @@ -1,4 +1,4 @@ -module go.opentelemetry.io/otel/tools +module go.opentelemetry.io/otel/internal/tools go 1.14 diff --git a/tools/go.sum b/internal/tools/go.sum similarity index 100% rename from tools/go.sum rename to internal/tools/go.sum diff --git a/tools/tools.go b/internal/tools/tools.go similarity index 100% rename from tools/tools.go rename to internal/tools/tools.go diff --git a/tag.sh b/tag.sh index 2a0ef1d26..70767c703 100755 --- a/tag.sh +++ b/tag.sh @@ -17,7 +17,7 @@ readonly PROGNAME=$(basename "$0") readonly PROGDIR=$(readlink -m "$(dirname "$0")") -readonly EXCLUDE_PACKAGES="tools" +readonly EXCLUDE_PACKAGES="internal/tools" readonly SEMVER_REGEX="v(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)(\\-[0-9A-Za-z-]+(\\.[0-9A-Za-z-]+)*)?(\\+[0-9A-Za-z-]+(\\.[0-9A-Za-z-]+)*)?" usage() {