From d29ac47b0852a4b64f75a7ad0fa8e0be144151b8 Mon Sep 17 00:00:00 2001 From: Pablo Baeyens Date: Wed, 16 Mar 2022 13:24:57 +0100 Subject: [PATCH] Prepare v0.47.0 release (#5008) * Update CHANGELOG.md and versions.yaml * Prepare collector-base for version v0.47.0 * Update Collector version in cmd/builder/internal/builder/config.go * Update Collector version on cmd/otelcorecol/builder-config.yaml * Update cmd/otelcorecol (not listed in playbook) --- CHANGELOG.md | 2 ++ cmd/builder/internal/builder/config.go | 2 +- cmd/otelcorecol/builder-config.yaml | 20 ++++++++++---------- cmd/otelcorecol/go.mod | 4 ++-- cmd/otelcorecol/main.go | 2 +- go.mod | 2 +- go.sum | 1 + versions.yaml | 2 +- 8 files changed, 19 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index deb2f5ec751..7b1bc6fa270 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Unreleased +## v0.47.0 Beta + ### 🛑 Breaking changes 🛑 - Remove `Type` funcs in pdata (#4933) diff --git a/cmd/builder/internal/builder/config.go b/cmd/builder/internal/builder/config.go index 03400782d72..fa36220924b 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.46.0" +const defaultOtelColVersion = "0.47.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 7f0a472c629..e7993cd6810 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.46.1-dev - otelcol_version: 0.46.0 + version: 0.47.1-dev + otelcol_version: 0.47.0 receivers: - import: go.opentelemetry.io/collector/receiver/otlpreceiver - gomod: go.opentelemetry.io/collector v0.46.0 + gomod: go.opentelemetry.io/collector v0.47.0 exporters: - import: go.opentelemetry.io/collector/exporter/loggingexporter - gomod: go.opentelemetry.io/collector v0.46.0 + gomod: go.opentelemetry.io/collector v0.47.0 - import: go.opentelemetry.io/collector/exporter/otlpexporter - gomod: go.opentelemetry.io/collector v0.46.0 + gomod: go.opentelemetry.io/collector v0.47.0 - import: go.opentelemetry.io/collector/exporter/otlphttpexporter - gomod: go.opentelemetry.io/collector v0.46.0 + gomod: go.opentelemetry.io/collector v0.47.0 extensions: - import: go.opentelemetry.io/collector/extension/ballastextension - gomod: go.opentelemetry.io/collector v0.46.0 + gomod: go.opentelemetry.io/collector v0.47.0 - import: go.opentelemetry.io/collector/extension/zpagesextension - gomod: go.opentelemetry.io/collector v0.46.0 + gomod: go.opentelemetry.io/collector v0.47.0 processors: - import: go.opentelemetry.io/collector/processor/batchprocessor - gomod: go.opentelemetry.io/collector v0.46.0 + gomod: go.opentelemetry.io/collector v0.47.0 - import: go.opentelemetry.io/collector/processor/memorylimiterprocessor - gomod: go.opentelemetry.io/collector v0.46.0 + gomod: go.opentelemetry.io/collector v0.47.0 replaces: - go.opentelemetry.io/collector => ../../ diff --git a/cmd/otelcorecol/go.mod b/cmd/otelcorecol/go.mod index d6551d3a6a1..eab2277c1ff 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.0 - go.opentelemetry.io/collector v0.46.0 + go.opentelemetry.io/collector v0.47.0 golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 ) @@ -54,7 +54,7 @@ require ( github.com/tklauser/numcpus v0.3.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/collector/model v0.46.0 // indirect + go.opentelemetry.io/collector/model v0.47.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 // indirect go.opentelemetry.io/contrib/zpages v0.29.0 // indirect diff --git a/cmd/otelcorecol/main.go b/cmd/otelcorecol/main.go index ad2a86a9aaf..0629b9faef8 100644 --- a/cmd/otelcorecol/main.go +++ b/cmd/otelcorecol/main.go @@ -21,7 +21,7 @@ func main() { info := component.BuildInfo{ Command: "otelcorecol", Description: "Local OpenTelemetry Collector binary, testing only.", - Version: "0.46.1-dev", + Version: "0.47.1-dev", } if err := run(service.CollectorSettings{BuildInfo: info, Factories: factories}); err != nil { diff --git a/go.mod b/go.mod index 55a62e042a0..fb2b0dadd92 100644 --- a/go.mod +++ b/go.mod @@ -21,7 +21,7 @@ require ( github.com/spf13/cobra v1.4.0 github.com/stretchr/testify v1.7.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector/model v0.46.0 + go.opentelemetry.io/collector/model v0.47.0 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 go.opentelemetry.io/contrib/zpages v0.29.0 diff --git a/go.sum b/go.sum index ca6cf360d7e..cad50552f87 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.2 h1:6Yo7N8UP2K6LWZnW94DLVSSrbobcWdVzAYOisuDPIFo= github.com/cenkalti/backoff/v4 v4.1.2/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= diff --git a/versions.yaml b/versions.yaml index 18167be44df..ee6f2c261ea 100644 --- a/versions.yaml +++ b/versions.yaml @@ -14,7 +14,7 @@ module-sets: collector-base: - version: v0.46.0 + version: v0.47.0 modules: - go.opentelemetry.io/collector - go.opentelemetry.io/collector/cmd/builder