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

Signed-off-by: Vincent Boutour <[email protected]>
DataDog · Feb 11, 2025 · e7b3ee2 · e7b3ee2
1 parent 04b8154
commit e7b3ee2
Show file tree

Hide file tree

Showing 13 changed files with 357 additions and 345 deletions.
diff --git a/aws/logs_monitoring/.editorconfig b/aws/logs_monitoring/.editorconfig
@@ -8,3 +8,9 @@ trim_trailing_whitespace = true
 
 [*.yaml]
 indent_size = 2
+
+[*.go]
+indent_style = tab
+
+[Makefile]
+indent_style = tab
diff --git a/aws/logs_monitoring/trace_forwarder/Dockerfile b/aws/logs_monitoring/trace_forwarder/Dockerfile
@@ -1,14 +1,11 @@
-FROM golang:1.12
-ARG runtime
-
-RUN go get -u github.com/golang/dep/cmd/dep
+FROM golang:1.23
 
 # Install dependencies
 COPY . /go/src/github.com/DataDog/datadog-serverless-functions/aws/logs_monitoring/trace_forwarder/
 WORKDIR /go/src/github.com/DataDog/datadog-serverless-functions/aws/logs_monitoring/trace_forwarder/
+
 ENV GOOS=linux
 ENV GOARCH=arm64
-RUN dep ensure
 
 # Build the go binary
 

diff --git a/aws/logs_monitoring/trace_forwarder/Gopkg.lock b/aws/logs_monitoring/trace_forwarder/Gopkg.lock
diff --git a/aws/logs_monitoring/trace_forwarder/Gopkg.toml b/aws/logs_monitoring/trace_forwarder/Gopkg.toml
diff --git a/aws/logs_monitoring/trace_forwarder/Makefile b/aws/logs_monitoring/trace_forwarder/Makefile
@@ -1,2 +1,2 @@
 target:
-	go build -o bin/trace-intake.so -gcflags="-e" -buildmode=c-shared cmd/trace/main.go
+	go build -o "bin/trace-intake.so" -gcflags="-e" -buildmode=c-shared "cmd/trace/main.go"
diff --git a/aws/logs_monitoring/trace_forwarder/README.md b/aws/logs_monitoring/trace_forwarder/README.md
@@ -3,10 +3,10 @@
 Shared libary for submitting traces to trace intake.
 Features include:
 
--   Tools for building AWS Lambda Layer from library
--   Trace obfuscation, (using logic from datadog-agent)
--   Submits Stats/Transcations for traces
--   Python bindings
+- Tools for building AWS Lambda Layer from library
+- Trace obfuscation, (using logic from datadog-agent)
+- Submits Stats/Transcations for traces
+- Python bindings
 
 ```python
 from trace_forwarder.connection import TraceConnection
@@ -43,14 +43,11 @@ conn.send("""
 
 ## Requirements
 
--   dep
--   go 1.12 or higher
--   docker
+- docker
 
 ## Building Go Binary
 
 ```bash
-dep ensure
 make
 ```
 

diff --git a/aws/logs_monitoring/trace_forwarder/cmd/trace/main.go b/aws/logs_monitoring/trace_forwarder/cmd/trace/main.go
@@ -14,10 +14,9 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/DataDog/datadog-serverless-functions/aws/logs_monitoring/trace_forwarder/internal/apm"
-
 	"github.com/DataDog/datadog-agent/pkg/trace/obfuscate"
 	"github.com/DataDog/datadog-agent/pkg/trace/pb"
+	"github.com/DataDog/datadog-serverless-functions/aws/logs_monitoring/trace_forwarder/internal/apm"
 )
 
 var (
@@ -93,7 +92,6 @@ func ForwardTraces(serializedTraces string) int {
 func unmarshalSerializedTraces(serializedTraces string) ([]RawTracePayload, error) {
 	var rawTracePayloads []RawTracePayload
 	err := json.Unmarshal([]byte(serializedTraces), &rawTracePayloads)
-
 	if err != nil {
 		return rawTracePayloads, fmt.Errorf("Couldn't unmarshal serialized traces, %v", err)
 	}