Skip to content

Commit

Permalink
split config/configcompression into its own module
Browse files Browse the repository at this point in the history
Part of open-telemetry#7895

Signed-off-by: Alex Boten <aboten@lightstep.com>
  • Loading branch information
Alex Boten committed Jun 15, 2023
1 parent 357d362 commit 739301b
Show file tree
Hide file tree
Showing 27 changed files with 89 additions and 0 deletions.
16 changes: 16 additions & 0 deletions .chloggen/codeboten_split-config-mod.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: enhancement

# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
component: configcompression

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Split config/configcompression into its own module

# One or more tracking issues or pull requests related to the change
issues: [7895]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext:
5 changes: 5 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@ updates:
schedule:
interval: "weekly"
day: "wednesday"
- package-ecosystem: "gomod"
directory: "/config/configcompression"
schedule:
interval: "weekly"
day: "wednesday"
- package-ecosystem: "gomod"
directory: "/confmap"
schedule:
Expand Down
1 change: 1 addition & 0 deletions cmd/builder/test/core.builder.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions cmd/otelcorecol/builder-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions cmd/otelcorecol/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions component/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -64,3 +64,5 @@ retract (
)

replace go.opentelemetry.io/collector/connector => ../connector

replace go.opentelemetry.io/collector/config/configcompression => ../config/configcompression
1 change: 1 addition & 0 deletions config/configcompression/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
include ../../Makefile.Common
11 changes: 11 additions & 0 deletions config/configcompression/go.mod
Original file line number Diff line number Diff line change
@@ -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
)
10 changes: 10 additions & 0 deletions config/configcompression/go.sum
Original file line number Diff line number Diff line change
@@ -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=
2 changes: 2 additions & 0 deletions connector/forwardconnector/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -72,3 +72,5 @@ retract (
)

replace go.opentelemetry.io/collector/extension/auth => ../../extension/auth

replace go.opentelemetry.io/collector/config/configcompression => ../../config/configcompression
2 changes: 2 additions & 0 deletions connector/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 2 additions & 0 deletions consumer/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -57,3 +57,5 @@ retract (
)

replace go.opentelemetry.io/collector/connector => ../connector

replace go.opentelemetry.io/collector/config/configcompression => ../config/configcompression
2 changes: 2 additions & 0 deletions exporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 2 additions & 0 deletions exporter/loggingexporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -78,3 +78,5 @@ retract (
)

replace go.opentelemetry.io/collector/connector => ../../connector

replace go.opentelemetry.io/collector/config/configcompression => ../../config/configcompression
3 changes: 3 additions & 0 deletions exporter/otlpexporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 => ../
Expand Down
3 changes: 3 additions & 0 deletions exporter/otlphttpexporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 => ../
Expand Down
2 changes: 2 additions & 0 deletions extension/auth/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 2 additions & 0 deletions extension/ballastextension/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 2 additions & 0 deletions extension/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 2 additions & 0 deletions extension/zpagesextension/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -70,3 +70,5 @@ retract (
)

replace go.opentelemetry.io/collector/connector => ../../connector

replace go.opentelemetry.io/collector/config/configcompression => ../../config/configcompression
3 changes: 3 additions & 0 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions processor/batchprocessor/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -93,3 +93,5 @@ retract (
)

replace go.opentelemetry.io/collector/connector => ../../connector

replace go.opentelemetry.io/collector/config/configcompression => ../../config/configcompression
2 changes: 2 additions & 0 deletions processor/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 2 additions & 0 deletions processor/memorylimiterprocessor/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -82,3 +82,5 @@ retract (
)

replace go.opentelemetry.io/collector/connector => ../../connector

replace go.opentelemetry.io/collector/config/configcompression => ../../config/configcompression
2 changes: 2 additions & 0 deletions receiver/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 3 additions & 0 deletions receiver/otlpreceiver/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
1 change: 1 addition & 0 deletions versions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 739301b

Please sign in to comment.