fix generated tests

Author: jackgopack4

extension/datadogfleetautomationextension/agent_components.go

@@ -30,7 +30,9 @@ func newLogComponent(set component.TelemetrySettings) corelog.Component {
 // The Forwarder sends the payloads to Datadog backend
 func newForwarder(cfg coreconfig.Component, log corelog.Component) defaultforwarder.Forwarder {
 	keysPerDomain := map[string][]string{"https://api." + cfg.GetString("site"): {cfg.GetString("api_key")}}
-	return defaultforwarder.NewDefaultForwarder(cfg, log, defaultforwarder.NewOptions(cfg, log, keysPerDomain))
+	forwarderOptions := defaultforwarder.NewOptions(cfg, log, keysPerDomain)
+	forwarderOptions.DisableAPIKeyChecking = true
+	return defaultforwarder.NewDefaultForwarder(cfg, log, forwarderOptions)
 }
 
 // create compressor with Gzip strategy, best compression

extension/datadogfleetautomationextension/fleetautomationextension.go

@@ -17,6 +17,7 @@ import (
 	"github.com/DataDog/datadog-agent/pkg/util/compression"
 	"github.com/DataDog/datadog-api-client-go/v2/api/datadog"
 	"github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes/source"
+	"github.com/google/uuid"
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/confmap"
 	"go.opentelemetry.io/collector/extension"
@@ -55,6 +56,7 @@ type fleetAutomationExtension struct {
 	ticker                   *time.Ticker
 	done                     chan bool
 	mu                       sync.RWMutex
+	uuid                     uuid.UUID
 
 	buildInfo            component.BuildInfo
 	moduleInfo           service.ModuleInfos
@@ -171,14 +173,7 @@ func (e *fleetAutomationExtension) Start(_ context.Context, host component.Host)
 // It shuts down the HTTP server, stops forwarder, and passes signal on
 // channel to end goroutine that sends the Datadog fleet automation payloads.
 func (e *fleetAutomationExtension) Shutdown(ctx context.Context) error {
-	if e.httpServer != nil {
-		err := e.httpServer.Shutdown(ctx)
-		if err != nil {
-			e.telemetry.Logger.Error("Failed to shutdown local metadata server", zap.Error(err))
-		}
-	}
-	e.done <- true
-	defer close(e.done)
+	e.stopLocalConfigServer()
 	e.forwarder.Stop()
 	e.telemetry.Logger.Info("Stopped Datadog Fleet Automation extension")
 	return nil
@@ -285,7 +280,10 @@ func newExtension(
 		}
 		settings.Logger.Warn(err.Error())
 	}
-
+	extUUID, err := uuid.NewRandom()
+	if err != nil {
+		return nil, err
+	}
 	telemetry := settings.TelemetrySettings
 	// Get Hostname provider
 	sp, err := sourceProviderGetter(telemetry, config.Hostname, 15*time.Second)
@@ -324,6 +322,7 @@ func newExtension(
 		hostnameProvider: sp,
 		hostnameSource:   hostnameSource,
 		hostname:         hostname,
+		uuid:             extUUID,
 	}, nil
 }
 

extension/datadogfleetautomationextension/fleetautomationextension_test.go

@@ -159,6 +159,7 @@ func Test_NotifyConfig(t *testing.T) {
 			}
 			faExt.componentChecker = mcc
 			err = faExt.forwarder.Start()
+			defer faExt.forwarder.Stop()
 			assert.NoError(t, err)
 
 			err = faExt.NotifyConfig(ctx, conf)
@@ -586,24 +587,15 @@ func TestFleetAutomationExtension_Start(t *testing.T) {
 				done:      make(chan bool),
 			}
 
-			// listen on ext.done to avoid panic
-			go func() {
-				<-ext.done
-			}()
-
 			err := ext.Start(ctx, tt.host)
 			if tt.expectedError != "" {
 				assert.Error(t, err)
 				assert.Contains(t, err.Error(), tt.expectedError)
 			} else {
 				assert.NoError(t, err)
 			}
-			if ext.httpServer != nil {
-				err = ext.httpServer.Shutdown(ctx)
-				assert.NoError(t, err)
-			}
-			ext.done <- true
-			defer close(ext.done)
+			err = ext.Shutdown(ctx)
+			assert.NoError(t, err)
 		})
 	}
 }
@@ -654,11 +646,6 @@ func TestFleetAutomationExtension_Shutdown(t *testing.T) {
 				ext.httpServer = tt.httpServer
 			}
 
-			// listen on ext.done to avoid panic
-			go func() {
-				<-ext.done
-			}()
-
 			err := ext.Shutdown(ctx)
 			if tt.expectedError != "" {
 				assert.Error(t, err)

extension/datadogfleetautomationextension/generated_package_test.go

@@ -13,9 +13,9 @@ require (
 	github.com/DataDog/datadog-agent/pkg/metrics v0.64.0-rc.5
 	github.com/DataDog/datadog-agent/pkg/serializer v0.64.0-rc.5
 	github.com/DataDog/datadog-agent/pkg/util/compression v0.64.0-rc.5
-	github.com/DataDog/datadog-agent/pkg/util/uuid v0.64.0-rc.5
 	github.com/DataDog/datadog-api-client-go/v2 v2.35.0
 	github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.26.0
+	github.com/google/uuid v1.6.0
 	github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog v0.121.0
 	github.com/open-telemetry/opentelemetry-collector-contrib/pkg/datadog v0.121.0
 	github.com/stretchr/testify v1.10.0
@@ -27,7 +27,6 @@ require (
 	go.opentelemetry.io/collector/extension/extensioncapabilities v0.121.0
 	go.opentelemetry.io/collector/extension/extensiontest v0.121.0
 	go.opentelemetry.io/collector/service v0.121.0
-	go.uber.org/goleak v1.3.0
 	go.uber.org/zap v1.27.0
 )
 
@@ -64,7 +63,6 @@ require (
 	github.com/DataDog/datadog-agent/pkg/trace v0.64.0-rc.5 // indirect
 	github.com/DataDog/datadog-agent/pkg/util/backoff v0.64.0-rc.5 // indirect
 	github.com/DataDog/datadog-agent/pkg/util/buf v0.64.0-rc.5 // indirect
-	github.com/DataDog/datadog-agent/pkg/util/cache v0.64.0-rc.5 // indirect
 	github.com/DataDog/datadog-agent/pkg/util/common v0.64.0-rc.5 // indirect
 	github.com/DataDog/datadog-agent/pkg/util/executable v0.64.0-rc.5 // indirect
 	github.com/DataDog/datadog-agent/pkg/util/filesystem v0.64.0-rc.5 // indirect
@@ -134,7 +132,6 @@ require (
 	github.com/google/gnostic-models v0.6.8 // indirect
 	github.com/google/go-cmp v0.7.0 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
-	github.com/google/uuid v1.6.0 // indirect
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.0 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect

extension/datadogfleetautomationextension/go.mod

@@ -4,6 +4,7 @@
 package datadogfleetautomationextension // import "github.com/open-telemetry/opentelemetry-collector-contrib/extension/datadogfleetautomationextension"
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	"net"
@@ -13,7 +14,6 @@ import (
 	"time"
 
 	"github.com/DataDog/datadog-agent/comp/forwarder/defaultforwarder"
-	"github.com/DataDog/datadog-agent/pkg/util/uuid"
 	"go.uber.org/zap"
 )
 
@@ -22,10 +22,18 @@ const (
 	defaultHealthCheckV2Endpoint = "localhost:13133"
 )
 
-var (
-	nowFunc  = time.Now
-	uuidFunc = uuid.GetUUID
-)
+var nowFunc = time.Now
+
+func (e *fleetAutomationExtension) stopLocalConfigServer() {
+	if e.httpServer != nil {
+		if err := e.httpServer.Shutdown(context.Background()); err != nil {
+			e.telemetry.Logger.Error("Failed to shutdown HTTP server", zap.Error(err))
+		}
+	}
+	if e.done != nil {
+		close(e.done)
+	}
+}
 
 func (e *fleetAutomationExtension) startLocalConfigServer() {
 	// TODO: let user specify port in config? Or remove?
@@ -101,7 +109,11 @@ func (e *fleetAutomationExtension) getHealthCheckStatus() (map[string]any, error
 	if err != nil {
 		return nil, fmt.Errorf("failed to make request to health check endpoint: %w", err)
 	}
-	defer resp.Body.Close()
+	defer func() {
+		if resp.Body != nil {
+			resp.Body.Close()
+		}
+	}()
 
 	// Parse the JSON response
 	var result map[string]any
@@ -167,13 +179,13 @@ func (e *fleetAutomationExtension) prepareAndSendFleetAutomationPayloads() (*Com
 		Hostname:  e.hostname,
 		Timestamp: nowFunc().UnixNano(),
 		Metadata:  e.agentMetadataPayload,
-		UUID:      uuidFunc(),
+		UUID:      e.uuid.String(),
 	}
 	p := otelAgentPayload{
 		Hostname:  e.hostname,
 		Timestamp: nowFunc().UnixNano(),
 		Metadata:  e.otelMetadataPayload,
-		UUID:      uuidFunc(),
+		UUID:      e.uuid.String(),
 	}
 
 	// Use datadog-agent serializer to send these payloads

extension/datadogfleetautomationextension/go.sum

@@ -16,7 +16,7 @@ import (
 	"github.com/DataDog/datadog-agent/pkg/metrics/servicecheck"
 	"github.com/DataDog/datadog-agent/pkg/serializer/marshaler"
 	"github.com/DataDog/datadog-agent/pkg/serializer/types"
-	"github.com/DataDog/datadog-agent/pkg/util/uuid"
+	googleuuid "github.com/google/uuid"
 	"github.com/stretchr/testify/assert"
 	"go.opentelemetry.io/collector/component"
 	"go.uber.org/zap"
@@ -85,9 +85,7 @@ func TestStartLocalConfigServer(t *testing.T) {
 			}
 
 			// Stop the server
-			if e.httpServer != nil {
-				e.httpServer.Close()
-			}
+			e.stopLocalConfigServer()
 		})
 	}
 }
@@ -482,6 +480,7 @@ func TestPrepareAndSendFleetAutomationPayloads(t *testing.T) {
 			} else {
 				assert.Nil(t, payload)
 			}
+			close(e.done)
 		})
 	}
 }
