[chore] Reenable tests and linting disabled due to testconainters-go …

…issue (#24247) **Description:** Dependent on testcontainers/testcontainers-go#1359 being resolved. Enable tests that were skipped in #24213 **Link to tracking Issue:** #24240
open-telemetry · Jul 21, 2023 · 64e6a5e · 64e6a5e
1 parent 20e9a02
commit 64e6a5e
Show file tree

Hide file tree

Showing 49 changed files with 110 additions and 57 deletions.
diff --git a/extension/observer/dockerobserver/go.mod b/extension/observer/dockerobserver/go.mod
@@ -75,6 +75,9 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/commo
 // see https://github.com/distribution/distribution/issues/3590
 exclude github.com/docker/distribution v2.8.0+incompatible
 
+// see https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/24240
+replace github.com/docker/docker v24.0.4+incompatible => github.com/docker/docker v24.0.5-0.20230719162248-f022632503d1+incompatible
+
 retract (
 	v0.76.2
 	v0.76.1

diff --git a/extension/observer/dockerobserver/go.sum b/extension/observer/dockerobserver/go.sum
diff --git a/extension/observer/dockerobserver/integration_test.go b/extension/observer/dockerobserver/integration_test.go
@@ -36,7 +36,6 @@ func (h *testHost) ReportFatalError(err error) {
 var _ component.Host = (*testHost)(nil)
 
 func TestObserverEmitsEndpointsIntegration(t *testing.T) {
-	t.Skip("See https://github.com/testcontainers/testcontainers-go/issues/1359")
 	image := "docker.io/library/nginx"
 	tag := "1.17"
 
@@ -83,7 +82,6 @@ func TestObserverEmitsEndpointsIntegration(t *testing.T) {
 }
 
 func TestObserverUpdatesEndpointsIntegration(t *testing.T) {
-	t.Skip("See https://github.com/testcontainers/testcontainers-go/issues/1359")
 	image := "docker.io/library/nginx"
 	tag := "1.17"
 
@@ -145,7 +143,6 @@ func TestObserverUpdatesEndpointsIntegration(t *testing.T) {
 }
 
 func TestObserverRemovesEndpointsIntegration(t *testing.T) {
-	t.Skip("See https://github.com/testcontainers/testcontainers-go/issues/1359")
 	image := "docker.io/library/nginx"
 	tag := "1.17"
 
@@ -188,7 +185,6 @@ func TestObserverRemovesEndpointsIntegration(t *testing.T) {
 }
 
 func TestObserverExcludesImagesIntegration(t *testing.T) {
-	t.Skip("See https://github.com/testcontainers/testcontainers-go/issues/1359")
 	ctx := context.Background()
 	req := testcontainers.ContainerRequest{
 		Image:        "docker.io/library/nginx:1.17",

diff --git a/internal/coreinternal/go.mod b/internal/coreinternal/go.mod
@@ -79,3 +79,6 @@ retract (
 replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil => ../../pkg/pdatautil
 
 replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest => ../../pkg/pdatatest
+
+// see https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/24240
+replace github.com/docker/docker v24.0.4+incompatible => github.com/docker/docker v24.0.5-0.20230719162248-f022632503d1+incompatible
diff --git a/internal/coreinternal/go.sum b/internal/coreinternal/go.sum
diff --git a/internal/coreinternal/scraperinttest/scraperint.go b/internal/coreinternal/scraperinttest/scraperint.go
@@ -143,7 +143,6 @@ func (it *IntegrationTest) Run(t *testing.T) {
 }
 
 func (it *IntegrationTest) createNetwork(t *testing.T) testcontainers.Network {
-	t.Skip("See https://github.com/testcontainers/testcontainers-go/issues/1359")
 	var errs error
 
 	var network testcontainers.Network
@@ -164,7 +163,6 @@ func (it *IntegrationTest) createNetwork(t *testing.T) testcontainers.Network {
 }
 
 func (it *IntegrationTest) createContainers(t *testing.T) *ContainerInfo {
-	t.Skip("See https://github.com/testcontainers/testcontainers-go/issues/1359")
 	var wg sync.WaitGroup
 	ci := &ContainerInfo{
 		containers: make(map[string]testcontainers.Container, len(it.containerRequests)),

diff --git a/receiver/aerospikereceiver/go.mod b/receiver/aerospikereceiver/go.mod
@@ -93,3 +93,6 @@ retract (
 	v0.76.1
 	v0.65.0
 )
+
+// see https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/24240
+replace github.com/docker/docker v24.0.4+incompatible => github.com/docker/docker v24.0.5-0.20230719162248-f022632503d1+incompatible
diff --git a/receiver/aerospikereceiver/go.sum b/receiver/aerospikereceiver/go.sum
diff --git a/receiver/apachereceiver/go.mod b/receiver/apachereceiver/go.mod
@@ -101,3 +101,6 @@ retract (
 	v0.76.1
 	v0.65.0
 )
+
+// see https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/24240
+replace github.com/docker/docker v24.0.4+incompatible => github.com/docker/docker v24.0.5-0.20230719162248-f022632503d1+incompatible
diff --git a/receiver/apachereceiver/go.sum b/receiver/apachereceiver/go.sum
diff --git a/receiver/apachesparkreceiver/go.mod b/receiver/apachesparkreceiver/go.mod
@@ -95,3 +95,6 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest
 replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ../../internal/coreinternal
 
 replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil => ../../pkg/pdatautil
+
+// see https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/24240
+replace github.com/docker/docker v24.0.4+incompatible => github.com/docker/docker v24.0.5-0.20230719162248-f022632503d1+incompatible
diff --git a/receiver/apachesparkreceiver/go.sum b/receiver/apachesparkreceiver/go.sum
diff --git a/receiver/bigipreceiver/go.mod b/receiver/bigipreceiver/go.mod
@@ -101,3 +101,6 @@ retract (
 	v0.76.1
 	v0.65.0
 )
+
+// see https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/24240
+replace github.com/docker/docker v24.0.4+incompatible => github.com/docker/docker v24.0.5-0.20230719162248-f022632503d1+incompatible
diff --git a/receiver/bigipreceiver/go.sum b/receiver/bigipreceiver/go.sum
diff --git a/receiver/dockerstatsreceiver/go.mod b/receiver/dockerstatsreceiver/go.mod
@@ -95,3 +95,6 @@ retract (
 	v0.76.1
 	v0.65.0
 )
+
+// see https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/24240
+replace github.com/docker/docker v24.0.4+incompatible => github.com/docker/docker v24.0.5-0.20230719162248-f022632503d1+incompatible
diff --git a/receiver/dockerstatsreceiver/go.sum b/receiver/dockerstatsreceiver/go.sum
diff --git a/receiver/dockerstatsreceiver/integration_test.go b/receiver/dockerstatsreceiver/integration_test.go
@@ -53,7 +53,6 @@ func paramsAndContext(t *testing.T) (rcvr.CreateSettings, context.Context, conte
 }
 
 func createNginxContainer(ctx context.Context, t *testing.T) testcontainers.Container {
-	t.Skip("See https://github.com/testcontainers/testcontainers-go/issues/1359")
 	req := testcontainers.ContainerRequest{
 		Image:        "docker.io/library/nginx:1.17",
 		ExposedPorts: []string{"80/tcp"},
@@ -86,8 +85,6 @@ func hasResourceScopeMetrics(containerID string, metrics []pmetric.Metrics) bool
 
 func TestDefaultMetricsIntegration(t *testing.T) {
 	t.Parallel()
-	// remove nolint when https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/24240 is resolved
-	// nolint:staticcheck
 	params, ctx, cancel := paramsAndContext(t)
 	defer cancel()
 
@@ -142,8 +139,6 @@ func TestMonitoringAddedAndRemovedContainerIntegration(t *testing.T) {
 
 func TestExcludedImageProducesNoMetricsIntegration(t *testing.T) {
 	t.Parallel()
-	// remove nolint when https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/24240 is resolved
-	// nolint:staticcheck
 	params, ctx, cancel := paramsAndContext(t)
 	defer cancel()
 

diff --git a/receiver/elasticsearchreceiver/go.mod b/receiver/elasticsearchreceiver/go.mod
@@ -98,6 +98,9 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil
 
 replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ../../internal/coreinternal
 
+// see https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/24240
+replace github.com/docker/docker v24.0.4+incompatible => github.com/docker/docker v24.0.5-0.20230719162248-f022632503d1+incompatible
+
 retract (
 	v0.76.2
 	v0.76.1

diff --git a/receiver/elasticsearchreceiver/go.sum b/receiver/elasticsearchreceiver/go.sum
diff --git a/receiver/flinkmetricsreceiver/go.mod b/receiver/flinkmetricsreceiver/go.mod
@@ -97,6 +97,9 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil
 
 replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ../../internal/coreinternal
 
+// see https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/24240
+replace github.com/docker/docker v24.0.4+incompatible => github.com/docker/docker v24.0.5-0.20230719162248-f022632503d1+incompatible
+
 retract (
 	v0.76.2
 	v0.76.1

diff --git a/receiver/flinkmetricsreceiver/go.sum b/receiver/flinkmetricsreceiver/go.sum
diff --git a/receiver/iisreceiver/go.mod b/receiver/iisreceiver/go.mod
@@ -83,6 +83,9 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil
 
 replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ../../internal/coreinternal
 
+// see https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/24240
+replace github.com/docker/docker v24.0.4+incompatible => github.com/docker/docker v24.0.5-0.20230719162248-f022632503d1+incompatible
+
 retract (
 	v0.76.2
 	v0.76.1

diff --git a/receiver/iisreceiver/go.sum b/receiver/iisreceiver/go.sum
diff --git a/receiver/jmxreceiver/go.mod b/receiver/jmxreceiver/go.mod
@@ -120,3 +120,6 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/corei
 
 // ambiguous import: found package cloud.google.com/go/compute/metadata in multiple modules
 replace cloud.google.com/go v0.34.0 => cloud.google.com/go v0.110.2
+
+// see https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/24240
+replace github.com/docker/docker v24.0.4+incompatible => github.com/docker/docker v24.0.5-0.20230719162248-f022632503d1+incompatible
diff --git a/receiver/jmxreceiver/go.sum b/receiver/jmxreceiver/go.sum
diff --git a/receiver/kafkametricsreceiver/go.mod b/receiver/kafkametricsreceiver/go.mod
@@ -127,3 +127,6 @@ retract (
 replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil => ../../pkg/pdatautil
 
 replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest => ../../pkg/pdatatest
+
+// see https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/24240
+replace github.com/docker/docker v24.0.4+incompatible => github.com/docker/docker v24.0.5-0.20230719162248-f022632503d1+incompatible