Release v0.36.0 (#783)

* Update deps to v0.36.0

* Bump smart agent bundle to v5.14.0

* Bump github.com/signalfx/signalfx-agent to main

* Update CHANGELOG.md

* Fixes for breaking upstream changes

Unit tests pass (at least on my machine) but we may want to test manually as
well.

* Use new run api from collector v.36

* Update configs for tls/insecure option

* testutil 0.36.0 fixes and mod tidy

* Bump smart agent bundle to v5.14.1

* Bump github.com/signalfx/signalfx-agent to main

* missing test insecure tls settings

* account for updated exec default timeout

* correct failing vault config source test

* Move exporters::otlp::tls::insecure if it exists

* Add a warning for deprecated parameter in otlp exporter

* Update CHANGELOG.md

Co-authored-by: Ryan Fitzpatrick <[email protected]>

* Update CHANGELOG.md

Co-authored-by: Pablo Collins <[email protected]>
Co-authored-by: Ryan Fitzpatrick <[email protected]>
Co-authored-by: Dmitry <[email protected]>
Co-authored-by: Ryan Fitzpatrick <[email protected]>

Author: 5 people

CHANGELOG.md

@@ -2,6 +2,21 @@
 
 ## Unreleased
 
+## v0.36.0
+
+This Splunk OpenTelemetry Connector release includes changes from the [opentelemetry-collector v0.36.0](https://github.com/open-telemetry/opentelemetry-collector/releases/tag/v0.36.0) and the [opentelemetry-collector-contrib v0.36.0](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases/tag/v0.36.0) releases.
+
+### 💡 Enhancements 💡
+
+- Handle backwards compatibility of internal ballast removal (#759)
+- Update bundled Smart Agent to [v5.14.1](https://github.com/signalfx/signalfx-agent/releases/tag/v5.14.1)
+- Automatically relocate removed OTLP exporter "insecure" field (#783)
+
+### 🧰 Bug fixes 🧰
+
+- Move Heroku buildpack to [https://github.com/signalfx/splunk-otel-collector-heroku](https://github.com/signalfx/splunk-otel-collector-heroku) (#755)
+- Fix rpm installation conflicts with the Smart Agent rpm (#773)
+
 ## v0.35.0
 
 This Splunk OpenTelemetry Connector release includes changes from the [opentelemetry-collector v0.35.0](https://github.com/open-telemetry/opentelemetry-collector/releases/tag/v0.35.0) and the [opentelemetry-collector-contrib v0.35.0](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases/tag/v0.35.0) releases.

cmd/otelcol/config/collector/agent_config.yaml

@@ -142,7 +142,8 @@ exporters:
   # Send to gateway
   otlp:
     endpoint: "${SPLUNK_GATEWAY_URL}:4317"
-    insecure: true
+    tls:
+      insecure: true
   # Debug
   logging:
     loglevel: debug

cmd/otelcol/config/collector/full_config_linux.yaml

@@ -394,7 +394,8 @@ exporters:
   # NOTE: These settings should be updated to the proper destination
   jaeger:
     endpoint: jaeger-all-in-one:14250
-    insecure: true
+    tls:
+      insecure: true
 
   # Enables the otlp grpc exporter
   # Full configuration here: https://github.com/open-telemetry/opentelemetry-collector/tree/main/exporter/otlpexporter
@@ -424,7 +425,8 @@ exporters:
   # NOTE: These settings should be updated to the proper destination
   zipkin:
     endpoint: "http://some.url:9411/api/v2/spans"
-    insecure: true
+    tls:
+      insecure: true
 
   #############################################################################
   # Metrics

cmd/otelcol/config/collector/upstream_agent_config.yaml

@@ -139,7 +139,8 @@ exporters:
   # Send to gateway
   otlp:
     endpoint: "${SPLUNK_GATEWAY_URL}:4317"
-    insecure: true
+    tls:
+      insecure: true
   # Debug
   logging:
     loglevel: debug

cmd/otelcol/main.go

@@ -86,13 +86,19 @@ func main() {
 		info,
 		configsources.Get()...,
 	)
+
 	const noConvertConfigFlag = "--no-convert-config"
 	if hasFlag(noConvertConfigFlag) {
 		// the collector complains about this flag if we don't remove it
 		removeFlag(&os.Args, noConvertConfigFlag)
 	} else {
-		parserProvider = configconverter.ParserProvider(parserProvider, configconverter.RemoveBallastKey)
+		parserProvider = configconverter.ParserProvider(
+			parserProvider,
+			configconverter.RemoveBallastKey,
+			configconverter.MoveOTLPInsecureKey,
+		)
 	}
+
 	serviceParams := service.CollectorSettings{
 		BuildInfo:      info,
 		Factories:      factories,
@@ -348,14 +354,14 @@ func newBaseParserProvider() parserprovider.ParserProvider {
 	return parserprovider.Default()
 }
 
-func runInteractive(params service.CollectorSettings) error {
-	app, err := service.New(params)
+func runInteractive(settings service.CollectorSettings) error {
+	app, err := service.New(settings)
 	if err != nil {
 		return fmt.Errorf("failed to construct the application: %w", err)
 	}
 
-	err = app.Run()
-	if err != nil {
+	cmd := service.NewCommand(app)
+	if err = cmd.Execute(); err != nil {
 		return fmt.Errorf("application run finished with error: %w", err)
 	}
 

go.mod

@@ -1 +1 @@
-v5.13.0
+v5.14.1

go.sum

@@ -64,7 +64,7 @@ import (
 	"go.opentelemetry.io/collector/extension/ballastextension"
 	"go.opentelemetry.io/collector/extension/zpagesextension"
 	"go.opentelemetry.io/collector/processor/batchprocessor"
-	"go.opentelemetry.io/collector/processor/memorylimiter"
+	"go.opentelemetry.io/collector/processor/memorylimiterprocessor"
 	"go.opentelemetry.io/collector/receiver/otlpreceiver"
 
 	"github.com/signalfx/splunk-otel-collector/internal/extension/smartagentextension"
@@ -136,7 +136,7 @@ func Get() (component.Factories, error) {
 		filterprocessor.NewFactory(),
 		groupbyattrsprocessor.NewFactory(),
 		k8sprocessor.NewFactory(),
-		memorylimiter.NewFactory(),
+		memorylimiterprocessor.NewFactory(),
 		metricstransformprocessor.NewFactory(),
 		probabilisticsamplerprocessor.NewFactory(),
 		resourcedetectionprocessor.NewFactory(),

internal/buildscripts/packaging/smart-agent-release.txt

@@ -29,7 +29,7 @@ func RemoveBallastKey(cfgMap *configparser.ConfigMap) *configparser.ConfigMap {
 	const expr = "processors::memory_limiter(/\\w+)?::ballast_size_mib"
 	ballastKeyRegexp, _ := regexp.Compile(expr)
 
-	out := configparser.NewParser()
+	out := configparser.NewConfigMap()
 	for _, k := range cfgMap.AllKeys() {
 		if ballastKeyRegexp.MatchString(k) {
 			log.Println("[WARNING] `ballast_size_mib` parameter in `memory_limiter` processor is " +