diff --git a/README.md b/README.md index 3d3d96dc9b9c..2856d50b0681 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ This program generates a custom OpenTelemetry Collector binary based on a given $ GO111MODULE=on go get github.com/open-telemetry/opentelemetry-collector-builder $ cat > ~/.otelcol-builder.yaml < /tmp/otelcol.yaml < github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.25.0 + - github.com/open-telemetry/opentelemetry-collector-contrib/internal/common => github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.26.0 ``` diff --git a/internal/builder/config.go b/internal/builder/config.go index e1f8aacb5af6..0fecfccd1b30 100644 --- a/internal/builder/config.go +++ b/internal/builder/config.go @@ -26,7 +26,7 @@ import ( "go.uber.org/zap" ) -const defaultOtelColVersion = "0.25.0" +const defaultOtelColVersion = "0.26.0" // ErrInvalidGoMod indicates an invalid gomod var ErrInvalidGoMod = errors.New("invalid gomod specification for module") diff --git a/internal/scaffold/main.go b/internal/scaffold/main.go index 10a180f587de..fd6de23a66d1 100644 --- a/internal/scaffold/main.go +++ b/internal/scaffold/main.go @@ -47,13 +47,13 @@ func main() { log.Fatalf("failed to build components: %v", err) } - info := component.ApplicationStartInfo{ - ExeName: "{{ .Distribution.ExeName }}", - LongName: "{{ .Distribution.LongName }}", + info := component.BuildInfo{ + Command: "{{ .Distribution.ExeName }}", + Description: "{{ .Distribution.LongName }}", Version: "{{ .Distribution.Version }}", } - app, err := service.New(service.Parameters{ApplicationStartInfo: info, Factories: factories}) + app, err := service.New(service.Parameters{BuildInfo: info, Factories: factories}) if err != nil { log.Fatalf("failed to construct the application: %v", err) } diff --git a/test/nocore.builder.yaml b/test/nocore.builder.yaml index f05c09d8322a..fe1e076e7020 100644 --- a/test/nocore.builder.yaml +++ b/test/nocore.builder.yaml @@ -1,6 +1,6 @@ dist: module: github.com/open-telemetry/opentelemetry-collector-builder/test/nocore - otelcol_version: 0.25.0 + otelcol_version: 0.26.0 include_core: false receivers: diff --git a/test/replaces.builder.yaml b/test/replaces.builder.yaml index 38009943b899..465d8a55e1bf 100644 --- a/test/replaces.builder.yaml +++ b/test/replaces.builder.yaml @@ -1,10 +1,10 @@ dist: module: github.com/open-telemetry/opentelemetry-collector-builder/test/replaces - otelcol_version: 0.25.0 + otelcol_version: 0.26.0 processors: - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor v0.25.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.25.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor v0.26.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.26.0 replaces: - - github.com/open-telemetry/opentelemetry-collector-contrib/internal/common => github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.25.0 + - github.com/open-telemetry/opentelemetry-collector-contrib/internal/common => github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.26.0