diff --git a/go.mod b/go.mod index 65107c40d7a34..75496c6646c71 100644 --- a/go.mod +++ b/go.mod @@ -196,7 +196,7 @@ require ( github.com/multiplay/go-ts3 v1.0.0 github.com/naoina/go-stringutil v0.1.0 // indirect github.com/nats-io/jwt/v2 v2.1.0 // indirect - github.com/nats-io/nats-server/v2 v2.6.3 + github.com/nats-io/nats-server/v2 v2.6.5 github.com/nats-io/nats.go v1.13.1-0.20211018182449-f2416a8b1483 github.com/nats-io/nkeys v0.3.0 // indirect github.com/nats-io/nuid v1.0.1 // indirect diff --git a/go.sum b/go.sum index f36bcce7474d7..727dc6e6d2611 100644 --- a/go.sum +++ b/go.sum @@ -1582,8 +1582,8 @@ github.com/nats-io/jwt v0.3.2/go.mod h1:/euKqTS1ZD+zzjYrY7pseZrTtWQSjujC7xjPc8wL github.com/nats-io/jwt/v2 v2.1.0 h1:1UbfD5g1xTdWmSeRV8bh/7u+utTiBsRtWhLl1PixZp4= github.com/nats-io/jwt/v2 v2.1.0/go.mod h1:0tqz9Hlu6bCBFLWAASKhE5vUA4c24L9KPUUgvwumE/k= github.com/nats-io/nats-server/v2 v2.1.2/go.mod h1:Afk+wRZqkMQs/p45uXdrVLuab3gwv3Z8C4HTBu8GD/k= -github.com/nats-io/nats-server/v2 v2.6.3 h1:/ponRuIBtTiVDZRBjTKP+Cm/SWpvovI3vuB3pkpRQWw= -github.com/nats-io/nats-server/v2 v2.6.3/go.mod h1:LlMieumxNUnCloOTVFv7Wog0YnasScxARUMXVXv9/+M= +github.com/nats-io/nats-server/v2 v2.6.5 h1:VTG8gdSw4bEqMwKudOHkBLqGwNpNaJOwruj3+rquQlQ= +github.com/nats-io/nats-server/v2 v2.6.5/go.mod h1:LlMieumxNUnCloOTVFv7Wog0YnasScxARUMXVXv9/+M= github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzEE/Zbp4w= github.com/nats-io/nats.go v1.13.1-0.20211018182449-f2416a8b1483 h1:GMx3ZOcMEVM5qnUItQ4eJyQ6ycwmIEB/VC/UxvdevE0= github.com/nats-io/nats.go v1.13.1-0.20211018182449-f2416a8b1483/go.mod h1:BPko4oXsySz4aSWeFgOHLZs3G4Jq4ZAyE6/zMCxRT6w= diff --git a/plugins/outputs/influxdb_v2/http.go b/plugins/outputs/influxdb_v2/http.go index ee29382888d7c..a571a92b06c6e 100644 --- a/plugins/outputs/influxdb_v2/http.go +++ b/plugins/outputs/influxdb_v2/http.go @@ -225,7 +225,7 @@ func (c *httpClient) Write(ctx context.Context, metrics []telegraf.Metric) error } func (c *httpClient) splitAndWriteBatch(ctx context.Context, bucket string, metrics []telegraf.Metric) error { - log.Printf("W! [outputs.influxdb_v2] Retrying write after splitting metric payload in half to reduce batch size") + c.log.Warnf("Retrying write after splitting metric payload in half to reduce batch size") midpoint := len(metrics) / 2 if err := c.writeBatch(ctx, bucket, metrics[:midpoint]); err != nil { @@ -284,7 +284,7 @@ func (c *httpClient) writeBatch(ctx context.Context, bucket string, metrics []te switch resp.StatusCode { // request was too large, send back to try again case http.StatusRequestEntityTooLarge: - log.Printf("E! [outputs.influxdb_v2] Failed to write metric, request was too large (413)") + c.log.Errorf("Failed to write metric, request was too large (413)") return &APIError{ StatusCode: resp.StatusCode, Title: resp.Status, diff --git a/plugins/outputs/influxdb_v2/http_test.go b/plugins/outputs/influxdb_v2/http_test.go index bce1dfe3d04e0..aac87817f108c 100644 --- a/plugins/outputs/influxdb_v2/http_test.go +++ b/plugins/outputs/influxdb_v2/http_test.go @@ -151,6 +151,7 @@ func TestTooLargeWriteRetry(t *testing.T) { Bucket: "telegraf", BucketTag: "bucket", ExcludeBucketTag: true, + Log: testutil.Logger{}, } client, err := influxdb.NewHTTPClient(config)