Skip to content

Commit

Permalink
[chore] prepare release 0.61.0 (#6171)
Browse files Browse the repository at this point in the history
  • Loading branch information
Alex Boten authored Sep 28, 2022
1 parent 1c217b3 commit c8871dc
Show file tree
Hide file tree
Showing 9 changed files with 32 additions and 30 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

## Unreleased

## v0.61.0 Beta

### 🛑 Breaking changes 🛑

- Change `ptrace.Span[Link]?.TraceState` signature to match `ptrace.Span[Link]?.TraceStateStruct` (#6085)
Expand Down
2 changes: 1 addition & 1 deletion cmd/builder/internal/builder/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"go.uber.org/zap"
)

const defaultOtelColVersion = "0.60.0"
const defaultOtelColVersion = "0.61.0"

// ErrInvalidGoMod indicates an invalid gomod
var ErrInvalidGoMod = errors.New("invalid gomod specification for module")
Expand Down
20 changes: 10 additions & 10 deletions cmd/builder/internal/config/default.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,27 @@ dist:
module: go.opentelemetry.io/collector/cmd/otelcorecol
name: otelcorecol
description: Local OpenTelemetry Collector binary, testing only.
version: 0.60.0-dev
otelcol_version: 0.60.0
version: 0.61.0-dev
otelcol_version: 0.61.0

receivers:
- import: go.opentelemetry.io/collector/receiver/otlpreceiver
gomod: go.opentelemetry.io/collector v0.60.0
gomod: go.opentelemetry.io/collector v0.61.0
exporters:
- import: go.opentelemetry.io/collector/exporter/loggingexporter
gomod: go.opentelemetry.io/collector v0.60.0
gomod: go.opentelemetry.io/collector v0.61.0
- import: go.opentelemetry.io/collector/exporter/otlpexporter
gomod: go.opentelemetry.io/collector v0.60.0
gomod: go.opentelemetry.io/collector v0.61.0
- import: go.opentelemetry.io/collector/exporter/otlphttpexporter
gomod: go.opentelemetry.io/collector v0.60.0
gomod: go.opentelemetry.io/collector v0.61.0
extensions:
- import: go.opentelemetry.io/collector/extension/ballastextension
gomod: go.opentelemetry.io/collector v0.60.0
gomod: go.opentelemetry.io/collector v0.61.0
- import: go.opentelemetry.io/collector/extension/zpagesextension
gomod: go.opentelemetry.io/collector v0.60.0
gomod: go.opentelemetry.io/collector v0.61.0
processors:
- import: go.opentelemetry.io/collector/processor/batchprocessor
gomod: go.opentelemetry.io/collector v0.60.0
gomod: go.opentelemetry.io/collector v0.61.0
- import: go.opentelemetry.io/collector/processor/memorylimiterprocessor
gomod: go.opentelemetry.io/collector v0.60.0
gomod: go.opentelemetry.io/collector v0.61.0

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.60.0-dev
otelcol_version: 0.60.0
version: 0.61.0-dev
otelcol_version: 0.61.0

receivers:
- import: go.opentelemetry.io/collector/receiver/otlpreceiver
gomod: go.opentelemetry.io/collector v0.60.0
gomod: go.opentelemetry.io/collector v0.61.0
exporters:
- import: go.opentelemetry.io/collector/exporter/loggingexporter
gomod: go.opentelemetry.io/collector v0.60.0
gomod: go.opentelemetry.io/collector v0.61.0
- import: go.opentelemetry.io/collector/exporter/otlpexporter
gomod: go.opentelemetry.io/collector v0.60.0
gomod: go.opentelemetry.io/collector v0.61.0
- import: go.opentelemetry.io/collector/exporter/otlphttpexporter
gomod: go.opentelemetry.io/collector v0.60.0
gomod: go.opentelemetry.io/collector v0.61.0
extensions:
- import: go.opentelemetry.io/collector/extension/ballastextension
gomod: go.opentelemetry.io/collector v0.60.0
gomod: go.opentelemetry.io/collector v0.61.0
- import: go.opentelemetry.io/collector/extension/zpagesextension
gomod: go.opentelemetry.io/collector v0.60.0
gomod: go.opentelemetry.io/collector v0.61.0
processors:
- import: go.opentelemetry.io/collector/processor/batchprocessor
gomod: go.opentelemetry.io/collector v0.60.0
gomod: go.opentelemetry.io/collector v0.61.0
- import: go.opentelemetry.io/collector/processor/memorylimiterprocessor
gomod: go.opentelemetry.io/collector v0.60.0
gomod: go.opentelemetry.io/collector v0.61.0

replaces:
- go.opentelemetry.io/collector => ../../
Expand Down
6 changes: 3 additions & 3 deletions 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.60.0
go.opentelemetry.io/collector v0.61.0
golang.org/x/sys v0.0.0-20220808155132-1c4a2a72c664
)

Expand Down Expand Up @@ -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.60.0 // indirect
go.opentelemetry.io/collector/semconv v0.60.0 // indirect
go.opentelemetry.io/collector/pdata v0.61.0 // indirect
go.opentelemetry.io/collector/semconv v0.61.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.0 // indirect
go.opentelemetry.io/contrib/propagators/b3 v1.10.0 // indirect
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.60.0
image: otel/opentelemetry-collector:0.61.0
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.60.0
image: otel/opentelemetry-collector:0.61.0
name: otel-collector
resources:
limits:
Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,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.60.0
go.opentelemetry.io/collector/semconv v0.60.0
go.opentelemetry.io/collector/pdata v0.61.0
go.opentelemetry.io/collector/semconv v0.61.0
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.0
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.0
go.opentelemetry.io/contrib/propagators/b3 v1.10.0
Expand Down
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.60.0
version: v0.61.0
modules:
- go.opentelemetry.io/collector
- go.opentelemetry.io/collector/cmd/builder
Expand Down

0 comments on commit c8871dc

Please sign in to comment.