From 3ce97aaf044518fc19cea0aa9e34a5f8fd7383dd Mon Sep 17 00:00:00 2001 From: Bogdan Drutu Date: Mon, 8 Nov 2021 16:25:40 -0800 Subject: [PATCH] Upgrade builder to use collector v0.38.0 (#4367) Signed-off-by: Bogdan Drutu --- cmd/builder/internal/builder/config.go | 2 +- cmd/builder/internal/builder/config_test.go | 10 +++++----- cmd/builder/test/nocore.builder.yaml | 8 ++++---- cmd/builder/test/replaces.builder.yaml | 8 ++++---- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/cmd/builder/internal/builder/config.go b/cmd/builder/internal/builder/config.go index 5af02f979819..04d4cd4c0c3b 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.37.0" +const defaultOtelColVersion = "0.38.0" // ErrInvalidGoMod indicates an invalid gomod var ErrInvalidGoMod = errors.New("invalid gomod specification for module") diff --git a/cmd/builder/internal/builder/config_test.go b/cmd/builder/internal/builder/config_test.go index 8cc2a56ca873..24abb3eb4d18 100644 --- a/cmd/builder/internal/builder/config_test.go +++ b/cmd/builder/internal/builder/config_test.go @@ -67,12 +67,12 @@ func TestModuleFromCore(t *testing.T) { cfg := Config{ Extensions: []Module{ // see issue-12 { - Import: "go.opentelemetry.io/collector/receiver/jaegerreceiver", - GoMod: "go.opentelemetry.io/collector v0.37.0", + Import: "go.opentelemetry.io/collector/receiver/otlpreceiver", + GoMod: "go.opentelemetry.io/collector v0.38.0", }, { - Import: "go.opentelemetry.io/collector/receiver/jaegerreceiver", - GoMod: "go.opentelemetry.io/collector v0.37.0", + Import: "go.opentelemetry.io/collector/receiver/otlpreceiver", + GoMod: "go.opentelemetry.io/collector v0.38.0", Core: nil, }, }, @@ -83,7 +83,7 @@ func TestModuleFromCore(t *testing.T) { assert.NoError(t, err) // verify - assert.True(t, strings.HasPrefix(cfg.Extensions[0].Name, "jaegerreceiver")) + assert.True(t, strings.HasPrefix(cfg.Extensions[0].Name, "otlpreceiver")) } func TestDeprecatedCore(t *testing.T) { diff --git a/cmd/builder/test/nocore.builder.yaml b/cmd/builder/test/nocore.builder.yaml index a5899cadf9c9..2d089832c7d6 100644 --- a/cmd/builder/test/nocore.builder.yaml +++ b/cmd/builder/test/nocore.builder.yaml @@ -1,14 +1,14 @@ dist: module: go.opentelemetry.io/collector/builder/test/nocore - otelcol_version: 0.37.0 + otelcol_version: 0.38.0 include_core: false receivers: - import: go.opentelemetry.io/collector/receiver/otlpreceiver - gomod: go.opentelemetry.io/collector v0.37.0 + gomod: go.opentelemetry.io/collector v0.38.0 exporters: - import: go.opentelemetry.io/collector/exporter/loggingexporter - gomod: go.opentelemetry.io/collector v0.37.0 + gomod: go.opentelemetry.io/collector v0.38.0 extensions: - import: go.opentelemetry.io/collector/extension/zpagesextension - gomod: go.opentelemetry.io/collector v0.37.0 + gomod: go.opentelemetry.io/collector v0.38.0 diff --git a/cmd/builder/test/replaces.builder.yaml b/cmd/builder/test/replaces.builder.yaml index 3a02d435df2c..a20e1a639778 100644 --- a/cmd/builder/test/replaces.builder.yaml +++ b/cmd/builder/test/replaces.builder.yaml @@ -1,10 +1,10 @@ dist: module: go.opentelemetry.io/collector/builder/test/replaces - otelcol_version: 0.37.0 + otelcol_version: 0.38.0 processors: - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor v0.37.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.37.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor v0.38.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.38.0 replaces: - - github.com/open-telemetry/opentelemetry-collector-contrib/internal/common => github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.37.0 + - github.com/open-telemetry/opentelemetry-collector-contrib/internal/common => github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.38.0