Use go mod compat, drops support for reproducibility with go 1.16 #7915

open-telemetry · Feb 14, 2022 · e8deba7 · e8deba7
1 parent dea8191
commit e8deba7
Show file tree

Hide file tree

Showing 163 changed files with 80 additions and 90,410 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,7 @@
 
 ### 🛑 Breaking changes 🛑
 
+- Use go mod compat, drops support for reproducibility with go 1.16 (#7915)
 - `apachereceiver`: Update instrumentation library name from `otel/apache` to `otelcol/apache` (#7754)
 - `pkg/translator/prometheusremotewrite`: Cleanup prw translator public functions (#7776)
 - `prometheusreceiver`: The OpenCensus-based metric conversion pipeline has 

diff --git a/Makefile b/Makefile
@@ -61,8 +61,7 @@ stability-tests: otelcontribcol
 .PHONY: gotidy
 gotidy:
  $(MAKE) for-all CMD="rm -fr go.sum"
- $(MAKE) for-all CMD="$(GOCMD) mod tidy -go=1.16"
- $(MAKE) for-all CMD="$(GOCMD) mod tidy -go=1.17"
+ $(MAKE) for-all CMD="$(GOCMD) mod tidy -compat=1.17"
 
 .PHONY: gomoddownload
 gomoddownload:

diff --git a/cmd/configschema/go.sum b/cmd/configschema/go.sum
diff --git a/cmd/mdatagen/go.sum b/cmd/mdatagen/go.sum
diff --git a/exporter/alibabacloudlogserviceexporter/go.mod b/exporter/alibabacloudlogserviceexporter/go.mod
@@ -24,14 +24,15 @@ require (
  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/pierrec/lz4 v2.6.1+incompatible // indirect
+ github.com/pierrec/lz4 v2.6.0+incompatible // indirect
  github.com/pkg/errors v0.9.1 // 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
  go.opencensus.io v0.23.0 // indirect
- go.opentelemetry.io/otel v1.4.0 // indirect
- go.opentelemetry.io/otel/metric v0.27.0 // indirect
- go.opentelemetry.io/otel/trace v1.4.0 // indirect
+ go.opentelemetry.io/otel v1.3.0 // indirect
+ go.opentelemetry.io/otel/metric v0.26.0 // indirect
+ go.opentelemetry.io/otel/trace v1.3.0 // indirect
  go.uber.org/atomic v1.9.0 // indirect
  go.uber.org/multierr v1.7.0 // indirect
  golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d // indirect

diff --git a/exporter/alibabacloudlogserviceexporter/go.sum b/exporter/alibabacloudlogserviceexporter/go.sum
diff --git a/exporter/awscloudwatchlogsexporter/go.mod b/exporter/awscloudwatchlogsexporter/go.mod
@@ -24,6 +24,7 @@ require (
  github.com/mitchellh/mapstructure v1.4.3 // indirect
  github.com/mitchellh/reflectwalk v1.0.2 // 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
  github.com/stretchr/objx v0.1.1 // indirect
  go.opencensus.io v0.23.0 // indirect

diff --git a/exporter/awscloudwatchlogsexporter/go.sum b/exporter/awscloudwatchlogsexporter/go.sum
diff --git a/exporter/awsemfexporter/go.sum b/exporter/awsemfexporter/go.sum
diff --git a/exporter/awskinesisexporter/go.sum b/exporter/awskinesisexporter/go.sum
diff --git a/exporter/awsprometheusremotewriteexporter/go.sum b/exporter/awsprometheusremotewriteexporter/go.sum
diff --git a/exporter/awsxrayexporter/go.sum b/exporter/awsxrayexporter/go.sum
diff --git a/exporter/azuremonitorexporter/go.sum b/exporter/azuremonitorexporter/go.sum
diff --git a/exporter/carbonexporter/go.sum b/exporter/carbonexporter/go.sum
diff --git a/exporter/clickhouseexporter/go.sum b/exporter/clickhouseexporter/go.sum
diff --git a/exporter/coralogixexporter/go.sum b/exporter/coralogixexporter/go.sum
diff --git a/exporter/datadogexporter/go.sum b/exporter/datadogexporter/go.sum
diff --git a/exporter/dynatraceexporter/go.mod b/exporter/dynatraceexporter/go.mod
@@ -28,7 +28,6 @@ require (
  github.com/mitchellh/mapstructure v1.4.3 // indirect
  github.com/mitchellh/reflectwalk v1.0.2 // indirect
  github.com/pmezard/go-difflib v1.0.0 // indirect
- github.com/rogpeppe/go-internal v1.8.0 // indirect
  github.com/rs/cors v1.8.2 // indirect
  github.com/spf13/cast v1.4.1 // indirect
  go.opencensus.io v0.23.0 // indirect

diff --git a/exporter/dynatraceexporter/go.sum b/exporter/dynatraceexporter/go.sum
diff --git a/exporter/elasticexporter/go.sum b/exporter/elasticexporter/go.sum
diff --git a/exporter/elasticsearchexporter/go.sum b/exporter/elasticsearchexporter/go.sum
diff --git a/exporter/f5cloudexporter/go.sum b/exporter/f5cloudexporter/go.sum
diff --git a/exporter/fileexporter/go.sum b/exporter/fileexporter/go.sum
diff --git a/exporter/googlecloudexporter/go.sum b/exporter/googlecloudexporter/go.sum
diff --git a/exporter/googlecloudpubsubexporter/go.sum b/exporter/googlecloudpubsubexporter/go.sum
diff --git a/exporter/honeycombexporter/go.sum b/exporter/honeycombexporter/go.sum
diff --git a/exporter/humioexporter/go.sum b/exporter/humioexporter/go.sum
diff --git a/exporter/influxdbexporter/go.sum b/exporter/influxdbexporter/go.sum
diff --git a/exporter/jaegerexporter/go.sum b/exporter/jaegerexporter/go.sum
diff --git a/exporter/jaegerthrifthttpexporter/go.sum b/exporter/jaegerthrifthttpexporter/go.sum
diff --git a/exporter/kafkaexporter/go.sum b/exporter/kafkaexporter/go.sum
diff --git a/exporter/loadbalancingexporter/go.sum b/exporter/loadbalancingexporter/go.sum
diff --git a/exporter/logzioexporter/go.mod b/exporter/logzioexporter/go.mod
@@ -35,6 +35,7 @@ require (
  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/nxadm/tail v1.4.8 // indirect
  github.com/olivere/elastic v6.2.37+incompatible // indirect
  github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.44.0 // indirect
  github.com/opentracing/opentracing-go v1.2.0 // indirect

diff --git a/exporter/logzioexporter/go.sum b/exporter/logzioexporter/go.sum
diff --git a/exporter/lokiexporter/go.sum b/exporter/lokiexporter/go.sum
diff --git a/exporter/newrelicexporter/go.sum b/exporter/newrelicexporter/go.sum
diff --git a/exporter/observiqexporter/go.mod b/exporter/observiqexporter/go.mod
@@ -14,24 +14,19 @@ require (
 require (
  github.com/cenkalti/backoff/v4 v4.1.2 // 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/pkg/errors v0.9.1 // indirect
  github.com/pmezard/go-difflib v1.0.0 // indirect
  github.com/spf13/cast v1.4.1 // 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
- go.opentelemetry.io/otel/trace v1.4.0 // indirect
+ go.opentelemetry.io/otel v1.3.0 // indirect
+ go.opentelemetry.io/otel/metric v0.26.0 // indirect
+ go.opentelemetry.io/otel/trace v1.3.0 // indirect
  go.uber.org/atomic v1.9.0 // indirect
- gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
  gopkg.in/yaml.v2 v2.4.0 // indirect
  gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
 )
diff --git a/exporter/observiqexporter/go.sum b/exporter/observiqexporter/go.sum
diff --git a/exporter/opencensusexporter/go.mod b/exporter/opencensusexporter/go.mod
@@ -53,6 +53,12 @@ require (
  gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
 )
 
+// ambiguous import: found package cloud.google.com/go/compute/metadata in multiple modules:
+// cloud.google.com/go
+// cloud.google.com/go/compute
+// Force cloud.google.com/go to be at least v0.100.2, so that the metadata is not present.
+replace cloud.google.com/go => cloud.google.com/go v0.100.2
+
 replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/common => ../../internal/common
 
 replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ../../internal/coreinternal