diff --git a/CHANGELOG.md b/CHANGELOG.md index b54c0c40312..4538f17473c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Unreleased +## v0.62.0 Beta + ### 🛑 Breaking changes 🛑 - Delete deprecated `go.opentelemetry.io/collector/service/featuregate`. (#6178) diff --git a/cmd/builder/internal/builder/config.go b/cmd/builder/internal/builder/config.go index ba886dcb0a5..9d4c09aae85 100644 --- a/cmd/builder/internal/builder/config.go +++ b/cmd/builder/internal/builder/config.go @@ -26,7 +26,7 @@ import ( "go.uber.org/zap" ) -const defaultOtelColVersion = "0.61.0" +const defaultOtelColVersion = "0.62.0" // ErrInvalidGoMod indicates an invalid gomod var ErrInvalidGoMod = errors.New("invalid gomod specification for module") diff --git a/cmd/builder/internal/config/default.yaml b/cmd/builder/internal/config/default.yaml index 67b1a774499..d65b1c7ef03 100644 --- a/cmd/builder/internal/config/default.yaml +++ b/cmd/builder/internal/config/default.yaml @@ -2,27 +2,27 @@ dist: module: go.opentelemetry.io/collector/cmd/otelcorecol name: otelcorecol description: Local OpenTelemetry Collector binary, testing only. - version: 0.61.0-dev - otelcol_version: 0.61.0 + version: 0.62.0-dev + otelcol_version: 0.62.0 receivers: - import: go.opentelemetry.io/collector/receiver/otlpreceiver - gomod: go.opentelemetry.io/collector v0.61.0 + gomod: go.opentelemetry.io/collector v0.62.0 exporters: - import: go.opentelemetry.io/collector/exporter/loggingexporter - gomod: go.opentelemetry.io/collector v0.61.0 + gomod: go.opentelemetry.io/collector v0.62.0 - import: go.opentelemetry.io/collector/exporter/otlpexporter - gomod: go.opentelemetry.io/collector v0.61.0 + gomod: go.opentelemetry.io/collector v0.62.0 - import: go.opentelemetry.io/collector/exporter/otlphttpexporter - gomod: go.opentelemetry.io/collector v0.61.0 + gomod: go.opentelemetry.io/collector v0.62.0 extensions: - import: go.opentelemetry.io/collector/extension/ballastextension - gomod: go.opentelemetry.io/collector v0.61.0 + gomod: go.opentelemetry.io/collector v0.62.0 - import: go.opentelemetry.io/collector/extension/zpagesextension - gomod: go.opentelemetry.io/collector v0.61.0 + gomod: go.opentelemetry.io/collector v0.62.0 processors: - import: go.opentelemetry.io/collector/processor/batchprocessor - gomod: go.opentelemetry.io/collector v0.61.0 + gomod: go.opentelemetry.io/collector v0.62.0 - import: go.opentelemetry.io/collector/processor/memorylimiterprocessor - gomod: go.opentelemetry.io/collector v0.61.0 + gomod: go.opentelemetry.io/collector v0.62.0 diff --git a/cmd/otelcorecol/builder-config.yaml b/cmd/otelcorecol/builder-config.yaml index 2f72a875da9..8aef8d59b0a 100644 --- a/cmd/otelcorecol/builder-config.yaml +++ b/cmd/otelcorecol/builder-config.yaml @@ -2,29 +2,29 @@ dist: module: go.opentelemetry.io/collector/cmd/otelcorecol name: otelcorecol description: Local OpenTelemetry Collector binary, testing only. - version: 0.61.0-dev - otelcol_version: 0.61.0 + version: 0.62.0-dev + otelcol_version: 0.62.0 receivers: - import: go.opentelemetry.io/collector/receiver/otlpreceiver - gomod: go.opentelemetry.io/collector v0.61.0 + gomod: go.opentelemetry.io/collector v0.62.0 exporters: - import: go.opentelemetry.io/collector/exporter/loggingexporter - gomod: go.opentelemetry.io/collector v0.61.0 + gomod: go.opentelemetry.io/collector v0.62.0 - import: go.opentelemetry.io/collector/exporter/otlpexporter - gomod: go.opentelemetry.io/collector v0.61.0 + gomod: go.opentelemetry.io/collector v0.62.0 - import: go.opentelemetry.io/collector/exporter/otlphttpexporter - gomod: go.opentelemetry.io/collector v0.61.0 + gomod: go.opentelemetry.io/collector v0.62.0 extensions: - import: go.opentelemetry.io/collector/extension/ballastextension - gomod: go.opentelemetry.io/collector v0.61.0 + gomod: go.opentelemetry.io/collector v0.62.0 - import: go.opentelemetry.io/collector/extension/zpagesextension - gomod: go.opentelemetry.io/collector v0.61.0 + gomod: go.opentelemetry.io/collector v0.62.0 processors: - import: go.opentelemetry.io/collector/processor/batchprocessor - gomod: go.opentelemetry.io/collector v0.61.0 + gomod: go.opentelemetry.io/collector v0.62.0 - import: go.opentelemetry.io/collector/processor/memorylimiterprocessor - gomod: go.opentelemetry.io/collector v0.61.0 + gomod: go.opentelemetry.io/collector v0.62.0 replaces: - go.opentelemetry.io/collector => ../../ diff --git a/cmd/otelcorecol/go.mod b/cmd/otelcorecol/go.mod index f5bbab6d097..ce49df0a4b7 100644 --- a/cmd/otelcorecol/go.mod +++ b/cmd/otelcorecol/go.mod @@ -6,7 +6,7 @@ go 1.18 require ( github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.61.0 + go.opentelemetry.io/collector v0.62.0 golang.org/x/sys v0.0.0-20220808155132-1c4a2a72c664 ) @@ -55,8 +55,8 @@ require ( github.com/tklauser/numcpus v0.4.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/collector/pdata v0.61.0 // indirect - go.opentelemetry.io/collector/semconv v0.61.0 // indirect + go.opentelemetry.io/collector/pdata v0.62.0 // indirect + go.opentelemetry.io/collector/semconv v0.62.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.1 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.10.0 // indirect diff --git a/cmd/otelcorecol/main.go b/cmd/otelcorecol/main.go index ef0c3dc6860..3291d2b8ed6 100644 --- a/cmd/otelcorecol/main.go +++ b/cmd/otelcorecol/main.go @@ -19,7 +19,7 @@ func main() { info := component.BuildInfo{ Command: "otelcorecol", Description: "Local OpenTelemetry Collector binary, testing only.", - Version: "0.61.0-dev", + Version: "0.62.0-dev", } if err := run(service.CollectorSettings{BuildInfo: info, Factories: factories}); err != nil { diff --git a/examples/k8s/otel-config.yaml b/examples/k8s/otel-config.yaml index 79778c1bc7c..160d7e5bc18 100644 --- a/examples/k8s/otel-config.yaml +++ b/examples/k8s/otel-config.yaml @@ -66,7 +66,7 @@ spec: - command: - "/otelcol" - "--config=/conf/otel-agent-config.yaml" - image: otel/opentelemetry-collector:0.61.0 + image: otel/opentelemetry-collector:0.62.0 name: otel-agent resources: limits: @@ -177,7 +177,7 @@ spec: - command: - "/otelcol" - "--config=/conf/otel-collector-config.yaml" - image: otel/opentelemetry-collector:0.61.0 + image: otel/opentelemetry-collector:0.62.0 name: otel-collector resources: limits: diff --git a/go.mod b/go.mod index 045c07ddc45..d4c0ec58e5a 100644 --- a/go.mod +++ b/go.mod @@ -20,8 +20,8 @@ require ( github.com/spf13/cobra v1.5.0 github.com/stretchr/testify v1.8.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector/pdata v0.61.0 - go.opentelemetry.io/collector/semconv v0.61.0 + go.opentelemetry.io/collector/pdata v0.62.0 + go.opentelemetry.io/collector/semconv v0.62.0 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.1 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1 go.opentelemetry.io/contrib/propagators/b3 v1.10.0 diff --git a/versions.yaml b/versions.yaml index 74303dc57e2..3be87dc64fd 100644 --- a/versions.yaml +++ b/versions.yaml @@ -14,7 +14,7 @@ module-sets: collector-core: - version: v0.61.0 + version: v0.62.0 modules: - go.opentelemetry.io/collector - go.opentelemetry.io/collector/cmd/builder