diff --git a/internal/models/buffer.go b/internal/models/buffer.go
index f7f343e46..7769ac1e9 100644
--- a/internal/models/buffer.go
+++ b/internal/models/buffer.go
@@ -32,7 +32,7 @@ type Buffer struct {
 }
 
 // NewBuffer returns a new empty Buffer with the given capacity.
-func NewBuffer(name string, capacity int) *Buffer {
+func NewBuffer(name string, alias string, capacity int) *Buffer {
 	b := &Buffer{
 		buf:   make([]telegraf.Metric, capacity),
 		first: 0,
@@ -43,27 +43,27 @@ func NewBuffer(name string, capacity int) *Buffer {
 		MetricsAdded: selfstat.Register(
 			"write",
 			"metrics_added",
-			map[string]string{"output": name},
+			map[string]string{"output": name, "alias": alias},
 		),
 		MetricsWritten: selfstat.Register(
 			"write",
 			"metrics_written",
-			map[string]string{"output": name},
+			map[string]string{"output": name, "alias": alias},
 		),
 		MetricsDropped: selfstat.Register(
 			"write",
 			"metrics_dropped",
-			map[string]string{"output": name},
+			map[string]string{"output": name, "alias": alias},
 		),
 		BufferSize: selfstat.Register(
 			"write",
 			"buffer_size",
-			map[string]string{"output": name},
+			map[string]string{"output": name, "alias": alias},
 		),
 		BufferLimit: selfstat.Register(
 			"write",
 			"buffer_limit",
-			map[string]string{"output": name},
+			map[string]string{"output": name, "alias": alias},
 		),
 	}
 	b.BufferSize.Set(int64(0))
diff --git a/internal/models/buffer_test.go b/internal/models/buffer_test.go
index bc19680d1..fa8fb1668 100644
--- a/internal/models/buffer_test.go
+++ b/internal/models/buffer_test.go
@@ -49,7 +49,7 @@ func MetricTime(sec int64) telegraf.Metric {
 }
 
 func BenchmarkAddMetrics(b *testing.B) {
-	buf := NewBuffer("test", 10000)
+	buf := NewBuffer("test", "", 10000)
 	m := Metric()
 	for n := 0; n < b.N; n++ {
 		buf.Add(m)
@@ -64,14 +64,14 @@ func setup(b *Buffer) *Buffer {
 }
 
 func TestBuffer_LenEmpty(t *testing.T) {
-	b := setup(NewBuffer("test", 5))
+	b := setup(NewBuffer("test", "", 5))
 
 	require.Equal(t, 0, b.Len())
 }
 
 func TestBuffer_LenOne(t *testing.T) {
 	m := Metric()
-	b := setup(NewBuffer("test", 5))
+	b := setup(NewBuffer("test", "", 5))
 	b.Add(m)
 
 	require.Equal(t, 1, b.Len())
@@ -79,7 +79,7 @@ func TestBuffer_LenOne(t *testing.T) {
 
 func TestBuffer_LenFull(t *testing.T) {
 	m := Metric()
-	b := setup(NewBuffer("test", 5))
+	b := setup(NewBuffer("test", "", 5))
 	b.Add(m, m, m, m, m)
 
 	require.Equal(t, 5, b.Len())
@@ -87,7 +87,7 @@ func TestBuffer_LenFull(t *testing.T) {
 
 func TestBuffer_LenOverfill(t *testing.T) {
 	m := Metric()
-	b := setup(NewBuffer("test", 5))
+	b := setup(NewBuffer("test", "", 5))
 	setup(b)
 	b.Add(m, m, m, m, m, m)
 
@@ -95,14 +95,14 @@ func TestBuffer_LenOverfill(t *testing.T) {
 }
 
 func TestBuffer_BatchLenZero(t *testing.T) {
-	b := setup(NewBuffer("test", 5))
+	b := setup(NewBuffer("test", "", 5))
 	batch := b.Batch(0)
 
 	require.Len(t, batch, 0)
 }
 
 func TestBuffer_BatchLenBufferEmpty(t *testing.T) {
-	b := setup(NewBuffer("test", 5))
+	b := setup(NewBuffer("test", "", 5))
 	batch := b.Batch(2)
 
 	require.Len(t, batch, 0)
@@ -110,7 +110,7 @@ func TestBuffer_BatchLenBufferEmpty(t *testing.T) {
 
 func TestBuffer_BatchLenUnderfill(t *testing.T) {
 	m := Metric()
-	b := setup(NewBuffer("test", 5))
+	b := setup(NewBuffer("test", "", 5))
 	b.Add(m)
 	batch := b.Batch(2)
 
@@ -119,7 +119,7 @@ func TestBuffer_BatchLenUnderfill(t *testing.T) {
 
 func TestBuffer_BatchLenFill(t *testing.T) {
 	m := Metric()
-	b := setup(NewBuffer("test", 5))
+	b := setup(NewBuffer("test", "", 5))
 	b.Add(m, m, m)
 	batch := b.Batch(2)
 	require.Len(t, batch, 2)
@@ -127,7 +127,7 @@ func TestBuffer_BatchLenFill(t *testing.T) {
 
 func TestBuffer_BatchLenExact(t *testing.T) {
 	m := Metric()
-	b := setup(NewBuffer("test", 5))
+	b := setup(NewBuffer("test", "", 5))
 	b.Add(m, m)
 	batch := b.Batch(2)
 	require.Len(t, batch, 2)
@@ -135,7 +135,7 @@ func TestBuffer_BatchLenExact(t *testing.T) {
 
 func TestBuffer_BatchLenLargerThanBuffer(t *testing.T) {
 	m := Metric()
-	b := setup(NewBuffer("test", 5))
+	b := setup(NewBuffer("test", "", 5))
 	b.Add(m, m, m, m, m)
 	batch := b.Batch(6)
 	require.Len(t, batch, 5)
@@ -143,7 +143,7 @@ func TestBuffer_BatchLenLargerThanBuffer(t *testing.T) {
 
 func TestBuffer_BatchWrap(t *testing.T) {
 	m := Metric()
-	b := setup(NewBuffer("test", 5))
+	b := setup(NewBuffer("test", "", 5))
 	b.Add(m, m, m, m, m)
 	batch := b.Batch(2)
 	b.Accept(batch)
@@ -153,7 +153,7 @@ func TestBuffer_BatchWrap(t *testing.T) {
 }
 
 func TestBuffer_BatchLatest(t *testing.T) {
-	b := setup(NewBuffer("test", 4))
+	b := setup(NewBuffer("test", "", 4))
 	b.Add(MetricTime(1))
 	b.Add(MetricTime(2))
 	b.Add(MetricTime(3))
@@ -167,7 +167,7 @@ func TestBuffer_BatchLatest(t *testing.T) {
 }
 
 func TestBuffer_BatchLatestWrap(t *testing.T) {
-	b := setup(NewBuffer("test", 4))
+	b := setup(NewBuffer("test", "", 4))
 	b.Add(MetricTime(1))
 	b.Add(MetricTime(2))
 	b.Add(MetricTime(3))
@@ -183,7 +183,7 @@ func TestBuffer_BatchLatestWrap(t *testing.T) {
 }
 
 func TestBuffer_MultipleBatch(t *testing.T) {
-	b := setup(NewBuffer("test", 10))
+	b := setup(NewBuffer("test", "", 10))
 	b.Add(MetricTime(1))
 	b.Add(MetricTime(2))
 	b.Add(MetricTime(3))
@@ -209,7 +209,7 @@ func TestBuffer_MultipleBatch(t *testing.T) {
 }
 
 func TestBuffer_RejectWithRoom(t *testing.T) {
-	b := setup(NewBuffer("test", 5))
+	b := setup(NewBuffer("test", "", 5))
 	b.Add(MetricTime(1))
 	b.Add(MetricTime(2))
 	b.Add(MetricTime(3))
@@ -232,7 +232,7 @@ func TestBuffer_RejectWithRoom(t *testing.T) {
 }
 
 func TestBuffer_RejectNothingNewFull(t *testing.T) {
-	b := setup(NewBuffer("test", 5))
+	b := setup(NewBuffer("test", "", 5))
 	b.Add(MetricTime(1))
 	b.Add(MetricTime(2))
 	b.Add(MetricTime(3))
@@ -255,7 +255,7 @@ func TestBuffer_RejectNothingNewFull(t *testing.T) {
 }
 
 func TestBuffer_RejectNoRoom(t *testing.T) {
-	b := setup(NewBuffer("test", 5))
+	b := setup(NewBuffer("test", "", 5))
 	b.Add(MetricTime(1))
 
 	b.Add(MetricTime(2))
@@ -284,7 +284,7 @@ func TestBuffer_RejectNoRoom(t *testing.T) {
 }
 
 func TestBuffer_RejectRoomExact(t *testing.T) {
-	b := setup(NewBuffer("test", 5))
+	b := setup(NewBuffer("test", "", 5))
 	b.Add(MetricTime(1))
 	b.Add(MetricTime(2))
 	batch := b.Batch(2)
@@ -308,7 +308,7 @@ func TestBuffer_RejectRoomExact(t *testing.T) {
 }
 
 func TestBuffer_RejectRoomOverwriteOld(t *testing.T) {
-	b := setup(NewBuffer("test", 5))
+	b := setup(NewBuffer("test", "", 5))
 	b.Add(MetricTime(1))
 	b.Add(MetricTime(2))
 	b.Add(MetricTime(3))
@@ -333,7 +333,7 @@ func TestBuffer_RejectRoomOverwriteOld(t *testing.T) {
 }
 
 func TestBuffer_RejectPartialRoom(t *testing.T) {
-	b := setup(NewBuffer("test", 5))
+	b := setup(NewBuffer("test", "", 5))
 	b.Add(MetricTime(1))
 
 	b.Add(MetricTime(2))
@@ -360,7 +360,7 @@ func TestBuffer_RejectPartialRoom(t *testing.T) {
 }
 
 func TestBuffer_RejectNewMetricsWrapped(t *testing.T) {
-	b := setup(NewBuffer("test", 5))
+	b := setup(NewBuffer("test", "", 5))
 	b.Add(MetricTime(1))
 	b.Add(MetricTime(2))
 	b.Add(MetricTime(3))
@@ -403,7 +403,7 @@ func TestBuffer_RejectNewMetricsWrapped(t *testing.T) {
 }
 
 func TestBuffer_RejectWrapped(t *testing.T) {
-	b := setup(NewBuffer("test", 5))
+	b := setup(NewBuffer("test", "", 5))
 	b.Add(MetricTime(1))
 	b.Add(MetricTime(2))
 	b.Add(MetricTime(3))
@@ -434,7 +434,7 @@ func TestBuffer_RejectWrapped(t *testing.T) {
 }
 
 func TestBuffer_RejectAdjustFirst(t *testing.T) {
-	b := setup(NewBuffer("test", 10))
+	b := setup(NewBuffer("test", "", 10))
 	b.Add(MetricTime(1))
 	b.Add(MetricTime(2))
 	b.Add(MetricTime(3))
@@ -482,7 +482,7 @@ func TestBuffer_RejectAdjustFirst(t *testing.T) {
 
 func TestBuffer_AddDropsOverwrittenMetrics(t *testing.T) {
 	m := Metric()
-	b := setup(NewBuffer("test", 5))
+	b := setup(NewBuffer("test", "", 5))
 
 	b.Add(m, m, m, m, m)
 	b.Add(m, m, m, m, m)
@@ -493,7 +493,7 @@ func TestBuffer_AddDropsOverwrittenMetrics(t *testing.T) {
 
 func TestBuffer_AcceptRemovesBatch(t *testing.T) {
 	m := Metric()
-	b := setup(NewBuffer("test", 5))
+	b := setup(NewBuffer("test", "", 5))
 	b.Add(m, m, m)
 	batch := b.Batch(2)
 	b.Accept(batch)
@@ -502,7 +502,7 @@ func TestBuffer_AcceptRemovesBatch(t *testing.T) {
 
 func TestBuffer_RejectLeavesBatch(t *testing.T) {
 	m := Metric()
-	b := setup(NewBuffer("test", 5))
+	b := setup(NewBuffer("test", "", 5))
 	b.Add(m, m, m)
 	batch := b.Batch(2)
 	b.Reject(batch)
@@ -511,7 +511,7 @@ func TestBuffer_RejectLeavesBatch(t *testing.T) {
 
 func TestBuffer_AcceptWritesOverwrittenBatch(t *testing.T) {
 	m := Metric()
-	b := setup(NewBuffer("test", 5))
+	b := setup(NewBuffer("test", "", 5))
 
 	b.Add(m, m, m, m, m)
 	batch := b.Batch(5)
@@ -524,7 +524,7 @@ func TestBuffer_AcceptWritesOverwrittenBatch(t *testing.T) {
 
 func TestBuffer_BatchRejectDropsOverwrittenBatch(t *testing.T) {
 	m := Metric()
-	b := setup(NewBuffer("test", 5))
+	b := setup(NewBuffer("test", "", 5))
 
 	b.Add(m, m, m, m, m)
 	batch := b.Batch(5)
@@ -537,7 +537,7 @@ func TestBuffer_BatchRejectDropsOverwrittenBatch(t *testing.T) {
 
 func TestBuffer_MetricsOverwriteBatchAccept(t *testing.T) {
 	m := Metric()
-	b := setup(NewBuffer("test", 5))
+	b := setup(NewBuffer("test", "", 5))
 
 	b.Add(m, m, m, m, m)
 	batch := b.Batch(3)
@@ -549,7 +549,7 @@ func TestBuffer_MetricsOverwriteBatchAccept(t *testing.T) {
 
 func TestBuffer_MetricsOverwriteBatchReject(t *testing.T) {
 	m := Metric()
-	b := setup(NewBuffer("test", 5))
+	b := setup(NewBuffer("test", "", 5))
 
 	b.Add(m, m, m, m, m)
 	batch := b.Batch(3)
@@ -561,7 +561,7 @@ func TestBuffer_MetricsOverwriteBatchReject(t *testing.T) {
 
 func TestBuffer_MetricsBatchAcceptRemoved(t *testing.T) {
 	m := Metric()
-	b := setup(NewBuffer("test", 5))
+	b := setup(NewBuffer("test", "", 5))
 
 	b.Add(m, m, m, m, m)
 	batch := b.Batch(3)
@@ -573,7 +573,7 @@ func TestBuffer_MetricsBatchAcceptRemoved(t *testing.T) {
 
 func TestBuffer_WrapWithBatch(t *testing.T) {
 	m := Metric()
-	b := setup(NewBuffer("test", 5))
+	b := setup(NewBuffer("test", "", 5))
 
 	b.Add(m, m, m)
 	b.Batch(3)
@@ -584,7 +584,7 @@ func TestBuffer_WrapWithBatch(t *testing.T) {
 
 func TestBuffer_BatchNotRemoved(t *testing.T) {
 	m := Metric()
-	b := setup(NewBuffer("test", 5))
+	b := setup(NewBuffer("test", "", 5))
 	b.Add(m, m, m, m, m)
 	b.Batch(2)
 	require.Equal(t, 5, b.Len())
@@ -592,7 +592,7 @@ func TestBuffer_BatchNotRemoved(t *testing.T) {
 
 func TestBuffer_BatchRejectAcceptNoop(t *testing.T) {
 	m := Metric()
-	b := setup(NewBuffer("test", 5))
+	b := setup(NewBuffer("test", "", 5))
 	b.Add(m, m, m, m, m)
 	batch := b.Batch(2)
 	b.Reject(batch)
@@ -608,7 +608,7 @@ func TestBuffer_AcceptCallsMetricAccept(t *testing.T) {
 			accept++
 		},
 	}
-	b := setup(NewBuffer("test", 5))
+	b := setup(NewBuffer("test", "", 5))
 	b.Add(mm, mm, mm)
 	batch := b.Batch(2)
 	b.Accept(batch)
@@ -623,7 +623,7 @@ func TestBuffer_AddCallsMetricRejectWhenNoBatch(t *testing.T) {
 			reject++
 		},
 	}
-	b := setup(NewBuffer("test", 5))
+	b := setup(NewBuffer("test", "", 5))
 	setup(b)
 	b.Add(mm, mm, mm, mm, mm)
 	b.Add(mm, mm)
@@ -638,7 +638,7 @@ func TestBuffer_AddCallsMetricRejectWhenNotInBatch(t *testing.T) {
 			reject++
 		},
 	}
-	b := setup(NewBuffer("test", 5))
+	b := setup(NewBuffer("test", "", 5))
 	setup(b)
 	b.Add(mm, mm, mm, mm, mm)
 	batch := b.Batch(2)
@@ -656,7 +656,7 @@ func TestBuffer_RejectCallsMetricRejectWithOverwritten(t *testing.T) {
 			reject++
 		},
 	}
-	b := setup(NewBuffer("test", 5))
+	b := setup(NewBuffer("test", "", 5))
 	b.Add(mm, mm, mm, mm, mm)
 	batch := b.Batch(5)
 	b.Add(mm, mm)
@@ -673,7 +673,7 @@ func TestBuffer_AddOverwriteAndReject(t *testing.T) {
 			reject++
 		},
 	}
-	b := setup(NewBuffer("test", 5))
+	b := setup(NewBuffer("test", "", 5))
 	b.Add(mm, mm, mm, mm, mm)
 	batch := b.Batch(5)
 	b.Add(mm, mm, mm, mm, mm)
@@ -697,7 +697,7 @@ func TestBuffer_AddOverwriteAndRejectOffset(t *testing.T) {
 			accept++
 		},
 	}
-	b := setup(NewBuffer("test", 5))
+	b := setup(NewBuffer("test", "", 5))
 	b.Add(mm, mm, mm)
 	b.Add(mm, mm, mm, mm)
 	require.Equal(t, 2, reject)
@@ -716,7 +716,7 @@ func TestBuffer_AddOverwriteAndRejectOffset(t *testing.T) {
 }
 
 func TestBuffer_RejectEmptyBatch(t *testing.T) {
-	b := setup(NewBuffer("test", 5))
+	b := setup(NewBuffer("test", "", 5))
 	batch := b.Batch(2)
 	b.Add(MetricTime(1))
 	b.Reject(batch)
diff --git a/internal/models/running_output.go b/internal/models/running_output.go
index c8167bac6..282c2d23b 100644
--- a/internal/models/running_output.go
+++ b/internal/models/running_output.go
@@ -79,7 +79,7 @@ func NewRunningOutput(
 	}
 
 	ro := &RunningOutput{
-		buffer:            NewBuffer(config.LogName(), bufferLimit),
+		buffer:            NewBuffer(config.Name, config.Alias, bufferLimit),
 		BatchReady:        make(chan time.Time, 1),
 		Output:            output,
 		Config:            config,
@@ -101,13 +101,6 @@ func NewRunningOutput(
 	return ro
 }
 
-func (c *OutputConfig) LogName() string {
-	if c.Alias == "" {
-		return c.Name
-	}
-	return c.Name + "::" + c.Alias
-}
-
 func (r *RunningOutput) LogName() string {
 	return logName("outputs", r.Config.Name, r.Config.Alias)
 }
diff --git a/plugins/outputs/influxdb/http.go b/plugins/outputs/influxdb/http.go
index c7c29a638..9497cadcc 100644
--- a/plugins/outputs/influxdb/http.go
+++ b/plugins/outputs/influxdb/http.go
@@ -100,7 +100,7 @@ type HTTPConfig struct {
 
 	InfluxUintSupport bool `toml:"influx_uint_support"`
 	Serializer        *influx.Serializer
-	log               telegraf.Logger
+	Log               telegraf.Logger
 }
 
 type httpClient struct {
@@ -176,7 +176,7 @@ func NewHTTPClient(config HTTPConfig) (*httpClient, error) {
 		},
 		createdDatabases: make(map[string]bool),
 		config:           config,
-		log:              config.log,
+		log:              config.Log,
 	}
 	return client, nil
 }
@@ -186,10 +186,6 @@ func (c *httpClient) URL() string {
 	return c.config.URL.String()
 }
 
-func (c *httpClient) SetLogger(log telegraf.Logger) {
-	c.log = log
-}
-
 // Database returns the default database that this client connects too.
 func (c *httpClient) Database() string {
 	return c.config.Database
diff --git a/plugins/outputs/influxdb/http_test.go b/plugins/outputs/influxdb/http_test.go
index 98ec4ef5b..e4acb1641 100644
--- a/plugins/outputs/influxdb/http_test.go
+++ b/plugins/outputs/influxdb/http_test.go
@@ -262,6 +262,7 @@ func TestHTTP_Write(t *testing.T) {
 			config: influxdb.HTTPConfig{
 				URL:      u,
 				Database: "telegraf",
+				Log:      testutil.Logger{},
 			},
 			queryHandlerFunc: func(t *testing.T, w http.ResponseWriter, r *http.Request) {
 				require.Equal(t, r.FormValue("db"), "telegraf")
@@ -278,6 +279,7 @@ func TestHTTP_Write(t *testing.T) {
 				Database: "telegraf",
 				Username: "guy",
 				Password: "smiley",
+				Log:      testutil.Logger{},
 			},
 			queryHandlerFunc: func(t *testing.T, w http.ResponseWriter, r *http.Request) {
 				username, password, ok := r.BasicAuth()
@@ -293,6 +295,7 @@ func TestHTTP_Write(t *testing.T) {
 				URL:       u,
 				Database:  "telegraf",
 				UserAgent: "telegraf",
+				Log:       testutil.Logger{},
 			},
 			queryHandlerFunc: func(t *testing.T, w http.ResponseWriter, r *http.Request) {
 				require.Equal(t, r.Header.Get("User-Agent"), "telegraf")
@@ -304,6 +307,7 @@ func TestHTTP_Write(t *testing.T) {
 			config: influxdb.HTTPConfig{
 				URL:      u,
 				Database: "telegraf",
+				Log:      testutil.Logger{},
 			},
 			queryHandlerFunc: func(t *testing.T, w http.ResponseWriter, r *http.Request) {
 				require.Equal(t, r.Header.Get("User-Agent"), "Telegraf/1.2.3")
@@ -314,6 +318,7 @@ func TestHTTP_Write(t *testing.T) {
 			name: "default database",
 			config: influxdb.HTTPConfig{
 				URL: u,
+				Log: testutil.Logger{},
 			},
 			queryHandlerFunc: func(t *testing.T, w http.ResponseWriter, r *http.Request) {
 				require.Equal(t, "telegraf", r.FormValue("db"))
@@ -328,6 +333,7 @@ func TestHTTP_Write(t *testing.T) {
 					"A": "B",
 					"C": "D",
 				},
+				Log: testutil.Logger{},
 			},
 			queryHandlerFunc: func(t *testing.T, w http.ResponseWriter, r *http.Request) {
 				require.Equal(t, r.Header.Get("A"), "B")
@@ -341,6 +347,7 @@ func TestHTTP_Write(t *testing.T) {
 				URL:             u,
 				Database:        "telegraf",
 				RetentionPolicy: "foo",
+				Log:             testutil.Logger{},
 			},
 			queryHandlerFunc: func(t *testing.T, w http.ResponseWriter, r *http.Request) {
 				require.Equal(t, "foo", r.FormValue("rp"))
@@ -353,6 +360,7 @@ func TestHTTP_Write(t *testing.T) {
 				URL:         u,
 				Database:    "telegraf",
 				Consistency: "all",
+				Log:         testutil.Logger{},
 			},
 			queryHandlerFunc: func(t *testing.T, w http.ResponseWriter, r *http.Request) {
 				require.Equal(t, "all", r.FormValue("consistency"))
@@ -364,6 +372,7 @@ func TestHTTP_Write(t *testing.T) {
 			config: influxdb.HTTPConfig{
 				URL:      u,
 				Database: "telegraf",
+				Log:      testutil.Logger{},
 			},
 			queryHandlerFunc: func(t *testing.T, w http.ResponseWriter, r *http.Request) {
 				w.WriteHeader(http.StatusBadRequest)
@@ -378,6 +387,7 @@ func TestHTTP_Write(t *testing.T) {
 			config: influxdb.HTTPConfig{
 				URL:      u,
 				Database: "telegraf",
+				Log:      testutil.Logger{},
 			},
 			queryHandlerFunc: func(t *testing.T, w http.ResponseWriter, r *http.Request) {
 				w.WriteHeader(http.StatusBadRequest)
@@ -392,6 +402,7 @@ func TestHTTP_Write(t *testing.T) {
 			config: influxdb.HTTPConfig{
 				URL:      u,
 				Database: "telegraf",
+				Log:      testutil.Logger{},
 			},
 			queryHandlerFunc: func(t *testing.T, w http.ResponseWriter, r *http.Request) {
 				w.WriteHeader(http.StatusBadRequest)
@@ -406,6 +417,7 @@ func TestHTTP_Write(t *testing.T) {
 			config: influxdb.HTTPConfig{
 				URL:      u,
 				Database: "telegraf",
+				Log:      testutil.Logger{},
 			},
 			queryHandlerFunc: func(t *testing.T, w http.ResponseWriter, r *http.Request) {
 				w.WriteHeader(http.StatusBadGateway)
@@ -423,6 +435,7 @@ func TestHTTP_Write(t *testing.T) {
 			config: influxdb.HTTPConfig{
 				URL:      u,
 				Database: "telegraf",
+				Log:      testutil.Logger{},
 			},
 			queryHandlerFunc: func(t *testing.T, w http.ResponseWriter, r *http.Request) {
 				w.WriteHeader(http.StatusServiceUnavailable)
@@ -472,7 +485,6 @@ func TestHTTP_Write(t *testing.T) {
 
 			client, err := influxdb.NewHTTPClient(tt.config)
 			require.NoError(t, err)
-			client.SetLogger(testutil.Logger{})
 			err = client.Write(ctx, metrics)
 			if tt.errFunc != nil {
 				tt.errFunc(t, err)
@@ -525,6 +537,7 @@ func TestHTTP_WritePathPrefix(t *testing.T) {
 	config := influxdb.HTTPConfig{
 		URL:      u,
 		Database: "telegraf",
+		Log:      testutil.Logger{},
 	}
 
 	client, err := influxdb.NewHTTPClient(config)
@@ -579,6 +592,7 @@ func TestHTTP_WriteContentEncodingGzip(t *testing.T) {
 		URL:             u,
 		Database:        "telegraf",
 		ContentEncoding: "gzip",
+		Log:             testutil.Logger{},
 	}
 
 	client, err := influxdb.NewHTTPClient(config)
@@ -618,6 +632,7 @@ func TestHTTP_UnixSocket(t *testing.T) {
 			config: influxdb.HTTPConfig{
 				URL:      &url.URL{Scheme: "unix", Path: sock},
 				Database: "xyzzy",
+				Log:      testutil.Logger{},
 			},
 			queryHandlerFunc: func(t *testing.T, w http.ResponseWriter, r *http.Request) {
 				require.Equal(t, `CREATE DATABASE "xyzzy"`, r.FormValue("q"))
diff --git a/plugins/outputs/influxdb/influxdb.go b/plugins/outputs/influxdb/influxdb.go
index 0a6f66696..6af6dc173 100644
--- a/plugins/outputs/influxdb/influxdb.go
+++ b/plugins/outputs/influxdb/influxdb.go
@@ -27,7 +27,6 @@ type Client interface {
 	Database() string
 	URL() string
 	Close()
-	SetLogger(telegraf.Logger)
 }
 
 // InfluxDB struct is the primary data structure for the plugin
@@ -172,8 +171,6 @@ func (i *InfluxDB) Connect() error {
 				return err
 			}
 
-			c.SetLogger(i.Log)
-
 			i.clients = append(i.clients, c)
 		case "http", "https", "unix":
 			c, err := i.httpClient(ctx, parts, proxy)
@@ -181,8 +178,6 @@ func (i *InfluxDB) Connect() error {
 				return err
 			}
 
-			c.SetLogger(i.Log)
-
 			i.clients = append(i.clients, c)
 		default:
 			return fmt.Errorf("unsupported scheme [%q]: %q", u, parts.Scheme)
@@ -243,6 +238,7 @@ func (i *InfluxDB) udpClient(url *url.URL) (Client, error) {
 		URL:            url,
 		MaxPayloadSize: int(i.UDPPayload.Size),
 		Serializer:     i.serializer,
+		Log:            i.Log,
 	}
 
 	c, err := i.CreateUDPClientF(config)
@@ -276,6 +272,7 @@ func (i *InfluxDB) httpClient(ctx context.Context, url *url.URL, proxy *url.URL)
 		RetentionPolicy:      i.RetentionPolicy,
 		Consistency:          i.WriteConsistency,
 		Serializer:           i.serializer,
+		Log:                  i.Log,
 	}
 
 	c, err := i.CreateHTTPClientF(config)
diff --git a/plugins/outputs/influxdb/udp.go b/plugins/outputs/influxdb/udp.go
index 76fdb7862..a50516c97 100644
--- a/plugins/outputs/influxdb/udp.go
+++ b/plugins/outputs/influxdb/udp.go
@@ -60,6 +60,7 @@ func NewUDPClient(config UDPConfig) (*udpClient, error) {
 		url:        config.URL,
 		serializer: serializer,
 		dialer:     dialer,
+		log:        config.Log,
 	}
 	return client, nil
 }
@@ -69,18 +70,13 @@ type udpClient struct {
 	dialer     Dialer
 	serializer *influx.Serializer
 	url        *url.URL
-
-	log telegraf.Logger
+	log        telegraf.Logger
 }
 
 func (c *udpClient) URL() string {
 	return c.url.String()
 }
 
-func (c *udpClient) SetLogger(log telegraf.Logger) {
-	c.log = log
-}
-
 func (c *udpClient) Database() string {
 	return ""
 }
diff --git a/plugins/outputs/influxdb/udp_test.go b/plugins/outputs/influxdb/udp_test.go
index 61c64ff77..2e60c586c 100644
--- a/plugins/outputs/influxdb/udp_test.go
+++ b/plugins/outputs/influxdb/udp_test.go
@@ -79,7 +79,6 @@ func TestUDP_URL(t *testing.T) {
 	}
 
 	client, err := influxdb.NewUDPClient(config)
-	client.SetLogger(testutil.Logger{})
 	require.NoError(t, err)
 
 	require.Equal(t, u.String(), client.URL())
@@ -103,7 +102,6 @@ func TestUDP_Simple(t *testing.T) {
 		},
 	}
 	client, err := influxdb.NewUDPClient(config)
-	client.SetLogger(testutil.Logger{})
 	require.NoError(t, err)
 
 	ctx := context.Background()
@@ -130,7 +128,6 @@ func TestUDP_DialError(t *testing.T) {
 		},
 	}
 	client, err := influxdb.NewUDPClient(config)
-	client.SetLogger(testutil.Logger{})
 	require.NoError(t, err)
 
 	ctx := context.Background()
@@ -160,7 +157,6 @@ func TestUDP_WriteError(t *testing.T) {
 		},
 	}
 	client, err := influxdb.NewUDPClient(config)
-	client.SetLogger(testutil.Logger{})
 	require.NoError(t, err)
 
 	ctx := context.Background()
@@ -187,6 +183,7 @@ func TestUDP_ErrorLogging(t *testing.T) {
 						return conn, nil
 					},
 				},
+				Log: testutil.Logger{},
 			},
 			metrics:     []telegraf.Metric{getMetric()},
 			logContains: `could not serialize metric: "cpu": need more space`,
@@ -201,6 +198,7 @@ func TestUDP_ErrorLogging(t *testing.T) {
 						return conn, nil
 					},
 				},
+				Log: testutil.Logger{},
 			},
 			metrics: []telegraf.Metric{
 				func() telegraf.Metric {
@@ -224,7 +222,6 @@ func TestUDP_ErrorLogging(t *testing.T) {
 			log.SetOutput(&b)
 
 			client, err := influxdb.NewUDPClient(tt.config)
-			client.SetLogger(testutil.Logger{})
 			require.NoError(t, err)
 
 			ctx := context.Background()
@@ -268,7 +265,6 @@ func TestUDP_WriteWithRealConn(t *testing.T) {
 		URL: u,
 	}
 	client, err := influxdb.NewUDPClient(config)
-	client.SetLogger(testutil.Logger{})
 	require.NoError(t, err)
 
 	ctx := context.Background()