From 31407141cfefd120c0fb879ef4d59a8bed733d91 Mon Sep 17 00:00:00 2001
From: Jakub Warczarek <jakub.warczarek@gmail.com>
Date: Fri, 3 Jul 2020 18:01:22 +0200
Subject: [PATCH] Fix data race in plugin output pubsub tests (#7782)

---
 plugins/outputs/cloud_pubsub/pubsub_test.go   | 10 ++++++----
 plugins/outputs/cloud_pubsub/topic_stubbed.go | 12 +++++++++---
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/plugins/outputs/cloud_pubsub/pubsub_test.go b/plugins/outputs/cloud_pubsub/pubsub_test.go
index 76eb518d7..6911ef139 100644
--- a/plugins/outputs/cloud_pubsub/pubsub_test.go
+++ b/plugins/outputs/cloud_pubsub/pubsub_test.go
@@ -3,8 +3,10 @@ package cloud_pubsub
 import (
 	"testing"
 
-	"cloud.google.com/go/pubsub"
 	"encoding/base64"
+
+	"cloud.google.com/go/pubsub"
+
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/plugins/parsers"
 	"github.com/influxdata/telegraf/testutil"
@@ -73,7 +75,7 @@ func TestPubSub_WriteMultiple(t *testing.T) {
 	for _, testM := range testMetrics {
 		verifyRawMetricPublished(t, testM.m, topic.published)
 	}
-	assert.Equalf(t, 1, topic.bundleCount, "unexpected bundle count")
+	assert.Equalf(t, 1, topic.getBundleCount(), "unexpected bundle count")
 }
 
 func TestPubSub_WriteOverCountThreshold(t *testing.T) {
@@ -97,7 +99,7 @@ func TestPubSub_WriteOverCountThreshold(t *testing.T) {
 	for _, testM := range testMetrics {
 		verifyRawMetricPublished(t, testM.m, topic.published)
 	}
-	assert.Equalf(t, 2, topic.bundleCount, "unexpected bundle count")
+	assert.Equalf(t, 2, topic.getBundleCount(), "unexpected bundle count")
 }
 
 func TestPubSub_WriteOverByteThreshold(t *testing.T) {
@@ -120,7 +122,7 @@ func TestPubSub_WriteOverByteThreshold(t *testing.T) {
 	for _, testM := range testMetrics {
 		verifyRawMetricPublished(t, testM.m, topic.published)
 	}
-	assert.Equalf(t, 2, topic.bundleCount, "unexpected bundle count")
+	assert.Equalf(t, 2, topic.getBundleCount(), "unexpected bundle count")
 }
 
 func TestPubSub_WriteBase64Single(t *testing.T) {
diff --git a/plugins/outputs/cloud_pubsub/topic_stubbed.go b/plugins/outputs/cloud_pubsub/topic_stubbed.go
index d78d4fbd4..e23a76536 100644
--- a/plugins/outputs/cloud_pubsub/topic_stubbed.go
+++ b/plugins/outputs/cloud_pubsub/topic_stubbed.go
@@ -9,8 +9,9 @@ import (
 	"testing"
 	"time"
 
-	"cloud.google.com/go/pubsub"
 	"encoding/base64"
+
+	"cloud.google.com/go/pubsub"
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal"
 	"github.com/influxdata/telegraf/plugins/parsers"
@@ -123,8 +124,7 @@ func (t *stubTopic) Publish(ctx context.Context, msg *pubsub.Message) publishRes
 	}
 
 	bundled := &bundledMsg{msg, r}
-	err := t.bundler.Add(bundled, len(msg.Data))
-	if err != nil {
+	if err := t.bundler.Add(bundled, len(msg.Data)); err != nil {
 		t.Fatalf("unexpected error while adding to bundle: %v", err)
 	}
 	return r
@@ -210,3 +210,9 @@ func (r *stubResult) Get(ctx context.Context) (string, error) {
 		return fmt.Sprintf("id-%s", r.metricIds[0]), nil
 	}
 }
+
+func (t *stubTopic) getBundleCount() int {
+	t.bLock.Lock()
+	defer t.bLock.Unlock()
+	return t.bundleCount
+}