From ef4b1a5110b6bae714152d8ae2b133a1f2e4f60d Mon Sep 17 00:00:00 2001 From: opentelemetrybot <107717825+opentelemetrybot@users.noreply.github.com> Date: Tue, 27 Aug 2024 04:05:16 +0000 Subject: [PATCH] add multimod changes 0.108.0 --- cmd/builder/internal/config/default.yaml | 40 +++++------ cmd/otelcorecol/components.go | 26 +++---- cmd/otelcorecol/go.mod | 86 ++++++++++++------------ cmd/otelcorecol/main.go | 2 +- internal/e2e/go.mod | 46 ++++++------- 5 files changed, 100 insertions(+), 100 deletions(-) diff --git a/cmd/builder/internal/config/default.yaml b/cmd/builder/internal/config/default.yaml index 5b02a1a98d5..12d6c68bfd8 100644 --- a/cmd/builder/internal/config/default.yaml +++ b/cmd/builder/internal/config/default.yaml @@ -10,32 +10,32 @@ dist: module: go.opentelemetry.io/collector/cmd/otelcorecol name: otelcorecol description: Local OpenTelemetry Collector binary, testing only. - version: 0.107.0-dev - otelcol_version: 0.107.0 + version: 0.108.0-dev + otelcol_version: 0.108.0 receivers: - - gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.107.0 - - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.107.0 + - gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.108.0 + - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.108.0 exporters: - - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.107.0 - - gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.107.0 - - gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.107.0 - - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.107.0 - - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.107.0 + - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.108.0 + - gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.108.0 + - gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.108.0 + - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.108.0 + - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.108.0 extensions: - - gomod: go.opentelemetry.io/collector/extension/ballastextension v0.107.0 - - gomod: go.opentelemetry.io/collector/extension/memorylimiterextension v0.107.0 - - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.107.0 + - gomod: go.opentelemetry.io/collector/extension/ballastextension v0.108.0 + - gomod: go.opentelemetry.io/collector/extension/memorylimiterextension v0.108.0 + - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.108.0 processors: - - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.107.0 - - gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.107.0 + - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.108.0 + - gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.108.0 connectors: - - gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.107.0 + - gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.108.0 providers: - - gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v0.107.0 - - gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v0.107.0 - - gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v0.107.0 - - gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.107.0 - - gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.107.0 + - gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v0.108.0 + - gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v0.108.0 + - gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v0.108.0 + - gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.108.0 + - gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.108.0 diff --git a/cmd/otelcorecol/components.go b/cmd/otelcorecol/components.go index 7c97d448801..ebdb80b862a 100644 --- a/cmd/otelcorecol/components.go +++ b/cmd/otelcorecol/components.go @@ -38,9 +38,9 @@ func components() (otelcol.Factories, error) { return otelcol.Factories{}, err } factories.ExtensionModules = make(map[component.Type]string, len(factories.Extensions)) - factories.ExtensionModules[ballastextension.NewFactory().Type()] = "go.opentelemetry.io/collector/extension/ballastextension v0.107.0" - factories.ExtensionModules[memorylimiterextension.NewFactory().Type()] = "go.opentelemetry.io/collector/extension/memorylimiterextension v0.107.0" - factories.ExtensionModules[zpagesextension.NewFactory().Type()] = "go.opentelemetry.io/collector/extension/zpagesextension v0.107.0" + factories.ExtensionModules[ballastextension.NewFactory().Type()] = "go.opentelemetry.io/collector/extension/ballastextension v0.108.0" + factories.ExtensionModules[memorylimiterextension.NewFactory().Type()] = "go.opentelemetry.io/collector/extension/memorylimiterextension v0.108.0" + factories.ExtensionModules[zpagesextension.NewFactory().Type()] = "go.opentelemetry.io/collector/extension/zpagesextension v0.108.0" factories.Receivers, err = receiver.MakeFactoryMap( nopreceiver.NewFactory(), @@ -50,8 +50,8 @@ func components() (otelcol.Factories, error) { return otelcol.Factories{}, err } factories.ReceiverModules = make(map[component.Type]string, len(factories.Receivers)) - factories.ReceiverModules[nopreceiver.NewFactory().Type()] = "go.opentelemetry.io/collector/receiver/nopreceiver v0.107.0" - factories.ReceiverModules[otlpreceiver.NewFactory().Type()] = "go.opentelemetry.io/collector/receiver/otlpreceiver v0.107.0" + factories.ReceiverModules[nopreceiver.NewFactory().Type()] = "go.opentelemetry.io/collector/receiver/nopreceiver v0.108.0" + factories.ReceiverModules[otlpreceiver.NewFactory().Type()] = "go.opentelemetry.io/collector/receiver/otlpreceiver v0.108.0" factories.Exporters, err = exporter.MakeFactoryMap( debugexporter.NewFactory(), @@ -64,11 +64,11 @@ func components() (otelcol.Factories, error) { return otelcol.Factories{}, err } factories.ExporterModules = make(map[component.Type]string, len(factories.Exporters)) - factories.ExporterModules[debugexporter.NewFactory().Type()] = "go.opentelemetry.io/collector/exporter/debugexporter v0.107.0" - factories.ExporterModules[loggingexporter.NewFactory().Type()] = "go.opentelemetry.io/collector/exporter/loggingexporter v0.107.0" - factories.ExporterModules[nopexporter.NewFactory().Type()] = "go.opentelemetry.io/collector/exporter/nopexporter v0.107.0" - factories.ExporterModules[otlpexporter.NewFactory().Type()] = "go.opentelemetry.io/collector/exporter/otlpexporter v0.107.0" - factories.ExporterModules[otlphttpexporter.NewFactory().Type()] = "go.opentelemetry.io/collector/exporter/otlphttpexporter v0.107.0" + factories.ExporterModules[debugexporter.NewFactory().Type()] = "go.opentelemetry.io/collector/exporter/debugexporter v0.108.0" + factories.ExporterModules[loggingexporter.NewFactory().Type()] = "go.opentelemetry.io/collector/exporter/loggingexporter v0.108.0" + factories.ExporterModules[nopexporter.NewFactory().Type()] = "go.opentelemetry.io/collector/exporter/nopexporter v0.108.0" + factories.ExporterModules[otlpexporter.NewFactory().Type()] = "go.opentelemetry.io/collector/exporter/otlpexporter v0.108.0" + factories.ExporterModules[otlphttpexporter.NewFactory().Type()] = "go.opentelemetry.io/collector/exporter/otlphttpexporter v0.108.0" factories.Processors, err = processor.MakeFactoryMap( batchprocessor.NewFactory(), @@ -78,8 +78,8 @@ func components() (otelcol.Factories, error) { return otelcol.Factories{}, err } factories.ProcessorModules = make(map[component.Type]string, len(factories.Processors)) - factories.ProcessorModules[batchprocessor.NewFactory().Type()] = "go.opentelemetry.io/collector/processor/batchprocessor v0.107.0" - factories.ProcessorModules[memorylimiterprocessor.NewFactory().Type()] = "go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.107.0" + factories.ProcessorModules[batchprocessor.NewFactory().Type()] = "go.opentelemetry.io/collector/processor/batchprocessor v0.108.0" + factories.ProcessorModules[memorylimiterprocessor.NewFactory().Type()] = "go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.108.0" factories.Connectors, err = connector.MakeFactoryMap( forwardconnector.NewFactory(), @@ -88,7 +88,7 @@ func components() (otelcol.Factories, error) { return otelcol.Factories{}, err } factories.ConnectorModules = make(map[component.Type]string, len(factories.Connectors)) - factories.ConnectorModules[forwardconnector.NewFactory().Type()] = "go.opentelemetry.io/collector/connector/forwardconnector v0.107.0" + factories.ConnectorModules[forwardconnector.NewFactory().Type()] = "go.opentelemetry.io/collector/connector/forwardconnector v0.108.0" return factories, nil } diff --git a/cmd/otelcorecol/go.mod b/cmd/otelcorecol/go.mod index 61218fab0c8..95c4e9b2704 100644 --- a/cmd/otelcorecol/go.mod +++ b/cmd/otelcorecol/go.mod @@ -7,32 +7,32 @@ go 1.22.0 toolchain go1.22.6 require ( - go.opentelemetry.io/collector/component v0.107.0 + go.opentelemetry.io/collector/component v0.108.0 go.opentelemetry.io/collector/confmap v1.14.0 - go.opentelemetry.io/collector/confmap/provider/envprovider v0.107.0 - go.opentelemetry.io/collector/confmap/provider/fileprovider v0.107.0 - go.opentelemetry.io/collector/confmap/provider/httpprovider v0.107.0 - go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.107.0 - go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.107.0 - go.opentelemetry.io/collector/connector v0.107.0 - go.opentelemetry.io/collector/connector/forwardconnector v0.107.0 - go.opentelemetry.io/collector/exporter v0.107.0 - go.opentelemetry.io/collector/exporter/debugexporter v0.107.0 - go.opentelemetry.io/collector/exporter/loggingexporter v0.107.0 - go.opentelemetry.io/collector/exporter/nopexporter v0.107.0 - go.opentelemetry.io/collector/exporter/otlpexporter v0.107.0 - go.opentelemetry.io/collector/exporter/otlphttpexporter v0.107.0 - go.opentelemetry.io/collector/extension v0.107.0 - go.opentelemetry.io/collector/extension/ballastextension v0.107.0 - go.opentelemetry.io/collector/extension/memorylimiterextension v0.107.0 - go.opentelemetry.io/collector/extension/zpagesextension v0.107.0 - go.opentelemetry.io/collector/otelcol v0.107.0 - go.opentelemetry.io/collector/processor v0.107.0 - go.opentelemetry.io/collector/processor/batchprocessor v0.107.0 - go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.107.0 - go.opentelemetry.io/collector/receiver v0.107.0 - go.opentelemetry.io/collector/receiver/nopreceiver v0.107.0 - go.opentelemetry.io/collector/receiver/otlpreceiver v0.107.0 + go.opentelemetry.io/collector/confmap/provider/envprovider v0.108.0 + go.opentelemetry.io/collector/confmap/provider/fileprovider v0.108.0 + go.opentelemetry.io/collector/confmap/provider/httpprovider v0.108.0 + go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.108.0 + go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.108.0 + go.opentelemetry.io/collector/connector v0.108.0 + go.opentelemetry.io/collector/connector/forwardconnector v0.108.0 + go.opentelemetry.io/collector/exporter v0.108.0 + go.opentelemetry.io/collector/exporter/debugexporter v0.108.0 + go.opentelemetry.io/collector/exporter/loggingexporter v0.108.0 + go.opentelemetry.io/collector/exporter/nopexporter v0.108.0 + go.opentelemetry.io/collector/exporter/otlpexporter v0.108.0 + go.opentelemetry.io/collector/exporter/otlphttpexporter v0.108.0 + go.opentelemetry.io/collector/extension v0.108.0 + go.opentelemetry.io/collector/extension/ballastextension v0.108.0 + go.opentelemetry.io/collector/extension/memorylimiterextension v0.108.0 + go.opentelemetry.io/collector/extension/zpagesextension v0.108.0 + go.opentelemetry.io/collector/otelcol v0.108.0 + go.opentelemetry.io/collector/processor v0.108.0 + go.opentelemetry.io/collector/processor/batchprocessor v0.108.0 + go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.108.0 + go.opentelemetry.io/collector/receiver v0.108.0 + go.opentelemetry.io/collector/receiver/nopreceiver v0.108.0 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.108.0 golang.org/x/sys v0.24.0 ) @@ -80,31 +80,31 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect - go.opentelemetry.io/collector v0.107.0 // indirect + go.opentelemetry.io/collector v0.108.0 // indirect go.opentelemetry.io/collector/client v1.14.0 // indirect - go.opentelemetry.io/collector/component/componentprofiles v0.107.0 // indirect - go.opentelemetry.io/collector/component/componentstatus v0.107.0 // indirect - go.opentelemetry.io/collector/config/configauth v0.107.0 // indirect + go.opentelemetry.io/collector/component/componentprofiles v0.108.0 // indirect + go.opentelemetry.io/collector/component/componentstatus v0.108.0 // indirect + go.opentelemetry.io/collector/config/configauth v0.108.0 // indirect go.opentelemetry.io/collector/config/configcompression v1.14.0 // indirect - go.opentelemetry.io/collector/config/configgrpc v0.107.0 // indirect - go.opentelemetry.io/collector/config/confighttp v0.107.0 // indirect - go.opentelemetry.io/collector/config/confignet v0.107.0 // indirect + go.opentelemetry.io/collector/config/configgrpc v0.108.0 // indirect + go.opentelemetry.io/collector/config/confighttp v0.108.0 // indirect + go.opentelemetry.io/collector/config/confignet v0.108.0 // indirect go.opentelemetry.io/collector/config/configopaque v1.14.0 // indirect go.opentelemetry.io/collector/config/configretry v1.14.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.107.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.108.0 // indirect go.opentelemetry.io/collector/config/configtls v1.14.0 // indirect - go.opentelemetry.io/collector/config/internal v0.107.0 // indirect - go.opentelemetry.io/collector/consumer v0.107.0 // indirect - go.opentelemetry.io/collector/consumer/consumerprofiles v0.107.0 // indirect - go.opentelemetry.io/collector/consumer/consumertest v0.107.0 // indirect - go.opentelemetry.io/collector/extension/auth v0.107.0 // indirect + go.opentelemetry.io/collector/config/internal v0.108.0 // indirect + go.opentelemetry.io/collector/consumer v0.108.0 // indirect + go.opentelemetry.io/collector/consumer/consumerprofiles v0.108.0 // indirect + go.opentelemetry.io/collector/consumer/consumertest v0.108.0 // indirect + go.opentelemetry.io/collector/extension/auth v0.108.0 // indirect go.opentelemetry.io/collector/featuregate v1.14.0 // indirect - go.opentelemetry.io/collector/internal/globalgates v0.107.0 // indirect + go.opentelemetry.io/collector/internal/globalgates v0.108.0 // indirect go.opentelemetry.io/collector/pdata v1.14.0 // indirect - go.opentelemetry.io/collector/pdata/pprofile v0.107.0 // indirect - go.opentelemetry.io/collector/pdata/testdata v0.107.0 // indirect - go.opentelemetry.io/collector/semconv v0.107.0 // indirect - go.opentelemetry.io/collector/service v0.107.0 // indirect + go.opentelemetry.io/collector/pdata/pprofile v0.108.0 // indirect + go.opentelemetry.io/collector/pdata/testdata v0.108.0 // indirect + go.opentelemetry.io/collector/semconv v0.108.0 // indirect + go.opentelemetry.io/collector/service v0.108.0 // indirect go.opentelemetry.io/contrib/config v0.8.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect diff --git a/cmd/otelcorecol/main.go b/cmd/otelcorecol/main.go index 3d243d5dcb2..05aa996ced5 100644 --- a/cmd/otelcorecol/main.go +++ b/cmd/otelcorecol/main.go @@ -20,7 +20,7 @@ func main() { info := component.BuildInfo{ Command: "otelcorecol", Description: "Local OpenTelemetry Collector binary, testing only.", - Version: "0.107.0-dev", + Version: "0.108.0-dev", } set := otelcol.CollectorSettings{ diff --git a/internal/e2e/go.mod b/internal/e2e/go.mod index 3e3fec4f3ba..7a410cc1908 100644 --- a/internal/e2e/go.mod +++ b/internal/e2e/go.mod @@ -4,26 +4,26 @@ go 1.22.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.107.0 - go.opentelemetry.io/collector/component v0.107.0 - go.opentelemetry.io/collector/component/componentstatus v0.107.0 - go.opentelemetry.io/collector/config/configgrpc v0.107.0 - go.opentelemetry.io/collector/config/confighttp v0.107.0 + go.opentelemetry.io/collector v0.108.0 + go.opentelemetry.io/collector/component v0.108.0 + go.opentelemetry.io/collector/component/componentstatus v0.108.0 + go.opentelemetry.io/collector/config/configgrpc v0.108.0 + go.opentelemetry.io/collector/config/confighttp v0.108.0 go.opentelemetry.io/collector/config/configopaque v1.14.0 go.opentelemetry.io/collector/config/configretry v1.14.0 - go.opentelemetry.io/collector/config/configtelemetry v0.107.0 + go.opentelemetry.io/collector/config/configtelemetry v0.108.0 go.opentelemetry.io/collector/config/configtls v1.14.0 go.opentelemetry.io/collector/confmap v1.14.0 - go.opentelemetry.io/collector/connector v0.107.0 - go.opentelemetry.io/collector/consumer v0.107.0 - go.opentelemetry.io/collector/consumer/consumertest v0.107.0 - go.opentelemetry.io/collector/exporter v0.107.0 + go.opentelemetry.io/collector/connector v0.108.0 + go.opentelemetry.io/collector/consumer v0.108.0 + go.opentelemetry.io/collector/consumer/consumertest v0.108.0 + go.opentelemetry.io/collector/exporter v0.108.0 go.opentelemetry.io/collector/exporter/otlpexporter v0.107.0 go.opentelemetry.io/collector/exporter/otlphttpexporter v0.107.0 - go.opentelemetry.io/collector/extension v0.107.0 + go.opentelemetry.io/collector/extension v0.108.0 go.opentelemetry.io/collector/pdata v1.14.0 - go.opentelemetry.io/collector/pdata/testdata v0.107.0 - go.opentelemetry.io/collector/receiver v0.107.0 + go.opentelemetry.io/collector/pdata/testdata v0.108.0 + go.opentelemetry.io/collector/receiver v0.108.0 go.opentelemetry.io/collector/receiver/otlpreceiver v0.107.0 go.opentelemetry.io/collector/service v0.107.0 go.uber.org/goleak v1.3.0 @@ -71,18 +71,18 @@ require ( github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opentelemetry.io/collector/client v1.14.0 // indirect - go.opentelemetry.io/collector/component/componentprofiles v0.107.0 // indirect - go.opentelemetry.io/collector/config/configauth v0.107.0 // indirect + go.opentelemetry.io/collector/component/componentprofiles v0.108.0 // indirect + go.opentelemetry.io/collector/config/configauth v0.108.0 // indirect go.opentelemetry.io/collector/config/configcompression v1.14.0 // indirect - go.opentelemetry.io/collector/config/confignet v0.107.0 // indirect - go.opentelemetry.io/collector/config/internal v0.107.0 // indirect - go.opentelemetry.io/collector/consumer/consumerprofiles v0.107.0 // indirect - go.opentelemetry.io/collector/extension/auth v0.107.0 // indirect + go.opentelemetry.io/collector/config/confignet v0.108.0 // indirect + go.opentelemetry.io/collector/config/internal v0.108.0 // indirect + go.opentelemetry.io/collector/consumer/consumerprofiles v0.108.0 // indirect + go.opentelemetry.io/collector/extension/auth v0.108.0 // indirect go.opentelemetry.io/collector/featuregate v1.14.0 // indirect - go.opentelemetry.io/collector/internal/globalgates v0.107.0 // indirect - go.opentelemetry.io/collector/pdata/pprofile v0.107.0 // indirect - go.opentelemetry.io/collector/processor v0.107.0 // indirect - go.opentelemetry.io/collector/semconv v0.107.0 // indirect + go.opentelemetry.io/collector/internal/globalgates v0.108.0 // indirect + go.opentelemetry.io/collector/pdata/pprofile v0.108.0 // indirect + go.opentelemetry.io/collector/processor v0.108.0 // indirect + go.opentelemetry.io/collector/semconv v0.108.0 // indirect go.opentelemetry.io/contrib/config v0.8.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect