From 0ac716300c812a1a905dfb9f14ad5b859f14e1e1 Mon Sep 17 00:00:00 2001 From: Bogdan Drutu Date: Wed, 3 Aug 2022 16:19:33 -0700 Subject: [PATCH] Prepare for v0.57.2 (#5808) (#5809) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Juraci Paixão Kröhling Co-authored-by: Juraci Paixão Kröhling --- CHANGELOG.md | 10 ++++++++++ cmd/builder/go.mod | 5 +++++ cmd/builder/internal/builder/config.go | 2 +- cmd/otelcorecol/builder-config.yaml | 20 ++++++++++---------- cmd/otelcorecol/go.mod | 2 +- cmd/otelcorecol/main.go | 2 +- examples/k8s/otel-config.yaml | 4 ++-- go.mod | 6 +++++- internal/tools/go.mod | 5 +++++ pdata/go.mod | 5 +++++ semconv/go.mod | 5 +++++ versions.yaml | 2 +- 12 files changed, 51 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d0642a574cb..e6804439870 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -32,8 +32,18 @@ ### 🧰 Bug fixes 🧰 +## v0.57.2 Beta + +See the changelog for v0.57.0. + +## v0.57.1 Beta + +This was a failed release. + ## v0.57.0 Beta +There isn't a valid core binary for this release. Use v0.57.2 instead. + ### 🛑 Breaking changes 🛑 - Remove deprecated funcs/types from service related to `Config` (#5755) diff --git a/cmd/builder/go.mod b/cmd/builder/go.mod index d9ed8848d78..6a177487ef7 100644 --- a/cmd/builder/go.mod +++ b/cmd/builder/go.mod @@ -37,3 +37,8 @@ require ( golang.org/x/sys v0.0.0-20211210111614-af8b64212486 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) + +retract ( + v0.57.0 // Release failed, use v0.57.2 + v0.57.1 // Release failed, use v0.57.2 +) diff --git a/cmd/builder/internal/builder/config.go b/cmd/builder/internal/builder/config.go index 7f6b852e25f..9ab910b9509 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.57.0" +const defaultOtelColVersion = "0.57.2" // 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 34c4aa49f4e..7a5f2cecf28 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.57.0-dev - otelcol_version: 0.57.0 + version: 0.57.2-dev + otelcol_version: 0.57.2 receivers: - import: go.opentelemetry.io/collector/receiver/otlpreceiver - gomod: go.opentelemetry.io/collector v0.57.0 + gomod: go.opentelemetry.io/collector v0.57.2 exporters: - import: go.opentelemetry.io/collector/exporter/loggingexporter - gomod: go.opentelemetry.io/collector v0.57.0 + gomod: go.opentelemetry.io/collector v0.57.2 - import: go.opentelemetry.io/collector/exporter/otlpexporter - gomod: go.opentelemetry.io/collector v0.57.0 + gomod: go.opentelemetry.io/collector v0.57.2 - import: go.opentelemetry.io/collector/exporter/otlphttpexporter - gomod: go.opentelemetry.io/collector v0.57.0 + gomod: go.opentelemetry.io/collector v0.57.2 extensions: - import: go.opentelemetry.io/collector/extension/ballastextension - gomod: go.opentelemetry.io/collector v0.57.0 + gomod: go.opentelemetry.io/collector v0.57.2 - import: go.opentelemetry.io/collector/extension/zpagesextension - gomod: go.opentelemetry.io/collector v0.57.0 + gomod: go.opentelemetry.io/collector v0.57.2 processors: - import: go.opentelemetry.io/collector/processor/batchprocessor - gomod: go.opentelemetry.io/collector v0.57.0 + gomod: go.opentelemetry.io/collector v0.57.2 - import: go.opentelemetry.io/collector/processor/memorylimiterprocessor - gomod: go.opentelemetry.io/collector v0.57.0 + gomod: go.opentelemetry.io/collector v0.57.2 replaces: - go.opentelemetry.io/collector => ../../ diff --git a/cmd/otelcorecol/go.mod b/cmd/otelcorecol/go.mod index f353e409ca1..8c8d72ab0c7 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.57.0 + go.opentelemetry.io/collector v0.57.2 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a ) diff --git a/cmd/otelcorecol/main.go b/cmd/otelcorecol/main.go index ddd579d8b87..3921c336344 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.57.0-dev", + Version: "0.57.2-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 c6a97efa7ab..3b485ca51c4 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.57.0 + image: otel/opentelemetry-collector:0.57.2 name: otel-agent resources: limits: @@ -177,7 +177,7 @@ spec: - command: - "/otelcol" - "--config=/conf/otel-collector-config.yaml" - image: otel/opentelemetry-collector:0.57.0 + image: otel/opentelemetry-collector:0.57.2 name: otel-collector resources: limits: diff --git a/go.mod b/go.mod index 3ccdf896efc..29413be243b 100644 --- a/go.mod +++ b/go.mod @@ -81,4 +81,8 @@ replace go.opentelemetry.io/collector/semconv => ./semconv replace go.opentelemetry.io/collector/pdata => ./pdata -retract v0.32.0 // Contains incomplete metrics transition to proto 0.9.0, random components are not working. +retract ( + v0.32.0 // Contains incomplete metrics transition to proto 0.9.0, random components are not working. + v0.57.0 // Release failed, use v0.57.2 + v0.57.1 // Release failed, use v0.57.2 +) diff --git a/internal/tools/go.mod b/internal/tools/go.mod index 70c2ea95b83..76d58013b9b 100644 --- a/internal/tools/go.mod +++ b/internal/tools/go.mod @@ -210,3 +210,8 @@ require ( mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b // indirect mvdan.cc/unparam v0.0.0-20220706161116-678bad134442 // indirect ) + +retract ( + v0.57.0 // Release failed, use v0.57.2 + v0.57.1 // Release failed, use v0.57.2 +) diff --git a/pdata/go.mod b/pdata/go.mod index 552e11234f2..7da08dd9c0b 100644 --- a/pdata/go.mod +++ b/pdata/go.mod @@ -22,3 +22,8 @@ require ( google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) + +retract ( + v0.57.0 // Release failed, use v0.57.2 + v0.57.1 // Release failed, use v0.57.2 +) diff --git a/semconv/go.mod b/semconv/go.mod index 3b14367e4c0..de2e497e091 100644 --- a/semconv/go.mod +++ b/semconv/go.mod @@ -9,3 +9,8 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) + +retract ( + v0.57.0 // Release failed, use v0.57.2 + v0.57.1 // Release failed, use v0.57.2 +) diff --git a/versions.yaml b/versions.yaml index 389efd79c6f..6186ec06b15 100644 --- a/versions.yaml +++ b/versions.yaml @@ -14,7 +14,7 @@ module-sets: collector-core: - version: v0.57.0 + version: v0.57.2 modules: - go.opentelemetry.io/collector - go.opentelemetry.io/collector/cmd/builder