feat: feature flag to clean inventory cache on start

Author: rubenruizdegauna

internal/agent/agent.go

@@ -18,6 +18,7 @@ import (
 
 	"github.com/newrelic/infrastructure-agent/pkg/sysinfo/hostid"
 
+	"github.com/newrelic/infrastructure-agent/internal/agent/cmdchannel/fflag"
 	"github.com/newrelic/infrastructure-agent/internal/agent/instrumentation"
 	"github.com/newrelic/infrastructure-agent/internal/agent/inventory"
 	"github.com/newrelic/infrastructure-agent/internal/agent/types"
@@ -95,6 +96,7 @@ type Agent struct {
 	agentID             *entity.ID                               // pointer as it's referred from several points
 	mtx                 sync.Mutex                               // Protect plugins
 	notificationHandler *ctl.NotificationHandlerWithCancellation // Handle ipc messaging.
+	ffRetriever         feature_flags.Retriever
 }
 
 type inventoryState struct {
@@ -393,6 +395,7 @@ func NewAgent(
 		cloudHarvester,
 		fpHarvester,
 		notificationHandler,
+		ffRetriever,
 	)
 }
 
@@ -410,6 +413,7 @@ func New(
 	cloudHarvester cloud.Harvester,
 	fpHarvester fingerprint.Harvester,
 	notificationHandler *ctl.NotificationHandlerWithCancellation,
+	ffRetriever feature_flags.Retriever,
 ) (*Agent, error) {
 	a := &Agent{
 		Context:             ctx,
@@ -422,6 +426,7 @@ func New(
 		connectSrv:          connectSrv,
 		provideIDs:          provideIDs,
 		notificationHandler: notificationHandler,
+		ffRetriever:         ffRetriever,
 	}
 
 	a.plugins = make([]Plugin, 0)
@@ -820,6 +825,19 @@ func (a *Agent) Run() (err error) {
 		close(exit)
 	}()
 
+	// We check FF to delete the whole inventory and trigger the whoel inventory send
+	// This will bypass the deltas cache and force the inventory to be sent after restarting the Agent
+	if a.ffRetriever != nil {
+		alog.Debug("readding FlagFullInventoryDeletion feature flag")
+		ffFullInventoryDeletionEnabled, ffExists := a.ffRetriever.GetFeatureFlag(fflag.FlagFullInventoryDeletion)
+		if ffExists && ffFullInventoryDeletionEnabled {
+			alog.Info("Cleaning inventory cache and forcing full inventory report")
+			a.store.ResetAllDeltas(a.Context.EntityKey())
+		}
+	} else {
+		alog.Warn("Feature flags retriever is not available")
+	}
+
 	if a.inventoryHandler != nil {
 		if a.shouldSendInventory() {
 			a.inventoryHandler.Start()

internal/agent/agent_test.go

@@ -80,6 +80,8 @@ func newTesting(cfg *config.Config) *Agent {
 	connectSrv := NewIdentityConnectService(&MockIdentityConnectClient{}, fpHarvester, metadataHarvester)
 	provideIDs := NewProvideIDs(registerClient, state.NewRegisterSM())
 
+	ffRetriever := &feature_flags.FeatureFlagRetrieverMock{}
+
 	a, err := New(
 		cfg,
 		ctx,
@@ -93,6 +95,7 @@ func newTesting(cfg *config.Config) *Agent {
 		cloudDetector,
 		fpHarvester,
 		ctl.NewNotificationHandlerWithCancellation(nil),
+		ffRetriever,
 	)
 	if err != nil {
 		panic(err)

internal/agent/cmdchannel/fflag/ffhandler.go

@@ -23,10 +23,11 @@ const (
 	FlagParallelizeInventory  = "parallelize_inventory_enabled"
 	FlagAsyncInventoryHandler = "async_inventory_handler_enabled"
 
-	FlagProtocolV4           = "protocol_v4_enabled"
-	FlagFullProcess          = "full_process_sampling"
-	FlagDmRegisterDeprecated = "dm_register_deprecated"
-	FlagFluentBit19          = "fluent_bit_19_win"
+	FlagProtocolV4            = "protocol_v4_enabled"
+	FlagFullProcess           = "full_process_sampling"
+	FlagDmRegisterDeprecated  = "dm_register_deprecated"
+	FlagFluentBit19           = "fluent_bit_19_win"
+	FlagFullInventoryDeletion = "full_inventory_deletion"
 	// Config
 	CfgYmlRegisterEnabled              = "register_enabled"
 	CfgYmlParallelizeInventory         = "inventory_queue_len"
@@ -183,7 +184,8 @@ func (h *handler) Handle(ctx context.Context, c commandapi.Command, isInitialFet
 func isBasicFeatureFlag(flag string) bool {
 	return flag == FlagProtocolV4 ||
 		flag == FlagFullProcess ||
-		flag == FlagDmRegisterDeprecated
+		flag == FlagDmRegisterDeprecated ||
+		flag == FlagFullInventoryDeletion
 }
 
 func (h *handler) setFFConfig(ff string, enabled bool) {

test/infra/agent.go

@@ -4,6 +4,7 @@ package infra
 
 import (
 	"compress/gzip"
+
 	"io/ioutil"
 	"net/http"
 	"path/filepath"
@@ -17,6 +18,7 @@ import (
 
 	"github.com/newrelic/infrastructure-agent/internal/agent"
 	"github.com/newrelic/infrastructure-agent/internal/agent/delta"
+	"github.com/newrelic/infrastructure-agent/internal/feature_flags"
 	"github.com/newrelic/infrastructure-agent/internal/testhelpers"
 	backendhttp "github.com/newrelic/infrastructure-agent/pkg/backend/http"
 	"github.com/newrelic/infrastructure-agent/pkg/backend/identityapi"
@@ -112,7 +114,8 @@ func NewAgentWithConnectClientAndConfig(connectClient *http.Client, dataClient b
 	transport := backendhttp.BuildTransport(cfg, backendhttp.ClientTimeout)
 	transport = backendhttp.NewRequestDecoratorTransport(cfg, transport)
 	dataClient = backendhttp.NewRequestDecoratorTransport(cfg, infra.ToRoundTripper(dataClient)).RoundTrip
-	a, err := agent.New(cfg, ctx, "user-agent", lookups, st, connectSrv, provideIDs, dataClient, transport, cloudDetector, fingerprintHarvester, ctl.NewNotificationHandlerWithCancellation(nil))
+	ffRetriever := feature_flags.NewManager(map[string]bool{})
+	a, err := agent.New(cfg, ctx, "user-agent", lookups, st, connectSrv, provideIDs, dataClient, transport, cloudDetector, fingerprintHarvester, ctl.NewNotificationHandlerWithCancellation(nil), ffRetriever)
 	if err != nil {
 		panic(err)
 	}