From e3470e77649d60a8f935497485193e5153c2db7f Mon Sep 17 00:00:00 2001
From: alrex <aboten@lightstep.com>
Date: Fri, 15 Oct 2021 08:53:07 -0700
Subject: [PATCH] release 0.37.0 (#78)

* release 0.37.0

* update use of NewCommand
---
 README.md                       |  8 ++++----
 internal/builder/config.go      |  2 +-
 internal/builder/config_test.go |  4 ++--
 internal/scaffold/main.go       | 10 ++--------
 test/nocore.builder.yaml        |  8 ++++----
 test/replaces.builder.yaml      |  8 ++++----
 6 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/README.md b/README.md
index c991a5a..c13c5b0 100644
--- a/README.md
+++ b/README.md
@@ -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
@@ -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
 ```
diff --git a/internal/builder/config.go b/internal/builder/config.go
index b771871..059fea9 100644
--- a/internal/builder/config.go
+++ b/internal/builder/config.go
@@ -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")
diff --git a/internal/builder/config_test.go b/internal/builder/config_test.go
index 0b3cd9b..1528ae3 100644
--- a/internal/builder/config_test.go
+++ b/internal/builder/config_test.go
@@ -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,
 			},
 		},
diff --git a/internal/scaffold/main.go b/internal/scaffold/main.go
index 2002b0e..3fbaed5 100644
--- a/internal/scaffold/main.go
+++ b/internal/scaffold/main.go
@@ -35,7 +35,6 @@ const Main = `
 package main
 
 import (
-	"fmt"
 	"log"
 
 	"go.opentelemetry.io/collector/component"
@@ -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)
 	}
 
diff --git a/test/nocore.builder.yaml b/test/nocore.builder.yaml
index 8cee426..abebfad 100644
--- a/test/nocore.builder.yaml
+++ b/test/nocore.builder.yaml
@@ -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
diff --git a/test/replaces.builder.yaml b/test/replaces.builder.yaml
index 939912e..aead637 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.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