From 3198df7cda2daadb7e02af2b11bd5dbcc3ba6649 Mon Sep 17 00:00:00 2001 From: Eundoo Song Date: Tue, 12 Jan 2021 23:41:22 +0900 Subject: [PATCH] Rename internal/testing to internal/internaltest --- CHANGELOG.md | 2 +- exporters/otlp/otlpgrpc/alignment_test.go | 2 +- exporters/trace/jaeger/env_test.go | 2 +- exporters/trace/jaeger/jaeger_test.go | 2 +- internal/global/internal_test.go | 2 +- internal/{testing => internaltest}/alignment.go | 2 +- internal/{testing => internaltest}/env.go | 2 +- internal/{testing => internaltest}/env_test.go | 2 +- internal/{testing => internaltest}/errors.go | 2 +- metric/alignment_test.go | 2 +- oteltest/alignment_test.go | 2 +- oteltest/span_test.go | 6 +++--- sdk/metric/aggregator/aggregatortest/test.go | 2 +- sdk/metric/aggregator/lastvalue/lastvalue_test.go | 2 +- sdk/metric/aggregator/sum/sum_test.go | 2 +- sdk/metric/alignment_test.go | 2 +- sdk/resource/config_test.go | 2 +- sdk/resource/env_test.go | 2 +- sdk/trace/trace_test.go | 4 ++-- 19 files changed, 22 insertions(+), 22 deletions(-) rename internal/{testing => internaltest}/alignment.go (99%) rename internal/{testing => internaltest}/env.go (98%) rename internal/{testing => internaltest}/env_test.go (99%) rename internal/{testing => internaltest}/errors.go (97%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6847e047fc8..ef029505c63 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,7 +19,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm - A new HTTP driver for OTLP exporter in `exporters/otlp/otlphttp`. Currently it only supports the binary protobuf payloads. (#1420) ### Changed - +- Rename `internal/testing` to `internal/internaltest`. (#1449) - Rename `export.SpanData` to `export.SpanSnapshot` and use it only for exporting spans. (#1360) - Store the parent's full `SpanContext` rather than just its span ID in the `span` struct. (#1360) - Improve span duration accuracy. (#1360) diff --git a/exporters/otlp/otlpgrpc/alignment_test.go b/exporters/otlp/otlpgrpc/alignment_test.go index ef3217b365b..db19e7d03c7 100644 --- a/exporters/otlp/otlpgrpc/alignment_test.go +++ b/exporters/otlp/otlpgrpc/alignment_test.go @@ -19,7 +19,7 @@ import ( "testing" "unsafe" - ottest "go.opentelemetry.io/otel/internal/testing" + ottest "go.opentelemetry.io/otel/internal/internaltest" ) // Ensure struct alignment prior to running tests. diff --git a/exporters/trace/jaeger/env_test.go b/exporters/trace/jaeger/env_test.go index 69cc847de8a..c3ffed60757 100644 --- a/exporters/trace/jaeger/env_test.go +++ b/exporters/trace/jaeger/env_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - ottest "go.opentelemetry.io/otel/internal/testing" + ottest "go.opentelemetry.io/otel/internal/internaltest" "go.opentelemetry.io/otel/label" ) diff --git a/exporters/trace/jaeger/jaeger_test.go b/exporters/trace/jaeger/jaeger_test.go index eea460b18c8..6cfe858aa3d 100644 --- a/exporters/trace/jaeger/jaeger_test.go +++ b/exporters/trace/jaeger/jaeger_test.go @@ -31,7 +31,7 @@ import ( "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/codes" gen "go.opentelemetry.io/otel/exporters/trace/jaeger/internal/gen-go/jaeger" - ottest "go.opentelemetry.io/otel/internal/testing" + ottest "go.opentelemetry.io/otel/internal/internaltest" "go.opentelemetry.io/otel/label" export "go.opentelemetry.io/otel/sdk/export/trace" "go.opentelemetry.io/otel/sdk/instrumentation" diff --git a/internal/global/internal_test.go b/internal/global/internal_test.go index dae5bc5ae38..ff332feae02 100644 --- a/internal/global/internal_test.go +++ b/internal/global/internal_test.go @@ -19,7 +19,7 @@ import ( "testing" "go.opentelemetry.io/otel/internal/global" - ottest "go.opentelemetry.io/otel/internal/testing" + ottest "go.opentelemetry.io/otel/internal/internaltest" ) // Ensure struct alignment prior to running tests. diff --git a/internal/testing/alignment.go b/internal/internaltest/alignment.go similarity index 99% rename from internal/testing/alignment.go rename to internal/internaltest/alignment.go index c47624b9027..a814ef685cb 100644 --- a/internal/testing/alignment.go +++ b/internal/internaltest/alignment.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package testing +package internaltest /* This file contains common utilities and objects to validate memory alignment diff --git a/internal/testing/env.go b/internal/internaltest/env.go similarity index 98% rename from internal/testing/env.go rename to internal/internaltest/env.go index d8458c644d7..92af567e8fa 100644 --- a/internal/testing/env.go +++ b/internal/internaltest/env.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package testing +package internaltest import ( "os" diff --git a/internal/testing/env_test.go b/internal/internaltest/env_test.go similarity index 99% rename from internal/testing/env_test.go rename to internal/internaltest/env_test.go index 4e05000ebb0..74b15abc476 100644 --- a/internal/testing/env_test.go +++ b/internal/internaltest/env_test.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package testing +package internaltest import ( "os" diff --git a/internal/testing/errors.go b/internal/internaltest/errors.go similarity index 97% rename from internal/testing/errors.go rename to internal/internaltest/errors.go index 465c5a22475..8d1e7d13862 100644 --- a/internal/testing/errors.go +++ b/internal/internaltest/errors.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package testing +package internaltest type TestError string diff --git a/metric/alignment_test.go b/metric/alignment_test.go index 3dc469907f0..b4c74cde9de 100644 --- a/metric/alignment_test.go +++ b/metric/alignment_test.go @@ -19,7 +19,7 @@ import ( "testing" "unsafe" - internaltest "go.opentelemetry.io/otel/internal/testing" + internaltest "go.opentelemetry.io/otel/internal/internaltest" ) // Ensure struct alignment prior to running tests. diff --git a/oteltest/alignment_test.go b/oteltest/alignment_test.go index 31877be1eb4..823d5fb4e66 100644 --- a/oteltest/alignment_test.go +++ b/oteltest/alignment_test.go @@ -19,7 +19,7 @@ import ( "testing" "unsafe" - internaltest "go.opentelemetry.io/otel/internal/testing" + internaltest "go.opentelemetry.io/otel/internal/internaltest" ) // TestMain ensures struct alignment prior to running tests. diff --git a/oteltest/span_test.go b/oteltest/span_test.go index cc526c6ebf8..6aebee593fb 100644 --- a/oteltest/span_test.go +++ b/oteltest/span_test.go @@ -23,8 +23,8 @@ import ( "time" "go.opentelemetry.io/otel/codes" + ottest "go.opentelemetry.io/otel/internal/internaltest" "go.opentelemetry.io/otel/internal/matchers" - ottest "go.opentelemetry.io/otel/internal/testing" "go.opentelemetry.io/otel/label" "go.opentelemetry.io/otel/oteltest" "go.opentelemetry.io/otel/trace" @@ -136,7 +136,7 @@ func TestSpan(t *testing.T) { }{ { err: ottest.NewTestError("test error"), - typ: "go.opentelemetry.io/otel/internal/testing.TestError", + typ: "go.opentelemetry.io/otel/internal/internaltest.TestError", msg: "test error", }, { @@ -192,7 +192,7 @@ func TestSpan(t *testing.T) { Timestamp: testTime, Name: "error", Attributes: map[label.Key]label.Value{ - label.Key("error.type"): label.StringValue("go.opentelemetry.io/otel/internal/testing.TestError"), + label.Key("error.type"): label.StringValue("go.opentelemetry.io/otel/internal/internaltest.TestError"), label.Key("error.message"): label.StringValue(errMsg), }, }} diff --git a/sdk/metric/aggregator/aggregatortest/test.go b/sdk/metric/aggregator/aggregatortest/test.go index 4313868fdd6..6a1650ee1aa 100644 --- a/sdk/metric/aggregator/aggregatortest/test.go +++ b/sdk/metric/aggregator/aggregatortest/test.go @@ -25,7 +25,7 @@ import ( "github.com/stretchr/testify/require" - ottest "go.opentelemetry.io/otel/internal/testing" + ottest "go.opentelemetry.io/otel/internal/internaltest" "go.opentelemetry.io/otel/metric" "go.opentelemetry.io/otel/metric/number" export "go.opentelemetry.io/otel/sdk/export/metric" diff --git a/sdk/metric/aggregator/lastvalue/lastvalue_test.go b/sdk/metric/aggregator/lastvalue/lastvalue_test.go index 3aad095e7b3..94baa69b71d 100644 --- a/sdk/metric/aggregator/lastvalue/lastvalue_test.go +++ b/sdk/metric/aggregator/lastvalue/lastvalue_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/require" - ottest "go.opentelemetry.io/otel/internal/testing" + ottest "go.opentelemetry.io/otel/internal/internaltest" "go.opentelemetry.io/otel/metric" "go.opentelemetry.io/otel/metric/number" export "go.opentelemetry.io/otel/sdk/export/metric" diff --git a/sdk/metric/aggregator/sum/sum_test.go b/sdk/metric/aggregator/sum/sum_test.go index 2b30c6a637c..e63d2f9d690 100644 --- a/sdk/metric/aggregator/sum/sum_test.go +++ b/sdk/metric/aggregator/sum/sum_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/require" - ottest "go.opentelemetry.io/otel/internal/testing" + ottest "go.opentelemetry.io/otel/internal/internaltest" "go.opentelemetry.io/otel/metric" "go.opentelemetry.io/otel/metric/number" export "go.opentelemetry.io/otel/sdk/export/metric" diff --git a/sdk/metric/alignment_test.go b/sdk/metric/alignment_test.go index a260ca02fdd..1fdc3804c58 100644 --- a/sdk/metric/alignment_test.go +++ b/sdk/metric/alignment_test.go @@ -18,7 +18,7 @@ import ( "os" "testing" - ottest "go.opentelemetry.io/otel/internal/testing" + ottest "go.opentelemetry.io/otel/internal/internaltest" ) // Ensure struct alignment prior to running tests. diff --git a/sdk/resource/config_test.go b/sdk/resource/config_test.go index f951787296d..7220f6c8b45 100644 --- a/sdk/resource/config_test.go +++ b/sdk/resource/config_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/otel" - ottest "go.opentelemetry.io/otel/internal/testing" + ottest "go.opentelemetry.io/otel/internal/internaltest" "go.opentelemetry.io/otel/label" "go.opentelemetry.io/otel/sdk/resource" ) diff --git a/sdk/resource/env_test.go b/sdk/resource/env_test.go index 622fb147838..2499288ca5d 100644 --- a/sdk/resource/env_test.go +++ b/sdk/resource/env_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - ottest "go.opentelemetry.io/otel/internal/testing" + ottest "go.opentelemetry.io/otel/internal/internaltest" "go.opentelemetry.io/otel/label" ) diff --git a/sdk/trace/trace_test.go b/sdk/trace/trace_test.go index f2f5e15cf68..dfaf186bfc8 100644 --- a/sdk/trace/trace_test.go +++ b/sdk/trace/trace_test.go @@ -35,7 +35,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - ottest "go.opentelemetry.io/otel/internal/testing" + ottest "go.opentelemetry.io/otel/internal/internaltest" export "go.opentelemetry.io/otel/sdk/export/trace" "go.opentelemetry.io/otel/sdk/instrumentation" "go.opentelemetry.io/otel/sdk/resource" @@ -1071,7 +1071,7 @@ func TestRecordError(t *testing.T) { }{ { err: ottest.NewTestError("test error"), - typ: "go.opentelemetry.io/otel/internal/testing.TestError", + typ: "go.opentelemetry.io/otel/internal/internaltest.TestError", msg: "test error", }, {