From 5ada61a99b0d9112936a2f94ed47b070600a4a1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juraci=20Paix=C3=A3o=20Kr=C3=B6hling?= <juraci@kroehling.de>
Date: Thu, 2 Sep 2021 09:00:46 +0200
Subject: [PATCH] Update to OpenTelemetry core 0.34.0 (#68)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #67

Signed-off-by: Juraci Paixão Kröhling <juraci@kroehling.de>
---
 README.md                  |  8 ++++----
 internal/builder/config.go |  2 +-
 internal/builder/main.go   |  2 +-
 test/nocore.builder.yaml   |  6 +++---
 test/nocore.otel.yaml      | 11 ++++-------
 test/replaces.builder.yaml |  8 ++++----
 test/replaces.otel.yaml    |  4 ++--
 test/test.sh               |  2 +-
 8 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/README.md b/README.md
index 9c766a5a90f..f22694d600a 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.33.0"
+  - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alibabacloudlogserviceexporter v0.34.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.33.0" # the OpenTelemetry Collector version to use as base for the distribution. Optional.
+    otelcol_version: "0.34.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.33.0" # the Go module for the component. Required.
+  - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alibabacloudlogserviceexporter v0.34.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.33.0
+  - github.com/open-telemetry/opentelemetry-collector-contrib/internal/common => github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.34.0
 ```
diff --git a/internal/builder/config.go b/internal/builder/config.go
index f8af3a42d26..a7bcba5cba3 100644
--- a/internal/builder/config.go
+++ b/internal/builder/config.go
@@ -27,7 +27,7 @@ import (
 	"go.uber.org/zap"
 )
 
-const defaultOtelColVersion = "0.33.0"
+const defaultOtelColVersion = "0.34.0"
 
 // ErrInvalidGoMod indicates an invalid gomod
 var ErrInvalidGoMod = errors.New("invalid gomod specification for module")
diff --git a/internal/builder/main.go b/internal/builder/main.go
index 2b8ab7773c1..8a8ca6c012d 100644
--- a/internal/builder/main.go
+++ b/internal/builder/main.go
@@ -110,7 +110,7 @@ func Compile(cfg Config) error {
 // GetModules retrieves the go modules, updating go.mod and go.sum in the process
 func GetModules(cfg Config) error {
 	// #nosec G204
-	cmd := exec.Command(cfg.Distribution.Go, "mod", "tidy")
+	cmd := exec.Command(cfg.Distribution.Go, "mod", "tidy", "-compat=1.17")
 	cmd.Dir = cfg.Distribution.OutputPath
 	if out, err := cmd.CombinedOutput(); err != nil {
 		return fmt.Errorf("failed to update go.mod: %w. Output: %q", err, out)
diff --git a/test/nocore.builder.yaml b/test/nocore.builder.yaml
index f982f24030c..80d57877c9d 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.33.0
+  otelcol_version: 0.34.0
   include_core: false
 
 receivers:
-  - import: go.opentelemetry.io/collector/receiver/jaegerreceiver
+  - import: go.opentelemetry.io/collector/receiver/otlpreceiver
     core: true
 exporters:
   - import: go.opentelemetry.io/collector/exporter/loggingexporter
     core: true
 extensions:
-  - import: go.opentelemetry.io/collector/extension/healthcheckextension
+  - import: go.opentelemetry.io/collector/extension/zpagesextension
     core: true
diff --git a/test/nocore.otel.yaml b/test/nocore.otel.yaml
index 8f8093839b6..e0d615cd3d9 100644
--- a/test/nocore.otel.yaml
+++ b/test/nocore.otel.yaml
@@ -1,13 +1,10 @@
 extensions:
-  health_check:
+  zpages:
 
 receivers:
-  jaeger:
+  otlp:
     protocols:
       grpc:
-      thrift_http:
-      thrift_compact:
-      thrift_binary:
 
 processors:
 
@@ -15,11 +12,11 @@ exporters:
   logging:
 
 service:
-  extensions: [health_check]
+  extensions: [zpages]
   pipelines:
     traces:
       receivers:
-        - jaeger
+        - otlp
       processors: []
       exporters:
         - logging
diff --git a/test/replaces.builder.yaml b/test/replaces.builder.yaml
index 8956e2174cc..bf603e85b96 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.33.0
+  otelcol_version: 0.34.0
 
 processors:
-  - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor v0.33.0
-  - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.33.0
+  - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor v0.34.0
+  - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.34.0
 
 replaces:
-  - github.com/open-telemetry/opentelemetry-collector-contrib/internal/common => github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.33.0
+  - github.com/open-telemetry/opentelemetry-collector-contrib/internal/common => github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.34.0
diff --git a/test/replaces.otel.yaml b/test/replaces.otel.yaml
index 04e3d5053fd..ebf08a2d925 100755
--- a/test/replaces.otel.yaml
+++ b/test/replaces.otel.yaml
@@ -1,5 +1,5 @@
 extensions:
-  health_check:
+  zpages:
 
 receivers:
   otlp:
@@ -24,7 +24,7 @@ exporters:
   logging:
 
 service:
-  extensions: [health_check]
+  extensions: [zpages]
   pipelines:
     traces:
       receivers:
diff --git a/test/test.sh b/test/test.sh
index cd7a498336d..bc4d598a8dc 100755
--- a/test/test.sh
+++ b/test/test.sh
@@ -62,7 +62,7 @@ do
             break
         fi
 
-        curl -s localhost:13133  | grep "Server available" > /dev/null
+        curl -s http://localhost:55679/debug/servicez | grep Uptime > /dev/null
         if [ $? == 0 ]; then
             echo "✅ PASS ${test}"