Skip to content

Commit

Permalink
release 0.37.0 (#78)
Browse files Browse the repository at this point in the history
* release 0.37.0

* update use of NewCommand
  • Loading branch information
alrex authored Oct 15, 2021
1 parent a9f8085 commit e3470e7
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 23 deletions.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,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 <<EOF
exporters:
- gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alibabacloudlogserviceexporter v0.36.0"
- gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alibabacloudlogserviceexporter v0.37.0"
EOF
$ opentelemetry-collector-builder --output-path=/tmp/dist
$ cat > /tmp/otelcol.yaml <<EOF
Expand Down Expand Up @@ -73,16 +73,16 @@ dist:
name: otelcol-custom # the binary name. Optional.
description: "Custom OpenTelemetry Collector distribution" # a long name for the application. Optional.
include_core: true # whether the core components should be included in the distribution. Optional.
otelcol_version: "0.36.0" # the OpenTelemetry Collector version to use as base for the distribution. Optional.
otelcol_version: "0.37.0" # the OpenTelemetry Collector version to use as base for the distribution. Optional.
output_path: /tmp/otelcol-distributionNNN # the path to write the output (sources and binary). Optional.
version: "1.0.0" # the version for your custom OpenTelemetry Collector. Optional.
go: "/usr/bin/go" # which Go binary to use to compile the generated sources. Optional.
exporters:
- gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alibabacloudlogserviceexporter v0.36.0" # the Go module for the component. Required.
- gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alibabacloudlogserviceexporter v0.37.0" # the Go module for the component. Required.
import: "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alibabacloudlogserviceexporter" # the import path for the component. Optional.
name: "alibabacloudlogserviceexporter" # package name to use in the generated sources. Optional.
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.
replaces:
# a list of "replaces" directives that will be part of the resulting go.mod
- github.com/open-telemetry/opentelemetry-collector-contrib/internal/common => github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.36.0
- github.com/open-telemetry/opentelemetry-collector-contrib/internal/common => github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.37.0
```
2 changes: 1 addition & 1 deletion internal/builder/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"go.uber.org/zap"
)

const defaultOtelColVersion = "0.36.0"
const defaultOtelColVersion = "0.37.0"

// ErrInvalidGoMod indicates an invalid gomod
var ErrInvalidGoMod = errors.New("invalid gomod specification for module")
Expand Down
4 changes: 2 additions & 2 deletions internal/builder/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,11 @@ func TestModuleFromCore(t *testing.T) {
Extensions: []Module{ // see issue-12
{
Import: "go.opentelemetry.io/collector/receiver/jaegerreceiver",
GoMod: "go.opentelemetry.io/collector v0.36.0",
GoMod: "go.opentelemetry.io/collector v0.37.0",
},
{
Import: "go.opentelemetry.io/collector/receiver/jaegerreceiver",
GoMod: "go.opentelemetry.io/collector v0.36.0",
GoMod: "go.opentelemetry.io/collector v0.37.0",
Core: nil,
},
},
Expand Down
10 changes: 2 additions & 8 deletions internal/scaffold/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ const Main = `
package main
import (
"fmt"
"log"
"go.opentelemetry.io/collector/component"
Expand All @@ -60,13 +59,8 @@ func main() {
}
func runInteractive(params service.CollectorSettings) error {
app, err := service.New(params)
if err != nil {
return fmt.Errorf("failed to construct the collector server: %w", err)
}
cmd := service.NewCommand(app)
if err = cmd.Execute(); err != nil {
cmd := service.NewCommand(params)
if err := cmd.Execute(); err != nil {
log.Fatalf("collector server run finished with error: %v", err)
}
Expand Down
8 changes: 4 additions & 4 deletions test/nocore.builder.yaml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
dist:
module: github.com/open-telemetry/opentelemetry-collector-builder/test/nocore
otelcol_version: 0.36.0
otelcol_version: 0.37.0
include_core: false

receivers:
- import: go.opentelemetry.io/collector/receiver/otlpreceiver
gomod: go.opentelemetry.io/collector v0.36.0
gomod: go.opentelemetry.io/collector v0.37.0
exporters:
- import: go.opentelemetry.io/collector/exporter/loggingexporter
gomod: go.opentelemetry.io/collector v0.36.0
gomod: go.opentelemetry.io/collector v0.37.0
extensions:
- import: go.opentelemetry.io/collector/extension/zpagesextension
gomod: go.opentelemetry.io/collector v0.36.0
gomod: go.opentelemetry.io/collector v0.37.0
8 changes: 4 additions & 4 deletions test/replaces.builder.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
dist:
module: github.com/open-telemetry/opentelemetry-collector-builder/test/replaces
otelcol_version: 0.36.0
otelcol_version: 0.37.0

processors:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor v0.36.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.36.0
- 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

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

0 comments on commit e3470e7

Please sign in to comment.