Skip to content

Commit

Permalink
[chore] prepare v0.63.1 patch (#6436)
Browse files Browse the repository at this point in the history 
Fixes #6434
  • Loading branch information
Alex Boten authored Oct 28, 2022
1 parent 525b2c7 commit bab8fda
Show file tree
Hide file tree
Showing 13 changed files with 46 additions and 51 deletions.
11 changes: 0 additions & 11 deletions .chloggen/revertargs.yaml
View file

This file was deleted.

6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@

<!-- next version -->

## v0.63.1

### 🧰 Bug fixes 🧰

- `service`: Fix running collector as a windows service. (#6433)

## v0.63.0

### 🛑 Breaking changes 🛑
Expand Down
2 changes: 1 addition & 1 deletion cmd/builder/internal/builder/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"go.uber.org/zap"
)

const defaultOtelColVersion = "0.63.0"
const defaultOtelColVersion = "0.63.1"

// 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
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,24 @@ dist:
module: go.opentelemetry.io/collector/cmd/otelcorecol
name: otelcorecol
description: Local OpenTelemetry Collector binary, testing only.
version: 0.63.0-dev
otelcol_version: 0.63.0
version: 0.63.1-dev
otelcol_version: 0.63.1

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

20 changes: 10 additions & 10 deletions cmd/otelcorecol/builder-config.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,26 @@ dist:
module: go.opentelemetry.io/collector/cmd/otelcorecol
name: otelcorecol
description: Local OpenTelemetry Collector binary, testing only.
version: 0.63.0-dev
otelcol_version: 0.63.0
version: 0.63.1-dev
otelcol_version: 0.63.1

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

replaces:
- go.opentelemetry.io/collector => ../../
Expand Down
12 changes: 6 additions & 6 deletions cmd/otelcorecol/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ go 1.18

require (
github.com/stretchr/testify v1.8.1
go.opentelemetry.io/collector v0.63.0
go.opentelemetry.io/collector/exporter/loggingexporter v0.63.0
go.opentelemetry.io/collector/exporter/otlpexporter v0.63.0
go.opentelemetry.io/collector/exporter/otlphttpexporter v0.63.0
go.opentelemetry.io/collector v0.63.1
go.opentelemetry.io/collector/exporter/loggingexporter v0.63.1
go.opentelemetry.io/collector/exporter/otlpexporter v0.63.1
go.opentelemetry.io/collector/exporter/otlphttpexporter v0.63.1
golang.org/x/sys v0.1.0
)

Expand Down Expand Up @@ -57,8 +57,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.63.0 // indirect
go.opentelemetry.io/collector/semconv v0.63.0 // indirect
go.opentelemetry.io/collector/pdata v0.63.1 // indirect
go.opentelemetry.io/collector/semconv v0.63.1 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect
go.opentelemetry.io/contrib/propagators/b3 v1.11.1 // indirect
Expand Down
2 changes: 1 addition & 1 deletion cmd/otelcorecol/main.go
View file

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
View file
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.63.0
image: otel/opentelemetry-collector:0.63.1
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.63.0
image: otel/opentelemetry-collector:0.63.1
name: otel-collector
resources:
limits:
Expand Down
4 changes: 2 additions & 2 deletions exporter/loggingexporter/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ go 1.18

require (
github.com/stretchr/testify v1.8.1
go.opentelemetry.io/collector v0.63.0
go.opentelemetry.io/collector/pdata v0.63.0
go.opentelemetry.io/collector v0.63.1
go.opentelemetry.io/collector/pdata v0.63.1
go.uber.org/zap v1.23.0
golang.org/x/sys v0.1.0
)
Expand Down
4 changes: 2 additions & 2 deletions exporter/otlpexporter/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ go 1.18

require (
github.com/stretchr/testify v1.8.1
go.opentelemetry.io/collector v0.63.0
go.opentelemetry.io/collector/pdata v0.63.0
go.opentelemetry.io/collector v0.63.1
go.opentelemetry.io/collector/pdata v0.63.1
go.uber.org/atomic v1.10.0
google.golang.org/genproto v0.0.0-20221018160656-63c7b68cfc55
google.golang.org/grpc v1.50.1
Expand Down
4 changes: 2 additions & 2 deletions exporter/otlphttpexporter/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ go 1.18

require (
github.com/stretchr/testify v1.8.1
go.opentelemetry.io/collector v0.63.0
go.opentelemetry.io/collector/pdata v0.63.0
go.opentelemetry.io/collector v0.63.1
go.opentelemetry.io/collector/pdata v0.63.1
go.uber.org/zap v1.23.0
google.golang.org/genproto v0.0.0-20221018160656-63c7b68cfc55
google.golang.org/grpc v1.50.1
Expand Down
4 changes: 2 additions & 2 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ require (
github.com/spf13/cobra v1.6.1
github.com/stretchr/testify v1.8.1
go.opencensus.io v0.23.0
go.opentelemetry.io/collector/pdata v0.63.0
go.opentelemetry.io/collector/semconv v0.63.0
go.opentelemetry.io/collector/pdata v0.63.1
go.opentelemetry.io/collector/semconv v0.63.1
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4
go.opentelemetry.io/contrib/propagators/b3 v1.11.1
Expand Down
4 changes: 2 additions & 2 deletions versions.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@

module-sets:
stable:
version: v0.63.0
version: v0.63.1
modules:
- go.opentelemetry.io/collector/pdata
beta:
version: v0.63.0
version: v0.63.1
modules:
- go.opentelemetry.io/collector
- go.opentelemetry.io/collector/cmd/builder
Expand Down

0 comments on commit bab8fda

Please sign in to comment.