[chore] Move otlptext to debug/internal, no need in exporter (#11372)

Depends on #11371 Signed-off-by: Bogdan Drutu <[email protected]>
open-telemetry · Oct 9, 2024 · 4c6a342 · 4c6a342
1 parent d2f844f
commit 4c6a342
Show file tree

Hide file tree

Showing 31 changed files with 14 additions and 14 deletions.
diff --git a/exporter/debugexporter/exporter.go b/exporter/debugexporter/exporter.go
@@ -10,7 +10,7 @@ import (
 
 	"go.opentelemetry.io/collector/config/configtelemetry"
 	"go.opentelemetry.io/collector/exporter/debugexporter/internal/normal"
-	"go.opentelemetry.io/collector/exporter/internal/otlptext"
+	"go.opentelemetry.io/collector/exporter/debugexporter/internal/otlptext"
 	"go.opentelemetry.io/collector/pdata/plog"
 	"go.opentelemetry.io/collector/pdata/pmetric"
 	"go.opentelemetry.io/collector/pdata/ptrace"

diff --git a/exporter/debugexporter/factory.go b/exporter/debugexporter/factory.go
@@ -15,8 +15,8 @@ import (
 	"go.opentelemetry.io/collector/consumer"
 	"go.opentelemetry.io/collector/exporter"
 	"go.opentelemetry.io/collector/exporter/debugexporter/internal/metadata"
+	"go.opentelemetry.io/collector/exporter/debugexporter/internal/otlptext"
 	"go.opentelemetry.io/collector/exporter/exporterhelper"
-	"go.opentelemetry.io/collector/exporter/internal/otlptext"
 )
 
 // The value of "type" key in configuration.

diff --git a/exporter/debugexporter/go.mod b/exporter/debugexporter/go.mod
@@ -10,9 +10,11 @@ require (
 	go.opentelemetry.io/collector/consumer v0.111.0
 	go.opentelemetry.io/collector/exporter v0.111.0
 	go.opentelemetry.io/collector/pdata v1.17.0
+	go.opentelemetry.io/collector/pdata/pprofile v0.111.0
 	go.opentelemetry.io/collector/pdata/testdata v0.111.0
 	go.uber.org/goleak v1.3.0
 	go.uber.org/zap v1.27.0
+	golang.org/x/sys v0.26.0
 )
 
 require (
@@ -39,7 +41,6 @@ require (
 	go.opentelemetry.io/collector/extension v0.111.0 // indirect
 	go.opentelemetry.io/collector/extension/experimental/storage v0.111.0 // indirect
 	go.opentelemetry.io/collector/internal/globalsignal v0.111.0 // indirect
-	go.opentelemetry.io/collector/pdata/pprofile v0.111.0 // indirect
 	go.opentelemetry.io/collector/pipeline v0.111.0 // indirect
 	go.opentelemetry.io/collector/receiver v0.111.0 // indirect
 	go.opentelemetry.io/collector/receiver/receiverprofiles v0.111.0 // indirect
@@ -50,7 +51,6 @@ require (
 	go.opentelemetry.io/otel/trace v1.30.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	golang.org/x/net v0.28.0 // indirect
-	golang.org/x/sys v0.26.0 // indirect
 	golang.org/x/text v0.17.0 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20240822170219-fc7c04adadcd // indirect
 	google.golang.org/grpc v1.67.1 // indirect

diff --git a/exporter/internal/otlptext/databuffer.go → ...gexporter/internal/otlptext/databuffer.go b/exporter/internal/otlptext/databuffer.go → ...gexporter/internal/otlptext/databuffer.go
@@ -1,7 +1,7 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-package otlptext // import "go.opentelemetry.io/collector/exporter/internal/otlptext"
+package otlptext // import "go.opentelemetry.io/collector/exporter/debugexporter/internal/otlptext"
 
 import (
 	"bytes"

diff --git a/...rter/internal/otlptext/databuffer_test.go → ...rter/internal/otlptext/databuffer_test.go b/...rter/internal/otlptext/databuffer_test.go → ...rter/internal/otlptext/databuffer_test.go
diff --git a/...ter/internal/otlptext/known_sync_error.go → ...ter/internal/otlptext/known_sync_error.go b/...ter/internal/otlptext/known_sync_error.go → ...ter/internal/otlptext/known_sync_error.go
@@ -3,7 +3,7 @@
 
 //go:build linux || darwin
 
-package otlptext // import "go.opentelemetry.io/collector/exporter/internal/otlptext"
+package otlptext // import "go.opentelemetry.io/collector/exporter/debugexporter/internal/otlptext"
 
 import (
 	"errors"

diff --git a/...ternal/otlptext/known_sync_error_other.go → ...ternal/otlptext/known_sync_error_other.go b/...ternal/otlptext/known_sync_error_other.go → ...ternal/otlptext/known_sync_error_other.go
@@ -3,7 +3,7 @@
 
 //go:build !linux && !darwin && !windows
 
-package otlptext // import "go.opentelemetry.io/collector/exporter/internal/otlptext"
+package otlptext // import "go.opentelemetry.io/collector/exporter/debugexporter/internal/otlptext"
 
 // knownSyncError returns true if the given error is one of the known
 // non-actionable errors returned by Sync on Plan 9.

diff --git a/...rnal/otlptext/known_sync_error_windows.go → ...rnal/otlptext/known_sync_error_windows.go b/...rnal/otlptext/known_sync_error_windows.go → ...rnal/otlptext/known_sync_error_windows.go
@@ -3,7 +3,7 @@
 
 //go:build windows
 
-package otlptext // import "go.opentelemetry.io/collector/exporter/internal/otlptext"
+package otlptext // import "go.opentelemetry.io/collector/exporter/debugexporter/internal/otlptext"
 
 import "golang.org/x/sys/windows"
 

diff --git a/exporter/internal/otlptext/logs.go → ...r/debugexporter/internal/otlptext/logs.go b/exporter/internal/otlptext/logs.go → ...r/debugexporter/internal/otlptext/logs.go
@@ -1,7 +1,7 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-package otlptext // import "go.opentelemetry.io/collector/exporter/internal/otlptext"
+package otlptext // import "go.opentelemetry.io/collector/exporter/debugexporter/internal/otlptext"
 
 import (
 	"go.opentelemetry.io/collector/pdata/plog"

diff --git a/exporter/internal/otlptext/logs_test.go → ...ugexporter/internal/otlptext/logs_test.go b/exporter/internal/otlptext/logs_test.go → ...ugexporter/internal/otlptext/logs_test.go
diff --git a/exporter/internal/otlptext/metrics.go → ...ebugexporter/internal/otlptext/metrics.go b/exporter/internal/otlptext/metrics.go → ...ebugexporter/internal/otlptext/metrics.go
@@ -1,7 +1,7 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-package otlptext // import "go.opentelemetry.io/collector/exporter/internal/otlptext"
+package otlptext // import "go.opentelemetry.io/collector/exporter/debugexporter/internal/otlptext"
 
 import "go.opentelemetry.io/collector/pdata/pmetric"
 

diff --git a/exporter/internal/otlptext/metrics_test.go → ...xporter/internal/otlptext/metrics_test.go b/exporter/internal/otlptext/metrics_test.go → ...xporter/internal/otlptext/metrics_test.go
diff --git a/exporter/internal/otlptext/package_test.go → ...xporter/internal/otlptext/package_test.go b/exporter/internal/otlptext/package_test.go → ...xporter/internal/otlptext/package_test.go
diff --git a/exporter/internal/otlptext/profiles.go → ...bugexporter/internal/otlptext/profiles.go b/exporter/internal/otlptext/profiles.go → ...bugexporter/internal/otlptext/profiles.go
@@ -1,7 +1,7 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-package otlptext // import "go.opentelemetry.io/collector/exporter/internal/otlptext"
+package otlptext // import "go.opentelemetry.io/collector/exporter/debugexporter/internal/otlptext"
 
 import (
 	"strconv"

diff --git a/exporter/internal/otlptext/profiles_test.go → ...porter/internal/otlptext/profiles_test.go b/exporter/internal/otlptext/profiles_test.go → ...porter/internal/otlptext/profiles_test.go
diff --git a/exporter/internal/otlptext/sync.go → ...r/debugexporter/internal/otlptext/sync.go b/exporter/internal/otlptext/sync.go → ...r/debugexporter/internal/otlptext/sync.go
@@ -1,7 +1,7 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-package otlptext // import "go.opentelemetry.io/collector/exporter/internal/otlptext"
+package otlptext // import "go.opentelemetry.io/collector/exporter/debugexporter/internal/otlptext"
 
 import (
 	"context"

diff --git a/.../otlptext/testdata/logs/embedded_maps.out → .../otlptext/testdata/logs/embedded_maps.out b/.../otlptext/testdata/logs/embedded_maps.out → .../otlptext/testdata/logs/embedded_maps.out
diff --git a/...internal/otlptext/testdata/logs/empty.out → ...internal/otlptext/testdata/logs/empty.out b/...internal/otlptext/testdata/logs/empty.out → ...internal/otlptext/testdata/logs/empty.out
diff --git a/...nal/otlptext/testdata/logs/one_record.out → ...nal/otlptext/testdata/logs/one_record.out b/...nal/otlptext/testdata/logs/one_record.out → ...nal/otlptext/testdata/logs/one_record.out
diff --git a/...al/otlptext/testdata/logs/two_records.out → ...al/otlptext/testdata/logs/two_records.out b/...al/otlptext/testdata/logs/two_records.out → ...al/otlptext/testdata/logs/two_records.out
diff --git a/...ernal/otlptext/testdata/metrics/empty.out → ...ernal/otlptext/testdata/metrics/empty.out b/...ernal/otlptext/testdata/metrics/empty.out → ...ernal/otlptext/testdata/metrics/empty.out
diff --git a/.../testdata/metrics/invalid_metric_type.out → .../testdata/metrics/invalid_metric_type.out b/.../testdata/metrics/invalid_metric_type.out → .../testdata/metrics/invalid_metric_type.out
diff --git a/...stdata/metrics/metrics_with_all_types.out → ...stdata/metrics/metrics_with_all_types.out b/...stdata/metrics/metrics_with_all_types.out → ...stdata/metrics/metrics_with_all_types.out
diff --git a/...otlptext/testdata/metrics/two_metrics.out → ...otlptext/testdata/metrics/two_metrics.out b/...otlptext/testdata/metrics/two_metrics.out → ...otlptext/testdata/metrics/two_metrics.out
diff --git a/...rnal/otlptext/testdata/profiles/empty.out → ...rnal/otlptext/testdata/profiles/empty.out b/...rnal/otlptext/testdata/profiles/empty.out → ...rnal/otlptext/testdata/profiles/empty.out
diff --git a/...lptext/testdata/profiles/two_profiles.out → ...lptext/testdata/profiles/two_profiles.out b/...lptext/testdata/profiles/two_profiles.out → ...lptext/testdata/profiles/two_profiles.out
diff --git a/...ternal/otlptext/testdata/traces/empty.out → ...ternal/otlptext/testdata/traces/empty.out b/...ternal/otlptext/testdata/traces/empty.out → ...ternal/otlptext/testdata/traces/empty.out
diff --git a/...al/otlptext/testdata/traces/two_spans.out → ...al/otlptext/testdata/traces/two_spans.out b/...al/otlptext/testdata/traces/two_spans.out → ...al/otlptext/testdata/traces/two_spans.out
diff --git a/exporter/internal/otlptext/traces.go → ...debugexporter/internal/otlptext/traces.go b/exporter/internal/otlptext/traces.go → ...debugexporter/internal/otlptext/traces.go
@@ -1,7 +1,7 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-package otlptext // import "go.opentelemetry.io/collector/exporter/internal/otlptext"
+package otlptext // import "go.opentelemetry.io/collector/exporter/debugexporter/internal/otlptext"
 
 import (
 	"go.opentelemetry.io/collector/pdata/ptrace"

diff --git a/exporter/internal/otlptext/traces_test.go → ...exporter/internal/otlptext/traces_test.go b/exporter/internal/otlptext/traces_test.go → ...exporter/internal/otlptext/traces_test.go
diff --git a/exporter/go.mod b/exporter/go.mod
@@ -27,7 +27,6 @@ require (
 	go.uber.org/goleak v1.3.0
 	go.uber.org/multierr v1.11.0
 	go.uber.org/zap v1.27.0
-	golang.org/x/sys v0.26.0
 	google.golang.org/grpc v1.67.1
 )
 
@@ -44,6 +43,7 @@ require (
 	go.opentelemetry.io/collector/internal/globalsignal v0.111.0 // indirect
 	go.opentelemetry.io/collector/receiver/receiverprofiles v0.111.0 // indirect
 	golang.org/x/net v0.28.0 // indirect
+	golang.org/x/sys v0.26.0 // indirect
 	golang.org/x/text v0.17.0 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20240822170219-fc7c04adadcd // indirect
 	google.golang.org/protobuf v1.35.1 // indirect