chore(build): switch and bump new version for IBM/sarama (grafana#5180

)
hainenber · Sep 23, 2023 · 2d0e399 · 2d0e399
1 parent 67108b8
commit 2d0e399
Show file tree

Hide file tree

Showing 19 changed files with 52 additions and 26 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -67,7 +67,7 @@ Main (unreleased)
 - Flow: Allow `grafana-agent run` to accept a path to a directory of `*.river` files.
   This will load all River files in the directory as a single configuration;
   component names must be unique across all loaded files. (@rfratto, @hainenber)
-  
+
 
 ### Enhancements
 
@@ -88,12 +88,12 @@ Main (unreleased)
 - Flow: improve river config validation step in `prometheus.scrape` by comparing `scrape_timeout` with `scrape_interval`. (@wildum)
 
 - Add support for `windows_certificate_filter` under http tls config block. (@mattdurham)
-  
+
 - Add `openstack` config converter to convert OpenStack yaml config (static mode) to river config (flow mode). (@wildum)
 
-- Some `otelcol` components will now display their debug metrics via the 
-  Agent's `/metrics` endpoint. Those components include `otelcol.receiver.otlp`, 
-  `otelcol.exporter.otlp` and `otelcol.processor.batch`. There may also be metrics 
+- Some `otelcol` components will now display their debug metrics via the
+  Agent's `/metrics` endpoint. Those components include `otelcol.receiver.otlp`,
+  `otelcol.exporter.otlp` and `otelcol.processor.batch`. There may also be metrics
   from other components which are not documented yet. (@ptodev)
 
 - Agent Management: Honor 503 ServiceUnavailable `Retry-After` header. (@jcreixell)
@@ -122,6 +122,29 @@ Main (unreleased)
 
 - Fixed a bug where converting `YACE` cloudwatch config to river skipped converting static jobs. (@berler)
 
+### Other changes
+
+- Use Go 1.21.1 for builds. (@rfratto)
+
+- Read contextual attributes from Faro measurements (@codecapitano)
+
+- Rename Grafana Agent service in windows app and features to not include the description
+
+- Correct YAML level for `multitenancy_enabled` option in Mimir's config in examples. (@hainenber)
+
+- Operator: Update default config reloader version. (@captncraig)
+
+- Sorting of common fields in log messages emitted by the agent in Flow mode
+  have been standardized. The first fields will always be `ts`, `level`, and
+  `msg`, followed by non-common fields. Previously, the position of `msg` was
+  not consistent. (@rfratto)
+
+- Documentation updated to link discovery.http and prometheus.scrape advanced configs (@proffalken)
+
+- Bump SNMP exporter version to v0.23 (@marctc)
+
+- Switch to `IBM/sarama` module. (@hainenber)
+
 v0.36.2 (2023-09-22)
 --------------------
 
@@ -135,7 +158,7 @@ v0.36.2 (2023-09-22)
 
 - Fix `loki.source.file` race condition in cleaning up metrics when stopping to tail files. (@thampiotr)
 
-- Fixed the `agent_prometheus_scrape_targets_gauge` incorrectly reporting all discovered targets 
+- Fixed the `agent_prometheus_scrape_targets_gauge` incorrectly reporting all discovered targets
   instead of targets that belong to current instance when clustering is enabled. (@thampiotr)
 
 v0.36.1 (2023-09-06)

