Skip to content

Commit

Permalink
Prepare for v0.57.2 (#5808) (#5809)
Browse files Browse the repository at this point in the history
Signed-off-by: Juraci Paixão Kröhling <juraci@kroehling.de>

Co-authored-by: Juraci Paixão Kröhling <juraci@kroehling.de>
  • Loading branch information
bogdandrutu and jpkrohling authored Aug 3, 2022
1 parent 186077d commit 0ac7163
Show file tree
Hide file tree
Showing 12 changed files with 51 additions and 17 deletions.
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
5 changes: 5 additions & 0 deletions cmd/builder/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
2 changes: 1 addition & 1 deletion cmd/builder/internal/builder/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
20 changes: 10 additions & 10 deletions cmd/otelcorecol/builder-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 => ../../
Expand Down
2 changes: 1 addition & 1 deletion cmd/otelcorecol/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/otelcorecol/main.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions examples/k8s/otel-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
6 changes: 5 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
5 changes: 5 additions & 0 deletions internal/tools/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
5 changes: 5 additions & 0 deletions pdata/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
5 changes: 5 additions & 0 deletions semconv/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
2 changes: 1 addition & 1 deletion versions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 0ac7163

Please sign in to comment.