diff --git a/Makefile b/Makefile index 522bfbdeaa0..882e0fdcf97 100644 --- a/Makefile +++ b/Makefile @@ -302,7 +302,6 @@ check-contrib: -replace go.opentelemetry.io/collector/extension/zpagesextension=$(CURDIR)/extension/zpagesextension \ -replace go.opentelemetry.io/collector/featuregate=$(CURDIR)/featuregate \ -replace go.opentelemetry.io/collector/filter=$(CURDIR)/filter \ - -replace go.opentelemetry.io/collector/internal/globalsignal=$(CURDIR)/internal/globalsignal \ -replace go.opentelemetry.io/collector/otelcol=$(CURDIR)/otelcol \ -replace go.opentelemetry.io/collector/otelcol/otelcoltest=$(CURDIR)/otelcol/otelcoltest \ -replace go.opentelemetry.io/collector/pdata=$(CURDIR)/pdata \ @@ -370,7 +369,6 @@ restore-contrib: -dropreplace go.opentelemetry.io/collector/extension/zpagesextension \ -dropreplace go.opentelemetry.io/collector/featuregate \ -dropreplace go.opentelemetry.io/collector/filter \ - -dropreplace go.opentelemetry.io/collector/internal/globalsignal \ -dropreplace go.opentelemetry.io/collector/otelcol \ -dropreplace go.opentelemetry.io/collector/otelcol/otelcoltest \ -dropreplace go.opentelemetry.io/collector/pdata \ diff --git a/cmd/builder/internal/builder/main_test.go b/cmd/builder/internal/builder/main_test.go index 5d7162e8c34..5d26f372d4b 100644 --- a/cmd/builder/internal/builder/main_test.go +++ b/cmd/builder/internal/builder/main_test.go @@ -76,7 +76,6 @@ var ( "/extension/extensioncapabilities", "/extension/zpagesextension", "/featuregate", - "/internal/globalsignal", "/pipeline", "/pipeline/pipelineprofiles", "/processor", diff --git a/cmd/builder/test/core.builder.yaml b/cmd/builder/test/core.builder.yaml index fc33f39e078..a92e61946b1 100644 --- a/cmd/builder/test/core.builder.yaml +++ b/cmd/builder/test/core.builder.yaml @@ -46,7 +46,6 @@ replaces: - go.opentelemetry.io/collector/extension/extensioncapabilities => ${WORKSPACE_DIR}/extension/extensioncapabilities - go.opentelemetry.io/collector/extension/zpagesextension => ${WORKSPACE_DIR}/extension/zpagesextension - go.opentelemetry.io/collector/featuregate => ${WORKSPACE_DIR}/featuregate - - go.opentelemetry.io/collector/internal/globalsignal => ${WORKSPACE_DIR}/internal/globalsignal - go.opentelemetry.io/collector/otelcol => ${WORKSPACE_DIR}/otelcol - go.opentelemetry.io/collector/otelcol/otelcoltest => ${WORKSPACE_DIR}/otelcol/otelcoltest - go.opentelemetry.io/collector/pdata => ${WORKSPACE_DIR}/pdata diff --git a/cmd/mdatagen/go.mod b/cmd/mdatagen/go.mod index 86b2287aa08..6723562ba28 100644 --- a/cmd/mdatagen/go.mod +++ b/cmd/mdatagen/go.mod @@ -45,7 +45,6 @@ require ( github.com/spf13/pflag v1.0.5 // indirect go.opentelemetry.io/collector/component/componentstatus v0.111.0 // indirect go.opentelemetry.io/collector/consumer/consumerprofiles v0.111.0 // indirect - go.opentelemetry.io/collector/internal/globalsignal v0.111.0 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.111.0 // indirect go.opentelemetry.io/collector/pdata/testdata v0.111.0 // indirect go.opentelemetry.io/collector/pipeline v0.111.0 // indirect @@ -98,8 +97,6 @@ replace go.opentelemetry.io/collector/receiver/receiverprofiles => ../../receive replace go.opentelemetry.io/collector/pipeline => ../../pipeline -replace go.opentelemetry.io/collector/internal/globalsignal => ../../internal/globalsignal - replace go.opentelemetry.io/collector/processor/processorprofiles => ../../processor/processorprofiles replace go.opentelemetry.io/collector/component/componentstatus => ../../component/componentstatus diff --git a/cmd/otelcorecol/builder-config.yaml b/cmd/otelcorecol/builder-config.yaml index b975754c5ca..550d8573fe3 100644 --- a/cmd/otelcorecol/builder-config.yaml +++ b/cmd/otelcorecol/builder-config.yaml @@ -39,7 +39,6 @@ providers: replaces: - go.opentelemetry.io/collector => ../../ - - go.opentelemetry.io/collector/internal/globalsignal => ../../internal/globalsignal - go.opentelemetry.io/collector/client => ../../client - go.opentelemetry.io/collector/otelcol => ../../otelcol - go.opentelemetry.io/collector/component => ../../component diff --git a/cmd/otelcorecol/go.mod b/cmd/otelcorecol/go.mod index 3ed466cf0a8..f3ca820bf67 100644 --- a/cmd/otelcorecol/go.mod +++ b/cmd/otelcorecol/go.mod @@ -101,7 +101,6 @@ require ( go.opentelemetry.io/collector/extension/experimental/storage v0.111.0 // indirect go.opentelemetry.io/collector/extension/extensioncapabilities v0.111.0 // indirect go.opentelemetry.io/collector/featuregate v1.17.0 // indirect - go.opentelemetry.io/collector/internal/globalsignal v0.111.0 // indirect go.opentelemetry.io/collector/pdata v1.17.0 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.111.0 // indirect go.opentelemetry.io/collector/pdata/testdata v0.111.0 // indirect @@ -149,8 +148,6 @@ require ( replace go.opentelemetry.io/collector => ../../ -replace go.opentelemetry.io/collector/internal/globalsignal => ../../internal/globalsignal - replace go.opentelemetry.io/collector/client => ../../client replace go.opentelemetry.io/collector/otelcol => ../../otelcol diff --git a/component/componentstatus/go.mod b/component/componentstatus/go.mod index dd8bfafae26..6f5fe591f1b 100644 --- a/component/componentstatus/go.mod +++ b/component/componentstatus/go.mod @@ -13,7 +13,6 @@ require ( github.com/gogo/protobuf v1.3.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.111.0 // indirect - go.opentelemetry.io/collector/internal/globalsignal v0.111.0 // indirect go.opentelemetry.io/collector/pdata v1.17.0 // indirect go.opentelemetry.io/otel v1.31.0 // indirect go.opentelemetry.io/otel/metric v1.31.0 // indirect @@ -36,5 +35,3 @@ replace go.opentelemetry.io/collector/component => ../ replace go.opentelemetry.io/collector/pdata => ../../pdata replace go.opentelemetry.io/collector/pipeline => ../../pipeline - -replace go.opentelemetry.io/collector/internal/globalsignal => ../../internal/globalsignal diff --git a/connector/connectorprofiles/go.mod b/connector/connectorprofiles/go.mod index 1a699f44a3c..c3edb160c5c 100644 --- a/connector/connectorprofiles/go.mod +++ b/connector/connectorprofiles/go.mod @@ -24,7 +24,6 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.111.0 // indirect - go.opentelemetry.io/collector/internal/globalsignal v0.111.0 // indirect go.opentelemetry.io/collector/pdata v1.17.0 // indirect go.opentelemetry.io/otel v1.31.0 // indirect go.opentelemetry.io/otel/metric v1.31.0 // indirect @@ -66,6 +65,4 @@ replace go.opentelemetry.io/collector/component/componentstatus => ../../compone replace go.opentelemetry.io/collector/pipeline => ../../pipeline -replace go.opentelemetry.io/collector/internal/globalsignal => ../../internal/globalsignal - replace go.opentelemetry.io/collector/pipeline/pipelineprofiles => ../../pipeline/pipelineprofiles diff --git a/connector/forwardconnector/go.mod b/connector/forwardconnector/go.mod index d1aa8378784..fe468d30547 100644 --- a/connector/forwardconnector/go.mod +++ b/connector/forwardconnector/go.mod @@ -34,7 +34,6 @@ require ( go.opentelemetry.io/collector/config/configtelemetry v0.111.0 // indirect go.opentelemetry.io/collector/connector/connectorprofiles v0.111.0 // indirect go.opentelemetry.io/collector/consumer/consumerprofiles v0.111.0 // indirect - go.opentelemetry.io/collector/internal/globalsignal v0.111.0 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.111.0 // indirect go.opentelemetry.io/collector/pipeline/pipelineprofiles v0.111.0 // indirect go.opentelemetry.io/otel v1.31.0 // indirect @@ -86,6 +85,4 @@ replace go.opentelemetry.io/collector/connector/connectorprofiles => ../connecto replace go.opentelemetry.io/collector/pipeline => ../../pipeline -replace go.opentelemetry.io/collector/internal/globalsignal => ../../internal/globalsignal - replace go.opentelemetry.io/collector/pipeline/pipelineprofiles => ../../pipeline/pipelineprofiles diff --git a/connector/go.mod b/connector/go.mod index e1ad96e3b0f..765ab4d037e 100644 --- a/connector/go.mod +++ b/connector/go.mod @@ -29,7 +29,6 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.111.0 // indirect - go.opentelemetry.io/collector/internal/globalsignal v0.111.0 // indirect go.opentelemetry.io/collector/pipeline/pipelineprofiles v0.111.0 // indirect go.opentelemetry.io/otel v1.31.0 // indirect go.opentelemetry.io/otel/metric v1.31.0 // indirect @@ -72,6 +71,4 @@ replace go.opentelemetry.io/collector/connector/connectorprofiles => ./connector replace go.opentelemetry.io/collector/pipeline => ../pipeline -replace go.opentelemetry.io/collector/internal/globalsignal => ../internal/globalsignal - replace go.opentelemetry.io/collector/pipeline/pipelineprofiles => ../pipeline/pipelineprofiles diff --git a/exporter/debugexporter/go.mod b/exporter/debugexporter/go.mod index c73a297f98d..3d7483e4533 100644 --- a/exporter/debugexporter/go.mod +++ b/exporter/debugexporter/go.mod @@ -40,7 +40,6 @@ require ( go.opentelemetry.io/collector/exporter/exporterprofiles v0.111.0 // indirect go.opentelemetry.io/collector/extension v0.111.0 // indirect go.opentelemetry.io/collector/extension/experimental/storage v0.111.0 // indirect - go.opentelemetry.io/collector/internal/globalsignal v0.111.0 // indirect go.opentelemetry.io/collector/pipeline v0.111.0 // indirect go.opentelemetry.io/collector/receiver v0.111.0 // indirect go.opentelemetry.io/collector/receiver/receiverprofiles v0.111.0 // indirect @@ -91,5 +90,3 @@ replace go.opentelemetry.io/collector/receiver/receiverprofiles => ../../receive replace go.opentelemetry.io/collector/exporter/exporterprofiles => ../exporterprofiles replace go.opentelemetry.io/collector/pipeline => ../../pipeline - -replace go.opentelemetry.io/collector/internal/globalsignal => ../../internal/globalsignal diff --git a/exporter/exporterprofiles/go.mod b/exporter/exporterprofiles/go.mod index defeb2e37c7..d53a2e2c59b 100644 --- a/exporter/exporterprofiles/go.mod +++ b/exporter/exporterprofiles/go.mod @@ -20,7 +20,6 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.111.0 // indirect go.opentelemetry.io/collector/consumer v0.111.0 // indirect - go.opentelemetry.io/collector/internal/globalsignal v0.111.0 // indirect go.opentelemetry.io/collector/pdata v1.17.0 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.111.0 // indirect go.opentelemetry.io/otel v1.31.0 // indirect @@ -66,5 +65,3 @@ replace go.opentelemetry.io/collector/exporter => ../ replace go.opentelemetry.io/collector/receiver/receiverprofiles => ../../receiver/receiverprofiles replace go.opentelemetry.io/collector/pipeline => ../../pipeline - -replace go.opentelemetry.io/collector/internal/globalsignal => ../../internal/globalsignal diff --git a/exporter/go.mod b/exporter/go.mod index 144d567f37a..b85de6ac70a 100644 --- a/exporter/go.mod +++ b/exporter/go.mod @@ -40,7 +40,6 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opentelemetry.io/collector/consumer/consumerprofiles v0.111.0 // indirect - go.opentelemetry.io/collector/internal/globalsignal v0.111.0 // indirect go.opentelemetry.io/collector/receiver/receiverprofiles v0.111.0 // indirect golang.org/x/net v0.28.0 // indirect golang.org/x/sys v0.26.0 // indirect @@ -81,5 +80,3 @@ replace go.opentelemetry.io/collector/consumer/consumertest => ../consumer/consu replace go.opentelemetry.io/collector/receiver/receiverprofiles => ../receiver/receiverprofiles replace go.opentelemetry.io/collector/exporter/exporterprofiles => ./exporterprofiles - -replace go.opentelemetry.io/collector/internal/globalsignal => ../internal/globalsignal diff --git a/exporter/nopexporter/go.mod b/exporter/nopexporter/go.mod index 21b1a33f110..8f03830397a 100644 --- a/exporter/nopexporter/go.mod +++ b/exporter/nopexporter/go.mod @@ -32,7 +32,6 @@ require ( go.opentelemetry.io/collector/consumer v0.111.0 // indirect go.opentelemetry.io/collector/consumer/consumerprofiles v0.111.0 // indirect go.opentelemetry.io/collector/exporter/exporterprofiles v0.111.0 // indirect - go.opentelemetry.io/collector/internal/globalsignal v0.111.0 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.111.0 // indirect go.opentelemetry.io/collector/pipeline v0.111.0 // indirect go.opentelemetry.io/collector/receiver v0.111.0 // indirect @@ -86,5 +85,3 @@ replace go.opentelemetry.io/collector/receiver/receiverprofiles => ../../receive replace go.opentelemetry.io/collector/exporter/exporterprofiles => ../exporterprofiles replace go.opentelemetry.io/collector/pipeline => ../../pipeline - -replace go.opentelemetry.io/collector/internal/globalsignal => ../../internal/globalsignal diff --git a/exporter/otlpexporter/go.mod b/exporter/otlpexporter/go.mod index e5cefcbcb40..9c7ba16306b 100644 --- a/exporter/otlpexporter/go.mod +++ b/exporter/otlpexporter/go.mod @@ -55,7 +55,6 @@ require ( go.opentelemetry.io/collector/extension v0.111.0 // indirect go.opentelemetry.io/collector/extension/auth v0.111.0 // indirect go.opentelemetry.io/collector/extension/experimental/storage v0.111.0 // indirect - go.opentelemetry.io/collector/internal/globalsignal v0.111.0 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.111.0 // indirect go.opentelemetry.io/collector/pipeline v0.111.0 // indirect go.opentelemetry.io/collector/receiver v0.111.0 // indirect @@ -125,8 +124,6 @@ replace go.opentelemetry.io/collector/exporter/exporterprofiles => ../exporterpr replace go.opentelemetry.io/collector/pipeline => ../../pipeline -replace go.opentelemetry.io/collector/internal/globalsignal => ../../internal/globalsignal - replace go.opentelemetry.io/collector => ../.. replace go.opentelemetry.io/collector/component/componentstatus => ../../component/componentstatus diff --git a/exporter/otlphttpexporter/go.mod b/exporter/otlphttpexporter/go.mod index acc49bf5bee..40b049f35bf 100644 --- a/exporter/otlphttpexporter/go.mod +++ b/exporter/otlphttpexporter/go.mod @@ -55,7 +55,6 @@ require ( go.opentelemetry.io/collector/extension v0.111.0 // indirect go.opentelemetry.io/collector/extension/auth v0.111.0 // indirect go.opentelemetry.io/collector/extension/experimental/storage v0.111.0 // indirect - go.opentelemetry.io/collector/internal/globalsignal v0.111.0 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.111.0 // indirect go.opentelemetry.io/collector/pipeline v0.111.0 // indirect go.opentelemetry.io/collector/receiver v0.111.0 // indirect @@ -127,8 +126,6 @@ replace go.opentelemetry.io/collector/exporter/exporterprofiles => ../exporterpr replace go.opentelemetry.io/collector/pipeline => ../../pipeline -replace go.opentelemetry.io/collector/internal/globalsignal => ../../internal/globalsignal - 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 diff --git a/extension/memorylimiterextension/go.mod b/extension/memorylimiterextension/go.mod index 7f76a5fc732..8bf629ead2b 100644 --- a/extension/memorylimiterextension/go.mod +++ b/extension/memorylimiterextension/go.mod @@ -75,5 +75,3 @@ replace go.opentelemetry.io/collector/consumer/consumertest => ../../consumer/co replace go.opentelemetry.io/collector/component/componentstatus => ../../component/componentstatus replace go.opentelemetry.io/collector/pipeline => ../../pipeline - -replace go.opentelemetry.io/collector/internal/globalsignal => ../../internal/globalsignal diff --git a/extension/zpagesextension/go.mod b/extension/zpagesextension/go.mod index 08533a99bda..e3c7fbd41d2 100644 --- a/extension/zpagesextension/go.mod +++ b/extension/zpagesextension/go.mod @@ -44,7 +44,6 @@ require ( go.opentelemetry.io/collector/config/configtls v1.17.0 // indirect go.opentelemetry.io/collector/config/internal v0.111.0 // indirect go.opentelemetry.io/collector/extension/auth v0.111.0 // indirect - go.opentelemetry.io/collector/internal/globalsignal v0.111.0 // indirect go.opentelemetry.io/collector/pdata v1.17.0 // indirect go.opentelemetry.io/collector/pipeline v0.111.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.55.0 // indirect @@ -103,8 +102,6 @@ replace go.opentelemetry.io/collector/component/componentstatus => ../../compone replace go.opentelemetry.io/collector/pipeline => ../../pipeline -replace go.opentelemetry.io/collector/internal/globalsignal => ../../internal/globalsignal - 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 diff --git a/go.mod b/go.mod index efe5cc405de..4ccd2837430 100644 --- a/go.mod +++ b/go.mod @@ -53,7 +53,6 @@ require ( github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.111.0 // indirect - go.opentelemetry.io/collector/internal/globalsignal v0.111.0 // indirect go.opentelemetry.io/collector/pipeline v0.111.0 // indirect go.opentelemetry.io/otel v1.31.0 // indirect go.opentelemetry.io/otel/metric v1.31.0 // indirect @@ -97,5 +96,3 @@ replace go.opentelemetry.io/collector/pdata/pprofile => ./pdata/pprofile replace go.opentelemetry.io/collector/consumer/consumerprofiles => ./consumer/consumerprofiles replace go.opentelemetry.io/collector/pipeline => ./pipeline - -replace go.opentelemetry.io/collector/internal/globalsignal => ./internal/globalsignal diff --git a/internal/e2e/go.mod b/internal/e2e/go.mod index c20fe1ab36f..22fc14cedbb 100644 --- a/internal/e2e/go.mod +++ b/internal/e2e/go.mod @@ -84,7 +84,6 @@ require ( go.opentelemetry.io/collector/extension/experimental/storage v0.111.0 // indirect go.opentelemetry.io/collector/extension/extensioncapabilities v0.111.0 // indirect go.opentelemetry.io/collector/featuregate v1.17.0 // indirect - go.opentelemetry.io/collector/internal/globalsignal v0.111.0 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.111.0 // indirect go.opentelemetry.io/collector/pipeline/pipelineprofiles v0.111.0 // indirect go.opentelemetry.io/collector/processor v0.111.0 // indirect @@ -207,6 +206,4 @@ replace go.opentelemetry.io/collector/exporter/exporterprofiles => ../../exporte replace go.opentelemetry.io/collector/pipeline => ../../pipeline -replace go.opentelemetry.io/collector/internal/globalsignal => ../globalsignal - replace go.opentelemetry.io/collector/pipeline/pipelineprofiles => ../../pipeline/pipelineprofiles diff --git a/internal/globalsignal/Makefile b/internal/globalsignal/Makefile deleted file mode 100644 index ded7a36092d..00000000000 --- a/internal/globalsignal/Makefile +++ /dev/null @@ -1 +0,0 @@ -include ../../Makefile.Common diff --git a/internal/globalsignal/go.mod b/internal/globalsignal/go.mod deleted file mode 100644 index 8ee5f5ddf1e..00000000000 --- a/internal/globalsignal/go.mod +++ /dev/null @@ -1,11 +0,0 @@ -module go.opentelemetry.io/collector/internal/globalsignal - -go 1.22.0 - -require github.com/stretchr/testify v1.9.0 - -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/internal/globalsignal/go.sum b/internal/globalsignal/go.sum deleted file mode 100644 index 60ce688a041..00000000000 --- a/internal/globalsignal/go.sum +++ /dev/null @@ -1,10 +0,0 @@ -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.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= -github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -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/otelcol/go.mod b/otelcol/go.mod index 231a38af3c8..3f7ef4119df 100644 --- a/otelcol/go.mod +++ b/otelcol/go.mod @@ -71,7 +71,6 @@ require ( go.opentelemetry.io/collector/consumer/consumertest v0.111.0 // indirect go.opentelemetry.io/collector/exporter/exporterprofiles v0.111.0 // indirect go.opentelemetry.io/collector/extension/extensioncapabilities v0.111.0 // indirect - go.opentelemetry.io/collector/internal/globalsignal v0.111.0 // indirect go.opentelemetry.io/collector/pdata v1.17.0 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.111.0 // indirect go.opentelemetry.io/collector/pdata/testdata v0.111.0 // indirect @@ -178,6 +177,4 @@ replace go.opentelemetry.io/collector/exporter/exporterprofiles => ../exporter/e replace go.opentelemetry.io/collector/pipeline => ../pipeline -replace go.opentelemetry.io/collector/internal/globalsignal => ../internal/globalsignal - replace go.opentelemetry.io/collector/pipeline/pipelineprofiles => ../pipeline/pipelineprofiles diff --git a/otelcol/otelcoltest/go.mod b/otelcol/otelcoltest/go.mod index 108b4b97553..5dd0f730ee9 100644 --- a/otelcol/otelcoltest/go.mod +++ b/otelcol/otelcoltest/go.mod @@ -69,7 +69,6 @@ require ( go.opentelemetry.io/collector/exporter/exporterprofiles v0.111.0 // indirect go.opentelemetry.io/collector/extension/extensioncapabilities v0.111.0 // indirect go.opentelemetry.io/collector/featuregate v1.17.0 // indirect - go.opentelemetry.io/collector/internal/globalsignal v0.111.0 // indirect go.opentelemetry.io/collector/pdata v1.17.0 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.111.0 // indirect go.opentelemetry.io/collector/pdata/testdata v0.111.0 // indirect @@ -193,6 +192,4 @@ replace go.opentelemetry.io/collector/exporter/exporterprofiles => ../../exporte replace go.opentelemetry.io/collector/pipeline => ../../pipeline -replace go.opentelemetry.io/collector/internal/globalsignal => ../../internal/globalsignal - replace go.opentelemetry.io/collector/pipeline/pipelineprofiles => ../../pipeline/pipelineprofiles diff --git a/pipeline/go.mod b/pipeline/go.mod index f77b5783ea7..919a5d0fa82 100644 --- a/pipeline/go.mod +++ b/pipeline/go.mod @@ -2,15 +2,10 @@ module go.opentelemetry.io/collector/pipeline go 1.22.0 -require ( - github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/internal/globalsignal v0.111.0 -) +require github.com/stretchr/testify v1.9.0 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 ) - -replace go.opentelemetry.io/collector/internal/globalsignal => ../internal/globalsignal diff --git a/internal/globalsignal/signal.go b/pipeline/internal/globalsignal/signal.go similarity index 93% rename from internal/globalsignal/signal.go rename to pipeline/internal/globalsignal/signal.go index a10431743b0..c97f7913075 100644 --- a/internal/globalsignal/signal.go +++ b/pipeline/internal/globalsignal/signal.go @@ -1,7 +1,7 @@ // Copyright The OpenTelemetry Authors // SPDX-License-Identifier: Apache-2.0 -package globalsignal // import "go.opentelemetry.io/collector/internal/globalsignal" +package globalsignal // import "go.opentelemetry.io/collector/pipeline/internal/globalsignal" import ( "fmt" diff --git a/internal/globalsignal/signal_test.go b/pipeline/internal/globalsignal/signal_test.go similarity index 100% rename from internal/globalsignal/signal_test.go rename to pipeline/internal/globalsignal/signal_test.go diff --git a/pipeline/pipeline.go b/pipeline/pipeline.go index ae8ac833cc5..aa2d3d0d0ad 100644 --- a/pipeline/pipeline.go +++ b/pipeline/pipeline.go @@ -8,7 +8,7 @@ import ( "regexp" "strings" - "go.opentelemetry.io/collector/internal/globalsignal" + "go.opentelemetry.io/collector/pipeline/internal/globalsignal" ) // typeAndNameSeparator is the separator that is used between type and name in type/name composite keys. diff --git a/pipeline/pipeline_test.go b/pipeline/pipeline_test.go index 91727381092..8f897260fb2 100644 --- a/pipeline/pipeline_test.go +++ b/pipeline/pipeline_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/internal/globalsignal" + "go.opentelemetry.io/collector/pipeline/internal/globalsignal" ) func Test_NewID(t *testing.T) { diff --git a/pipeline/pipelineprofiles/config.go b/pipeline/pipelineprofiles/config.go index 8aa00dd61a1..e1cd9136cfd 100644 --- a/pipeline/pipelineprofiles/config.go +++ b/pipeline/pipelineprofiles/config.go @@ -4,7 +4,7 @@ package pipelineprofiles // import "go.opentelemetry.io/collector/pipeline/pipelineprofiles" import ( - "go.opentelemetry.io/collector/internal/globalsignal" + "go.opentelemetry.io/collector/pipeline/internal/globalsignal" ) var ( diff --git a/pipeline/pipelineprofiles/go.mod b/pipeline/pipelineprofiles/go.mod index 8170d7826b5..bbe18350b71 100644 --- a/pipeline/pipelineprofiles/go.mod +++ b/pipeline/pipelineprofiles/go.mod @@ -2,6 +2,6 @@ module go.opentelemetry.io/collector/pipeline/pipelineprofiles go 1.22.0 -require go.opentelemetry.io/collector/internal/globalsignal v0.111.0 +require go.opentelemetry.io/collector/pipeline v0.111.0 -replace go.opentelemetry.io/collector/internal/globalsignal => ./../../internal/globalsignal +replace go.opentelemetry.io/collector/pipeline => ../ diff --git a/pipeline/signal.go b/pipeline/signal.go index 69b3d527952..77376c999ad 100644 --- a/pipeline/signal.go +++ b/pipeline/signal.go @@ -6,7 +6,7 @@ package pipeline // import "go.opentelemetry.io/collector/pipeline" import ( "errors" - "go.opentelemetry.io/collector/internal/globalsignal" + "go.opentelemetry.io/collector/pipeline/internal/globalsignal" ) // Signal represents the signals supported by the collector. We currently support diff --git a/processor/batchprocessor/go.mod b/processor/batchprocessor/go.mod index 82c50d82558..35ca4c1f829 100644 --- a/processor/batchprocessor/go.mod +++ b/processor/batchprocessor/go.mod @@ -39,7 +39,6 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect go.opentelemetry.io/collector/component/componentstatus v0.111.0 // indirect go.opentelemetry.io/collector/consumer/consumerprofiles v0.111.0 // indirect - go.opentelemetry.io/collector/internal/globalsignal v0.111.0 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.111.0 // indirect go.opentelemetry.io/collector/pipeline v0.111.0 // indirect go.opentelemetry.io/collector/processor/processorprofiles v0.111.0 // indirect @@ -86,5 +85,3 @@ replace go.opentelemetry.io/collector/component/componentstatus => ../../compone replace go.opentelemetry.io/collector/processor/processorprofiles => ../processorprofiles replace go.opentelemetry.io/collector/pipeline => ../../pipeline - -replace go.opentelemetry.io/collector/internal/globalsignal => ../../internal/globalsignal diff --git a/processor/go.mod b/processor/go.mod index 4e8e3152b40..5e05342fb2f 100644 --- a/processor/go.mod +++ b/processor/go.mod @@ -32,7 +32,6 @@ 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/internal/globalsignal v0.111.0 // indirect go.opentelemetry.io/otel/sdk v1.31.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect @@ -66,5 +65,3 @@ replace go.opentelemetry.io/collector/component/componentstatus => ../component/ replace go.opentelemetry.io/collector/processor/processorprofiles => ./processorprofiles replace go.opentelemetry.io/collector/pipeline => ../pipeline - -replace go.opentelemetry.io/collector/internal/globalsignal => ../internal/globalsignal diff --git a/processor/memorylimiterprocessor/go.mod b/processor/memorylimiterprocessor/go.mod index 3f7afc8d42f..3e3fcb44137 100644 --- a/processor/memorylimiterprocessor/go.mod +++ b/processor/memorylimiterprocessor/go.mod @@ -46,7 +46,6 @@ require ( github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opentelemetry.io/collector/component/componentstatus v0.111.0 // indirect go.opentelemetry.io/collector/consumer/consumerprofiles v0.111.0 // indirect - go.opentelemetry.io/collector/internal/globalsignal v0.111.0 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.111.0 // indirect go.opentelemetry.io/collector/pdata/testdata v0.111.0 // indirect go.opentelemetry.io/collector/processor/processorprofiles v0.111.0 // indirect @@ -94,5 +93,3 @@ replace go.opentelemetry.io/collector/component/componentstatus => ../../compone replace go.opentelemetry.io/collector/processor/processorprofiles => ../processorprofiles replace go.opentelemetry.io/collector/pipeline => ../../pipeline - -replace go.opentelemetry.io/collector/internal/globalsignal => ../../internal/globalsignal diff --git a/processor/processorprofiles/go.mod b/processor/processorprofiles/go.mod index 639304261c9..5949b0457ec 100644 --- a/processor/processorprofiles/go.mod +++ b/processor/processorprofiles/go.mod @@ -20,7 +20,6 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.111.0 // indirect go.opentelemetry.io/collector/consumer v0.111.0 // indirect - go.opentelemetry.io/collector/internal/globalsignal v0.111.0 // indirect go.opentelemetry.io/collector/pdata v1.17.0 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.111.0 // indirect go.opentelemetry.io/otel v1.31.0 // indirect @@ -58,5 +57,3 @@ replace go.opentelemetry.io/collector/consumer/consumertest => ../../consumer/co replace go.opentelemetry.io/collector/component/componentstatus => ../../component/componentstatus replace go.opentelemetry.io/collector/pipeline => ../../pipeline - -replace go.opentelemetry.io/collector/internal/globalsignal => ../../internal/globalsignal diff --git a/receiver/go.mod b/receiver/go.mod index f22d1ce0003..785fa39e071 100644 --- a/receiver/go.mod +++ b/receiver/go.mod @@ -32,7 +32,6 @@ 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/internal/globalsignal v0.111.0 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.111.0 // indirect golang.org/x/net v0.28.0 // indirect golang.org/x/sys v0.26.0 // indirect @@ -64,5 +63,3 @@ replace go.opentelemetry.io/collector/receiver/receiverprofiles => ./receiverpro retract v0.76.0 // Depends on retracted pdata v1.0.0-rc10 module replace go.opentelemetry.io/collector/pipeline => ../pipeline - -replace go.opentelemetry.io/collector/internal/globalsignal => ../internal/globalsignal diff --git a/receiver/nopreceiver/go.mod b/receiver/nopreceiver/go.mod index 35005191258..8b755afa463 100644 --- a/receiver/nopreceiver/go.mod +++ b/receiver/nopreceiver/go.mod @@ -30,7 +30,6 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.111.0 // indirect go.opentelemetry.io/collector/consumer/consumerprofiles v0.111.0 // indirect - go.opentelemetry.io/collector/internal/globalsignal v0.111.0 // indirect go.opentelemetry.io/collector/pdata v1.17.0 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.111.0 // indirect go.opentelemetry.io/collector/pipeline v0.111.0 // indirect @@ -74,5 +73,3 @@ replace go.opentelemetry.io/collector/consumer/consumertest => ../../consumer/co replace go.opentelemetry.io/collector/receiver/receiverprofiles => ../receiverprofiles replace go.opentelemetry.io/collector/pipeline => ../../pipeline - -replace go.opentelemetry.io/collector/internal/globalsignal => ../../internal/globalsignal diff --git a/receiver/otlpreceiver/go.mod b/receiver/otlpreceiver/go.mod index c666b2da0af..3e74fcab003 100644 --- a/receiver/otlpreceiver/go.mod +++ b/receiver/otlpreceiver/go.mod @@ -58,7 +58,6 @@ require ( go.opentelemetry.io/collector/config/internal v0.111.0 // indirect go.opentelemetry.io/collector/extension v0.111.0 // indirect go.opentelemetry.io/collector/extension/auth v0.111.0 // indirect - go.opentelemetry.io/collector/internal/globalsignal v0.111.0 // indirect go.opentelemetry.io/collector/pipeline v0.111.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.55.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.55.0 // indirect @@ -124,8 +123,6 @@ replace go.opentelemetry.io/collector/receiver/receiverprofiles => ../receiverpr replace go.opentelemetry.io/collector/pipeline => ../../pipeline -replace go.opentelemetry.io/collector/internal/globalsignal => ../../internal/globalsignal - 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 diff --git a/receiver/receiverprofiles/go.mod b/receiver/receiverprofiles/go.mod index d5d5e94fffc..13613156582 100644 --- a/receiver/receiverprofiles/go.mod +++ b/receiver/receiverprofiles/go.mod @@ -20,7 +20,6 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.111.0 // indirect go.opentelemetry.io/collector/consumer v0.111.0 // indirect - go.opentelemetry.io/collector/internal/globalsignal v0.111.0 // indirect go.opentelemetry.io/collector/pdata v1.17.0 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.111.0 // indirect go.opentelemetry.io/otel v1.31.0 // indirect @@ -56,5 +55,3 @@ replace go.opentelemetry.io/collector/pdata => ../../pdata replace go.opentelemetry.io/collector/consumer/consumertest => ../../consumer/consumertest replace go.opentelemetry.io/collector/pipeline => ../../pipeline - -replace go.opentelemetry.io/collector/internal/globalsignal => ../../internal/globalsignal diff --git a/service/go.mod b/service/go.mod index 62083742a71..23e6c29fd4b 100644 --- a/service/go.mod +++ b/service/go.mod @@ -95,7 +95,6 @@ require ( go.opentelemetry.io/collector/config/configtls v1.17.0 // indirect go.opentelemetry.io/collector/config/internal v0.111.0 // indirect go.opentelemetry.io/collector/extension/auth v0.111.0 // indirect - go.opentelemetry.io/collector/internal/globalsignal v0.111.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.55.0 // indirect go.opentelemetry.io/contrib/zpages v0.55.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.6.0 // indirect @@ -187,6 +186,4 @@ replace go.opentelemetry.io/collector/connector/connectorprofiles => ../connecto replace go.opentelemetry.io/collector/exporter/exporterprofiles => ../exporter/exporterprofiles -replace go.opentelemetry.io/collector/internal/globalsignal => ../internal/globalsignal - replace go.opentelemetry.io/collector/pipeline/pipelineprofiles => ../pipeline/pipelineprofiles diff --git a/versions.yaml b/versions.yaml index 1a82dbb2daf..92bb90d59e4 100644 --- a/versions.yaml +++ b/versions.yaml @@ -23,7 +23,6 @@ module-sets: version: v0.111.0 modules: - go.opentelemetry.io/collector - - go.opentelemetry.io/collector/internal/globalsignal - go.opentelemetry.io/collector/cmd/builder - go.opentelemetry.io/collector/cmd/mdatagen - go.opentelemetry.io/collector/component