Run gopls modernize tool

cmd/agent/common/autodiscovery.go

@@ -10,6 +10,7 @@ import (
 	"errors"
 	"fmt"
 	"path/filepath"
+	"slices"
 	"time"
 
 	"go.uber.org/atomic"
@@ -277,12 +278,7 @@ func waitForConfigsFromAD(ctx context.Context,
 	} else {
 		// match configs with names in checkNames
 		match = func(cfg integration.Config) bool {
-			for _, checkName := range checkNames {
-				if cfg.Name == checkName {
-					return true
-				}
-			}
-			return false
+			return slices.Contains(checkNames, cfg.Name)
 		}
 	}
 

cmd/agent/subcommands/run/internal/clcrunnerapi/v1/clcrunner.go

@@ -10,6 +10,7 @@ package v1
 
 import (
 	"encoding/json"
+	"maps"
 	"net/http"
 
 	"github.com/gorilla/mux"
@@ -67,9 +68,7 @@ func getCLCRunnerStats(w http.ResponseWriter, _ *http.Request, ac autodiscovery.
 func flattenCLCStats(stats status.CLCChecks) map[string]status.CLCStats {
 	flatened := make(map[string]status.CLCStats)
 	for _, checks := range stats.Checks {
-		for checkID, checkStats := range checks {
-			flatened[checkID] = checkStats
-		}
+		maps.Copy(flatened, checks)
 	}
 
 	return flatened

cmd/serverless-init/cloudservice/appservice.go

@@ -7,6 +7,7 @@
 package cloudservice
 
 import (
+	"maps"
 	"os"
 
 	"github.com/DataDog/datadog-agent/pkg/trace/traceutil"
@@ -38,9 +39,7 @@ func (a *AppService) GetTags() map[string]string {
 		"_dd.origin": a.GetOrigin(),
 	}
 
-	for key, value := range traceutil.GetAppServicesTags() {
-		tags[key] = value
-	}
+	maps.Copy(tags, traceutil.GetAppServicesTags())
 
 	return tags
 }

cmd/serverless-init/tag/tag.go

@@ -7,6 +7,7 @@
 package tag
 
 import (
+	"maps"
 	"os"
 	"strings"
 
@@ -52,9 +53,7 @@ func GetBaseTagsMapWithMetadata(metadata map[string]string, versionMode string)
 		}
 	}
 
-	for key, value := range metadata {
-		tagsMap[key] = value
-	}
+	maps.Copy(tagsMap, metadata)
 
 	tagsMap[versionMode] = tags.GetExtensionVersion()
 	tagsMap[tags.ComputeStatsKey] = tags.ComputeStatsValue

cmd/trace-agent/test/testsuite/traces_test.go

@@ -6,6 +6,7 @@
 package testsuite
 
 import (
+	"slices"
 	"strings"
 	"testing"
 	"time"
@@ -97,7 +98,7 @@ func TestTraces(t *testing.T) {
 			t.Fatal(err)
 		}
 		waitForTrace(t, &r, func(v *pb.AgentPayload) {
-			payloadsEqual(t, append(p[:2], p[3:]...), v)
+			payloadsEqual(t, slices.Delete(p, 2, 3), v)
 		})
 	})
 

comp/core/autodiscovery/autodiscoveryimpl/stats.go

@@ -7,6 +7,7 @@ package autodiscoveryimpl
 
 import (
 	"expvar"
+	"maps"
 	"sync"
 
 	"github.com/mohae/deepcopy"
@@ -63,9 +64,7 @@ func (es *acErrorStats) getConfigErrors() map[string]string {
 	defer es.m.RUnlock()
 
 	configCopy := make(map[string]string)
-	for k, v := range es.config {
-		configCopy[k] = v
-	}
+	maps.Copy(configCopy, es.config)
 
 	return configCopy
 }

comp/core/autodiscovery/autodiscoveryimpl/store.go

@@ -6,6 +6,7 @@
 package autodiscoveryimpl
 
 import (
+	"maps"
 	"sync"
 
 	"github.com/DataDog/datadog-agent/comp/core/autodiscovery/integration"
@@ -157,9 +158,7 @@ func (s *store) setIDsOfChecksWithSecrets(checkIDs map[checkid.ID]checkid.ID) {
 	s.m.Lock()
 	defer s.m.Unlock()
 
-	for idWithResolvedSecrets, idWithEncryptedSecrets := range checkIDs {
-		s.idsOfChecksWithSecrets[idWithResolvedSecrets] = idWithEncryptedSecrets
-	}
+	maps.Copy(s.idsOfChecksWithSecrets, checkIDs)
 }
 
 func (s *store) getIDOfCheckWithEncryptedSecrets(idCheckWithResolvedSecrets checkid.ID) checkid.ID {

comp/core/autodiscovery/autodiscoveryimpl/templatecache.go

@@ -7,6 +7,7 @@ package autodiscoveryimpl
 
 import (
 	"fmt"
+	"slices"
 	"strings"
 	"sync"
 
@@ -111,7 +112,7 @@ func (cache *templateCache) del(tpl integration.Config) error {
 		} else {
 			for i, digest := range digests {
 				if digest == d {
-					cache.adIDToDigests[id] = append(digests[:i], digests[i+1:]...)
+					cache.adIDToDigests[id] = slices.Delete(digests, i, i+1)
 					break
 				}
 			}

comp/core/autodiscovery/listeners/common.go

@@ -11,6 +11,7 @@ package listeners
 import (
 	"fmt"
 	"hash/fnv"
+	"maps"
 	"strconv"
 
 	"github.com/DataDog/datadog-agent/comp/core/autodiscovery/common/types"
@@ -116,9 +117,7 @@ func getPrometheusIncludeAnnotations() types.PrometheusAnnotations {
 			log.Errorf("Couldn't init check configuration: %v", err)
 			continue
 		}
-		for k, v := range check.AD.GetIncludeAnnotations() {
-			annotations[k] = v
-		}
+		maps.Copy(annotations, check.AD.GetIncludeAnnotations())
 	}
 	return annotations
 }

comp/core/autodiscovery/listeners/container.go

@@ -9,6 +9,7 @@ package listeners
 
 import (
 	"errors"
+	"maps"
 	"sort"
 	"strings"
 	"time"
@@ -151,9 +152,7 @@ func (l *ContainerListener) createContainerService(entity workloadmeta.Entity) {
 		}
 
 		hosts := make(map[string]string)
-		for host, ip := range container.NetworkIPs {
-			hosts[host] = ip
-		}
+		maps.Copy(hosts, container.NetworkIPs)
 
 		if rancherIP, ok := docker.FindRancherIPInLabels(container.Labels); ok {
 			hosts["rancher"] = rancherIP

comp/core/autodiscovery/providers/config_reader.go

@@ -10,6 +10,7 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"slices"
 	"strings"
 	"sync"
 	"time"
@@ -454,12 +455,7 @@ func GetIntegrationConfigFromFile(name, fpath string) (integration.Config, error
 }
 
 func containsString(slice []string, str string) bool {
-	for _, s := range slice {
-		if s == str {
-			return true
-		}
-	}
-	return false
+	return slices.Contains(slice, str)
 }
 
 // ResetReader is only for unit tests

comp/core/autodiscovery/providers/consul.go

@@ -12,6 +12,7 @@ import (
 	"fmt"
 	"math"
 	"net/url"
+	"slices"
 	"sort"
 	"strings"
 
@@ -287,12 +288,7 @@ func (p *ConsulConfigProvider) getJSONValue(ctx context.Context, key string) ([]
 func isTemplateField(key string) bool {
 	tplKeys := []string{instancePath, checkNamePath, initConfigPath}
 
-	for _, tpl := range tplKeys {
-		if key == tpl {
-			return true
-		}
-	}
-	return false
+	return slices.Contains(tplKeys, key)
 }
 
 // GetConfigErrors is not implemented for the ConsulConfigProvider

comp/core/autodiscovery/providers/container.go

@@ -10,6 +10,7 @@ package providers
 import (
 	"context"
 	"fmt"
+	"maps"
 	"strings"
 	"sync"
 
@@ -113,9 +114,7 @@ func (k *ContainerConfigProvider) processEvents(evBundle workloadmeta.EventBundl
 			}
 
 			configsToUnschedule := make(map[string]integration.Config)
-			for digest, config := range configCache {
-				configsToUnschedule[digest] = config
-			}
+			maps.Copy(configsToUnschedule, configCache)
 
 			for _, config := range configs {
 				digest := config.Digest()
@@ -282,9 +281,7 @@ func (k *ContainerConfigProvider) GetConfigErrors() map[string]ErrorMsgSet {
 
 	errors := make(map[string]ErrorMsgSet, len(k.configErrors))
 
-	for entity, errset := range k.configErrors {
-		errors[entity] = errset
-	}
+	maps.Copy(errors, k.configErrors)
 
 	return errors
 }

comp/core/autodiscovery/providers/remote_config.go

@@ -9,6 +9,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"maps"
 	"regexp"
 	"strings"
 	"sync"
@@ -83,9 +84,7 @@ func (rc *RemoteConfigProvider) GetConfigErrors() map[string]ErrorMsgSet {
 
 	errors := make(map[string]ErrorMsgSet, len(rc.configErrors))
 
-	for entity, errset := range rc.configErrors {
-		errors[entity] = errset
-	}
+	maps.Copy(errors, rc.configErrors)
 
 	return errors
 }

comp/core/secrets/secretsimpl/secrets.go

@@ -13,6 +13,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
+	stdmaps "maps"
 	"net/http"
 	"path/filepath"
 	"regexp"
@@ -405,13 +406,7 @@ func (r *secretResolver) matchesAllowlist(handle string) bool {
 	if !allowlistEnabled {
 		return true
 	}
-	for _, secretCtx := range r.origin[handle] {
-		if secretMatchesAllowlist(secretCtx) {
-			return true
-		}
-	}
-	// the handle does not appear for a setting that is in the allowlist
-	return false
+	return slices.ContainsFunc(r.origin[handle], secretMatchesAllowlist)
 }
 
 // for all secrets returned by the backend command, notify subscribers (if allowlist lets them),
@@ -451,9 +446,7 @@ func (r *secretResolver) processSecretResponse(secretResponse map[string]string,
 		handleInfoList = append(handleInfoList, handleInfo{Name: handle, Places: places})
 	}
 	// add results to the cache
-	for handle, secretValue := range secretResponse {
-		r.cache[handle] = secretValue
-	}
+	stdmaps.Copy(r.cache, secretResponse)
 	// return info about the handles sorted by their name
 	sort.Slice(handleInfoList, func(i, j int) bool {
 		return handleInfoList[i].Name < handleInfoList[j].Name

comp/core/settings/settingsimpl/settingsimpl.go

@@ -8,6 +8,7 @@ package settingsimpl
 
 import (
 	"html"
+	"maps"
 	"net/http"
 	"sync"
 
@@ -63,9 +64,7 @@ func (s *settingsRegistry) RuntimeSettings() map[string]settings.RuntimeSetting
 	s.rwMutex.RLock()
 	defer s.rwMutex.RUnlock()
 	settingsCopy := map[string]settings.RuntimeSetting{}
-	for k, v := range s.settings {
-		settingsCopy[k] = v
-	}
+	maps.Copy(settingsCopy, s.settings)
 	return settingsCopy
 }
 

comp/core/status/statusimpl/common_header_provider.go

@@ -46,9 +46,7 @@ func (h *headerProvider) Name() string {
 }
 
 func (h *headerProvider) JSON(_ bool, stats map[string]interface{}) error {
-	for k, v := range h.data() {
-		stats[k] = v
-	}
+	maps.Copy(stats, h.data())
 
 	return nil
 }

comp/core/status/statusimpl/status_test.go

@@ -9,6 +9,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
+	"maps"
 	"os"
 	"runtime"
 	"strings"
@@ -50,9 +51,7 @@ func (m mockProvider) JSON(_ bool, stats map[string]interface{}) error {
 		return fmt.Errorf("JSON error")
 	}
 
-	for key, value := range m.data {
-		stats[key] = value
-	}
+	maps.Copy(stats, m.data)
 
 	return nil
 }
@@ -97,9 +96,7 @@ func (m mockHeaderProvider) JSON(_ bool, stats map[string]interface{}) error {
 		return fmt.Errorf("JSON error")
 	}
 
-	for key, value := range m.data {
-		stats[key] = value
-	}
+	maps.Copy(stats, m.data)
 
 	return nil
 }