Use new store for tokens

cmd/launcher/launcher.go

@@ -291,7 +291,7 @@ func runLauncher(ctx context.Context, cancel func(), opts *launcher.Options) err
 		}
 
 		// Set up our tracing instrumentation
-		ingestConsumer := tokenconsumer.NewIngestTokenConsumer(k.ConfigStore())
+		ingestConsumer := tokenconsumer.NewIngestTokenConsumer(k.TokenStore())
 		if err := controlService.RegisterConsumer(tokenconsumer.IngestSubsystem, ingestConsumer); err != nil {
 			return fmt.Errorf("failed to register ingest consumer: %w", err)
 		}

pkg/agent/knapsack/knapsack.go

@@ -85,6 +85,10 @@ func (k *knapsack) ServerProvidedDataStore() types.KVStore {
 	return k.getKVStore(storage.ServerProvidedDataStore)
 }
 
+func (k *knapsack) TokenStore() types.KVStore {
+	return k.getKVStore(storage.TokenStore)
+}
+
 func (k *knapsack) getKVStore(storeType storage.Store) types.KVStore {
 	if k == nil {
 		return nil

pkg/agent/storage/stores.go

@@ -14,6 +14,7 @@ const (
 	SentNotificationsStore      Store = "sent_notifications"       // The store used for sent notifications.
 	StatusLogsStore             Store = "status_logs"              // The store used for buffered status logs.
 	ServerProvidedDataStore     Store = "server_provided_data"     // The store used for pushing values from server-backed tables.
+	TokenStore                  Store = "token_store"              // The store used for holding bearer auth tokens, e.g. the ones used to authenticate with the observability ingest server.
 )
 
 func (storeType Store) String() string {

pkg/agent/types/stores.go

@@ -11,4 +11,5 @@ type Stores interface {
 	SentNotificationsStore() KVStore
 	StatusLogsStore() KVStore
 	ServerProvidedDataStore() KVStore
+	TokenStore() KVStore
 }

pkg/traces/exporter/exporter.go

@@ -64,7 +64,7 @@ func NewTraceExporter(ctx context.Context, k types.Knapsack, client osquery.Quer
 		attrs = append(attrs, archAttr)
 	}
 
-	currentToken, _ := k.ConfigStore().Get(tokenconsumer.ObservabilityIngestTokenKey)
+	currentToken, _ := k.TokenStore().Get(tokenconsumer.ObservabilityIngestTokenKey)
 
 	t := &TraceExporter{
 		knapsack:                  k,
@@ -238,7 +238,7 @@ func (t *TraceExporter) Interrupt(_ error) {
 // Update satisfies control.subscriber interface -- looks at changes to the `observability_ingest` subsystem,
 // which amounts to a new bearer auth token being provided.
 func (t *TraceExporter) Ping() {
-	newToken, err := t.knapsack.ConfigStore().Get(tokenconsumer.ObservabilityIngestTokenKey)
+	newToken, err := t.knapsack.TokenStore().Get(tokenconsumer.ObservabilityIngestTokenKey)
 	if err != nil {
 		level.Debug(t.logger).Log("msg", "could not get new token from token store", "err", err)
 		return