Skip to content

Commit e3470e7

Browse files
author
alrex
authored
release 0.37.0 (#78)
* release 0.37.0 * update use of NewCommand
1 parent a9f8085 commit e3470e7

File tree

6 files changed

+17
-23
lines changed

6 files changed

+17
-23
lines changed

README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ This program generates a custom OpenTelemetry Collector binary based on a given
88
$ GO111MODULE=on go get github.com/open-telemetry/opentelemetry-collector-builder
99
$ cat > ~/.otelcol-builder.yaml <<EOF
1010
exporters:
11-
- gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alibabacloudlogserviceexporter v0.36.0"
11+
- gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alibabacloudlogserviceexporter v0.37.0"
1212
EOF
1313
$ opentelemetry-collector-builder --output-path=/tmp/dist
1414
$ cat > /tmp/otelcol.yaml <<EOF
@@ -73,16 +73,16 @@ dist:
7373
name: otelcol-custom # the binary name. Optional.
7474
description: "Custom OpenTelemetry Collector distribution" # a long name for the application. Optional.
7575
include_core: true # whether the core components should be included in the distribution. Optional.
76-
otelcol_version: "0.36.0" # the OpenTelemetry Collector version to use as base for the distribution. Optional.
76+
otelcol_version: "0.37.0" # the OpenTelemetry Collector version to use as base for the distribution. Optional.
7777
output_path: /tmp/otelcol-distributionNNN # the path to write the output (sources and binary). Optional.
7878
version: "1.0.0" # the version for your custom OpenTelemetry Collector. Optional.
7979
go: "/usr/bin/go" # which Go binary to use to compile the generated sources. Optional.
8080
exporters:
81-
- gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alibabacloudlogserviceexporter v0.36.0" # the Go module for the component. Required.
81+
- gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alibabacloudlogserviceexporter v0.37.0" # the Go module for the component. Required.
8282
import: "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alibabacloudlogserviceexporter" # the import path for the component. Optional.
8383
name: "alibabacloudlogserviceexporter" # package name to use in the generated sources. Optional.
8484
path: "./alibabacloudlogserviceexporter" # in case a local version should be used for the module, the path relative to the current dir, or a full path can be specified. Optional.
8585
replaces:
8686
# a list of "replaces" directives that will be part of the resulting go.mod
87-
- github.com/open-telemetry/opentelemetry-collector-contrib/internal/common => github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.36.0
87+
- github.com/open-telemetry/opentelemetry-collector-contrib/internal/common => github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.37.0
8888
```

internal/builder/config.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
"go.uber.org/zap"
2828
)
2929

30-
const defaultOtelColVersion = "0.36.0"
30+
const defaultOtelColVersion = "0.37.0"
3131

3232
// ErrInvalidGoMod indicates an invalid gomod
3333
var ErrInvalidGoMod = errors.New("invalid gomod specification for module")

internal/builder/config_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,11 @@ func TestModuleFromCore(t *testing.T) {
6868
Extensions: []Module{ // see issue-12
6969
{
7070
Import: "go.opentelemetry.io/collector/receiver/jaegerreceiver",
71-
GoMod: "go.opentelemetry.io/collector v0.36.0",
71+
GoMod: "go.opentelemetry.io/collector v0.37.0",
7272
},
7373
{
7474
Import: "go.opentelemetry.io/collector/receiver/jaegerreceiver",
75-
GoMod: "go.opentelemetry.io/collector v0.36.0",
75+
GoMod: "go.opentelemetry.io/collector v0.37.0",
7676
Core: nil,
7777
},
7878
},

internal/scaffold/main.go

+2-8
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ const Main = `
3535
package main
3636
3737
import (
38-
"fmt"
3938
"log"
4039
4140
"go.opentelemetry.io/collector/component"
@@ -60,13 +59,8 @@ func main() {
6059
}
6160
6261
func runInteractive(params service.CollectorSettings) error {
63-
app, err := service.New(params)
64-
if err != nil {
65-
return fmt.Errorf("failed to construct the collector server: %w", err)
66-
}
67-
68-
cmd := service.NewCommand(app)
69-
if err = cmd.Execute(); err != nil {
62+
cmd := service.NewCommand(params)
63+
if err := cmd.Execute(); err != nil {
7064
log.Fatalf("collector server run finished with error: %v", err)
7165
}
7266

test/nocore.builder.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
dist:
22
module: github.com/open-telemetry/opentelemetry-collector-builder/test/nocore
3-
otelcol_version: 0.36.0
3+
otelcol_version: 0.37.0
44
include_core: false
55

66
receivers:
77
- import: go.opentelemetry.io/collector/receiver/otlpreceiver
8-
gomod: go.opentelemetry.io/collector v0.36.0
8+
gomod: go.opentelemetry.io/collector v0.37.0
99
exporters:
1010
- import: go.opentelemetry.io/collector/exporter/loggingexporter
11-
gomod: go.opentelemetry.io/collector v0.36.0
11+
gomod: go.opentelemetry.io/collector v0.37.0
1212
extensions:
1313
- import: go.opentelemetry.io/collector/extension/zpagesextension
14-
gomod: go.opentelemetry.io/collector v0.36.0
14+
gomod: go.opentelemetry.io/collector v0.37.0

test/replaces.builder.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
dist:
22
module: github.com/open-telemetry/opentelemetry-collector-builder/test/replaces
3-
otelcol_version: 0.36.0
3+
otelcol_version: 0.37.0
44

55
processors:
6-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor v0.36.0
7-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.36.0
6+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor v0.37.0
7+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.37.0
88

99
replaces:
10-
- github.com/open-telemetry/opentelemetry-collector-contrib/internal/common => github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.36.0
10+
- github.com/open-telemetry/opentelemetry-collector-contrib/internal/common => github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.37.0

0 commit comments

Comments
 (0)