Skip to content

Commit

Permalink
[chore] prepare release v0.64.1 (#6517)
Browse files Browse the repository at this point in the history
* prepare release 0.64.1

* Prepare stable for version v0.64.1

* Prepare beta for version v0.64.1

* add multimod changes
  • Loading branch information
bogdandrutu authored Nov 10, 2022
1 parent 3d21bc8 commit 4c7d517
Show file tree
Hide file tree
Showing 16 changed files with 59 additions and 59 deletions.
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.64.0"
const defaultOtelColVersion = "0.64.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
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@ dist:
module: go.opentelemetry.io/collector/cmd/otelcorecol
name: otelcorecol
description: Local OpenTelemetry Collector binary, testing only.
version: 0.64.0-dev
otelcol_version: 0.64.0
version: 0.64.1-dev
otelcol_version: 0.64.1

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

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

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

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

require (
github.com/stretchr/testify v1.8.1
go.opentelemetry.io/collector v0.64.0
go.opentelemetry.io/collector/exporter/loggingexporter v0.64.0
go.opentelemetry.io/collector/exporter/otlpexporter v0.64.0
go.opentelemetry.io/collector/exporter/otlphttpexporter v0.64.0
go.opentelemetry.io/collector/extension/ballastextension v0.64.0
go.opentelemetry.io/collector/extension/zpagesextension v0.64.0
go.opentelemetry.io/collector/processor/batchprocessor v0.64.0
go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.64.0
go.opentelemetry.io/collector/receiver/otlpreceiver v0.64.0
go.opentelemetry.io/collector v0.64.1
go.opentelemetry.io/collector/exporter/loggingexporter v0.64.1
go.opentelemetry.io/collector/exporter/otlpexporter v0.64.1
go.opentelemetry.io/collector/exporter/otlphttpexporter v0.64.1
go.opentelemetry.io/collector/extension/ballastextension v0.64.1
go.opentelemetry.io/collector/extension/zpagesextension v0.64.1
go.opentelemetry.io/collector/processor/batchprocessor v0.64.1
go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.64.1
go.opentelemetry.io/collector/receiver/otlpreceiver v0.64.1
golang.org/x/sys v0.1.0
)

Expand Down Expand Up @@ -62,8 +62,8 @@ require (
github.com/tklauser/numcpus v0.4.0 // indirect
github.com/yusufpapurcu/wmi v1.2.2 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/collector/pdata v0.64.0 // indirect
go.opentelemetry.io/collector/semconv v0.64.0 // indirect
go.opentelemetry.io/collector/pdata v0.64.1 // indirect
go.opentelemetry.io/collector/semconv v0.64.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

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.64.0
image: otel/opentelemetry-collector:0.64.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.64.0
image: otel/opentelemetry-collector:0.64.1
name: otel-collector
resources:
limits:
Expand Down
4 changes: 2 additions & 2 deletions exporter/loggingexporter/go.mod
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.64.0
go.opentelemetry.io/collector/pdata v0.64.0
go.opentelemetry.io/collector v0.64.1
go.opentelemetry.io/collector/pdata v0.64.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
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.64.0
go.opentelemetry.io/collector/pdata v0.64.0
go.opentelemetry.io/collector v0.64.1
go.opentelemetry.io/collector/pdata v0.64.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
6 changes: 3 additions & 3 deletions exporter/otlphttpexporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ go 1.18

require (
github.com/stretchr/testify v1.8.1
go.opentelemetry.io/collector v0.64.0
go.opentelemetry.io/collector/pdata v0.64.0
go.opentelemetry.io/collector/receiver/otlpreceiver v0.64.0
go.opentelemetry.io/collector v0.64.1
go.opentelemetry.io/collector/pdata v0.64.1
go.opentelemetry.io/collector/receiver/otlpreceiver v0.64.1
go.uber.org/zap v1.23.0
google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
google.golang.org/grpc v1.50.1
Expand Down
4 changes: 2 additions & 2 deletions extension/ballastextension/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.18

require (
github.com/stretchr/testify v1.8.1
go.opentelemetry.io/collector v0.64.0
go.opentelemetry.io/collector v0.64.1
go.uber.org/zap v1.23.0
)

Expand All @@ -25,7 +25,7 @@ require (
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
github.com/shirou/gopsutil/v3 v3.22.10 // indirect
github.com/yusufpapurcu/wmi v1.2.2 // indirect
go.opentelemetry.io/collector/pdata v0.64.0 // indirect
go.opentelemetry.io/collector/pdata v0.64.1 // indirect
go.opentelemetry.io/otel v1.11.1 // indirect
go.opentelemetry.io/otel/metric v0.33.0 // indirect
go.opentelemetry.io/otel/trace v1.11.1 // indirect
Expand Down
4 changes: 2 additions & 2 deletions extension/zpagesextension/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.18

require (
github.com/stretchr/testify v1.8.1
go.opentelemetry.io/collector v0.64.0
go.opentelemetry.io/collector v0.64.1
go.opentelemetry.io/contrib/zpages v0.36.4
go.opentelemetry.io/otel/sdk v1.11.1
go.opentelemetry.io/otel/trace v1.11.1
Expand All @@ -25,7 +25,7 @@ require (
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
go.opentelemetry.io/collector/pdata v0.64.0 // indirect
go.opentelemetry.io/collector/pdata v0.64.1 // indirect
go.opentelemetry.io/otel v1.11.1 // indirect
go.opentelemetry.io/otel/metric v0.33.0 // indirect
go.uber.org/atomic v1.10.0 // indirect
Expand Down
8 changes: 4 additions & 4 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ require (
github.com/spf13/cobra v1.6.1
github.com/stretchr/testify v1.8.1
go.opencensus.io v0.24.0
go.opentelemetry.io/collector/extension/zpagesextension v0.64.0
go.opentelemetry.io/collector/pdata v0.64.0
go.opentelemetry.io/collector/processor/batchprocessor v0.64.0
go.opentelemetry.io/collector/semconv v0.64.0
go.opentelemetry.io/collector/extension/zpagesextension v0.64.1
go.opentelemetry.io/collector/pdata v0.64.1
go.opentelemetry.io/collector/processor/batchprocessor v0.64.1
go.opentelemetry.io/collector/semconv v0.64.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 processor/batchprocessor/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ go 1.18
require (
github.com/stretchr/testify v1.8.1
go.opencensus.io v0.24.0
go.opentelemetry.io/collector v0.64.0
go.opentelemetry.io/collector/pdata v0.64.0
go.opentelemetry.io/collector v0.64.1
go.opentelemetry.io/collector/pdata v0.64.1
go.uber.org/zap v1.23.0
)

Expand Down
4 changes: 2 additions & 2 deletions processor/memorylimiterprocessor/go.mod
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.64.0
go.opentelemetry.io/collector/pdata v0.64.0
go.opentelemetry.io/collector v0.64.1
go.opentelemetry.io/collector/pdata v0.64.1
go.uber.org/atomic v1.10.0
go.uber.org/zap v1.23.0
)
Expand Down
6 changes: 3 additions & 3 deletions receiver/otlpreceiver/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ go 1.18
require (
github.com/gogo/protobuf v1.3.2
github.com/stretchr/testify v1.8.1
go.opentelemetry.io/collector v0.64.0
go.opentelemetry.io/collector/pdata v0.64.0
go.opentelemetry.io/collector/semconv v0.64.0
go.opentelemetry.io/collector v0.64.1
go.opentelemetry.io/collector/pdata v0.64.1
go.opentelemetry.io/collector/semconv v0.64.1
go.uber.org/zap v1.23.0
google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
google.golang.org/grpc v1.50.1
Expand Down
4 changes: 2 additions & 2 deletions versions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@

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

0 comments on commit 4c7d517

Please sign in to comment.