Move ratelimiting pieces all to one package

influxdata · Dec 4, 2024 · 1896438 · 1896438
1 parent 21ac3f2
commit 1896438
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/plugins/common/ratelimiter/serializers.go b/plugins/common/ratelimiter/serializers.go
@@ -1,4 +1,4 @@
-package limited
+package ratelimiter
 
 import (
 	"bytes"

diff --git a/plugins/common/ratelimiter/serializers_test.go b/plugins/common/ratelimiter/serializers_test.go
@@ -1,4 +1,4 @@
-package limited
+package ratelimiter
 
 import (
 	"math"

diff --git a/plugins/outputs/influxdb_v2/http.go b/plugins/outputs/influxdb_v2/http.go
@@ -22,7 +22,6 @@ import (
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/config"
 	"github.com/influxdata/telegraf/internal"
-	"github.com/influxdata/telegraf/plugins/common/limited"
 	"github.com/influxdata/telegraf/plugins/common/ratelimiter"
 )
 
@@ -61,7 +60,7 @@ type httpClient struct {
 	readIdleTimeout  config.Duration
 	tlsConfig        *tls.Config
 	encoder          internal.ContentEncoder
-	serializer       limited.Serializer
+	serializer       ratelimiter.Serializer
 	rateLimiter      *ratelimiter.RateLimiter
 	client           *http.Client
 	params           url.Values

diff --git a/plugins/outputs/influxdb_v2/influxdb_v2.go b/plugins/outputs/influxdb_v2/influxdb_v2.go
@@ -17,7 +17,6 @@ import (
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/config"
 	"github.com/influxdata/telegraf/internal"
-	"github.com/influxdata/telegraf/plugins/common/limited"
 	"github.com/influxdata/telegraf/plugins/common/ratelimiter"
 	commontls "github.com/influxdata/telegraf/plugins/common/tls"
 	"github.com/influxdata/telegraf/plugins/outputs"
@@ -50,7 +49,7 @@ type InfluxDB struct {
 
 	clients    []*httpClient
 	encoder    internal.ContentEncoder
-	serializer limited.Serializer
+	serializer ratelimiter.Serializer
 	tlsCfg     *tls.Config
 }
 
@@ -90,7 +89,7 @@ func (i *InfluxDB) Init() error {
 	if err := serializer.Init(); err != nil {
 		return fmt.Errorf("setting up serializer failed: %w", err)
 	}
-	i.serializer = limited.NewIndividualSerializer(serializer)
+	i.serializer = ratelimiter.NewIndividualSerializer(serializer)
 
 	// Setup the client config
 	tlsCfg, err := i.ClientConfig.TLSConfig()