Skip to content

Commit 9c21dba

Browse files
authored
build: bump go to 1.21 (#399)
* build: bump go to 1.21 * build: bump dependencies * build: generate notice * test: update expected log message due to ecszap bump * refactor: remove global seed call From https://go.dev/doc/go1.20 The math/rand package now automatically seeds the global random number generator (used by top-level functions like Float64 and Int) with a random value, and the top-level Seed function has been deprecated. * build: bump golangci for compatibility with go 1.21 * lint: remove unused import
1 parent 83a565a commit 9c21dba

File tree

7 files changed

+367
-206
lines changed

7 files changed

+367
-206
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ SHELL = /bin/bash -eo pipefail
22

33
GORELEASER_VERSION = "v1.14.1"
44
GO_LICENSER_VERSION = "v0.4.0"
5-
GOLANGCI_LINT_VERSION = "v1.48.0"
5+
GOLANGCI_LINT_VERSION = "v1.54.2"
66
export DOCKER_IMAGE_NAME = observability/apm-lambda-extension
77
export DOCKER_REGISTRY = docker.elastic.co
88

NOTICE.txt

Lines changed: 270 additions & 58 deletions
Large diffs are not rendered by default.

apmproxy/client.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ package apmproxy
2020
import (
2121
"bytes"
2222
"errors"
23-
"math/rand"
2423
"net/http"
2524
"strings"
2625
"sync"
@@ -113,7 +112,5 @@ func NewClient(opts ...Option) (*Client, error) {
113112
c.serverURL = c.serverURL + "/"
114113
}
115114

116-
rand.Seed(time.Now().UnixNano())
117-
118115
return &c, nil
119116
}

dependencies.asciidoc

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,31 +14,32 @@ This page lists the third-party dependencies used to build {n}.
1414
|===
1515
| Name | Version | Licence
1616

17-
| link:https://github.com/aws/aws-sdk-go-v2[$$github.com/aws/aws-sdk-go-v2/config$$] | v1.15.14 | Apache-2.0
18-
| link:https://github.com/aws/aws-sdk-go-v2[$$github.com/aws/aws-sdk-go-v2/credentials$$] | v1.12.9 | Apache-2.0
19-
| link:https://github.com/aws/aws-sdk-go-v2[$$github.com/aws/aws-sdk-go-v2/feature/ec2/imds$$] | v1.12.8 | Apache-2.0
20-
| link:https://github.com/aws/aws-sdk-go-v2[$$github.com/aws/aws-sdk-go-v2/internal/configsources$$] | v1.1.26 | Apache-2.0
21-
| link:https://github.com/aws/aws-sdk-go-v2[$$github.com/aws/aws-sdk-go-v2/internal/endpoints/v2$$] | v2.4.20 | Apache-2.0
22-
| link:https://github.com/aws/aws-sdk-go-v2[$$github.com/aws/aws-sdk-go-v2/internal/ini$$] | v1.3.15 | Apache-2.0
23-
| link:https://github.com/aws/aws-sdk-go-v2[$$github.com/aws/aws-sdk-go-v2/service/acm$$] | v1.16.4 | Apache-2.0
24-
| link:https://github.com/aws/aws-sdk-go-v2[$$github.com/aws/aws-sdk-go-v2/service/internal/presigned-url$$] | v1.9.8 | Apache-2.0
25-
| link:https://github.com/aws/aws-sdk-go-v2[$$github.com/aws/aws-sdk-go-v2/service/secretsmanager$$] | v1.15.13 | Apache-2.0
26-
| link:https://github.com/aws/aws-sdk-go-v2[$$github.com/aws/aws-sdk-go-v2/service/sso$$] | v1.11.12 | Apache-2.0
27-
| link:https://github.com/aws/aws-sdk-go-v2[$$github.com/aws/aws-sdk-go-v2/service/sts$$] | v1.16.9 | Apache-2.0
28-
| link:https://github.com/aws/aws-sdk-go-v2[$$github.com/aws/aws-sdk-go-v2$$] | v1.17.2 | Apache-2.0
29-
| link:https://github.com/aws/smithy-go[$$github.com/aws/smithy-go$$] | v1.13.5 | Apache-2.0
17+
| link:https://github.com/aws/aws-sdk-go-v2[$$github.com/aws/aws-sdk-go-v2/config$$] | v1.18.37 | Apache-2.0
18+
| link:https://github.com/aws/aws-sdk-go-v2[$$github.com/aws/aws-sdk-go-v2/credentials$$] | v1.13.35 | Apache-2.0
19+
| link:https://github.com/aws/aws-sdk-go-v2[$$github.com/aws/aws-sdk-go-v2/feature/ec2/imds$$] | v1.13.11 | Apache-2.0
20+
| link:https://github.com/aws/aws-sdk-go-v2[$$github.com/aws/aws-sdk-go-v2/internal/configsources$$] | v1.1.41 | Apache-2.0
21+
| link:https://github.com/aws/aws-sdk-go-v2[$$github.com/aws/aws-sdk-go-v2/internal/endpoints/v2$$] | v2.4.35 | Apache-2.0
22+
| link:https://github.com/aws/aws-sdk-go-v2[$$github.com/aws/aws-sdk-go-v2/internal/ini$$] | v1.3.42 | Apache-2.0
23+
| link:https://github.com/aws/aws-sdk-go-v2[$$github.com/aws/aws-sdk-go-v2/service/acm$$] | v1.18.5 | Apache-2.0
24+
| link:https://github.com/aws/aws-sdk-go-v2[$$github.com/aws/aws-sdk-go-v2/service/internal/presigned-url$$] | v1.9.35 | Apache-2.0
25+
| link:https://github.com/aws/aws-sdk-go-v2[$$github.com/aws/aws-sdk-go-v2/service/secretsmanager$$] | v1.21.0 | Apache-2.0
26+
| link:https://github.com/aws/aws-sdk-go-v2[$$github.com/aws/aws-sdk-go-v2/service/sso$$] | v1.13.5 | Apache-2.0
27+
| link:https://github.com/aws/aws-sdk-go-v2[$$github.com/aws/aws-sdk-go-v2/service/ssooidc$$] | v1.15.5 | Apache-2.0
28+
| link:https://github.com/aws/aws-sdk-go-v2[$$github.com/aws/aws-sdk-go-v2/service/sts$$] | v1.21.5 | Apache-2.0
29+
| link:https://github.com/aws/aws-sdk-go-v2[$$github.com/aws/aws-sdk-go-v2$$] | v1.21.0 | Apache-2.0
30+
| link:https://github.com/aws/smithy-go[$$github.com/aws/smithy-go$$] | v1.14.2 | Apache-2.0
3031
| link:https://github.com/jmespath/go-jmespath[$$github.com/jmespath/go-jmespath$$] | v0.4.0 | Apache-2.0
3132
| link:https://github.com/pkg/errors[$$github.com/pkg/errors$$] | v0.9.1 | BSD-2-Clause
3233
| link:https://github.com/tidwall/gjson[$$github.com/tidwall/gjson$$] | v1.14.3 | MIT
3334
| link:https://github.com/tidwall/match[$$github.com/tidwall/match$$] | v1.1.1 | MIT
3435
| link:https://github.com/tidwall/pretty[$$github.com/tidwall/pretty$$] | v1.2.1 | MIT
3536
| link:https://github.com/tidwall/sjson[$$github.com/tidwall/sjson$$] | v1.2.5 | MIT
36-
| link:https://go.elastic.co/apm/v2[$$go.elastic.co/apm/v2$$] | v2.1.1-0.20220617022209-90f624fe11b0 | Apache-2.0
37-
| link:https://go.elastic.co/ecszap[$$go.elastic.co/ecszap$$] | v1.0.1 | Apache-2.0
38-
| link:https://go.elastic.co/fastjson[$$go.elastic.co/fastjson$$] | v1.1.0 | MIT
39-
| link:https://go.uber.org/atomic[$$go.uber.org/atomic$$] | v1.9.0 | MIT
40-
| link:https://go.uber.org/multierr[$$go.uber.org/multierr$$] | v1.8.0 | MIT
41-
| link:https://go.uber.org/zap[$$go.uber.org/zap$$] | v1.21.0 | MIT
37+
| link:https://go.elastic.co/apm/v2[$$go.elastic.co/apm/v2$$] | v2.4.3 | Apache-2.0
38+
| link:https://go.elastic.co/ecszap[$$go.elastic.co/ecszap$$] | v1.0.2 | Apache-2.0
39+
| link:https://go.elastic.co/fastjson[$$go.elastic.co/fastjson$$] | v1.2.0 | MIT
40+
| link:https://go.uber.org/atomic[$$go.uber.org/atomic$$] | v1.7.0 | MIT
41+
| link:https://go.uber.org/multierr[$$go.uber.org/multierr$$] | v1.6.0 | MIT
42+
| link:https://go.uber.org/zap[$$go.uber.org/zap$$] | v1.24.0 | MIT
4243
|===
4344

4445

go.mod

Lines changed: 23 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,42 @@
11
module github.com/elastic/apm-aws-lambda
22

3-
go 1.19
3+
go 1.21
44

55
require (
6+
github.com/aws/aws-sdk-go-v2 v1.21.0
7+
github.com/aws/aws-sdk-go-v2/config v1.18.37
8+
github.com/aws/aws-sdk-go-v2/service/acm v1.18.5
9+
github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0
610
github.com/google/uuid v1.3.0
711
github.com/joho/godotenv v1.4.0
8-
github.com/magefile/mage v1.13.0 // indirect
9-
github.com/stretchr/testify v1.7.0
10-
go.elastic.co/ecszap v1.0.1
11-
go.uber.org/atomic v1.9.0 // indirect
12-
go.uber.org/multierr v1.8.0 // indirect
13-
go.uber.org/zap v1.21.0
14-
)
15-
16-
require (
17-
github.com/aws/aws-sdk-go-v2 v1.17.2
18-
github.com/aws/aws-sdk-go-v2/config v1.15.14
19-
github.com/aws/aws-sdk-go-v2/service/acm v1.16.4
20-
github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.15.13
12+
github.com/stretchr/testify v1.8.4
2113
github.com/tidwall/gjson v1.14.3
2214
github.com/tidwall/sjson v1.2.5
23-
go.elastic.co/apm/v2 v2.1.1-0.20220617022209-90f624fe11b0
24-
go.elastic.co/fastjson v1.1.0
15+
go.elastic.co/apm/v2 v2.4.3
16+
go.elastic.co/ecszap v1.0.2
17+
go.elastic.co/fastjson v1.2.0
18+
go.uber.org/zap v1.24.0
2519
)
2620

2721
require (
28-
github.com/aws/aws-sdk-go-v2/credentials v1.12.9 // indirect
29-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.8 // indirect
30-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.26 // indirect
31-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.20 // indirect
32-
github.com/aws/aws-sdk-go-v2/internal/ini v1.3.15 // indirect
33-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.8 // indirect
34-
github.com/aws/aws-sdk-go-v2/service/sso v1.11.12 // indirect
35-
github.com/aws/aws-sdk-go-v2/service/sts v1.16.9 // indirect
36-
github.com/aws/smithy-go v1.13.5 // indirect
22+
github.com/aws/aws-sdk-go-v2/credentials v1.13.35 // indirect
23+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.11 // indirect
24+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.41 // indirect
25+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.35 // indirect
26+
github.com/aws/aws-sdk-go-v2/internal/ini v1.3.42 // indirect
27+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.35 // indirect
28+
github.com/aws/aws-sdk-go-v2/service/sso v1.13.5 // indirect
29+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.15.5 // indirect
30+
github.com/aws/aws-sdk-go-v2/service/sts v1.21.5 // indirect
31+
github.com/aws/smithy-go v1.14.2 // indirect
3732
github.com/benbjohnson/clock v1.1.0 // indirect
3833
github.com/davecgh/go-spew v1.1.1 // indirect
3934
github.com/jmespath/go-jmespath v0.4.0 // indirect
4035
github.com/pkg/errors v0.9.1 // indirect
4136
github.com/pmezard/go-difflib v1.0.0 // indirect
42-
github.com/santhosh-tekuri/jsonschema v1.2.4 // indirect
4337
github.com/tidwall/match v1.1.1 // indirect
4438
github.com/tidwall/pretty v1.2.1 // indirect
45-
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
39+
go.uber.org/atomic v1.7.0 // indirect
40+
go.uber.org/multierr v1.6.0 // indirect
41+
gopkg.in/yaml.v3 v3.0.1 // indirect
4642
)

0 commit comments

Comments
 (0)