diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 7c8d6ff608..25deba298a 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -87,6 +87,8 @@ services: build: ./envoy ports: - "9901:9901" + networks: + - envoy # Haproxy image for haproxy test: haproxy: image: quay.io/splunko11ytest/haproxy:latest @@ -316,3 +318,7 @@ services: interval: 10s timeout: 5s retries: 5 +networks: + envoy: + driver: bridge + name: envoy diff --git a/tests/receivers/envoy/bundled_test.go b/tests/receivers/envoy/bundled_test.go index 888edc009d..124df52245 100644 --- a/tests/receivers/envoy/bundled_test.go +++ b/tests/receivers/envoy/bundled_test.go @@ -31,7 +31,6 @@ import ( ) func TestEnvoyDockerObserver(t *testing.T) { - t.Skip("Redis data points are also discovered since Redis runs, making this test fail.") testutils.SkipIfNotContainerTest(t) dockerSocket := testutils.CreateDockerSocketProxy(t) require.NoError(t, dockerSocket.Start()) @@ -43,7 +42,9 @@ func TestEnvoyDockerObserver(t *testing.T) { defer tc.PrintLogsOnFailure() defer tc.ShutdownOTLPReceiverSink() _, shutdown := tc.SplunkOtelCollectorContainer("otlp_exporter.yaml", func(collector testutils.Collector) testutils.Collector { - return collector.WithEnv(map[string]string{ + cc := collector.(*testutils.CollectorContainer) + cc.Container = cc.Container.WithNetworks("envoy").WithNetworkMode("bridge") + return cc.WithEnv(map[string]string{ "SPLUNK_DISCOVERY_DURATION": "20s", "SPLUNK_DISCOVERY_LOG_LEVEL": "debug", }).WithArgs(