Merge branch 'main' into codesmon/exporter/azuremonitor/persistent_queue

open-telemetry · Nov 7, 2023 · b7100f4 · b7100f4
2 parents 1cf091d + dbfa694
commit b7100f4
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/receiver/kafkametricsreceiver/go.mod b/receiver/kafkametricsreceiver/go.mod
@@ -5,6 +5,7 @@ go 1.20
 require (
 	github.com/IBM/sarama v1.41.3
 	github.com/google/go-cmp v0.6.0
+	github.com/google/uuid v1.4.0
 	github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.88.0
 	github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka v0.88.0
 	github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.88.0
@@ -44,7 +45,6 @@ require (
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
-	github.com/google/uuid v1.4.0 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
 	github.com/hashicorp/go-uuid v1.0.3 // indirect

diff --git a/receiver/kafkametricsreceiver/integration_test.go b/receiver/kafkametricsreceiver/integration_test.go
@@ -11,6 +11,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/google/uuid"
 	"github.com/testcontainers/testcontainers-go"
 	"github.com/testcontainers/testcontainers-go/wait"
 	"go.opentelemetry.io/collector/component"
@@ -20,13 +21,16 @@ import (
 )
 
 const (
-	networkName   = "kafka-network"
 	kafkaPort     = "9092"
 	zookeeperPort = "2181"
-	zookeeperHost = "zookeeper"
 )
 
 func TestIntegration(t *testing.T) {
+	uid := fmt.Sprintf("-%s", uuid.NewString())
+	networkName := "kafka-network" + uid
+	zkContainerName := "zookeeper" + uid
+	kafkaContainerName := "kafka" + uid
+
 	scraperinttest.NewIntegrationTest(
 		NewFactory(),
 		scraperinttest.WithNetworkRequest(
@@ -37,23 +41,23 @@ func TestIntegration(t *testing.T) {
 		),
 		scraperinttest.WithContainerRequest(
 			testcontainers.ContainerRequest{
-				Name:         "zookeeper",
+				Name:         zkContainerName,
 				Image:        "ubuntu/zookeeper:3.1-22.04_beta",
 				Networks:     []string{networkName},
-				Hostname:     zookeeperHost,
+				Hostname:     zkContainerName,
 				ExposedPorts: []string{zookeeperPort},
 				WaitingFor: wait.ForAll(
 					wait.ForListeningPort(zookeeperPort).WithStartupTimeout(2 * time.Minute),
 				),
 			}),
 		scraperinttest.WithContainerRequest(
 			testcontainers.ContainerRequest{
-				Name:         "kafka",
+				Name:         kafkaContainerName,
 				Image:        "ubuntu/kafka:3.1-22.04_beta",
 				Networks:     []string{networkName},
 				ExposedPorts: []string{kafkaPort},
 				Env: map[string]string{
-					"ZOOKEEPER_HOST": zookeeperHost,
+					"ZOOKEEPER_HOST": zkContainerName,
 					"ZOOKEEPER_PORT": zookeeperPort,
 				},
 				WaitingFor: wait.ForAll(
@@ -65,8 +69,8 @@ func TestIntegration(t *testing.T) {
 				rCfg := cfg.(*Config)
 				rCfg.CollectionInterval = 5 * time.Second
 				rCfg.Brokers = []string{fmt.Sprintf("%s:%s",
-					ci.HostForNamedContainer(t, "kafka"),
-					ci.MappedPortForNamedContainer(t, "kafka", kafkaPort))}
+					ci.HostForNamedContainer(t, kafkaContainerName),
+					ci.MappedPortForNamedContainer(t, kafkaContainerName, kafkaPort))}
 				rCfg.Scrapers = []string{"brokers", "consumers", "topics"}
 			}),
 		// scraperinttest.WriteExpected(), // TODO remove