diff --git a/component/loki/source/azure_event_hubs/azure_event_hubs.go b/component/loki/source/azure_event_hubs/azure_event_hubs.go
@@ -6,7 +6,7 @@ import (
 	"net"
 	"sync"
 
-	"github.com/Shopify/sarama"
+	"github.com/IBM/sarama"
 	"github.com/go-kit/log/level"
 	"github.com/grafana/agent/component"
 	"github.com/grafana/agent/component/common/loki"

diff --git a/component/loki/source/azure_event_hubs/internal/parser/parser.go b/component/loki/source/azure_event_hubs/internal/parser/parser.go
@@ -11,7 +11,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/Shopify/sarama"
+	"github.com/IBM/sarama"
 	"github.com/grafana/agent/component/common/loki"
 	"github.com/grafana/loki/pkg/logproto"
 	"github.com/prometheus/common/model"

diff --git a/component/loki/source/azure_event_hubs/internal/parser/parser_test.go b/component/loki/source/azure_event_hubs/internal/parser/parser_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/Shopify/sarama"
+	"github.com/IBM/sarama"
 	"github.com/prometheus/common/model"
 	"github.com/prometheus/prometheus/model/relabel"
 	"github.com/stretchr/testify/assert"

diff --git a/component/loki/source/internal/kafkatarget/authentication.go b/component/loki/source/internal/kafkatarget/authentication.go
@@ -11,7 +11,7 @@ import (
 	"github.com/xdg-go/scram"
 )
 
-// copied from https://github.com/Shopify/sarama/blob/44627b731c60bb90efe25573e7ef2b3f8df3fa23/examples/sasl_scram_client/scram_client.go
+// copied from https://github.com/IBM/sarama/blob/44627b731c60bb90efe25573e7ef2b3f8df3fa23/examples/sasl_scram_client/scram_client.go
 var (
 	SHA256 scram.HashGeneratorFcn = sha256.New
 	SHA512 scram.HashGeneratorFcn = sha512.New

diff --git a/component/loki/source/internal/kafkatarget/config.go b/component/loki/source/internal/kafkatarget/config.go
@@ -1,7 +1,7 @@
 package kafkatarget
 
 import (
-	"github.com/Shopify/sarama"
+	"github.com/IBM/sarama"
 	"github.com/grafana/agent/component/common/loki"
 	"github.com/grafana/dskit/flagext"
 	promconfig "github.com/prometheus/common/config"

diff --git a/component/loki/source/internal/kafkatarget/consumer.go b/component/loki/source/internal/kafkatarget/consumer.go
@@ -10,7 +10,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/Shopify/sarama"
+	"github.com/IBM/sarama"
 	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
 	"github.com/grafana/dskit/backoff"

diff --git a/component/loki/source/internal/kafkatarget/consumer_test.go b/component/loki/source/internal/kafkatarget/consumer_test.go
@@ -10,7 +10,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/Shopify/sarama"
+	"github.com/IBM/sarama"
 	"github.com/go-kit/log"
 	"github.com/prometheus/common/model"
 	"github.com/stretchr/testify/require"

diff --git a/component/loki/source/internal/kafkatarget/kafkatarget.go b/component/loki/source/internal/kafkatarget/kafkatarget.go
@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/Shopify/sarama"
+	"github.com/IBM/sarama"
 	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
 	"github.com/grafana/agent/component/common/loki"

diff --git a/component/loki/source/internal/kafkatarget/kafkatarget_test.go b/component/loki/source/internal/kafkatarget/kafkatarget_test.go
@@ -13,7 +13,7 @@ import (
 
 	"github.com/grafana/agent/component/common/loki/client/fake"
 
-	"github.com/Shopify/sarama"
+	"github.com/IBM/sarama"
 	"github.com/prometheus/common/model"
 	"github.com/prometheus/prometheus/model/relabel"
 	"github.com/stretchr/testify/require"

diff --git a/component/loki/source/internal/kafkatarget/oauth_provider.go b/component/loki/source/internal/kafkatarget/oauth_provider.go
@@ -8,7 +8,7 @@ import (
 	"github.com/Azure/azure-sdk-for-go/sdk/azcore"
 	"github.com/Azure/azure-sdk-for-go/sdk/azcore/policy"
 	"github.com/Azure/azure-sdk-for-go/sdk/azidentity"
-	"github.com/Shopify/sarama"
+	"github.com/IBM/sarama"
 )
 
 func NewOAuthProvider(opts OAuthConfig) (sarama.AccessTokenProvider, error) {

diff --git a/component/loki/source/internal/kafkatarget/parser.go b/component/loki/source/internal/kafkatarget/parser.go
@@ -1,7 +1,7 @@
 package kafkatarget
 
 import (
-	"github.com/Shopify/sarama"
+	"github.com/IBM/sarama"
 	"github.com/grafana/agent/component/common/loki"
 	"github.com/grafana/loki/pkg/logproto"
 	"github.com/prometheus/common/model"

diff --git a/component/loki/source/internal/kafkatarget/target_syncer.go b/component/loki/source/internal/kafkatarget/target_syncer.go
@@ -11,7 +11,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/Shopify/sarama"
+	"github.com/IBM/sarama"
 	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
 	promconfig "github.com/prometheus/common/config"
@@ -65,11 +65,11 @@ func NewSyncer(
 
 	switch cfg.KafkaConfig.Assignor {
 	case sarama.StickyBalanceStrategyName:
-		config.Consumer.Group.Rebalance.Strategy = sarama.BalanceStrategySticky
+		config.Consumer.Group.Rebalance.Strategy = sarama.NewBalanceStrategySticky()
 	case sarama.RoundRobinBalanceStrategyName:
-		config.Consumer.Group.Rebalance.Strategy = sarama.BalanceStrategyRoundRobin
+		config.Consumer.Group.Rebalance.Strategy = sarama.NewBalanceStrategyRoundRobin()
 	case sarama.RangeBalanceStrategyName, "":
-		config.Consumer.Group.Rebalance.Strategy = sarama.BalanceStrategyRange
+		config.Consumer.Group.Rebalance.Strategy = sarama.NewBalanceStrategyRange()
 	default:
 		return nil, fmt.Errorf("unrecognized consumer group partition assignor: %s", cfg.KafkaConfig.Assignor)
 	}

diff --git a/component/loki/source/internal/kafkatarget/target_syncer_test.go b/component/loki/source/internal/kafkatarget/target_syncer_test.go
@@ -12,7 +12,7 @@ import (
 	"github.com/grafana/dskit/flagext"
 	"github.com/prometheus/common/config"
 
-	"github.com/Shopify/sarama"
+	"github.com/IBM/sarama"
 	"github.com/go-kit/log"
 	"github.com/prometheus/common/model"
 	"github.com/prometheus/prometheus/model/relabel"

diff --git a/component/loki/source/kafka/kafka.go b/component/loki/source/kafka/kafka.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"sync"
 
-	"github.com/Shopify/sarama"
+	"github.com/IBM/sarama"
 	"github.com/go-kit/log/level"
 	"github.com/grafana/agent/component"
 	"github.com/grafana/agent/component/common/config"

diff --git a/component/prometheus/exporter/kafka/kafka.go b/component/prometheus/exporter/kafka/kafka.go
@@ -3,7 +3,7 @@ package kafka
 import (
 	"fmt"
 
-	"github.com/Shopify/sarama"
+	"github.com/IBM/sarama"
 	"github.com/grafana/agent/component"
 	"github.com/grafana/agent/component/discovery"
 	"github.com/grafana/agent/component/prometheus/exporter"

diff --git a/go.mod b/go.mod
@@ -7,10 +7,10 @@ require (
 	github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.0
 	github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.3.0
 	github.com/Azure/go-autorest/autorest v0.11.29
+	github.com/IBM/sarama v1.40.1
 	github.com/Lusitaniae/apache_exporter v0.11.1-0.20220518131644-f9522724dab4
 	github.com/Masterminds/sprig/v3 v3.2.3
 	github.com/PuerkitoBio/rehttp v1.1.0
-	github.com/Shopify/sarama v1.38.1
 	github.com/alecthomas/kingpin/v2 v2.3.2
 	github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137
 	github.com/aws/aws-sdk-go v1.44.327
@@ -623,6 +623,7 @@ require (
 )
 
 require (
+	github.com/Shopify/sarama v1.38.1 // indirect
 	github.com/Workiva/go-datastructures v1.1.0 // indirect
 	github.com/drone/envsubst v1.0.3 // indirect
 	github.com/julienschmidt/httprouter v1.3.0 // indirect

diff --git a/go.sum b/go.sum
@@ -524,6 +524,8 @@ github.com/GehirnInc/crypt v0.0.0-20200316065508-bb7000b8a962 h1:KeNholpO2xKjgaa
 github.com/GehirnInc/crypt v0.0.0-20200316065508-bb7000b8a962/go.mod h1:kC29dT1vFpj7py2OvG1khBdQpo3kInWP+6QipLbdngo=
 github.com/HdrHistogram/hdrhistogram-go v1.1.2 h1:5IcZpTvzydCQeHzK4Ef/D5rrSqwxob0t8PQPMybUNFM=
 github.com/HdrHistogram/hdrhistogram-go v1.1.2/go.mod h1:yDgFjdqOqDEKOvasDdhWNXYg9BVp4O+o5f6V/ehm6Oo=
+github.com/IBM/sarama v1.40.1 h1:lL01NNg/iBeigUbT+wpPysuTYW6roHo6kc1QrffRf0k=
+github.com/IBM/sarama v1.40.1/go.mod h1:+5OFwA5Du9I6QrznhaMHsuwWdWZNMjaBSIxEWEgKOYE=
 github.com/Jeffail/gabs v1.1.0/go.mod h1:6xMvQMK4k33lb7GUUpaAPh6nKMmemQeg5d4gn7/bOXc=
 github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c h1:RGWPOewvKIROun94nF7v2cua9qP+thov/7M50KEoeSU=
 github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c/go.mod h1:X0CRv0ky0k6m906ixxpzmDRLvX58TFUKS2eePweuyxk=

diff --git a/pkg/integrations/kafka_exporter/kafka_exporter.go b/pkg/integrations/kafka_exporter/kafka_exporter.go
@@ -5,7 +5,7 @@ import (
 
 	config_util "github.com/prometheus/common/config"
 
-	"github.com/Shopify/sarama"
+	"github.com/IBM/sarama"
 	kafka_exporter "github.com/davidmparrott/kafka_exporter/v2/exporter"
 	"github.com/go-kit/log"
 	"github.com/grafana/agent/pkg/integrations"