Change recentAPIKey to lastAPIKey for consistency

DataDog · Feb 12, 2025 · 876e191 · 876e191
1 parent 5e9c5c5
commit 876e191
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 19 deletions.
diff --git a/test/fakeintake/server/server.go b/test/fakeintake/server/server.go
@@ -358,7 +358,7 @@ func (fi *Server) handleDatadogRequest(w http.ResponseWriter, req *http.Request)
 
 	apiKey := fi.extractDatadogAPIKey(req)
 	if apiKey != "" {
-		fi.store.SetRecentAPIKey(apiKey)
+		fi.store.SetLastAPIKey(apiKey)
 	}
 
 	log.Printf("Handling Datadog %s request to %s, header %v", req.Method, req.URL.Path, redactHeader(req.Header))
@@ -477,7 +477,7 @@ func (fi *Server) extractDatadogAPIKey(req *http.Request) string {
 }
 
 func (fi *Server) handleGetLastAPIKey(w http.ResponseWriter, _req *http.Request) {
-	apiKey, err := fi.store.GetRecentAPIKey()
+	apiKey, err := fi.store.GetLastAPIKey()
 	if err != nil {
 		response := buildErrorResponse(err)
 		writeHTTPResponse(w, response)

diff --git a/test/fakeintake/server/serverstore/db.go b/test/fakeintake/server/serverstore/db.go
@@ -123,12 +123,12 @@ func (s *sqlStore) Close() {
 	os.Remove(s.path)
 }
 
-func (s *sqlStore) SetRecentAPIKey(_ string) {
+func (s *sqlStore) SetLastAPIKey(_ string) {
 	// pass
 }
 
-func (s *sqlStore) GetRecentAPIKey() (string, error) {
-	return "", fmt.Errorf("sqlstore does not track recent APIKey")
+func (s *sqlStore) GetLastAPIKey() (string, error) {
+	return "", fmt.Errorf("sqlstore does not track last APIKey")
 }
 
 // AppendPayload adds a payload to the store and tries parsing and adding a dumped json to the parsed store

diff --git a/test/fakeintake/server/serverstore/in_memory.go b/test/fakeintake/server/serverstore/in_memory.go
@@ -20,8 +20,8 @@ import (
 type inMemoryStore struct {
 	mutex sync.RWMutex
 
-	rawPayloads  map[string][]api.Payload
-	recentAPIKey string
+	rawPayloads map[string][]api.Payload
+	lastAPIKey  string
 
 	// NbPayloads is a prometheus metric to track the number of payloads collected by route
 	NbPayloads *prometheus.GaugeVec
@@ -39,26 +39,25 @@ func newInMemoryStore() *inMemoryStore {
 	}
 }
 
-func (s *inMemoryStore) SetRecentAPIKey(key string) {
+func (s *inMemoryStore) SetLastAPIKey(key string) {
 	s.mutex.Lock()
 	defer s.mutex.Unlock()
-	s.recentAPIKey = key
+	s.lastAPIKey = key
 }
 
-func (s *inMemoryStore) GetRecentAPIKey() (string, error) {
+func (s *inMemoryStore) GetLastAPIKey() (string, error) {
 	s.mutex.Lock()
 	defer s.mutex.Unlock()
-	lastAPIKey := s.recentAPIKey
-	if lastAPIKey == "" {
+	if s.lastAPIKey == "" {
 		return "", fmt.Errorf("no apiKey sent")
 	}
-	return lastAPIKey, nil
+	return s.lastAPIKey, nil
 }
 
 // AppendPayload adds a payload to the store and tries parsing and adding a dumped json to the parsed store
 func (s *inMemoryStore) AppendPayload(route string, apiKey string, data []byte, encoding string, contentType string, collectTime time.Time) error {
-	// Set the recent APIKey first, to avoid deadlocking
-	s.SetRecentAPIKey(apiKey)
+	// Set the last APIKey first, to avoid deadlocking
+	s.SetLastAPIKey(apiKey)
 	s.mutex.Lock()
 	defer s.mutex.Unlock()
 	rawPayload := api.Payload{

diff --git a/test/fakeintake/server/serverstore/store.go b/test/fakeintake/server/serverstore/store.go
@@ -22,10 +22,10 @@ import (
 type Store interface {
 	// AppendPayload adds a payload to the store and tries parsing and adding a dumped json to the parsed store
 	AppendPayload(route string, apiKey string, data []byte, encoding string, contentType string, collectTime time.Time) error
-	// SetRecentAPIKey sets the most recent API Key
-	SetRecentAPIKey(apiKey string)
-	// GetRecentAPIKey gets the most recent API Keys
-	GetRecentAPIKey() (string, error)
+	// SetLastAPIKey sets the last seen API Key
+	SetLastAPIKey(apiKey string)
+	// GetLastAPIKey gets the last seen API Keys
+	GetLastAPIKey() (string, error)
 	// CleanUpPayloadsOlderThan removes payloads older than the given time
 	CleanUpPayloadsOlderThan(time.Time)
 	// GetRawPayloads returns all raw payloads for a given route