Avoid exposing internal implementation public in OC/OTEL receivers

Signed-off-by: Bogdan Drutu <[email protected]>
open-telemetry · Jun 3, 2021 · e6a108e · e6a108e
1 parent 9e240bc
commit e6a108e
Show file tree

Hide file tree

Showing 17 changed files with 9 additions and 8 deletions.
diff --git a/receiver/opencensusreceiver/ocmetrics/doc.go → ...ncensusreceiver/internal/ocmetrics/doc.go b/receiver/opencensusreceiver/ocmetrics/doc.go → ...ncensusreceiver/internal/ocmetrics/doc.go
diff --git a/...pencensusreceiver/ocmetrics/opencensus.go → ...receiver/internal/ocmetrics/opencensus.go b/...pencensusreceiver/ocmetrics/opencensus.go → ...receiver/internal/ocmetrics/opencensus.go
diff --git a/...nsusreceiver/ocmetrics/opencensus_test.go → ...ver/internal/ocmetrics/opencensus_test.go b/...nsusreceiver/ocmetrics/opencensus_test.go → ...ver/internal/ocmetrics/opencensus_test.go
diff --git a/receiver/opencensusreceiver/octrace/doc.go → ...pencensusreceiver/internal/octrace/doc.go b/receiver/opencensusreceiver/octrace/doc.go → ...pencensusreceiver/internal/octrace/doc.go
diff --git a/...susreceiver/octrace/observability_test.go → ...er/internal/octrace/observability_test.go b/...susreceiver/octrace/observability_test.go → ...er/internal/octrace/observability_test.go
diff --git a/.../opencensusreceiver/octrace/opencensus.go → ...usreceiver/internal/octrace/opencensus.go b/.../opencensusreceiver/octrace/opencensus.go → ...usreceiver/internal/octrace/opencensus.go
diff --git a/...censusreceiver/octrace/opencensus_test.go → ...eiver/internal/octrace/opencensus_test.go b/...censusreceiver/octrace/opencensus_test.go → ...eiver/internal/octrace/opencensus_test.go
diff --git a/receiver/opencensusreceiver/opencensus.go b/receiver/opencensusreceiver/opencensus.go
@@ -33,8 +33,8 @@ import (
 	"go.opentelemetry.io/collector/config"
 	"go.opentelemetry.io/collector/config/configgrpc"
 	"go.opentelemetry.io/collector/consumer"
-	"go.opentelemetry.io/collector/receiver/opencensusreceiver/ocmetrics"
-	"go.opentelemetry.io/collector/receiver/opencensusreceiver/octrace"
+	"go.opentelemetry.io/collector/receiver/opencensusreceiver/internal/ocmetrics"
+	"go.opentelemetry.io/collector/receiver/opencensusreceiver/internal/octrace"
 )
 
 // ocReceiver is the type that exposes Trace and Metrics reception.

diff --git a/receiver/otlpreceiver/logs/otlp.go → receiver/otlpreceiver/internal/logs/otlp.go b/receiver/otlpreceiver/logs/otlp.go → receiver/otlpreceiver/internal/logs/otlp.go
diff --git a/receiver/otlpreceiver/logs/otlp_test.go → ...r/otlpreceiver/internal/logs/otlp_test.go b/receiver/otlpreceiver/logs/otlp_test.go → ...r/otlpreceiver/internal/logs/otlp_test.go
diff --git a/receiver/otlpreceiver/marshal_jsonpb.go → ...r/otlpreceiver/internal/marshal_jsonpb.go b/receiver/otlpreceiver/marshal_jsonpb.go → ...r/otlpreceiver/internal/marshal_jsonpb.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package otlpreceiver
+package internal
 
 import (
 	"bytes"

diff --git a/receiver/otlpreceiver/marshal_jsonpb_test.go → ...preceiver/internal/marshal_jsonpb_test.go b/receiver/otlpreceiver/marshal_jsonpb_test.go → ...preceiver/internal/marshal_jsonpb_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package otlpreceiver
+package internal
 
 import (
 	"testing"

diff --git a/receiver/otlpreceiver/metrics/otlp.go → ...ver/otlpreceiver/internal/metrics/otlp.go b/receiver/otlpreceiver/metrics/otlp.go → ...ver/otlpreceiver/internal/metrics/otlp.go
diff --git a/receiver/otlpreceiver/metrics/otlp_test.go → ...tlpreceiver/internal/metrics/otlp_test.go b/receiver/otlpreceiver/metrics/otlp_test.go → ...tlpreceiver/internal/metrics/otlp_test.go
diff --git a/receiver/otlpreceiver/trace/otlp.go → receiver/otlpreceiver/internal/trace/otlp.go b/receiver/otlpreceiver/trace/otlp.go → receiver/otlpreceiver/internal/trace/otlp.go
diff --git a/receiver/otlpreceiver/trace/otlp_test.go → .../otlpreceiver/internal/trace/otlp_test.go b/receiver/otlpreceiver/trace/otlp_test.go → .../otlpreceiver/internal/trace/otlp_test.go
diff --git a/receiver/otlpreceiver/otlp.go b/receiver/otlpreceiver/otlp.go
@@ -32,9 +32,10 @@ import (
 	collectorlog "go.opentelemetry.io/collector/internal/data/protogen/collector/logs/v1"
 	collectormetrics "go.opentelemetry.io/collector/internal/data/protogen/collector/metrics/v1"
 	collectortrace "go.opentelemetry.io/collector/internal/data/protogen/collector/trace/v1"
-	"go.opentelemetry.io/collector/receiver/otlpreceiver/logs"
-	"go.opentelemetry.io/collector/receiver/otlpreceiver/metrics"
-	"go.opentelemetry.io/collector/receiver/otlpreceiver/trace"
+	"go.opentelemetry.io/collector/receiver/otlpreceiver/internal"
+	"go.opentelemetry.io/collector/receiver/otlpreceiver/internal/logs"
+	"go.opentelemetry.io/collector/receiver/otlpreceiver/internal/metrics"
+	"go.opentelemetry.io/collector/receiver/otlpreceiver/internal/trace"
 )
 
 // otlpReceiver is the type that exposes Trace and Metrics reception.
@@ -64,7 +65,7 @@ func newOtlpReceiver(cfg *Config, logger *zap.Logger) *otlpReceiver {
 		// Use our custom JSON marshaler instead of default Protobuf JSON marshaler.
 		// This is needed because OTLP spec defines encoding for trace and span id
 		// and it is only possible to do using Gogoproto-compatible JSONPb marshaler.
-		jsonpb := &JSONPb{
+		jsonpb := &internal.JSONPb{
 			EmitDefaults: true,
 			Indent:       "  ",
 			OrigName:     true,