fixup! chore(deps): Using a more recent go version for building

Signed-off-by: Vincent Boutour <[email protected]>

Author: ViBiOh

aws/logs_monitoring/.editorconfig

@@ -9,7 +9,7 @@ trim_trailing_whitespace = true
 [*.yaml]
 indent_size = 2
 
-[*.go]
+[{*.go,go.mod}]
 indent_style = tab
 
 [Makefile]

aws/logs_monitoring/trace_forwarder/cmd/trace/main.go

@@ -37,8 +37,8 @@ type (
 func Configure(rootURL, apiKey string, InsecureSkipVerify bool) {
 	// Need to make a copy of these values, otherwise the underlying memory
 	// might be cleaned up by the runtime.
-	localRootURL := fmt.Sprintf("%s", rootURL)
-	localAPIKey := fmt.Sprintf("%s", apiKey)
+	localRootURL := rootURL
+	localAPIKey := apiKey
 
 	obfuscator = obfuscate.NewObfuscator(&obfuscate.Config{
 		ES: obfuscate.JSONSettings{

aws/logs_monitoring/trace_forwarder/cmd/trace/main_test.go

@@ -8,7 +8,7 @@
 package main
 
 import (
-	"io/ioutil"
+	"io"
 	"os"
 	"testing"
 
@@ -58,7 +58,7 @@ func TestForwardTracesWithXRayRoot(t *testing.T) {
 	assert.NoError(t, err)
 	defer file.Close()
 
-	contents, err := ioutil.ReadAll(file)
+	contents, err := io.ReadAll(file)
 	input := string(contents)
 
 	assert.NoError(t, err, "Couldn't read contents of test file")
@@ -71,7 +71,7 @@ func TestForwardTracesWithXRayRoot(t *testing.T) {
 	result := ForwardTraces(input)
 
 	w.Close()
-	out, _ := ioutil.ReadAll(r)
+	out, _ := io.ReadAll(r)
 	os.Stdout = originalStdout
 
 	outputLog := string(out)

aws/logs_monitoring/trace_forwarder/go.mod

@@ -3,7 +3,7 @@ module github.com/DataDog/datadog-serverless-functions/aws/logs_monitoring/trace
 go 1.23.6
 
 require (
-	github.com/DataDog/datadog-agent v0.0.0-20200417180928-f454c60bc16f
+	github.com/DataDog/datadog-agent v0.0.0-20200417180928-f454c60bc16f // This is kept as a commit ref for now
 	github.com/davecgh/go-spew v1.1.1
 	github.com/gogo/protobuf v1.3.2
 	github.com/stretchr/testify v1.10.0

aws/logs_monitoring/trace_forwarder/internal/apm/model_test.go

@@ -10,7 +10,7 @@ package apm
 import (
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"os"
 	"strings"
 	"testing"
@@ -40,7 +40,7 @@ func CompareSnapshot(t *testing.T, inputFile, snapshotFile string, updateSnapsho
 	assert.NoError(t, err)
 	defer file.Close()
 
-	contents, err := ioutil.ReadAll(file)
+	contents, err := io.ReadAll(file)
 
 	assert.NoError(t, err, "Couldn't read contents of test file")
 
@@ -72,19 +72,19 @@ func CompareSnapshot(t *testing.T, inputFile, snapshotFile string, updateSnapsho
 	output := sc.Sdump(payload)
 
 	if updateSnapshots {
-		err = ioutil.WriteFile(snapshotFile, []byte(output), 0o644)
+		err = os.WriteFile(snapshotFile, []byte(output), 0o644)
 		assert.NoError(t, err)
 		fmt.Printf("Updated Snapshot %s\n", snapshotFile)
 	} else {
-		snapshot, err := ioutil.ReadFile(snapshotFile)
+		snapshot, err := os.ReadFile(snapshotFile)
 		assert.NoError(t, err, "Missing snapshot file for test")
 		expected := string(snapshot)
 		assert.Equal(t, expected, output, fmt.Sprintf("Snapshot's didn't match for %s. To update run `$UPDATE_SNAPSHOTS=true go test ./...`", inputFile))
 	}
 }
 
 func TestSnapshotsMatch(t *testing.T) {
-	files, err := ioutil.ReadDir("testdata")
+	files, err := os.ReadDir("testdata")
 	assert.NoError(t, err)
 	us := os.Getenv("UPDATE_SNAPSHOTS")
 	updateSnapshots := strings.ToLower(us) == "true"