rebase on master

influxdata · Dec 14, 2021 · 512b2d1 · 512b2d1
1 parent 283c97e
commit 512b2d1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/plugins/outputs/http/http.go b/plugins/outputs/http/http.go
@@ -123,12 +123,8 @@ type HTTP struct {
 	Headers                 map[string]string `toml:"headers"`
 	ContentEncoding         string            `toml:"content_encoding"`
 	UseBatchFormat          bool              `toml:"use_batch_format"`
-<<<<<<< HEAD
 	AwsService              string            `toml:"aws_service"`
 	NonRetryableStatusCodes []int             `toml:"non_retryable_statuscodes`
-=======
-	NonRetryableStatusCodes []int             `toml:"non_retryable_statuscodes"`
->>>>>>> a11e9202 (fix: fix toml field)
 	httpconfig.HTTPClientConfig
 	Log telegraf.Logger `toml:"-"`
 

diff --git a/plugins/outputs/http/http_test.go b/plugins/outputs/http/http_test.go
@@ -21,6 +21,7 @@ import (
 	"github.com/influxdata/telegraf/plugins/serializers"
 	"github.com/influxdata/telegraf/plugins/serializers/influx"
 	"github.com/influxdata/telegraf/plugins/serializers/json"
+	"github.com/influxdata/telegraf/testutil"
 )
 
 func getMetric() telegraf.Metric {
@@ -201,6 +202,8 @@ func TestStatusCode(t *testing.T) {
 			err = tt.plugin.Connect()
 			require.NoError(t, err)
 
+			tt.plugin.Log = testutil.Logger{}
+
 			err = tt.plugin.Write([]telegraf.Metric{getMetric()})
 			tt.errFunc(t, err)
 		})