@@ -522,12 +521,6 @@ func TestHandleMetadata(t *testing.T) {
 	}()
 	// Mock the UUID
 	mockUUID := "123e4567-e89b-12d3-a456-426614174000"
-	uuidFunc = func() string {
-		return mockUUID
-	}
-	defer func() {
-		uuidFunc = uuid.GetUUID
-	}()
 
 	tests := []struct {
 		name           string
@@ -554,6 +547,7 @@ func TestHandleMetadata(t *testing.T) {
 					},
 					ticker: time.NewTicker(DefaultReporterPeriod),
 					done:   make(chan bool),
+					uuid:   googleuuid.MustParse(mockUUID),
 				}, logs
 			},
 			expectedStatus: http.StatusOK,
@@ -573,6 +567,7 @@ func TestHandleMetadata(t *testing.T) {
 					hostnameSource: "unset",
 					ticker:         time.NewTicker(DefaultReporterPeriod),
 					done:           make(chan bool),
+					uuid:           googleuuid.MustParse(mockUUID),
 				}, logs
 			},
 			expectedStatus: http.StatusOK,
@@ -597,6 +592,7 @@ func TestHandleMetadata(t *testing.T) {
 					},
 					ticker: time.NewTicker(DefaultReporterPeriod),
 					done:   make(chan bool),
+					uuid:   googleuuid.MustParse(mockUUID),
 				}, logs
 			},
 			expectedStatus: http.StatusInternalServerError,
@@ -636,6 +632,7 @@ func TestHandleMetadata(t *testing.T) {
 				}
 				assert.True(t, found, "Expected log message not found: %s", expectedLog)
 			}
+			close(e.done)
 		})
 	}
 }
@@ -690,6 +687,12 @@ func TestMakeGetRequest(t *testing.T) {
 
 			// Call makeGetRequest
 			resp, err := makeGetRequest(tt.url)
+			defer func() {
+				if resp != nil {
+					_, _ = resp.Body.Read(nil)
+					_ = resp.Body.Close()
+				}
+			}()
 			// Verify the result
 			if tt.expectedError == "" {
 				assert.NoError(t, err)

extension/datadogfleetautomationextension/http.go

@@ -4,6 +4,10 @@ status:
   class: extension
   stability:
     development: [extension]
-  distributions: [core, contrib, k8s]
+  distributions: []
   codeowners:
     active: [jackgopack4, dineshg13, mx-psi]
+
+tests:
+  goleak:
+    skip: true