From 1692ccd73d0d36f6d77d9d0fbb66a5f4e1ebacce Mon Sep 17 00:00:00 2001 From: Anthony J Mirabella Date: Wed, 22 Jun 2022 13:05:30 -0400 Subject: [PATCH 1/5] Update CHANGELOG and versions.yaml to prepare for 0.54 release Signed-off-by: Anthony J Mirabella --- CHANGELOG.md | 8 +++++--- versions.yaml | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6d913e63c1a..d4256ef9533 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Unreleased +## v0.54.0 Beta + ### 🛑 Breaking changes 🛑 - Remove deprecated `GetLogger`. (#5504) @@ -11,13 +13,12 @@ - Remove deprecated `config.MapConverter` (#5505) - Remove deprecated `config.Received` (#5505) - Remove deprecated `config.CloseFunc` (#5505) -- Deprecated `pcommon.Value.NewValueBytes` is brought back taking `pcommon.ImmutableByteSlice` as an argument instead - of `[]byte` (#5299) +- Deprecated `pcommon.Value.NewValueBytes` is brought back taking `pcommon.ImmutableByteSlice` as an argument instead of `[]byte` (#5299) ### 🚩 Deprecations 🚩 - Use immutable slices for primitive types slices to restrict mutations. (#5299) - - `Value.NewValueMBytes` func is deprecated in favor of Value.NewValueMBytes func that takes + - `Value.NewValueMBytes` func is deprecated in favor of `Value.NewValueBytes` func that takes `ImmutableByteSlice` instead of `[]byte` - `Value.SetMBytesVal` func is deprecated in favor of `Value.SetBytesVal` func that takes `pcommon.ImmutableByteSlice` instead of []byte. @@ -46,6 +47,7 @@ - Unconfigured receivers are not identified, this was not a real problem in final binaries since the validation of the config catch this. - Allow configurations to contain "unused" receivers. Receivers that are configured but not used in any pipeline, this was possible already for exporters and processors. - Remove the enforcement/check that Receiver factories create the same instance for the same config. + ## v0.53.0 Beta ### 🛑 Breaking changes 🛑 diff --git a/versions.yaml b/versions.yaml index 3acf8e71ba3..e640d56ea44 100644 --- a/versions.yaml +++ b/versions.yaml @@ -14,7 +14,7 @@ module-sets: collector-core: - version: v0.53.0 + version: v0.54.0 modules: - go.opentelemetry.io/collector - go.opentelemetry.io/collector/cmd/builder From c34253bcf0bbca29cf12e5d4a0644b31138cfe34 Mon Sep 17 00:00:00 2001 From: Anthony J Mirabella Date: Wed, 22 Jun 2022 13:06:03 -0400 Subject: [PATCH 2/5] Prepare collector-core for version v0.54.0 --- go.mod | 4 ++-- go.sum | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 1793d5c4533..d4af258103f 100644 --- a/go.mod +++ b/go.mod @@ -20,8 +20,8 @@ require ( github.com/spf13/cobra v1.4.0 github.com/stretchr/testify v1.7.4 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector/pdata v0.53.0 - go.opentelemetry.io/collector/semconv v0.53.0 + go.opentelemetry.io/collector/pdata v0.54.0 + go.opentelemetry.io/collector/semconv v0.54.0 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.32.0 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.32.0 go.opentelemetry.io/contrib/zpages v0.32.0 diff --git a/go.sum b/go.sum index ff4860eb891..e205c64bf3c 100644 --- a/go.sum +++ b/go.sum @@ -67,6 +67,7 @@ github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kB github.com/cenkalti/backoff/v4 v4.1.3 h1:cFAlzYUlVYDysBEH2T5hyJZMh3+5+WCBvSnK6Q8UtC4= github.com/cenkalti/backoff/v4 v4.1.3/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE= @@ -103,6 +104,7 @@ github.com/felixge/httpsnoop v1.0.2/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSw github.com/frankban/quicktest v1.4.0/go.mod h1:36zfPVQyHxymz4cH7wlDmVwDrJuljRB60qkgn7rorfQ= github.com/frankban/quicktest v1.14.0/go.mod h1:NeW+ay9A/U67EYXNFA1nPE8e/tnQv/09mUdL/ijj8og= github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE= +github.com/frankban/quicktest v1.14.3/go.mod h1:mgiwOwqx65TmIk1wJ6Q7wvnVMocbUorkibMOrVTHZps= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= From 3a8a70939371ed8269ab8466aa1caf645d94f827 Mon Sep 17 00:00:00 2001 From: Anthony J Mirabella Date: Wed, 22 Jun 2022 13:08:30 -0400 Subject: [PATCH 3/5] Update collector versions Signed-off-by: Anthony J Mirabella --- cmd/builder/internal/builder/config.go | 2 +- cmd/otelcorecol/builder-config.yaml | 20 ++++++++++---------- examples/k8s/otel-config.yaml | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/cmd/builder/internal/builder/config.go b/cmd/builder/internal/builder/config.go index ee2a47b19ac..2cac5e4bf85 100644 --- a/cmd/builder/internal/builder/config.go +++ b/cmd/builder/internal/builder/config.go @@ -25,7 +25,7 @@ import ( "go.uber.org/zap" ) -const defaultOtelColVersion = "0.53.0" +const defaultOtelColVersion = "0.54.0" // ErrInvalidGoMod indicates an invalid gomod var ErrInvalidGoMod = errors.New("invalid gomod specification for module") diff --git a/cmd/otelcorecol/builder-config.yaml b/cmd/otelcorecol/builder-config.yaml index 3cecccca32c..eeecb87bb75 100644 --- a/cmd/otelcorecol/builder-config.yaml +++ b/cmd/otelcorecol/builder-config.yaml @@ -2,29 +2,29 @@ dist: module: go.opentelemetry.io/collector/cmd/otelcorecol name: otelcorecol description: Local OpenTelemetry Collector binary, testing only. - version: 0.53.0-dev - otelcol_version: 0.53.0 + version: 0.54.0-dev + otelcol_version: 0.54.0 receivers: - import: go.opentelemetry.io/collector/receiver/otlpreceiver - gomod: go.opentelemetry.io/collector v0.53.0 + gomod: go.opentelemetry.io/collector v0.54.0 exporters: - import: go.opentelemetry.io/collector/exporter/loggingexporter - gomod: go.opentelemetry.io/collector v0.53.0 + gomod: go.opentelemetry.io/collector v0.54.0 - import: go.opentelemetry.io/collector/exporter/otlpexporter - gomod: go.opentelemetry.io/collector v0.53.0 + gomod: go.opentelemetry.io/collector v0.54.0 - import: go.opentelemetry.io/collector/exporter/otlphttpexporter - gomod: go.opentelemetry.io/collector v0.53.0 + gomod: go.opentelemetry.io/collector v0.54.0 extensions: - import: go.opentelemetry.io/collector/extension/ballastextension - gomod: go.opentelemetry.io/collector v0.53.0 + gomod: go.opentelemetry.io/collector v0.54.0 - import: go.opentelemetry.io/collector/extension/zpagesextension - gomod: go.opentelemetry.io/collector v0.53.0 + gomod: go.opentelemetry.io/collector v0.54.0 processors: - import: go.opentelemetry.io/collector/processor/batchprocessor - gomod: go.opentelemetry.io/collector v0.53.0 + gomod: go.opentelemetry.io/collector v0.54.0 - import: go.opentelemetry.io/collector/processor/memorylimiterprocessor - gomod: go.opentelemetry.io/collector v0.53.0 + gomod: go.opentelemetry.io/collector v0.54.0 replaces: - go.opentelemetry.io/collector => ../../ diff --git a/examples/k8s/otel-config.yaml b/examples/k8s/otel-config.yaml index 245e70bf8e5..92836475b3e 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.53.0 + image: otel/opentelemetry-collector:0.54.0 name: otel-agent resources: limits: @@ -177,7 +177,7 @@ spec: - command: - "/otelcol" - "--config=/conf/otel-collector-config.yaml" - image: otel/opentelemetry-collector:0.53.0 + image: otel/opentelemetry-collector:0.54.0 name: otel-collector resources: limits: From c6ab1a6b992a124b0682ec9abbe32c22d0ad8a53 Mon Sep 17 00:00:00 2001 From: Anthony J Mirabella Date: Wed, 22 Jun 2022 13:12:29 -0400 Subject: [PATCH 4/5] gotidy Signed-off-by: Anthony J Mirabella --- cmd/otelcorecol/go.mod | 4 ++-- go.sum | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/cmd/otelcorecol/go.mod b/cmd/otelcorecol/go.mod index ec5710ffde0..0b326d1e345 100644 --- a/cmd/otelcorecol/go.mod +++ b/cmd/otelcorecol/go.mod @@ -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.53.0 // indirect - go.opentelemetry.io/collector/semconv v0.53.0 // indirect + go.opentelemetry.io/collector/pdata v0.54.0 // indirect + go.opentelemetry.io/collector/semconv v0.54.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.32.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.32.0 // indirect go.opentelemetry.io/contrib/zpages v0.32.0 // indirect diff --git a/go.sum b/go.sum index e205c64bf3c..ff4860eb891 100644 --- a/go.sum +++ b/go.sum @@ -67,7 +67,6 @@ github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kB github.com/cenkalti/backoff/v4 v4.1.3 h1:cFAlzYUlVYDysBEH2T5hyJZMh3+5+WCBvSnK6Q8UtC4= github.com/cenkalti/backoff/v4 v4.1.3/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE= @@ -104,7 +103,6 @@ github.com/felixge/httpsnoop v1.0.2/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSw github.com/frankban/quicktest v1.4.0/go.mod h1:36zfPVQyHxymz4cH7wlDmVwDrJuljRB60qkgn7rorfQ= github.com/frankban/quicktest v1.14.0/go.mod h1:NeW+ay9A/U67EYXNFA1nPE8e/tnQv/09mUdL/ijj8og= github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE= -github.com/frankban/quicktest v1.14.3/go.mod h1:mgiwOwqx65TmIk1wJ6Q7wvnVMocbUorkibMOrVTHZps= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= From c8b1995b954c9c4bdaea36de9a4babb208fffe34 Mon Sep 17 00:00:00 2001 From: Anthony J Mirabella Date: Wed, 22 Jun 2022 13:16:32 -0400 Subject: [PATCH 5/5] make genotelcorecol Signed-off-by: Anthony J Mirabella --- cmd/otelcorecol/go.mod | 2 +- cmd/otelcorecol/main.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/otelcorecol/go.mod b/cmd/otelcorecol/go.mod index 0b326d1e345..3dba093d6f9 100644 --- a/cmd/otelcorecol/go.mod +++ b/cmd/otelcorecol/go.mod @@ -6,7 +6,7 @@ go 1.17 require ( github.com/stretchr/testify v1.7.4 - go.opentelemetry.io/collector v0.53.0 + go.opentelemetry.io/collector v0.54.0 golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27 ) diff --git a/cmd/otelcorecol/main.go b/cmd/otelcorecol/main.go index dd4005619b4..d4109280384 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.53.0-dev", + Version: "0.54.0-dev", } if err := run(service.CollectorSettings{BuildInfo: info, Factories: factories}); err != nil {