shadow

open-telemetry · Sep 25, 2023 · fc4668a · fc4668a
1 parent 23dc9e7
commit fc4668a
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 46 deletions.
diff --git a/exporter/kafkaexporter/kafka_exporter.go b/exporter/kafkaexporter/kafka_exporter.go
@@ -136,14 +136,14 @@ func newSaramaProducer(config Config) (sarama.SyncProducer, error) {
 
 	if config.ProxyURL != "" {
 		// Should point to a registered tcp proxy URL.
-		httpProxyURI, err := url.Parse(config.ProxyURL)
-		if err != nil {
-			return nil, err
+		httpProxyURI, parseErr := url.Parse(config.ProxyURL)
+		if parseErr != nil {
+			return nil, parseErr
 		}
 
-		httpDialer, err := proxy.FromURL(httpProxyURI, proxy.Direct)
-		if err != nil {
-			return nil, err
+		httpDialer, fromErr := proxy.FromURL(httpProxyURI, proxy.Direct)
+		if fromErr != nil {
+			return nil, fromErr
 		}
 
 		c.Net.Proxy = struct {

diff --git a/receiver/kafkareceiver/kafka_receiver.go b/receiver/kafkareceiver/kafka_receiver.go
@@ -94,23 +94,16 @@ func newTracesReceiver(config Config, set receiver.CreateSettings, unmarshalers
 	} else {
 		return nil, err
 	}
-	if config.ProtocolVersion != "" {
-		version, err := sarama.ParseKafkaVersion(config.ProtocolVersion)
-		if err != nil {
-			return nil, err
-		}
-		c.Version = version
-	}
 
 	if config.ProxyURL != "" {
-		httpProxyURI, err := url.Parse(config.ProxyURL)
-		if err != nil {
-			return nil, err
+		httpProxyURI, parseErr := url.Parse(config.ProxyURL)
+		if parseErr != nil {
+			return nil, parseErr
 		}
 
-		httpDialer, err := proxy.FromURL(httpProxyURI, proxy.Direct)
-		if err != nil {
-			return nil, err
+		httpDialer, fromErr := proxy.FromURL(httpProxyURI, proxy.Direct)
+		if fromErr != nil {
+			return nil, fromErr
 		}
 
 		c.Net.Proxy = struct {
@@ -122,6 +115,14 @@ func newTracesReceiver(config Config, set receiver.CreateSettings, unmarshalers
 		}
 	}
 
+	if config.ProtocolVersion != "" {
+		version, err := sarama.ParseKafkaVersion(config.ProtocolVersion)
+		if err != nil {
+			return nil, err
+		}
+		c.Version = version
+	}
+
 	if err := kafkaexporter.ConfigureAuthentication(config.Authentication, c); err != nil {
 		return nil, err
 	}
@@ -208,23 +209,16 @@ func newMetricsReceiver(config Config, set receiver.CreateSettings, unmarshalers
 	} else {
 		return nil, err
 	}
-	if config.ProtocolVersion != "" {
-		version, err := sarama.ParseKafkaVersion(config.ProtocolVersion)
-		if err != nil {
-			return nil, err
-		}
-		c.Version = version
-	}
 
 	if config.ProxyURL != "" {
-		httpProxyURI, err := url.Parse(config.ProxyURL)
-		if err != nil {
-			return nil, err
+		httpProxyURI, parseErr := url.Parse(config.ProxyURL)
+		if parseErr != nil {
+			return nil, parseErr
 		}
 
-		httpDialer, err := proxy.FromURL(httpProxyURI, proxy.Direct)
-		if err != nil {
-			return nil, err
+		httpDialer, fromErr := proxy.FromURL(httpProxyURI, proxy.Direct)
+		if fromErr != nil {
+			return nil, fromErr
 		}
 
 		c.Net.Proxy = struct {
@@ -237,6 +231,14 @@ func newMetricsReceiver(config Config, set receiver.CreateSettings, unmarshalers
 
 	}
 
+	if config.ProtocolVersion != "" {
+		version, err := sarama.ParseKafkaVersion(config.ProtocolVersion)
+		if err != nil {
+			return nil, err
+		}
+		c.Version = version
+	}
+
 	if err := kafkaexporter.ConfigureAuthentication(config.Authentication, c); err != nil {
 		return nil, err
 	}
@@ -322,24 +324,16 @@ func newLogsReceiver(config Config, set receiver.CreateSettings, unmarshalers ma
 	if err != nil {
 		return nil, err
 	}
-	if config.ProtocolVersion != "" {
-		var version sarama.KafkaVersion
-		version, err = sarama.ParseKafkaVersion(config.ProtocolVersion)
-		if err != nil {
-			return nil, err
-		}
-		c.Version = version
-	}
 
 	if config.ProxyURL != "" {
-		httpProxyURI, err := url.Parse(config.ProxyURL)
-		if err != nil {
-			return nil, err
+		httpProxyURI, parseErr := url.Parse(config.ProxyURL)
+		if parseErr != nil {
+			return nil, parseErr
 		}
 
-		httpDialer, err := proxy.FromURL(httpProxyURI, proxy.Direct)
-		if err != nil {
-			return nil, err
+		httpDialer, fromErr := proxy.FromURL(httpProxyURI, proxy.Direct)
+		if fromErr != nil {
+			return nil, fromErr
 		}
 
 		c.Net.Proxy = struct {
@@ -352,6 +346,15 @@ func newLogsReceiver(config Config, set receiver.CreateSettings, unmarshalers ma
 
 	}
 
+	if config.ProtocolVersion != "" {
+		var version sarama.KafkaVersion
+		version, err = sarama.ParseKafkaVersion(config.ProtocolVersion)
+		if err != nil {
+			return nil, err
+		}
+		c.Version = version
+	}
+
 	if err = kafkaexporter.ConfigureAuthentication(config.Authentication, c); err != nil {
 		return nil, err
 	}