diff --git a/.chloggen/codeboten_split-config-mod-telemetry.yaml b/.chloggen/codeboten_split-config-mod-telemetry.yaml new file mode 100755 index 000000000000..194582283921 --- /dev/null +++ b/.chloggen/codeboten_split-config-mod-telemetry.yaml @@ -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: configtelemetry + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Split config/configtelemetry 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: diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 2731aaf75390..57712120f9bf 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -42,6 +42,11 @@ updates: schedule: interval: "weekly" day: "wednesday" + - package-ecosystem: "gomod" + directory: "/config/configtelemetry" + schedule: + interval: "weekly" + day: "wednesday" - package-ecosystem: "gomod" directory: "/config/configtls" schedule: diff --git a/Makefile b/Makefile index 70eab07c9645..2f8fd9c98fa9 100644 --- a/Makefile +++ b/Makefile @@ -277,6 +277,7 @@ check-contrib: @$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit -replace go.opentelemetry.io/collector/config/configcompression=$(CURDIR)/config/configcompression" @$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit -replace go.opentelemetry.io/collector/config/confignet=$(CURDIR)/config/confignet" @$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit -replace go.opentelemetry.io/collector/config/configopaque=$(CURDIR)/config/configopaque" + @$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit -replace go.opentelemetry.io/collector/config/configtelemetry=$(CURDIR)/config/configtelemetry" @$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit -replace go.opentelemetry.io/collector/config/configtls=$(CURDIR)/config/configtls" @$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit -replace go.opentelemetry.io/collector/confmap=$(CURDIR)/confmap" @$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit -replace go.opentelemetry.io/collector/consumer=$(CURDIR)/consumer" @@ -311,6 +312,7 @@ restore-contrib: @$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit -dropreplace go.opentelemetry.io/collector/config/configcompression" @$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit -dropreplace go.opentelemetry.io/collector/config/confignet" @$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit -dropreplace go.opentelemetry.io/collector/config/configopaque" + @$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit -dropreplace go.opentelemetry.io/collector/config/configtelemetry" @$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit -dropreplace go.opentelemetry.io/collector/config/configtls" @$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit -dropreplace go.opentelemetry.io/collector/confmap" @$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit -dropreplace go.opentelemetry.io/collector/consumer" diff --git a/cmd/builder/test/core.builder.yaml b/cmd/builder/test/core.builder.yaml index 4a565922452a..e05217720008 100644 --- a/cmd/builder/test/core.builder.yaml +++ b/cmd/builder/test/core.builder.yaml @@ -26,7 +26,7 @@ replaces: # - go.opentelemetry.io/collector/config/confighttp => ${WORKSPACE_DIR}/config/confighttp - go.opentelemetry.io/collector/config/confignet => ${WORKSPACE_DIR}/config/confignet - go.opentelemetry.io/collector/config/configopaque => ${WORKSPACE_DIR}/config/configopaque - # - go.opentelemetry.io/collector/config/configtelemetry => ${WORKSPACE_DIR}/config/configtelemetry + - go.opentelemetry.io/collector/config/configtelemetry => ${WORKSPACE_DIR}/config/configtelemetry - go.opentelemetry.io/collector/config/configtls => ${WORKSPACE_DIR}/config/configtls - go.opentelemetry.io/collector/confmap => ${WORKSPACE_DIR}/confmap - go.opentelemetry.io/collector/consumer => ${WORKSPACE_DIR}/consumer diff --git a/cmd/otelcorecol/builder-config.yaml b/cmd/otelcorecol/builder-config.yaml index ab7820a2d85e..881c823b66c3 100644 --- a/cmd/otelcorecol/builder-config.yaml +++ b/cmd/otelcorecol/builder-config.yaml @@ -29,7 +29,7 @@ replaces: # - go.opentelemetry.io/collector/config/confighttp => ../../config/confighttp - go.opentelemetry.io/collector/config/confignet => ../../config/confignet - go.opentelemetry.io/collector/config/configopaque => ../../config/configopaque - # - go.opentelemetry.io/collector/config/configtelemetry => ../../config/configtelemetry + - go.opentelemetry.io/collector/config/configtelemetry => ../../config/configtelemetry - go.opentelemetry.io/collector/config/configtls => ../../config/configtls - go.opentelemetry.io/collector/confmap => ../../confmap - go.opentelemetry.io/collector/consumer => ../../consumer diff --git a/cmd/otelcorecol/go.mod b/cmd/otelcorecol/go.mod index e66903c4a0e9..ecace88f5349 100644 --- a/cmd/otelcorecol/go.mod +++ b/cmd/otelcorecol/go.mod @@ -74,6 +74,7 @@ require ( go.opentelemetry.io/collector/config/configcompression v0.0.0-00010101000000-000000000000 // indirect go.opentelemetry.io/collector/config/confignet v0.0.0-00010101000000-000000000000 // indirect go.opentelemetry.io/collector/config/configopaque v0.0.0-00010101000000-000000000000 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.0.0-00010101000000-000000000000 // indirect go.opentelemetry.io/collector/config/configtls v0.0.0-00010101000000-000000000000 // indirect go.opentelemetry.io/collector/confmap v0.79.0 // indirect go.opentelemetry.io/collector/consumer v0.79.0 // indirect @@ -115,6 +116,8 @@ replace go.opentelemetry.io/collector/config/confignet => ../../config/confignet replace go.opentelemetry.io/collector/config/configopaque => ../../config/configopaque +replace go.opentelemetry.io/collector/config/configtelemetry => ../../config/configtelemetry + replace go.opentelemetry.io/collector/config/configtls => ../../config/configtls replace go.opentelemetry.io/collector/confmap => ../../confmap diff --git a/component/go.mod b/component/go.mod index e4de3d1708d8..407cb9dae32f 100644 --- a/component/go.mod +++ b/component/go.mod @@ -4,7 +4,7 @@ go 1.19 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector v0.79.0 + go.opentelemetry.io/collector/config/configtelemetry v0.0.0-00010101000000-000000000000 go.opentelemetry.io/collector/confmap v0.79.0 go.opentelemetry.io/collector/pdata v1.0.0-rcv0012 go.opentelemetry.io/otel/metric v1.16.0 @@ -14,6 +14,7 @@ require ( ) require ( + github.com/benbjohnson/clock v1.3.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect @@ -34,41 +35,15 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -replace go.opentelemetry.io/collector => ../ +replace go.opentelemetry.io/collector/config/configtelemetry => ../config/configtelemetry replace go.opentelemetry.io/collector/confmap => ../confmap -replace go.opentelemetry.io/collector/consumer => ../consumer - -replace go.opentelemetry.io/collector/exporter => ../exporter - -replace go.opentelemetry.io/collector/extension => ../extension - -replace go.opentelemetry.io/collector/extension/auth => ../extension/auth - replace go.opentelemetry.io/collector/featuregate => ../featuregate replace go.opentelemetry.io/collector/pdata => ../pdata -replace go.opentelemetry.io/collector/processor => ../processor - -replace go.opentelemetry.io/collector/receiver => ../receiver - -replace go.opentelemetry.io/collector/semconv => ../semconv - -replace go.opentelemetry.io/collector/extension/zpagesextension => ../extension/zpagesextension - retract ( v0.76.0 // Depends on retracted pdata v1.0.0-rc10 module, use v0.76.1 v0.69.0 // Release failed, use v0.69.1 ) - -replace go.opentelemetry.io/collector/connector => ../connector - -replace go.opentelemetry.io/collector/config/configcompression => ../config/configcompression - -replace go.opentelemetry.io/collector/config/confignet => ../config/confignet - -replace go.opentelemetry.io/collector/config/configopaque => ../config/configopaque - -replace go.opentelemetry.io/collector/config/configtls => ../config/configtls diff --git a/component/go.sum b/component/go.sum index 7f628a8062c9..1addc41fd7db 100644 --- a/component/go.sum +++ b/component/go.sum @@ -22,6 +22,7 @@ github.com/aws/aws-sdk-go-v2/service/sso v1.4.2/go.mod h1:NBvT9R1MEF+Ud6ApJKM0G+ github.com/aws/aws-sdk-go-v2/service/sts v1.7.2/go.mod h1:8EzeIqfWt2wWT4rJVu3f21TfrhJ8AEMzVybRNSb/b4g= github.com/aws/smithy-go v1.8.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A= +github.com/benbjohnson/clock v1.3.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= diff --git a/config/configtelemetry/Makefile b/config/configtelemetry/Makefile new file mode 100644 index 000000000000..ded7a36092dc --- /dev/null +++ b/config/configtelemetry/Makefile @@ -0,0 +1 @@ +include ../../Makefile.Common diff --git a/config/configtelemetry/go.mod b/config/configtelemetry/go.mod new file mode 100644 index 000000000000..90526b90946d --- /dev/null +++ b/config/configtelemetry/go.mod @@ -0,0 +1,11 @@ +module go.opentelemetry.io/collector/config/configtelemetry + +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/configtelemetry/go.sum b/config/configtelemetry/go.sum new file mode 100644 index 000000000000..fa4b6e6825c4 --- /dev/null +++ b/config/configtelemetry/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 be7c3228d312..7613c4156b21 100644 --- a/connector/forwardconnector/go.mod +++ b/connector/forwardconnector/go.mod @@ -22,7 +22,7 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector v0.79.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.0.0-00010101000000-000000000000 // indirect go.opentelemetry.io/collector/confmap v0.79.0 // indirect go.opentelemetry.io/collector/featuregate v1.0.0-rcv0012 // indirect go.opentelemetry.io/otel v1.16.0 // indirect @@ -80,3 +80,5 @@ replace go.opentelemetry.io/collector/config/confignet => ../../config/confignet replace go.opentelemetry.io/collector/config/configopaque => ../../config/configopaque replace go.opentelemetry.io/collector/config/configtls => ../../config/configtls + +replace go.opentelemetry.io/collector/config/configtelemetry => ../../config/configtelemetry diff --git a/connector/go.mod b/connector/go.mod index faeeb43696af..82f629d31b83 100644 --- a/connector/go.mod +++ b/connector/go.mod @@ -22,7 +22,7 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector v0.79.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.0.0-00010101000000-000000000000 // indirect go.opentelemetry.io/collector/confmap v0.79.0 // indirect go.opentelemetry.io/collector/featuregate v1.0.0-rcv0012 // indirect go.opentelemetry.io/otel v1.16.0 // indirect @@ -43,6 +43,8 @@ replace go.opentelemetry.io/collector => ../ replace go.opentelemetry.io/collector/component => ../component +replace go.opentelemetry.io/collector/config/configtelemetry => ../config/configtelemetry + replace go.opentelemetry.io/collector/confmap => ../confmap replace go.opentelemetry.io/collector/consumer => ../consumer diff --git a/consumer/go.mod b/consumer/go.mod index f168744c5ea9..9f20d944ed53 100644 --- a/consumer/go.mod +++ b/consumer/go.mod @@ -65,3 +65,5 @@ replace go.opentelemetry.io/collector/config/confignet => ../config/confignet replace go.opentelemetry.io/collector/config/configopaque => ../config/configopaque replace go.opentelemetry.io/collector/config/configtls => ../config/configtls + +replace go.opentelemetry.io/collector/config/configtelemetry => ../config/configtelemetry diff --git a/exporter/go.mod b/exporter/go.mod index f880f6d2a5a3..d2028c461121 100644 --- a/exporter/go.mod +++ b/exporter/go.mod @@ -43,6 +43,7 @@ require ( github.com/prometheus/common v0.44.0 // indirect github.com/prometheus/procfs v0.9.0 // indirect github.com/prometheus/statsd_exporter v0.22.7 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.0.0-00010101000000-000000000000 // indirect go.opentelemetry.io/collector/confmap v0.79.0 // indirect go.opentelemetry.io/collector/featuregate v1.0.0-rcv0012 // indirect go.opentelemetry.io/collector/processor v0.0.0-20230609193203-89d1060c7606 // indirect @@ -97,3 +98,5 @@ replace go.opentelemetry.io/collector/config/confignet => ../config/confignet replace go.opentelemetry.io/collector/config/configopaque => ../config/configopaque replace go.opentelemetry.io/collector/config/configtls => ../config/configtls + +replace go.opentelemetry.io/collector/config/configtelemetry => ../config/configtelemetry diff --git a/exporter/loggingexporter/go.mod b/exporter/loggingexporter/go.mod index 04b64d604054..41746f975b65 100644 --- a/exporter/loggingexporter/go.mod +++ b/exporter/loggingexporter/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/configtelemetry 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 @@ -86,3 +87,5 @@ replace go.opentelemetry.io/collector/config/confignet => ../../config/confignet replace go.opentelemetry.io/collector/config/configopaque => ../../config/configopaque replace go.opentelemetry.io/collector/config/configtls => ../../config/configtls + +replace go.opentelemetry.io/collector/config/configtelemetry => ../../config/configtelemetry diff --git a/exporter/otlpexporter/go.mod b/exporter/otlpexporter/go.mod index 5c2787c0285d..3c0db8787c62 100644 --- a/exporter/otlpexporter/go.mod +++ b/exporter/otlpexporter/go.mod @@ -40,6 +40,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect go.opentelemetry.io/collector/config/confignet v0.0.0-00010101000000-000000000000 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.0.0-00010101000000-000000000000 // indirect go.opentelemetry.io/collector/extension v0.0.0-20230609200026-525adf4a682a // indirect go.opentelemetry.io/collector/extension/auth v0.0.0-20230615165320-df20186ee21c // indirect go.opentelemetry.io/collector/featuregate v1.0.0-rcv0012 // indirect @@ -99,3 +100,5 @@ retract ( ) replace go.opentelemetry.io/collector/connector => ../../connector + +replace go.opentelemetry.io/collector/config/configtelemetry => ../../config/configtelemetry diff --git a/exporter/otlphttpexporter/go.mod b/exporter/otlphttpexporter/go.mod index 3e1e9bd8ade6..22e957a30597 100644 --- a/exporter/otlphttpexporter/go.mod +++ b/exporter/otlphttpexporter/go.mod @@ -44,6 +44,7 @@ require ( github.com/rs/cors v1.9.0 // indirect go.opencensus.io v0.24.0 // indirect go.opentelemetry.io/collector/config/confignet v0.0.0-00010101000000-000000000000 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.0.0-00010101000000-000000000000 // indirect go.opentelemetry.io/collector/extension v0.0.0-20230609200026-525adf4a682a // indirect go.opentelemetry.io/collector/extension/auth v0.0.0-20230615165320-df20186ee21c // indirect go.opentelemetry.io/collector/featuregate v1.0.0-rcv0012 // indirect @@ -72,6 +73,8 @@ replace go.opentelemetry.io/collector/config/confignet => ../../config/confignet replace go.opentelemetry.io/collector/config/configopaque => ../../config/configopaque +replace go.opentelemetry.io/collector/config/configtelemetry => ../../config/configtelemetry + replace go.opentelemetry.io/collector/config/configtls => ../../config/configtls replace go.opentelemetry.io/collector/confmap => ../../confmap diff --git a/extension/auth/go.mod b/extension/auth/go.mod index fe44e0b7d930..bc9b0f49a81d 100644 --- a/extension/auth/go.mod +++ b/extension/auth/go.mod @@ -18,7 +18,7 @@ require ( github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector v0.79.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.0.0-00010101000000-000000000000 // indirect go.opentelemetry.io/collector/confmap v0.79.0 // indirect go.opentelemetry.io/collector/featuregate v1.0.0-rcv0012 // indirect go.opentelemetry.io/collector/pdata v1.0.0-rcv0012 // indirect @@ -69,3 +69,5 @@ replace go.opentelemetry.io/collector/config/confignet => ../../config/confignet replace go.opentelemetry.io/collector/config/configopaque => ../../config/configopaque replace go.opentelemetry.io/collector/config/configtls => ../../config/configtls + +replace go.opentelemetry.io/collector/config/configtelemetry => ../../config/configtelemetry diff --git a/extension/ballastextension/go.mod b/extension/ballastextension/go.mod index 59ef85249f35..5f65a7aaae0e 100644 --- a/extension/ballastextension/go.mod +++ b/extension/ballastextension/go.mod @@ -27,6 +27,7 @@ require ( github.com/tklauser/go-sysconf v0.3.11 // indirect github.com/tklauser/numcpus v0.6.0 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.0.0-00010101000000-000000000000 // indirect go.opentelemetry.io/collector/featuregate v1.0.0-rcv0012 // indirect go.opentelemetry.io/collector/pdata v1.0.0-rcv0012 // indirect go.opentelemetry.io/otel v1.16.0 // indirect @@ -83,3 +84,5 @@ replace go.opentelemetry.io/collector/config/confignet => ../../config/confignet replace go.opentelemetry.io/collector/config/configopaque => ../../config/configopaque replace go.opentelemetry.io/collector/config/configtls => ../../config/configtls + +replace go.opentelemetry.io/collector/config/configtelemetry => ../../config/configtelemetry diff --git a/extension/go.mod b/extension/go.mod index 2533783be171..b5c6a788c5ba 100644 --- a/extension/go.mod +++ b/extension/go.mod @@ -16,7 +16,7 @@ require ( github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector v0.79.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.0.0-00010101000000-000000000000 // indirect go.opentelemetry.io/collector/confmap v0.79.0 // indirect go.opentelemetry.io/collector/featuregate v1.0.0-rcv0012 // indirect go.opentelemetry.io/collector/pdata v1.0.0-rcv0012 // indirect @@ -68,3 +68,5 @@ replace go.opentelemetry.io/collector/config/confignet => ../config/confignet replace go.opentelemetry.io/collector/config/configopaque => ../config/configopaque replace go.opentelemetry.io/collector/config/configtls => ../config/configtls + +replace go.opentelemetry.io/collector/config/configtelemetry => ../config/configtelemetry diff --git a/extension/zpagesextension/go.mod b/extension/zpagesextension/go.mod index b3db21f75cf3..865f802c1e30 100644 --- a/extension/zpagesextension/go.mod +++ b/extension/zpagesextension/go.mod @@ -26,6 +26,7 @@ require ( github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.0.0-00010101000000-000000000000 // indirect go.opentelemetry.io/collector/featuregate v1.0.0-rcv0012 // indirect go.opentelemetry.io/collector/pdata v1.0.0-rcv0012 // indirect go.opentelemetry.io/otel v1.16.0 // indirect @@ -79,3 +80,5 @@ replace go.opentelemetry.io/collector/connector => ../../connector replace go.opentelemetry.io/collector/config/configopaque => ../../config/configopaque replace go.opentelemetry.io/collector/config/configtls => ../../config/configtls + +replace go.opentelemetry.io/collector/config/configtelemetry => ../../config/configtelemetry diff --git a/go.mod b/go.mod index 19df8fbc9182..9fc1aa5a3af3 100644 --- a/go.mod +++ b/go.mod @@ -20,6 +20,7 @@ require ( go.opentelemetry.io/collector/config/configcompression v0.0.0-00010101000000-000000000000 go.opentelemetry.io/collector/config/confignet v0.0.0-00010101000000-000000000000 go.opentelemetry.io/collector/config/configopaque v0.0.0-00010101000000-000000000000 + go.opentelemetry.io/collector/config/configtelemetry v0.0.0-00010101000000-000000000000 go.opentelemetry.io/collector/config/configtls v0.0.0-00010101000000-000000000000 go.opentelemetry.io/collector/confmap v0.79.0 go.opentelemetry.io/collector/connector v0.0.0-20230615165320-df20186ee21c @@ -54,7 +55,6 @@ require ( require ( cloud.google.com/go/compute/metadata v0.2.4-0.20230602132616-4d8f0906c19e // indirect - github.com/benbjohnson/clock v1.3.0 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect @@ -105,6 +105,8 @@ replace go.opentelemetry.io/collector/config/confignet => ./config/confignet replace go.opentelemetry.io/collector/config/configopaque => ./config/configopaque +replace go.opentelemetry.io/collector/config/configtelemetry => ./config/configtelemetry + replace go.opentelemetry.io/collector/config/configtls => ./config/configtls replace go.opentelemetry.io/collector/connector => ./connector diff --git a/go.sum b/go.sum index 2f59a5173b5e..54eaa523ddfa 100644 --- a/go.sum +++ b/go.sum @@ -61,7 +61,6 @@ github.com/aws/aws-sdk-go-v2/service/sso v1.4.2/go.mod h1:NBvT9R1MEF+Ud6ApJKM0G+ github.com/aws/aws-sdk-go-v2/service/sts v1.7.2/go.mod h1:8EzeIqfWt2wWT4rJVu3f21TfrhJ8AEMzVybRNSb/b4g= github.com/aws/smithy-go v1.8.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A= -github.com/benbjohnson/clock v1.3.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= diff --git a/processor/batchprocessor/go.mod b/processor/batchprocessor/go.mod index 132ccf04aa89..9af92bcd4b15 100644 --- a/processor/batchprocessor/go.mod +++ b/processor/batchprocessor/go.mod @@ -11,6 +11,7 @@ require ( go.opencensus.io v0.24.0 go.opentelemetry.io/collector v0.79.0 go.opentelemetry.io/collector/component v0.79.0 + go.opentelemetry.io/collector/config/configtelemetry 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/pdata v1.0.0-rcv0012 @@ -101,3 +102,5 @@ replace go.opentelemetry.io/collector/config/confignet => ../../config/confignet replace go.opentelemetry.io/collector/config/configopaque => ../../config/configopaque replace go.opentelemetry.io/collector/config/configtls => ../../config/configtls + +replace go.opentelemetry.io/collector/config/configtelemetry => ../../config/configtelemetry diff --git a/processor/go.mod b/processor/go.mod index b456538dd5af..18956a21d767 100644 --- a/processor/go.mod +++ b/processor/go.mod @@ -26,6 +26,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.0.0-00010101000000-000000000000 // indirect go.opentelemetry.io/collector/confmap v0.79.0 // indirect go.opentelemetry.io/collector/featuregate v1.0.0-rcv0012 // indirect go.opentelemetry.io/otel/metric v1.16.0 // indirect @@ -73,3 +74,5 @@ replace go.opentelemetry.io/collector/config/confignet => ../config/confignet replace go.opentelemetry.io/collector/config/configopaque => ../config/configopaque replace go.opentelemetry.io/collector/config/configtls => ../config/configtls + +replace go.opentelemetry.io/collector/config/configtelemetry => ../config/configtelemetry diff --git a/processor/memorylimiterprocessor/go.mod b/processor/memorylimiterprocessor/go.mod index 748b0d3fe76f..41975043a678 100644 --- a/processor/memorylimiterprocessor/go.mod +++ b/processor/memorylimiterprocessor/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/configtelemetry 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/pdata v1.0.0-rcv0012 @@ -90,3 +91,5 @@ replace go.opentelemetry.io/collector/config/confignet => ../../config/confignet replace go.opentelemetry.io/collector/config/configopaque => ../../config/configopaque replace go.opentelemetry.io/collector/config/configtls => ../../config/configtls + +replace go.opentelemetry.io/collector/config/configtelemetry => ../../config/configtelemetry diff --git a/receiver/go.mod b/receiver/go.mod index 18d844bda120..10c6a8795676 100644 --- a/receiver/go.mod +++ b/receiver/go.mod @@ -41,6 +41,7 @@ require ( github.com/prometheus/procfs v0.9.0 // indirect github.com/prometheus/statsd_exporter v0.22.7 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.0.0-00010101000000-000000000000 // indirect go.opentelemetry.io/collector/confmap v0.79.0 // indirect go.opentelemetry.io/collector/exporter v0.79.0 // indirect go.opentelemetry.io/collector/featuregate v1.0.0-rcv0012 // indirect @@ -95,3 +96,5 @@ replace go.opentelemetry.io/collector/config/confignet => ../config/confignet replace go.opentelemetry.io/collector/config/configopaque => ../config/configopaque replace go.opentelemetry.io/collector/config/configtls => ../config/configtls + +replace go.opentelemetry.io/collector/config/configtelemetry => ../config/configtelemetry diff --git a/receiver/otlpreceiver/go.mod b/receiver/otlpreceiver/go.mod index 738522a1952b..8ed3c9133df2 100644 --- a/receiver/otlpreceiver/go.mod +++ b/receiver/otlpreceiver/go.mod @@ -8,6 +8,7 @@ require ( go.opentelemetry.io/collector v0.79.0 go.opentelemetry.io/collector/component v0.79.0 go.opentelemetry.io/collector/config/confignet v0.0.0-00010101000000-000000000000 + go.opentelemetry.io/collector/config/configtelemetry v0.0.0-00010101000000-000000000000 go.opentelemetry.io/collector/config/configtls v0.0.0-00010101000000-000000000000 go.opentelemetry.io/collector/confmap v0.79.0 go.opentelemetry.io/collector/consumer v0.79.0 @@ -87,6 +88,8 @@ replace go.opentelemetry.io/collector/config/confignet => ../../config/confignet replace go.opentelemetry.io/collector/config/configopaque => ../../config/configopaque +replace go.opentelemetry.io/collector/config/configtelemetry => ../../config/configtelemetry + replace go.opentelemetry.io/collector/config/configtls => ../../config/configtls replace go.opentelemetry.io/collector/confmap => ../../confmap diff --git a/versions.yaml b/versions.yaml index 00b2c2aca14a..c1c1816edea2 100644 --- a/versions.yaml +++ b/versions.yaml @@ -20,7 +20,7 @@ module-sets: # - go.opentelemetry.io/collector/config/confighttp - go.opentelemetry.io/collector/config/confignet - go.opentelemetry.io/collector/config/configopaque - # - go.opentelemetry.io/collector/config/configtelemetry + - go.opentelemetry.io/collector/config/configtelemetry - go.opentelemetry.io/collector/config/configtls - go.opentelemetry.io/collector/connector - go.opentelemetry.io/collector/connector/forwardconnector