From 772a3755f4e8e132e4a4068d2884ecb3ddbaa48f Mon Sep 17 00:00:00 2001 From: Pablo Baeyens Date: Wed, 8 Jun 2022 16:35:00 +0200 Subject: [PATCH] [chore] prepare v0.53.0 release (#5493) * Update CHANGELOG * Update versions.yaml * Prepare collector-core for version v0.53.0 * Update the collector version in the collector builder to the new release in ./cmd/builder/internal/builder/config.go. * Update the collector version in the manifest used by make run to the new release in ./cmd/otelcorecol/builder-config.yaml and run make genotelcorecol * Update the collector version in the examples/k8s/otel-config.yaml --- CHANGELOG.md | 10 ++++++++++ cmd/builder/internal/builder/config.go | 2 +- cmd/otelcorecol/builder-config.yaml | 20 ++++++++++---------- cmd/otelcorecol/go.mod | 6 +++--- cmd/otelcorecol/main.go | 2 +- examples/k8s/otel-config.yaml | 4 ++-- go.mod | 4 ++-- go.sum | 2 ++ versions.yaml | 2 +- 9 files changed, 32 insertions(+), 20 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 02f7cf13301..b42eabc3fee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,16 @@ ### 🛑 Breaking changes 🛑 +### 🚩 Deprecations 🚩 + +### 💡 Enhancements 💡 + +### 🧰 Bug fixes 🧰 + +## v0.53.0 Beta + +### 🛑 Breaking changes 🛑 + - Remove deprecated `componenterror` package. (#5420) - Remove deprecated `config.MapConverterFunc`. (#5419) - Remove `AddCollectorVersionTag`, enabled for long time already. (#5471) diff --git a/cmd/builder/internal/builder/config.go b/cmd/builder/internal/builder/config.go index 0b7b2b8f457..ee2a47b19ac 100644 --- a/cmd/builder/internal/builder/config.go +++ b/cmd/builder/internal/builder/config.go @@ -25,7 +25,7 @@ import ( "go.uber.org/zap" ) -const defaultOtelColVersion = "0.52.0" +const defaultOtelColVersion = "0.53.0" // ErrInvalidGoMod indicates an invalid gomod var ErrInvalidGoMod = errors.New("invalid gomod specification for module") diff --git a/cmd/otelcorecol/builder-config.yaml b/cmd/otelcorecol/builder-config.yaml index 951d819619c..3cecccca32c 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.52.0-dev - otelcol_version: 0.52.0 + version: 0.53.0-dev + otelcol_version: 0.53.0 receivers: - import: go.opentelemetry.io/collector/receiver/otlpreceiver - gomod: go.opentelemetry.io/collector v0.52.0 + gomod: go.opentelemetry.io/collector v0.53.0 exporters: - import: go.opentelemetry.io/collector/exporter/loggingexporter - gomod: go.opentelemetry.io/collector v0.52.0 + gomod: go.opentelemetry.io/collector v0.53.0 - import: go.opentelemetry.io/collector/exporter/otlpexporter - gomod: go.opentelemetry.io/collector v0.52.0 + gomod: go.opentelemetry.io/collector v0.53.0 - import: go.opentelemetry.io/collector/exporter/otlphttpexporter - gomod: go.opentelemetry.io/collector v0.52.0 + gomod: go.opentelemetry.io/collector v0.53.0 extensions: - import: go.opentelemetry.io/collector/extension/ballastextension - gomod: go.opentelemetry.io/collector v0.52.0 + gomod: go.opentelemetry.io/collector v0.53.0 - import: go.opentelemetry.io/collector/extension/zpagesextension - gomod: go.opentelemetry.io/collector v0.52.0 + gomod: go.opentelemetry.io/collector v0.53.0 processors: - import: go.opentelemetry.io/collector/processor/batchprocessor - gomod: go.opentelemetry.io/collector v0.52.0 + gomod: go.opentelemetry.io/collector v0.53.0 - import: go.opentelemetry.io/collector/processor/memorylimiterprocessor - gomod: go.opentelemetry.io/collector v0.52.0 + gomod: go.opentelemetry.io/collector v0.53.0 replaces: - go.opentelemetry.io/collector => ../../ diff --git a/cmd/otelcorecol/go.mod b/cmd/otelcorecol/go.mod index 6e72a71549e..56366719672 100644 --- a/cmd/otelcorecol/go.mod +++ b/cmd/otelcorecol/go.mod @@ -6,7 +6,7 @@ go 1.17 require ( github.com/stretchr/testify v1.7.1 - go.opentelemetry.io/collector v0.52.0 + go.opentelemetry.io/collector v0.53.0 golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27 ) @@ -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.52.0 // indirect - go.opentelemetry.io/collector/semconv v0.52.0 // indirect + go.opentelemetry.io/collector/pdata v0.53.0 // indirect + go.opentelemetry.io/collector/semconv v0.53.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.32.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.32.0 // indirect go.opentelemetry.io/contrib/zpages v0.32.0 // indirect diff --git a/cmd/otelcorecol/main.go b/cmd/otelcorecol/main.go index 9020e3052c8..dd4005619b4 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.52.0-dev", + Version: "0.53.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 94bfee6581f..245e70bf8e5 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.50.0 + image: otel/opentelemetry-collector:0.53.0 name: otel-agent resources: limits: @@ -177,7 +177,7 @@ spec: - command: - "/otelcol" - "--config=/conf/otel-collector-config.yaml" - image: otel/opentelemetry-collector:0.52.0 + image: otel/opentelemetry-collector:0.53.0 name: otel-collector resources: limits: diff --git a/go.mod b/go.mod index 03f6e6a4504..c451aed853d 100644 --- a/go.mod +++ b/go.mod @@ -20,8 +20,8 @@ require ( github.com/spf13/cobra v1.4.0 github.com/stretchr/testify v1.7.1 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector/pdata v0.52.0 - go.opentelemetry.io/collector/semconv v0.52.0 + go.opentelemetry.io/collector/pdata v0.53.0 + go.opentelemetry.io/collector/semconv v0.53.0 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.32.0 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.32.0 go.opentelemetry.io/contrib/zpages v0.32.0 diff --git a/go.sum b/go.sum index f48298b56a2..fc77be54156 100644 --- a/go.sum +++ b/go.sum @@ -67,6 +67,7 @@ github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kB github.com/cenkalti/backoff/v4 v4.1.3 h1:cFAlzYUlVYDysBEH2T5hyJZMh3+5+WCBvSnK6Q8UtC4= github.com/cenkalti/backoff/v4 v4.1.3/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE= @@ -103,6 +104,7 @@ github.com/felixge/httpsnoop v1.0.2/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSw github.com/frankban/quicktest v1.4.0/go.mod h1:36zfPVQyHxymz4cH7wlDmVwDrJuljRB60qkgn7rorfQ= github.com/frankban/quicktest v1.14.0/go.mod h1:NeW+ay9A/U67EYXNFA1nPE8e/tnQv/09mUdL/ijj8og= github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE= +github.com/frankban/quicktest v1.14.3/go.mod h1:mgiwOwqx65TmIk1wJ6Q7wvnVMocbUorkibMOrVTHZps= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= diff --git a/versions.yaml b/versions.yaml index eeae9e28bdd..3acf8e71ba3 100644 --- a/versions.yaml +++ b/versions.yaml @@ -14,7 +14,7 @@ module-sets: collector-core: - version: v0.52.0 + version: v0.53.0 modules: - go.opentelemetry.io/collector - go.opentelemetry.io/collector/cmd/builder