From bbe27a512f5c3fc6e83c0c692c1c541c3cf9003b Mon Sep 17 00:00:00 2001 From: Alex Boten Date: Thu, 15 Jun 2023 10:30:48 -0700 Subject: [PATCH] split config/configcompression into its own module Part of #7895 Signed-off-by: Alex Boten --- cmd/builder/test/core.builder.yaml | 1 + cmd/otelcorecol/builder-config.yaml | 1 + cmd/otelcorecol/go.mod | 3 +++ component/go.mod | 2 ++ config/configcompression/Makefile | 1 + config/configcompression/go.mod | 11 +++++++++++ config/configcompression/go.sum | 10 ++++++++++ connector/forwardconnector/go.mod | 2 ++ connector/go.mod | 2 ++ consumer/go.mod | 2 ++ exporter/go.mod | 2 ++ exporter/loggingexporter/go.mod | 2 ++ exporter/otlpexporter/go.mod | 3 +++ exporter/otlphttpexporter/go.mod | 3 +++ extension/auth/go.mod | 2 ++ extension/ballastextension/go.mod | 2 ++ extension/go.mod | 2 ++ extension/zpagesextension/go.mod | 2 ++ go.mod | 3 +++ processor/batchprocessor/go.mod | 2 ++ processor/go.mod | 2 ++ processor/memorylimiterprocessor/go.mod | 2 ++ receiver/go.mod | 2 ++ receiver/otlpreceiver/go.mod | 3 +++ versions.yaml | 1 + 25 files changed, 68 insertions(+) create mode 100644 config/configcompression/Makefile create mode 100644 config/configcompression/go.mod create mode 100644 config/configcompression/go.sum diff --git a/cmd/builder/test/core.builder.yaml b/cmd/builder/test/core.builder.yaml index ba374bbc502..65d6790424d 100644 --- a/cmd/builder/test/core.builder.yaml +++ b/cmd/builder/test/core.builder.yaml @@ -20,6 +20,7 @@ exporters: replaces: - go.opentelemetry.io/collector => ${WORKSPACE_DIR} - go.opentelemetry.io/collector/component => ${WORKSPACE_DIR}/component + - go.opentelemetry.io/collector/config/configcompression => ${WORKSPACE_DIR}/config/configcompression - go.opentelemetry.io/collector/confmap => ${WORKSPACE_DIR}/confmap - go.opentelemetry.io/collector/consumer => ${WORKSPACE_DIR}/consumer - go.opentelemetry.io/collector/connector => ${WORKSPACE_DIR}/connector diff --git a/cmd/otelcorecol/builder-config.yaml b/cmd/otelcorecol/builder-config.yaml index 05be6e9a5f3..163f5c10ad0 100644 --- a/cmd/otelcorecol/builder-config.yaml +++ b/cmd/otelcorecol/builder-config.yaml @@ -23,6 +23,7 @@ connectors: replaces: - go.opentelemetry.io/collector => ../../ - go.opentelemetry.io/collector/component => ../../component + - go.opentelemetry.io/collector/config/configcompression => ../../config/configcompression - go.opentelemetry.io/collector/confmap => ../../confmap - go.opentelemetry.io/collector/consumer => ../../consumer - go.opentelemetry.io/collector/connector => ../../connector diff --git a/cmd/otelcorecol/go.mod b/cmd/otelcorecol/go.mod index 78f78df431e..fc83422085e 100644 --- a/cmd/otelcorecol/go.mod +++ b/cmd/otelcorecol/go.mod @@ -71,6 +71,7 @@ require ( github.com/tklauser/numcpus v0.6.0 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/config/configcompression v0.0.0-00010101000000-000000000000 // indirect go.opentelemetry.io/collector/confmap v0.79.0 // indirect go.opentelemetry.io/collector/consumer v0.79.0 // indirect go.opentelemetry.io/collector/extension/auth v0.0.0-20230615165320-df20186ee21c // indirect @@ -105,6 +106,8 @@ replace go.opentelemetry.io/collector => ../../ replace go.opentelemetry.io/collector/component => ../../component +replace go.opentelemetry.io/collector/config/configcompression => ../../config/configcompression + replace go.opentelemetry.io/collector/confmap => ../../confmap replace go.opentelemetry.io/collector/consumer => ../../consumer diff --git a/component/go.mod b/component/go.mod index 2d6dec9b44c..7b3617eea6c 100644 --- a/component/go.mod +++ b/component/go.mod @@ -64,3 +64,5 @@ retract ( ) replace go.opentelemetry.io/collector/connector => ../connector + +replace go.opentelemetry.io/collector/config/configcompression => ../config/configcompression diff --git a/config/configcompression/Makefile b/config/configcompression/Makefile new file mode 100644 index 00000000000..ded7a36092d --- /dev/null +++ b/config/configcompression/Makefile @@ -0,0 +1 @@ +include ../../Makefile.Common diff --git a/config/configcompression/go.mod b/config/configcompression/go.mod new file mode 100644 index 00000000000..5877dbc78ea --- /dev/null +++ b/config/configcompression/go.mod @@ -0,0 +1,11 @@ +module go.opentelemetry.io/collector/config/configcompression + +go 1.19 + +require github.com/stretchr/testify v1.8.4 + +require ( + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect +) diff --git a/config/configcompression/go.sum b/config/configcompression/go.sum new file mode 100644 index 00000000000..fa4b6e6825c --- /dev/null +++ b/config/configcompression/go.sum @@ -0,0 +1,10 @@ +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/connector/forwardconnector/go.mod b/connector/forwardconnector/go.mod index 33296741798..a8844605015 100644 --- a/connector/forwardconnector/go.mod +++ b/connector/forwardconnector/go.mod @@ -72,3 +72,5 @@ retract ( ) replace go.opentelemetry.io/collector/extension/auth => ../../extension/auth + +replace go.opentelemetry.io/collector/config/configcompression => ../../config/configcompression diff --git a/connector/go.mod b/connector/go.mod index 911d409050e..f2b20ff3e9e 100644 --- a/connector/go.mod +++ b/connector/go.mod @@ -64,3 +64,5 @@ replace go.opentelemetry.io/collector/receiver => ../receiver replace go.opentelemetry.io/collector/semconv => ../semconv replace go.opentelemetry.io/collector/exporter => ../exporter + +replace go.opentelemetry.io/collector/config/configcompression => ../config/configcompression diff --git a/consumer/go.mod b/consumer/go.mod index 8d0c32bcdff..0ea38e8532f 100644 --- a/consumer/go.mod +++ b/consumer/go.mod @@ -57,3 +57,5 @@ retract ( ) replace go.opentelemetry.io/collector/connector => ../connector + +replace go.opentelemetry.io/collector/config/configcompression => ../config/configcompression diff --git a/exporter/go.mod b/exporter/go.mod index 86f88b16dc2..d5fba5f63f3 100644 --- a/exporter/go.mod +++ b/exporter/go.mod @@ -89,3 +89,5 @@ replace go.opentelemetry.io/collector/semconv => ../semconv retract v0.76.0 // Depends on retracted pdata v1.0.0-rc10 module replace go.opentelemetry.io/collector/connector => ../connector + +replace go.opentelemetry.io/collector/config/configcompression => ../config/configcompression diff --git a/exporter/loggingexporter/go.mod b/exporter/loggingexporter/go.mod index 31c2f7210dc..69daa8b1f05 100644 --- a/exporter/loggingexporter/go.mod +++ b/exporter/loggingexporter/go.mod @@ -78,3 +78,5 @@ retract ( ) replace go.opentelemetry.io/collector/connector => ../../connector + +replace go.opentelemetry.io/collector/config/configcompression => ../../config/configcompression diff --git a/exporter/otlpexporter/go.mod b/exporter/otlpexporter/go.mod index b3929e08085..e09dd6f36ca 100644 --- a/exporter/otlpexporter/go.mod +++ b/exporter/otlpexporter/go.mod @@ -6,6 +6,7 @@ require ( github.com/stretchr/testify v1.8.4 go.opentelemetry.io/collector v0.79.0 go.opentelemetry.io/collector/component v0.79.0 + go.opentelemetry.io/collector/config/configcompression v0.0.0-00010101000000-000000000000 go.opentelemetry.io/collector/confmap v0.79.0 go.opentelemetry.io/collector/consumer v0.79.0 go.opentelemetry.io/collector/exporter v0.79.0 @@ -59,6 +60,8 @@ replace go.opentelemetry.io/collector => ../../ replace go.opentelemetry.io/collector/component => ../../component +replace go.opentelemetry.io/collector/config/configcompression => ../../config/configcompression + replace go.opentelemetry.io/collector/confmap => ../../confmap replace go.opentelemetry.io/collector/exporter => ../ diff --git a/exporter/otlphttpexporter/go.mod b/exporter/otlphttpexporter/go.mod index bb38f206f7a..be798fe2cf3 100644 --- a/exporter/otlphttpexporter/go.mod +++ b/exporter/otlphttpexporter/go.mod @@ -6,6 +6,7 @@ require ( github.com/stretchr/testify v1.8.4 go.opentelemetry.io/collector v0.79.0 go.opentelemetry.io/collector/component v0.79.0 + go.opentelemetry.io/collector/config/configcompression v0.0.0-00010101000000-000000000000 go.opentelemetry.io/collector/confmap v0.79.0 go.opentelemetry.io/collector/consumer v0.79.0 go.opentelemetry.io/collector/exporter v0.79.0 @@ -62,6 +63,8 @@ replace go.opentelemetry.io/collector => ../../ replace go.opentelemetry.io/collector/component => ../../component +replace go.opentelemetry.io/collector/config/configcompression => ../../config/configcompression + replace go.opentelemetry.io/collector/confmap => ../../confmap replace go.opentelemetry.io/collector/exporter => ../ diff --git a/extension/auth/go.mod b/extension/auth/go.mod index add68c8d446..9d4d33aa84d 100644 --- a/extension/auth/go.mod +++ b/extension/auth/go.mod @@ -61,3 +61,5 @@ replace go.opentelemetry.io/collector/receiver => ../../receiver replace go.opentelemetry.io/collector/semconv => ../../semconv replace go.opentelemetry.io/collector/connector => ../../connector + +replace go.opentelemetry.io/collector/config/configcompression => ../../config/configcompression diff --git a/extension/ballastextension/go.mod b/extension/ballastextension/go.mod index 3acbac9990c..8d92c939e25 100644 --- a/extension/ballastextension/go.mod +++ b/extension/ballastextension/go.mod @@ -75,3 +75,5 @@ retract ( replace go.opentelemetry.io/collector/processor => ../../processor replace go.opentelemetry.io/collector/connector => ../../connector + +replace go.opentelemetry.io/collector/config/configcompression => ../../config/configcompression diff --git a/extension/go.mod b/extension/go.mod index f2ad259a8f0..c579bf04edf 100644 --- a/extension/go.mod +++ b/extension/go.mod @@ -60,3 +60,5 @@ replace go.opentelemetry.io/collector/semconv => ../semconv replace go.opentelemetry.io/collector/exporter => ../exporter replace go.opentelemetry.io/collector/connector => ../connector + +replace go.opentelemetry.io/collector/config/configcompression => ../config/configcompression diff --git a/extension/zpagesextension/go.mod b/extension/zpagesextension/go.mod index 18f0e8f2c43..4d12e4fa900 100644 --- a/extension/zpagesextension/go.mod +++ b/extension/zpagesextension/go.mod @@ -70,3 +70,5 @@ retract ( ) replace go.opentelemetry.io/collector/connector => ../../connector + +replace go.opentelemetry.io/collector/config/configcompression => ../../config/configcompression diff --git a/go.mod b/go.mod index 01eca326be7..2ef6664f2ed 100644 --- a/go.mod +++ b/go.mod @@ -18,6 +18,7 @@ require ( github.com/stretchr/testify v1.8.4 go.opencensus.io v0.24.0 go.opentelemetry.io/collector/component v0.79.0 + go.opentelemetry.io/collector/config/configcompression v0.0.0-00010101000000-000000000000 go.opentelemetry.io/collector/confmap v0.79.0 go.opentelemetry.io/collector/connector v0.0.0-20230615165320-df20186ee21c go.opentelemetry.io/collector/consumer v0.79.0 @@ -95,6 +96,8 @@ replace go.opentelemetry.io/collector/component => ./component replace go.opentelemetry.io/collector/confmap => ./confmap +replace go.opentelemetry.io/collector/config/configcompression => ./config/configcompression + replace go.opentelemetry.io/collector/connector => ./connector replace go.opentelemetry.io/collector/consumer => ./consumer diff --git a/processor/batchprocessor/go.mod b/processor/batchprocessor/go.mod index 137c916e95b..2e78bc66619 100644 --- a/processor/batchprocessor/go.mod +++ b/processor/batchprocessor/go.mod @@ -93,3 +93,5 @@ retract ( ) replace go.opentelemetry.io/collector/connector => ../../connector + +replace go.opentelemetry.io/collector/config/configcompression => ../../config/configcompression diff --git a/processor/go.mod b/processor/go.mod index 63bb9bb8031..3481535339a 100644 --- a/processor/go.mod +++ b/processor/go.mod @@ -65,3 +65,5 @@ replace go.opentelemetry.io/collector/receiver => ../receiver replace go.opentelemetry.io/collector/semconv => ../semconv replace go.opentelemetry.io/collector/connector => ../connector + +replace go.opentelemetry.io/collector/config/configcompression => ../config/configcompression diff --git a/processor/memorylimiterprocessor/go.mod b/processor/memorylimiterprocessor/go.mod index e184f3f0ef5..2d70d4d3527 100644 --- a/processor/memorylimiterprocessor/go.mod +++ b/processor/memorylimiterprocessor/go.mod @@ -82,3 +82,5 @@ retract ( ) replace go.opentelemetry.io/collector/connector => ../../connector + +replace go.opentelemetry.io/collector/config/configcompression => ../../config/configcompression diff --git a/receiver/go.mod b/receiver/go.mod index eefad020d18..85533dc91a2 100644 --- a/receiver/go.mod +++ b/receiver/go.mod @@ -87,3 +87,5 @@ replace go.opentelemetry.io/collector/semconv => ../semconv retract v0.76.0 // Depends on retracted pdata v1.0.0-rc10 module replace go.opentelemetry.io/collector/connector => ../connector + +replace go.opentelemetry.io/collector/config/configcompression => ../config/configcompression diff --git a/receiver/otlpreceiver/go.mod b/receiver/otlpreceiver/go.mod index eb041fae154..189c1b55167 100644 --- a/receiver/otlpreceiver/go.mod +++ b/receiver/otlpreceiver/go.mod @@ -51,6 +51,7 @@ require ( github.com/prometheus/statsd_exporter v0.22.7 // indirect github.com/rs/cors v1.9.0 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/config/configcompression v0.0.0-00010101000000-000000000000 // indirect go.opentelemetry.io/collector/exporter v0.79.0 // indirect go.opentelemetry.io/collector/extension v0.0.0-20230609200026-525adf4a682a // indirect go.opentelemetry.io/collector/extension/auth v0.0.0-20230615165320-df20186ee21c // indirect @@ -77,6 +78,8 @@ replace go.opentelemetry.io/collector => ../../ replace go.opentelemetry.io/collector/component => ../../component +replace go.opentelemetry.io/collector/config/configcompression => ../../config/configcompression + replace go.opentelemetry.io/collector/confmap => ../../confmap replace go.opentelemetry.io/collector/exporter => ../../exporter diff --git a/versions.yaml b/versions.yaml index 446ab329add..e2393fbf5a5 100644 --- a/versions.yaml +++ b/versions.yaml @@ -14,6 +14,7 @@ module-sets: - go.opentelemetry.io/collector/cmd/builder - go.opentelemetry.io/collector/component - go.opentelemetry.io/collector/confmap + - go.opentelemetry.io/collector/config/configcompression - go.opentelemetry.io/collector/connector - go.opentelemetry.io/collector/connector/forwardconnector - go.opentelemetry.io/collector/consumer