From 4c7d5172cec212e19654cf546d922993d79f6b95 Mon Sep 17 00:00:00 2001 From: Bogdan Drutu Date: Thu, 10 Nov 2022 10:01:15 -0800 Subject: [PATCH] [chore] prepare release v0.64.1 (#6517) * prepare release 0.64.1 * Prepare stable for version v0.64.1 * Prepare beta for version v0.64.1 * add multimod changes --- cmd/builder/internal/builder/config.go | 2 +- cmd/builder/internal/config/default.yaml | 20 ++++++++++---------- cmd/otelcorecol/builder-config.yaml | 20 ++++++++++---------- cmd/otelcorecol/go.mod | 22 +++++++++++----------- cmd/otelcorecol/main.go | 2 +- examples/k8s/otel-config.yaml | 4 ++-- exporter/loggingexporter/go.mod | 4 ++-- exporter/otlpexporter/go.mod | 4 ++-- exporter/otlphttpexporter/go.mod | 6 +++--- extension/ballastextension/go.mod | 4 ++-- extension/zpagesextension/go.mod | 4 ++-- go.mod | 8 ++++---- processor/batchprocessor/go.mod | 4 ++-- processor/memorylimiterprocessor/go.mod | 4 ++-- receiver/otlpreceiver/go.mod | 6 +++--- versions.yaml | 4 ++-- 16 files changed, 59 insertions(+), 59 deletions(-) diff --git a/cmd/builder/internal/builder/config.go b/cmd/builder/internal/builder/config.go index 5c3c533e450..90b5eacd060 100644 --- a/cmd/builder/internal/builder/config.go +++ b/cmd/builder/internal/builder/config.go @@ -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") diff --git a/cmd/builder/internal/config/default.yaml b/cmd/builder/internal/config/default.yaml index 1e7dbd197f3..a8d65e41bd2 100644 --- a/cmd/builder/internal/config/default.yaml +++ b/cmd/builder/internal/config/default.yaml @@ -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 diff --git a/cmd/otelcorecol/builder-config.yaml b/cmd/otelcorecol/builder-config.yaml index e4501a3686e..b3df9897134 100644 --- a/cmd/otelcorecol/builder-config.yaml +++ b/cmd/otelcorecol/builder-config.yaml @@ -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 => ../../ diff --git a/cmd/otelcorecol/go.mod b/cmd/otelcorecol/go.mod index 65fb2705b4a..4eb869c0cfd 100644 --- a/cmd/otelcorecol/go.mod +++ b/cmd/otelcorecol/go.mod @@ -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 ) @@ -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 diff --git a/cmd/otelcorecol/main.go b/cmd/otelcorecol/main.go index 83b2159bb4b..ecead64deb9 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.64.0-dev", + Version: "0.64.1-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 8970e4307b1..4aab92777dd 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.64.0 + image: otel/opentelemetry-collector:0.64.1 name: otel-agent resources: limits: @@ -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: diff --git a/exporter/loggingexporter/go.mod b/exporter/loggingexporter/go.mod index 46e9473895a..f8f794db477 100644 --- a/exporter/loggingexporter/go.mod +++ b/exporter/loggingexporter/go.mod @@ -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 ) diff --git a/exporter/otlpexporter/go.mod b/exporter/otlpexporter/go.mod index d40d012b4fc..de7a8df37c1 100644 --- a/exporter/otlpexporter/go.mod +++ b/exporter/otlpexporter/go.mod @@ -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 diff --git a/exporter/otlphttpexporter/go.mod b/exporter/otlphttpexporter/go.mod index edbea90d40e..da3f04e9afe 100644 --- a/exporter/otlphttpexporter/go.mod +++ b/exporter/otlphttpexporter/go.mod @@ -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 diff --git a/extension/ballastextension/go.mod b/extension/ballastextension/go.mod index 16615be4912..ff7dc5bfafa 100644 --- a/extension/ballastextension/go.mod +++ b/extension/ballastextension/go.mod @@ -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 ) @@ -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 diff --git a/extension/zpagesextension/go.mod b/extension/zpagesextension/go.mod index 9cd7ebdf48c..3634d11d946 100644 --- a/extension/zpagesextension/go.mod +++ b/extension/zpagesextension/go.mod @@ -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 @@ -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 diff --git a/go.mod b/go.mod index 460e1bbb5b8..b55ed952d38 100644 --- a/go.mod +++ b/go.mod @@ -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 diff --git a/processor/batchprocessor/go.mod b/processor/batchprocessor/go.mod index e5bcf7940f6..84ec708a72e 100644 --- a/processor/batchprocessor/go.mod +++ b/processor/batchprocessor/go.mod @@ -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 ) diff --git a/processor/memorylimiterprocessor/go.mod b/processor/memorylimiterprocessor/go.mod index 8a45b6f9984..f466b9f276e 100644 --- a/processor/memorylimiterprocessor/go.mod +++ b/processor/memorylimiterprocessor/go.mod @@ -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 ) diff --git a/receiver/otlpreceiver/go.mod b/receiver/otlpreceiver/go.mod index 42fa8edaa62..9bf4bd8691a 100644 --- a/receiver/otlpreceiver/go.mod +++ b/receiver/otlpreceiver/go.mod @@ -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 diff --git a/versions.yaml b/versions.yaml index 9139a7ecba5..1d50a1a1891 100644 --- a/versions.yaml +++ b/versions.yaml @@ -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