DataDog · dd-mergequeue · Dec 5, 2023 · Dec 1, 2023 · Dec 2, 2023 · Dec 2, 2023
@@ -62,11 +62,6 @@ issues:
     - text: "Temporary has been deprecated since Go 1.18"
       linters: [staticcheck]
 
-  # We're enabling the revive and the gosimple linters on the whole codebase
-  # TODO [After 7.48.0 freeze removal]: Remove the new-from-rev key
-  # TODO [After 7.48.0 freeze removal]: Tweak the KUBERNETES_MEMORY_LIMIT in .tests_linux_ebpf for runners not to fail running on the whole codebase (and not just the small diff induced by new-from-rev).
-  new-from-rev: f40667d3841c6339be0d00d53e54a4a63f43f11e
-
 linters:
   disable-all: true
   enable:

@@ -46,6 +46,7 @@ type serverSecure struct {
 	capture            dsdReplay.Component
 }
 
+//nolint:revive // TODO(ASC) Fix revive linter
 func (s *server) GetHostname(ctx context.Context, in *pb.HostnameRequest) (*pb.HostnameReply, error) {
 	h, err := hostname.Get(ctx)
 	if err != nil {
@@ -58,6 +59,8 @@ func (s *server) GetHostname(ctx context.Context, in *pb.HostnameRequest) (*pb.H
 // override of the AuthFunc registered with the unary interceptor.
 //
 // see: https://godoc.org/github.com/grpc-ecosystem/go-grpc-middleware/auth#ServiceAuthFuncOverride
+//
+//nolint:revive // TODO(ASC) Fix revive linter
 func (s *server) AuthFuncOverride(ctx context.Context, fullMethodName string) (context.Context, error) {
 	return ctx, nil
 }
@@ -73,6 +76,8 @@ func (s *serverSecure) TaggerFetchEntity(ctx context.Context, req *pb.FetchEntit
 // DogstatsdCaptureTrigger triggers a dogstatsd traffic capture for the
 // duration specified in the request. If a capture is already in progress,
 // an error response is sent back.
+//
+//nolint:revive // TODO(ASC) Fix revive linter
 func (s *serverSecure) DogstatsdCaptureTrigger(ctx context.Context, req *pb.CaptureTriggerRequest) (*pb.CaptureTriggerResponse, error) {
 	d, err := time.ParseDuration(req.GetDuration())
 	if err != nil {
@@ -91,6 +96,8 @@ func (s *serverSecure) DogstatsdCaptureTrigger(ctx context.Context, req *pb.Capt
 // Tagger facilities. This endpoint is used when traffic replays are in
 // progress. An empty state or nil request will result in the Tagger
 // capture state being reset to nil.
+//
+//nolint:revive // TODO(ASC) Fix revive linter
 func (s *serverSecure) DogstatsdSetTaggerState(ctx context.Context, req *pb.TaggerState) (*pb.TaggerStateResponse, error) {
 	// Reset and return if no state pushed
 	if req == nil || req.State == nil {
@@ -126,6 +133,7 @@ func (s *serverSecure) ClientGetConfigs(ctx context.Context, in *pb.ClientGetCon
 	return s.configService.ClientGetConfigs(ctx, in)
 }
 
+//nolint:revive // TODO(ASC) Fix revive linter
 func (s *serverSecure) GetConfigState(ctx context.Context, e *emptypb.Empty) (*pb.GetStateConfigResponse, error) {
 	if s.configService == nil {
 		log.Debug(rcNotInitializedErr.Error())

@@ -124,6 +124,7 @@ func setJSONError(w http.ResponseWriter, err error, errorCode int) {
 	http.Error(w, string(body), errorCode)
 }
 
+//nolint:revive // TODO(ASC) Fix revive linter
 func stopAgent(w http.ResponseWriter, r *http.Request) {
 	signals.Stopper <- true
 	w.Header().Set("Content-Type", "application/json")
@@ -360,6 +361,7 @@ func getFormattedStatus(w http.ResponseWriter, _ *http.Request, invAgent invento
 	w.Write(s)
 }
 
+//nolint:revive // TODO(ASC) Fix revive linter
 func getHealth(w http.ResponseWriter, r *http.Request) {
 	h := health.GetReady()
 
@@ -377,10 +379,12 @@ func getHealth(w http.ResponseWriter, r *http.Request) {
 	w.Write(jsonHealth)
 }
 
+//nolint:revive // TODO(ASC) Fix revive linter
 func getCSRFToken(w http.ResponseWriter, r *http.Request) {
 	w.Write([]byte(gui.CsrfToken))
 }
 
+//nolint:revive // TODO(ASC) Fix revive linter
 func getConfigCheck(w http.ResponseWriter, r *http.Request) {
 	var response response.ConfigCheckResponse
 
@@ -408,6 +412,7 @@ func getConfigCheck(w http.ResponseWriter, r *http.Request) {
 	w.Write(jsonConfig)
 }
 
+//nolint:revive // TODO(ASC) Fix revive linter
 func getTaggerList(w http.ResponseWriter, r *http.Request) {
 	// query at the highest cardinality between checks and dogstatsd cardinalities
 	cardinality := collectors.TagCardinality(max(int(tagger.ChecksCardinality), int(tagger.DogstatsdCardinality)))

@@ -19,11 +19,13 @@ import (
 
 const noJMXErrorString = "jmx is not compiled in this agent"
 
+//nolint:revive // TODO(ASC) Fix revive linter
 func getJMXConfigs(w http.ResponseWriter, r *http.Request) {
 	log.Error(noJMXErrorString)
 	http.Error(w, noJMXErrorString, 500)
 }
 
+//nolint:revive // TODO(ASC) Fix revive linter
 func setJMXStatus(w http.ResponseWriter, r *http.Request) {
 	log.Error(noJMXErrorString)
 	http.Error(w, noJMXErrorString, 500)

@@ -19,6 +19,7 @@ import (
 	"github.com/DataDog/datadog-agent/pkg/util/log"
 )
 
+//nolint:revive // TODO(ASC) Fix revive linter
 func getPythonStatus(w http.ResponseWriter, r *http.Request) {
 	w.Header().Set("Content-Type", "application/json")
 	pyStats, err := python.GetPythonInterpreterMemoryUsage()

@@ -15,6 +15,7 @@ import (
 	"net/http"
 )
 
+//nolint:revive // TODO(ASC) Fix revive linter
 func getPythonStatus(w http.ResponseWriter, r *http.Request) {
 	// nothing here when python disabled
 }
@@ -203,6 +203,8 @@ func (sf schedulerFunc) Schedule(configs []integration.Config) {
 }
 
 // Unschedule implements scheduler.Scheduler#Unschedule.
+//
+//nolint:revive // TODO(ASC) Fix revive linter
 func (sf schedulerFunc) Unschedule(configs []integration.Config) {
 	// (do nothing)
 }

@@ -51,6 +51,8 @@ func GetPythonPaths() []string {
 }
 
 // GetVersion returns the version of the agent in a http response json
+//
+//nolint:revive // TODO(ASC) Fix revive linter
 func GetVersion(w http.ResponseWriter, r *http.Request) {
 	w.Header().Set("Content-Type", "application/json")
 	av, _ := version.Agent()

@@ -19,6 +19,8 @@ import (
 )
 
 // Name of the Windows Service the agent runs as
+//
+//nolint:revive // TODO(ASC) Fix revive linter
 const ServiceName = "DatadogAgent"
 
 func init() {

@@ -3,6 +3,7 @@
 // This product includes software developed at Datadog (https://www.datadoghq.com/).
 // Copyright 2016-present Datadog, Inc.
 
+//nolint:revive // TODO(ASC) Fix revive linter
 package dogstatsd
 
 import (

@@ -3,6 +3,7 @@
 // This product includes software developed at Datadog (https://www.datadoghq.com/).
 // Copyright 2016-present Datadog, Inc.
 
+//nolint:revive // TODO(ASC) Fix revive linter
 package gui
 
 import (
@@ -45,6 +46,8 @@ func agentHandler(r *mux.Router, flare flare.Component, invAgent inventoryagent.
 }
 
 // Sends a simple reply (for checking connection to server)
+//
+//nolint:revive // TODO(ASC) Fix revive linter
 func ping(w http.ResponseWriter, r *http.Request) {
 	elapsed := time.Now().Unix() - startTimestamp
 	w.Write([]byte(strconv.FormatInt(elapsed, 10)))
@@ -175,6 +178,8 @@ func makeFlare(w http.ResponseWriter, r *http.Request, flare flare.Component) {
 }
 
 // Restarts the agent using the appropriate (platform-specific) restart function
+//
+//nolint:revive // TODO(ASC) Fix revive linter
 func restartAgent(w http.ResponseWriter, r *http.Request) {
 	log.Infof("got restart function")
 	e := restart()
@@ -207,6 +212,8 @@ func getConfigSetting(w http.ResponseWriter, r *http.Request) {
 }
 
 // Sends the configuration (aka datadog.yaml) file
+//
+//nolint:revive // TODO(ASC) Fix revive linter
 func getConfigFile(w http.ResponseWriter, r *http.Request) {
 	path := config.Datadog.ConfigFileUsed()
 	settings, e := os.ReadFile(path)

@@ -61,6 +61,8 @@ func checkHandler(r *mux.Router) {
 }
 
 // Sends a list of all the current running checks
+//
+//nolint:revive // TODO(ASC) Fix revive linter
 func sendRunningChecks(w http.ResponseWriter, r *http.Request) {
 	html, e := renderRunningChecks()
 	if e != nil {
@@ -73,6 +75,8 @@ func sendRunningChecks(w http.ResponseWriter, r *http.Request) {
 }
 
 // Schedules a specific check
+//
+//nolint:revive // TODO(ASC) Fix revive linter
 func runCheck(w http.ResponseWriter, r *http.Request) {
 	// Fetch the desired check
 	name := mux.Vars(r)["name"]
@@ -338,6 +342,8 @@ func getWheelsChecks() ([]string, error) {
 }
 
 // Sends a list containing the names of all the checks
+//
+//nolint:revive // TODO(ASC) Fix revive linter
 func listChecks(w http.ResponseWriter, r *http.Request) {
 	integrations := []string{}
 	for _, path := range checkPaths {
@@ -417,6 +423,8 @@ func getConfigsInPath(path string) ([]string, error) {
 }
 
 // Sends a list containing the names of all the config files
+//
+//nolint:revive // TODO(ASC) Fix revive linter
 func listConfigs(w http.ResponseWriter, r *http.Request) {
 	filenames := []string{}
 	for _, path := range configPaths {

@@ -120,6 +120,7 @@ func createCSRFToken() error {
 	return nil
 }
 
+//nolint:revive // TODO(ASC) Fix revive linter
 func generateIndex(w http.ResponseWriter, r *http.Request) {
 	data, err := viewsFS.ReadFile("views/templates/index.tmpl")
 	if err != nil {
@@ -139,6 +140,7 @@ func generateIndex(w http.ResponseWriter, r *http.Request) {
 	}
 }
 
+//nolint:revive // TODO(ASC) Fix revive linter
 func generateAuthEndpoint(w http.ResponseWriter, r *http.Request) {
 	data, err := viewsFS.ReadFile("views/templates/auth.tmpl")
 	if err != nil {

@@ -57,6 +57,7 @@ func Commands(globalParams *command.GlobalParams) []*cobra.Command {
 	return []*cobra.Command{configCheckCommand}
 }
 
+//nolint:revive // TODO(ASC) Fix revive linter
 func run(config config.Component, cliParams *cliParams) error {
 	var b bytes.Buffer
 	color.Output = &b

@@ -18,6 +18,8 @@ import (
 )
 
 // Commands returns a slice of subcommands for the 'agent' command.
+//
+//nolint:revive // TODO(WINA) Fix revive linter
 func Commands(globalParams *command.GlobalParams) []*cobra.Command {
 	return []*cobra.Command{
 		{

@@ -212,6 +212,8 @@ func cmdDiagnose(cliParams *cliParams, senderManager diagnosesendermanager.Compo
 }
 
 // NOTE: This and related will be moved to separate "agent telemetry" command in future
+//
+//nolint:revive // TODO(ASC) Fix revive linter
 func printPayload(name payloadName, _ log.Component, config config.Component) error {
 	if err := util.SetAuthToken(); err != nil {
 		fmt.Println(err)

@@ -74,6 +74,7 @@ func Commands(globalParams *command.GlobalParams) []*cobra.Command {
 	return []*cobra.Command{dogstatsdCaptureCmd}
 }
 
+//nolint:revive // TODO(AML) Fix revive linter
 func dogstatsdCapture(log log.Component, config config.Component, cliParams *cliParams) error {
 	fmt.Printf("Starting a dogstatsd traffic capture session...\n\n")
 

@@ -75,6 +75,7 @@ func Commands(globalParams *command.GlobalParams) []*cobra.Command {
 	return []*cobra.Command{dogstatsdReplayCmd}
 }
 
+//nolint:revive // TODO(AML) Fix revive linter
 func dogstatsdReplay(log log.Component, config config.Component, cliParams *cliParams) error {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()

@@ -64,6 +64,7 @@ func Commands(globalParams *command.GlobalParams) []*cobra.Command {
 	return []*cobra.Command{dogstatsdStatsCmd}
 }
 
+//nolint:revive // TODO(AML) Fix revive linter
 func requestDogstatsdStats(log log.Component, config config.Component, cliParams *cliParams) error {
 	fmt.Printf("Getting the dogstatsd stats from the agent.\n\n")
 	var e error

@@ -32,6 +32,7 @@ import (
 	"github.com/DataDog/datadog-agent/comp/core/sysprobeconfig/sysprobeconfigimpl"
 	"github.com/DataDog/datadog-agent/comp/metadata/inventoryagent"
 	"github.com/DataDog/datadog-agent/pkg/api/util"
+	//nolint:revive // TODO(ASC) Fix revive linter
 	apiutil "github.com/DataDog/datadog-agent/pkg/api/util"
 	pkgconfig "github.com/DataDog/datadog-agent/pkg/config"
 	"github.com/DataDog/datadog-agent/pkg/config/settings"
@@ -207,6 +208,7 @@ func readProfileData(seconds int) (flare.ProfileData, error) {
 	return pdata, errs
 }
 
+//nolint:revive // TODO(ASC) Fix revive linter
 func makeFlare(flareComp flare.Component, log log.Component, config config.Component, sysprobeconfig sysprobeconfig.Component, cliParams *cliParams) error {
 	var (
 		profile flare.ProfileData

@@ -12,6 +12,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
+	//nolint:revive // TODO(ASC) Fix revive linter
 	assert "github.com/stretchr/testify/require"
 
 	"github.com/DataDog/datadog-agent/cmd/agent/command"

@@ -49,6 +49,7 @@ func Commands(globalParams *command.GlobalParams) []*cobra.Command {
 	return []*cobra.Command{getHostnameCommand}
 }
 
+//nolint:revive // TODO(ASC) Fix revive linter
 func getHostname(log log.Component, config config.Component, cliParams *cliParams) error {
 	hname, err := hostname.Get(context.TODO())
 	if err != nil {

@@ -12,6 +12,7 @@ import (
 	"os"
 )
 
+//nolint:revive // TODO(ASC) Fix revive linter
 func validateUser(allowRoot bool) error {
 	if os.Geteuid() != 0 {
 		return fmt.Errorf("please run this tool with the root user")

@@ -26,9 +26,11 @@ func getRelChecksPath(cliParams *cliParams) (string, error) {
 	return filepath.Join(fmt.Sprintf("embedded%s", cliParams.pythonMajorVersion), "Lib", "site-packages", "datadog_checks"), nil
 }
 
+//nolint:revive // TODO(ASC) Fix revive linter
 func validateUser(allowRoot bool) error {
 	elevated, _ := winutil.IsProcessElevated()
 	if !elevated {
+		//nolint:revive // TODO(ASC) Fix revive linter
 		return fmt.Errorf("Operation is not possible for unelevated process.")
 	}
 	return nil

@@ -50,6 +50,7 @@ func Commands(globalParams *command.GlobalParams) []*cobra.Command {
 	return []*cobra.Command{launchCmd}
 }
 
+//nolint:revive // TODO(ASC) Fix revive linter
 func launchGui(config config.Component, cliParams *cliParams) error {
 	guiPort := pkgconfig.Datadog.GetString("GUI_port")
 	if guiPort == "-1" {

@@ -54,6 +54,7 @@ func Commands(globalParams *command.GlobalParams) []*cobra.Command {
 	return []*cobra.Command{remoteConfigCmd}
 }
 
+//nolint:revive // TODO(RC) Fix revive linter
 func state(cliParams *cliParams, config config.Component) error {
 	if !pkgconfig.IsRemoteConfigEnabled(config) {
 		return fmt.Errorf("Remote configuration is not enabled")
@@ -65,6 +66,7 @@ func state(cliParams *cliParams, config config.Component) error {
 	if err != nil {
 		return fmt.Errorf("Couldn't get auth token: %v", err)
 	}
+	//nolint:revive // TODO(RC) Fix revive linter
 	ctx, close := context.WithCancel(context.Background())
 	defer close()
 	md := metadata.MD{