Revive linter placeholders for Serverless

cmd/serverless-init/cloudservice/appservice.go

@@ -3,6 +3,7 @@
 // This product includes software developed at Datadog (https://www.datadoghq.com/).
 // Copyright 2016-present Datadog, Inc.
 
+//nolint:revive // TODO(SERV) Fix revive linter
 package cloudservice
 
 import (
@@ -15,9 +16,13 @@ import (
 type AppService struct{}
 
 const (
-	WebsiteName  = "WEBSITE_SITE_NAME"
-	RegionName   = "REGION_NAME"
-	RunZip       = "APPSVC_RUN_ZIP"
+	//nolint:revive // TODO(SERV) Fix revive linter
+	WebsiteName = "WEBSITE_SITE_NAME"
+	//nolint:revive // TODO(SERV) Fix revive linter
+	RegionName = "REGION_NAME"
+	//nolint:revive // TODO(SERV) Fix revive linter
+	RunZip = "APPSVC_RUN_ZIP"
+	//nolint:revive // TODO(SERV) Fix revive linter
 	AppLogsTrace = "WEBSITE_APPSERVICEAPPLOGS_TRACE_ENABLED"
 )
 

cmd/serverless-init/cloudservice/containerapp.go

@@ -14,17 +14,24 @@ import (
 
 // ContainerApp has helper functions for getting specific Azure Container App data
 type ContainerApp struct {
+	//nolint:revive // TODO(SERV) Fix revive linter
 	SubscriptionId string
-	ResourceGroup  string
+	//nolint:revive // TODO(SERV) Fix revive linter
+	ResourceGroup string
 }
 
 const (
+	//nolint:revive // TODO(SERV) Fix revive linter
 	ContainerAppNameEnvVar = "CONTAINER_APP_NAME"
-	ContainerAppDNSSuffix  = "CONTAINER_APP_ENV_DNS_SUFFIX"
-	ContainerAppRevision   = "CONTAINER_APP_REVISION"
+	//nolint:revive // TODO(SERV) Fix revive linter
+	ContainerAppDNSSuffix = "CONTAINER_APP_ENV_DNS_SUFFIX"
+	//nolint:revive // TODO(SERV) Fix revive linter
+	ContainerAppRevision = "CONTAINER_APP_REVISION"
 
+	//nolint:revive // TODO(SERV) Fix revive linter
 	AzureSubscriptionIdEnvVar = "DD_AZURE_SUBSCRIPTION_ID"
-	AzureResourceGroupEnvVar  = "DD_AZURE_RESOURCE_GROUP"
+	//nolint:revive // TODO(SERV) Fix revive linter
+	AzureResourceGroupEnvVar = "DD_AZURE_RESOURCE_GROUP"
 )
 
 // GetTags returns a map of Azure-related tags
@@ -86,6 +93,7 @@ func (c *ContainerApp) Init() error {
 	// and DD_AZURE_RESOURCE_GROUP.
 	// These environment variables are optional for now. Once we go GA,
 	// return an error if these are not set.
+	//nolint:revive // TODO(SERV) Fix revive linter
 	if subscriptionId, exists := os.LookupEnv(AzureSubscriptionIdEnvVar); exists {
 		c.SubscriptionId = subscriptionId
 	} else {

cmd/serverless-init/cloudservice/containerapp_test.go

@@ -82,7 +82,7 @@ func TestInitHasErrorsWhenMissingSubscriptionId(t *testing.T) {
 	err := cmd.Run()
 	if e, ok := err.(*exec.ExitError); ok && !e.Success() {
 		return
-	} else {
+	} else { //nolint:revive // TODO(SERV) Fix revive linter
 		assert.FailNow(t, "Process didn't exit when not specifying DD_AZURE_SUBSCRIPTION_ID")
 	}
 }
@@ -106,7 +106,7 @@ func TestInitHasErrorsWhenMissingResourceGroup(t *testing.T) {
 	err := cmd.Run()
 	if e, ok := err.(*exec.ExitError); ok && !e.Success() {
 		return
-	} else {
+	} else { //nolint:revive // TODO(SERV) Fix revive linter
 		assert.FailNow(t, "Process didn't exit when not specifying DD_AZURE_RESOURCE_GROUP")
 	}
 }

cmd/serverless-init/cloudservice/helper/gcp.go

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

cmd/serverless-init/cloudservice/service.go

@@ -27,6 +27,7 @@ type CloudService interface {
 	Init() error
 }
 
+//nolint:revive // TODO(SERV) Fix revive linter
 type LocalService struct{}
 
 // GetTags is a default implementation that returns a local empty tag set
@@ -49,6 +50,7 @@ func (l *LocalService) Init() error {
 	return nil
 }
 
+//nolint:revive // TODO(SERV) Fix revive linter
 func GetCloudServiceType() CloudService {
 	if isCloudRunService() {
 		return &CloudRun{}

cmd/serverless-init/initcontainer/initcontainer.go

@@ -5,6 +5,7 @@
 
 //go:build !windows
 
+//nolint:revive // TODO(SERV) Fix revive linter
 package initcontainer
 
 import (

cmd/serverless-init/initcontainer/instrument.go

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

cmd/serverless-init/main_windows.go

@@ -5,6 +5,7 @@
 
 //go:build windows
 
+//nolint:revive // TODO(SERV) Fix revive linter
 package main
 
 func main() {

cmd/serverless-init/metric/metric.go

@@ -3,6 +3,7 @@
 // This product includes software developed at Datadog (https://www.datadoghq.com/).
 // Copyright 2016-present Datadog, Inc.
 
+//nolint:revive // TODO(SERV) Fix revive linter
 package metric
 
 import (
@@ -14,11 +15,15 @@ import (
 )
 
 // AddColdStartMetric adds the coldstart metric to the demultiplexer
+//
+//nolint:revive // TODO(SERV) Fix revive linter
 func AddColdStartMetric(metricPrefix string, tags []string, timestamp time.Time, demux aggregator.Demultiplexer) {
 	add(fmt.Sprintf("%v.enhanced.cold_start", metricPrefix), tags, time.Now(), demux)
 }
 
 // AddShutdownMetric adds the shutdown metric to the demultiplexer
+//
+//nolint:revive // TODO(SERV) Fix revive linter
 func AddShutdownMetric(metricPrefix string, tags []string, timestamp time.Time, demux aggregator.Demultiplexer) {
 	add(fmt.Sprintf("%v.enhanced.shutdown", metricPrefix), tags, time.Now(), demux)
 }

cmd/serverless-init/tag/tag.go

@@ -3,6 +3,7 @@
 // This product includes software developed at Datadog (https://www.datadoghq.com/).
 // Copyright 2016-present Datadog, Inc.
 
+//nolint:revive // TODO(SERV) Fix revive linter
 package tag
 
 import (
@@ -13,6 +14,8 @@ import (
 )
 
 // TagPair contains a pair of tag key and value
+//
+//nolint:revive // TODO(SERV) Fix revive linter
 type TagPair struct {
 	name    string
 	envName string

cmd/serverless/main.go

@@ -3,6 +3,7 @@
 // This product includes software developed at Datadog (https://www.datadoghq.com/).
 // Copyright 2016-present Datadog, Inc.
 
+//nolint:revive // TODO(SERV) Fix revive linter
 package main
 
 import (
@@ -182,6 +183,7 @@ func runAgent() {
 	// Channels for ColdStartCreator
 	lambdaSpanChan := make(chan *pb.Span)
 	lambdaInitMetricChan := make(chan *serverlessLogs.LambdaInitMetric)
+	//nolint:revive // TODO(SERV) Fix revive linter
 	coldStartSpanId := random.Random.Uint64()
 	metricAgent := &metrics.ServerlessMetricAgent{
 		SketchesBucketOffset: time.Second * 10,

pkg/serverless/daemon/daemon.go

@@ -3,6 +3,7 @@
 // This product includes software developed at Datadog (https://www.datadoghq.com/).
 // Copyright 2016-present Datadog, Inc.
 
+//nolint:revive // TODO(SERV) Fix revive linter
 package daemon
 
 import (
@@ -208,10 +209,12 @@ func (d *Daemon) SetTraceAgent(traceAgent *trace.ServerlessTraceAgent) {
 	d.TraceAgent = traceAgent
 }
 
+//nolint:revive // TODO(SERV) Fix revive linter
 func (d *Daemon) SetOTLPAgent(otlpAgent *otlp.ServerlessOTLPAgent) {
 	d.OTLPAgent = otlpAgent
 }
 
+//nolint:revive // TODO(SERV) Fix revive linter
 func (d *Daemon) SetColdStartSpanCreator(creator *trace.ColdStartSpanCreator) {
 	d.ColdStartCreator = creator
 }

pkg/serverless/daemon/routes.go

@@ -23,6 +23,7 @@ type Hello struct {
 	daemon *Daemon
 }
 
+//nolint:revive // TODO(SERV) Fix revive linter
 func (h *Hello) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	log.Debug("Hit on the serverless.Hello route.")
 	h.daemon.LambdaLibraryDetected = true
@@ -34,6 +35,7 @@ type Flush struct {
 	daemon *Daemon
 }
 
+//nolint:revive // TODO(SERV) Fix revive linter
 func (f *Flush) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	log.Debug("Hit on the serverless.Flush route.")
 	if os.Getenv(LocalTestEnvVar) == "true" || os.Getenv(LocalTestEnvVar) == "1" {
@@ -131,6 +133,7 @@ type TraceContext struct {
 	daemon *Daemon
 }
 
+//nolint:revive // TODO(SERV) Fix revive linter
 func (tc *TraceContext) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	executionInfo := tc.daemon.InvocationProcessor.GetExecutionInfo()
 	log.Debug("Hit on the serverless.TraceContext route.")

pkg/serverless/daemon/utils.go

@@ -10,6 +10,7 @@ import (
 	"time"
 )
 
+//nolint:revive // TODO(SERV) Fix revive linter
 const LocalTestEnvVar = "DD_LOCAL_TEST"
 
 // waitWithTimeout waits for a WaitGroup with a specified max timeout.

pkg/serverless/executioncontext/executioncontext.go

@@ -3,6 +3,7 @@
 // This product includes software developed at Datadog (https://www.datadoghq.com/).
 // Copyright 2016-present Datadog, Inc.
 
+//nolint:revive // TODO(SERV) Fix revive linter
 package executioncontext
 
 import (
@@ -15,6 +16,7 @@ import (
 
 const persistedStateFilePath = "/tmp/dd-lambda-extension-cache.json"
 
+//nolint:revive // TODO(SERV) Fix revive linter
 type ColdStartTags struct {
 	IsColdStart     bool
 	IsProactiveInit bool
@@ -73,6 +75,8 @@ func (ec *ExecutionContext) GetCurrentState() State {
 }
 
 // Returns whether or not the given request ID is a cold start or is a proactive init
+//
+//nolint:revive // TODO(SERV) Fix revive linter
 func (ec *ExecutionContext) GetColdStartTagsForRequestID(requestID string) ColdStartTags {
 	ec.m.Lock()
 	defer ec.m.Unlock()
@@ -130,6 +134,8 @@ func (ec *ExecutionContext) SetArnFromExtensionResponse(arn string) {
 }
 
 // SetInitTime sets the agent initialization time
+//
+//nolint:revive // TODO(SERV) Fix revive linter
 func (ec *ExecutionContext) SetInitializationTime(time time.Time) {
 	ec.m.Lock()
 	defer ec.m.Unlock()
@@ -153,6 +159,8 @@ func (ec *ExecutionContext) UpdateEndTime(time time.Time) {
 
 // UpdateOutOfMemoryRequestID updates the execution context with the request ID if an
 // out of memory is detected either in the function or platform.report logs
+//
+//nolint:revive // TODO(SERV) Fix revive linter
 func (ec *ExecutionContext) UpdateOutOfMemoryRequestID(requestId string) {
 	ec.m.Lock()
 	defer ec.m.Unlock()

pkg/serverless/flush/strategy.go

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

pkg/serverless/invocationlifecycle/constants.go

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

pkg/serverless/logs/http.go

@@ -3,6 +3,7 @@
 // This product includes software developed at Datadog (https://www.datadoghq.com/).
 // Copyright 2016-present Datadog, Inc.
 
+//nolint:revive // TODO(SERV) Fix revive linter
 package logs
 
 import (
@@ -11,19 +12,25 @@ import (
 )
 
 // LambdaLogsAPI implements the AWS Lambda Logs API callback
+//
+//nolint:revive // TODO(SERV) Fix revive linter
 type LambdaLogsAPIServer struct {
 	out chan<- []LambdaLogAPIMessage
 }
 
+//nolint:revive // TODO(SERV) Fix revive linter
 func NewLambdaLogsAPIServer(out chan<- []LambdaLogAPIMessage) LambdaLogsAPIServer {
 	return LambdaLogsAPIServer{out}
 }
 
+//nolint:revive // TODO(SERV) Fix revive linter
 func (l *LambdaLogsAPIServer) Close() {
 	close(l.out)
 }
 
 // ServeHTTP - see type LambdaLogsCollector comment.
+//
+//nolint:revive // TODO(SERV) Fix revive linter
 func (c *LambdaLogsAPIServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	data, _ := io.ReadAll(r.Body)
 	defer r.Body.Close()

pkg/serverless/logs/logs_collector.go

@@ -31,6 +31,7 @@ type Tags struct {
 	Tags []string
 }
 
+//nolint:revive // TODO(SERV) Fix revive linter
 type LambdaInitMetric struct {
 	InitDurationTelemetry float64
 	InitStartTime         time.Time
@@ -50,17 +51,19 @@ type LambdaLogsCollector struct {
 	enhancedMetricsEnabled bool
 	invocationStartTime    time.Time
 	invocationEndTime      time.Time
-	process_once           *sync.Once
-	executionContext       *executioncontext.ExecutionContext
-	lambdaInitMetricChan   chan<- *LambdaInitMetric
-	orphanLogsChan         chan []LambdaLogAPIMessage
+	//nolint:revive // TODO(SERV) Fix revive linter
+	process_once         *sync.Once
+	executionContext     *executioncontext.ExecutionContext
+	lambdaInitMetricChan chan<- *LambdaInitMetric
+	orphanLogsChan       chan []LambdaLogAPIMessage
 
 	arn string
 
 	// handleRuntimeDone is the function to be called when a platform.runtimeDone log message is received
 	handleRuntimeDone func()
 }
 
+//nolint:revive // TODO(SERV) Fix revive linter
 func NewLambdaLogCollector(out chan<- *logConfig.ChannelMessage, demux aggregator.Demultiplexer, extraTags *Tags, logsEnabled bool, enhancedMetricsEnabled bool, executionContext *executioncontext.ExecutionContext, handleRuntimeDone func(), lambdaInitMetricChan chan<- *LambdaInitMetric) *LambdaLogsCollector {
 
 	return &LambdaLogsCollector{
@@ -258,6 +261,7 @@ func (lc *LambdaLogsCollector) processMessage(
 			coldStart = coldStartTags.IsColdStart
 		}
 		tags := tags.AddColdStartTag(lc.extraTags.Tags, coldStart, proactiveInit)
+		//nolint:revive // TODO(SERV) Fix revive linter
 		outOfMemoryRequestId := ""
 
 		if message.logType == logTypeFunction {

pkg/serverless/logs/parse.go

@@ -206,6 +206,7 @@ func (l *LambdaLogAPIMessage) handlePlatformReport(objectRecord map[string]inter
 	log.Debugf("Enhanced metrics: %+v\n", l.objectRecord.reportLogItem)
 }
 
+//nolint:revive // TODO(SERV) Fix revive linter
 func (l *LambdaLogAPIMessage) handlePlatformInitStart(objectRecord map[string]interface{}) {
 	l.objectRecord.reportLogItem.initStartTime = l.time
 }

pkg/serverless/logs/scheduler.go

@@ -40,6 +40,7 @@ func SetLogsTags(tags []string) {
 	}
 }
 
+//nolint:revive // TODO(SERV) Fix revive linter
 func GetLogsTags() []string {
 	if logsScheduler != nil {
 		return logsScheduler.GetLogsTags()

pkg/serverless/metrics/enhanced_metrics.go

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