Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions aws/logs_monitoring/.editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,9 @@ trim_trailing_whitespace = true

[*.yaml]
indent_size = 2

[{*.go,go.mod}]
indent_style = tab

[Makefile]
indent_style = tab
7 changes: 2 additions & 5 deletions aws/logs_monitoring/trace_forwarder/Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand Down
308 changes: 0 additions & 308 deletions aws/logs_monitoring/trace_forwarder/Gopkg.lock

This file was deleted.

7 changes: 0 additions & 7 deletions aws/logs_monitoring/trace_forwarder/Gopkg.toml

This file was deleted.

2 changes: 1 addition & 1 deletion aws/logs_monitoring/trace_forwarder/Makefile
Original file line number Diff line number Diff line change
@@ -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"
13 changes: 5 additions & 8 deletions aws/logs_monitoring/trace_forwarder/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -43,14 +43,11 @@ conn.send("""

## Requirements

- dep
- go 1.12 or higher
- docker
- docker

## Building Go Binary

```bash
dep ensure
make
```

Expand Down
Loading
Loading