Skip to content

Commit

Permalink
Upgrade builder to use collector v0.38.0 (open-telemetry#4367)
Browse files Browse the repository at this point in the history
Signed-off-by: Bogdan Drutu <[email protected]>
  • Loading branch information
bogdandrutu authored Nov 9, 2021
1 parent 582ac1d commit 3ce97aa
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 14 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 @@ -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")
Expand Down
10 changes: 5 additions & 5 deletions cmd/builder/internal/builder/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
},
},
Expand All @@ -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) {
Expand Down
8 changes: 4 additions & 4 deletions cmd/builder/test/nocore.builder.yaml
Original file line number Diff line number Diff line change
@@ -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
8 changes: 4 additions & 4 deletions cmd/builder/test/replaces.builder.yaml
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 3ce97aa

Please sign in to comment.