Move coreinternal testutil and sanitize to common (open-telemetry#7904)

Signed-off-by: Bogdan Drutu <[email protected]>

cmd/configschema/go.mod

@@ -217,7 +217,7 @@ require (
  github.com/open-telemetry/opentelemetry-collector-contrib/exporter/azuremonitorexporter v0.44.0 // indirect
  github.com/open-telemetry/opentelemetry-collector-contrib/exporter/carbonexporter v0.44.0 // indirect
  github.com/open-telemetry/opentelemetry-collector-contrib/exporter/clickhouseexporter v0.44.0 // indirect
- github.com/open-telemetry/opentelemetry-collector-contrib/exporter/coralogixexporter v0.0.0-00010101000000-000000000000 // indirect
+ github.com/open-telemetry/opentelemetry-collector-contrib/exporter/coralogixexporter v0.44.0 // indirect
  github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter v0.44.0 // indirect
  github.com/open-telemetry/opentelemetry-collector-contrib/exporter/dynatraceexporter v0.44.0 // indirect
  github.com/open-telemetry/opentelemetry-collector-contrib/exporter/elasticexporter v0.44.0 // indirect
@@ -377,7 +377,7 @@ require (
  github.com/santhosh-tekuri/jsonschema v1.2.4 // indirect
  github.com/scaleway/scaleway-sdk-go v1.0.0-beta.7.0.20210223165440-c65ae3540d44 // indirect
  github.com/seccomp/libseccomp-golang v0.9.1 // indirect
- github.com/shirou/gopsutil v3.21.10+incompatible // indirect
+ github.com/shirou/gopsutil v2.20.9+incompatible // indirect
  github.com/shirou/gopsutil/v3 v3.22.1 // indirect
  github.com/signalfx/com_signalfx_metrics_protobuf v0.0.3 // indirect
  github.com/signalfx/gohistogram v0.0.0-20160107210732-1ccfd2ff5083 // indirect

exporter/carbonexporter/exporter_test.go

@@ -36,8 +36,8 @@ import (
  "go.opentelemetry.io/collector/model/pdata"
  "google.golang.org/protobuf/types/known/timestamppb"
 
+ "github.com/open-telemetry/opentelemetry-collector-contrib/internal/common/testutil"
  "github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/metricstestutil"
- "github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/testutil"
  internaldata "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus"
 )
 

exporter/carbonexporter/go.mod

@@ -4,6 +4,7 @@ go 1.17
 
 require (
  github.com/census-instrumentation/opencensus-proto v0.3.0
+ github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.44.0
  github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.44.0
  github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.44.0
  github.com/stretchr/testify v1.7.0
@@ -45,4 +46,6 @@ require (
 
 replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus => ../../pkg/translator/opencensus
 
+replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/common => ../../internal/common
+
 replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ../../internal/coreinternal

exporter/datadogexporter/go.mod

@@ -7,32 +7,26 @@ require (
  github.com/DataDog/datadog-agent/pkg/quantile v0.33.1
  github.com/DataDog/datadog-agent/pkg/trace/exportable v0.0.0-20201016145401-4646cf596b02
  github.com/aws/aws-sdk-go v1.42.52
- github.com/cenkalti/backoff v2.2.1+incompatible // indirect
+ github.com/cenkalti/backoff/v4 v4.1.2
  github.com/gogo/protobuf v1.3.2
  github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.44.0
  github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.44.0
  github.com/patrickmn/go-cache v2.1.0+incompatible
  github.com/stretchr/testify v1.7.0
- github.com/tinylib/msgp v1.1.5 // indirect
- github.com/zorkian/go-datadog-api v2.29.0+incompatible // indirect
  go.opentelemetry.io/collector v0.44.1-0.20220210184720-ea897a6906a5
  go.opentelemetry.io/collector/model v0.44.1-0.20220210184720-ea897a6906a5
+ go.uber.org/multierr v1.7.0
  go.uber.org/zap v1.21.0
  gopkg.in/DataDog/dd-trace-go.v1 v1.36.0
  gopkg.in/zorkian/go-datadog-api.v2 v2.30.0
 )
 
-require (
- github.com/cenkalti/backoff/v4 v4.1.2
- github.com/shirou/gopsutil v3.21.9+incompatible // indirect
- go.uber.org/multierr v1.7.0
-)
-
 require (
  github.com/DataDog/datadog-agent/pkg/util/log v0.0.0-20201009092105-58e18918b2db // indirect
  github.com/DataDog/datadog-go v4.8.2+incompatible // indirect
  github.com/Microsoft/go-winio v0.5.1 // indirect
  github.com/StackExchange/wmi v1.2.1 // indirect
+ github.com/cenkalti/backoff v2.2.1+incompatible // indirect
  github.com/cespare/xxhash/v2 v2.1.2 // indirect
  github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect
  github.com/davecgh/go-spew v1.1.1 // indirect
@@ -49,9 +43,10 @@ require (
  github.com/philhofer/fwd v1.1.1 // indirect
  github.com/pkg/errors v0.9.1 // indirect
  github.com/pmezard/go-difflib v1.0.0 // indirect
+ github.com/shirou/gopsutil v2.20.9+incompatible // indirect
  github.com/spf13/cast v1.4.1 // indirect
- github.com/tklauser/go-sysconf v0.3.9 // indirect
- github.com/tklauser/numcpus v0.3.0 // indirect
+ github.com/tinylib/msgp v1.1.2 // indirect
+ github.com/zorkian/go-datadog-api v2.30.0+incompatible // indirect
  go.opencensus.io v0.23.0 // indirect
  go.opentelemetry.io/otel v1.4.0 // indirect
  go.opentelemetry.io/otel/metric v0.27.0 // indirect

exporter/elasticsearchexporter/exporter.go

@@ -32,7 +32,7 @@ import (
  "go.uber.org/multierr"
  "go.uber.org/zap"
 
- "github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/sanitize"
+ "github.com/open-telemetry/opentelemetry-collector-contrib/internal/common/sanitize"
 )
 
 type esClientCurrent = elasticsearch7.Client

exporter/elasticsearchexporter/go.mod

@@ -6,7 +6,7 @@ require (
  github.com/cenkalti/backoff/v4 v4.1.2
  github.com/elastic/go-elasticsearch/v7 v7.17.0
  github.com/elastic/go-structform v0.0.9
- github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.44.0
+ github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.44.0
  github.com/stretchr/testify v1.7.0
  go.opentelemetry.io/collector v0.44.1-0.20220210184720-ea897a6906a5
  go.opentelemetry.io/collector/model v0.44.1-0.20220210184720-ea897a6906a5
@@ -18,12 +18,15 @@ require (
 require (
  github.com/benbjohnson/clock v1.3.0 // indirect
  github.com/davecgh/go-spew v1.1.1 // indirect
+ github.com/fsnotify/fsnotify v1.5.1 // indirect
  github.com/gogo/protobuf v1.3.2 // indirect
  github.com/knadh/koanf v1.4.0 // indirect
+ github.com/kr/pretty v0.3.0 // indirect
  github.com/magiconair/properties v1.8.5 // indirect
  github.com/mitchellh/copystructure v1.2.0 // indirect
  github.com/mitchellh/mapstructure v1.4.3 // indirect
  github.com/mitchellh/reflectwalk v1.0.2 // indirect
+ github.com/pelletier/go-toml v1.9.4 // indirect
  github.com/pmezard/go-difflib v1.0.0 // indirect
  github.com/rogpeppe/go-internal v1.8.1 // indirect
  github.com/spf13/cast v1.4.1 // indirect
@@ -36,4 +39,4 @@ require (
  gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
 )
 
-replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ../../internal/coreinternal
+replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/common => ../../internal/common