Skip to content

Commit 08441d5

Browse files
simittsimitt
authored
8.0 update beats (#7137)
* Update to elastic/beats@13de35e26893 * Update Makefile * Update deprecated grpc.WithInsecure()
1 parent 535f709 commit 08441d5

File tree

15 files changed

+182
-556
lines changed

15 files changed

+182
-556
lines changed

‎.go-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.17.1
1+
1.17.5

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.17.1
1+
FROM golang:1.17.5
22
MAINTAINER Nicolas Ruflin <[email protected]>
33

44
RUN set -x && \

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ update-beats: update-beats-module update
135135

136136
.PHONY: update-beats-module
137137
update-beats-module:
138-
$(GO) get -d -u $(BEATS_MODULE)@$(BEATS_VERSION) && $(GO) mod tidy
138+
$(GO) get -d -u $(BEATS_MODULE)@$(BEATS_VERSION) && $(GO) mod tidy -compat=1.17
139139
cp -f $$($(GO) list -m -f {{.Dir}} $(BEATS_MODULE))/.go-version .go-version
140140
find . -maxdepth 2 -name Dockerfile -exec sed -i'.bck' -E -e "s#(FROM golang):[0-9]+\.[0-9]+\.[0-9]+#\1:$$(cat .go-version)#g" {} \;
141141
sed -i'.bck' -E -e "s#(:go-version): [0-9]+\.[0-9]+\.[0-9]+#\1: $$(cat .go-version)#g" docs/version.asciidoc

‎NOTICE.txt‎

Lines changed: 30 additions & 452 deletions
Large diffs are not rendered by default.

‎beater/jaeger/grpc_test.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ import (
3434
"go.opentelemetry.io/collector/model/pdata"
3535
"google.golang.org/grpc"
3636
"google.golang.org/grpc/codes"
37+
"google.golang.org/grpc/credentials/insecure"
3738
"google.golang.org/grpc/status"
3839

3940
"github.com/elastic/beats/v7/libbeat/common"
@@ -258,7 +259,7 @@ func newServer(t *testing.T, batchProcessor model.BatchProcessor, agentcfgFetche
258259

259260
go srv.Serve(lis)
260261
t.Cleanup(srv.GracefulStop)
261-
conn, err := grpc.Dial(lis.Addr().String(), grpc.WithInsecure())
262+
conn, err := grpc.Dial(lis.Addr().String(), grpc.WithTransportCredentials(insecure.NewCredentials()))
262263
require.NoError(t, err)
263264
t.Cleanup(func() { conn.Close() })
264265
return conn

‎beater/otlp/grpc_test.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import (
2828
"go.opentelemetry.io/collector/model/otlpgrpc"
2929
"go.opentelemetry.io/collector/model/pdata"
3030
"google.golang.org/grpc"
31+
"google.golang.org/grpc/credentials/insecure"
3132
"google.golang.org/grpc/status"
3233

3334
"github.com/elastic/apm-server/beater/interceptors"
@@ -192,7 +193,7 @@ func newServer(t *testing.T, batchProcessor model.BatchProcessor) *grpc.ClientCo
192193

193194
go srv.Serve(lis)
194195
t.Cleanup(srv.GracefulStop)
195-
conn, err := grpc.Dial(lis.Addr().String(), grpc.WithInsecure())
196+
conn, err := grpc.Dial(lis.Addr().String(), grpc.WithTransportCredentials(insecure.NewCredentials()))
196197
require.NoError(t, err)
197198
t.Cleanup(func() { conn.Close() })
198199
return conn

‎beater/server_test.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ import (
4343
"github.com/stretchr/testify/require"
4444
"google.golang.org/grpc"
4545
"google.golang.org/grpc/codes"
46+
"google.golang.org/grpc/credentials/insecure"
4647
"google.golang.org/grpc/metadata"
4748
"google.golang.org/grpc/status"
4849

@@ -404,7 +405,7 @@ func TestServerJaegerGRPC(t *testing.T) {
404405

405406
baseURL, err := url.Parse(server.baseURL)
406407
require.NoError(t, err)
407-
conn, err := grpc.Dial(baseURL.Host, grpc.WithInsecure())
408+
conn, err := grpc.Dial(baseURL.Host, grpc.WithTransportCredentials(insecure.NewCredentials()))
408409
require.NoError(t, err)
409410
defer conn.Close()
410411

@@ -434,7 +435,7 @@ func TestServerOTLPGRPC(t *testing.T) {
434435
return conn.Invoke(ctx, "/opentelemetry.proto.collector.trace.v1.TraceService/Export", request, response)
435436
}
436437

437-
conn, err := grpc.Dial(baseURL.Host, grpc.WithInsecure())
438+
conn, err := grpc.Dial(baseURL.Host, grpc.WithTransportCredentials(insecure.NewCredentials()))
438439
require.NoError(t, err)
439440
defer conn.Close()
440441

‎docs/version.asciidoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// doc-branch can be: master, 8.0, 8.1, etc.
22
:doc-branch: master
3-
:go-version: 1.17.1
3+
:go-version: 1.17.5
44
:python: 3.7
55
:docker: 1.12
66
:docker-compose: 1.11

‎go.mod‎

Lines changed: 19 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ require (
1010
github.com/dgraph-io/badger/v2 v2.2007.3-0.20201012072640-f5a7e0a1c83b
1111
github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect
1212
github.com/dlclark/regexp2 v1.4.0 // indirect
13-
github.com/dop251/goja v0.0.0-20211115154819-26ebff68a7d5 // indirect
13+
github.com/dop251/goja v0.0.0-20220124171016-cfb079cdc7b4 // indirect
1414
github.com/dop251/goja_nodejs v0.0.0-20211022123610-8dd9abb0616d // indirect
1515
github.com/dustin/go-humanize v1.0.0
1616
github.com/elastic/apm-server/approvaltest v0.0.0-00010101000000-000000000000
17-
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20211115162123-4d7e91351f6e
17+
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20220126085914-13de35e26893
1818
github.com/elastic/ecs v1.12.0
1919
github.com/elastic/elastic-agent-client/v7 v7.0.0-20210922110810-e6f1f402a9ed // indirect
2020
github.com/elastic/gmux v0.2.0
@@ -24,19 +24,19 @@ require (
2424
github.com/elastic/go-ucfg v0.8.4
2525
github.com/fatih/color v1.13.0 // indirect
2626
github.com/go-sourcemap/sourcemap v2.1.3+incompatible
27-
github.com/gofrs/uuid v4.1.0+incompatible
27+
github.com/gofrs/uuid v4.2.0+incompatible
2828
github.com/gogo/protobuf v1.3.2
29-
github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9
29+
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1
3030
github.com/hashicorp/errwrap v1.1.0 // indirect
3131
github.com/hashicorp/go-multierror v1.1.1
3232
github.com/hashicorp/golang-lru v0.5.4
3333
github.com/jaegertracing/jaeger v1.25.0
3434
github.com/jcchavezs/porto v0.4.0 // indirect
35-
github.com/josephspurrier/goversioninfo v1.3.0 // indirect
35+
github.com/josephspurrier/goversioninfo v1.4.0 // indirect
3636
github.com/json-iterator/go v1.1.11
3737
github.com/libp2p/go-reuseport v0.0.2
38-
github.com/magefile/mage v1.11.0
39-
github.com/mattn/go-colorable v0.1.11 // indirect
38+
github.com/magefile/mage v1.12.1
39+
github.com/mattn/go-colorable v0.1.12 // indirect
4040
github.com/mitchellh/hashstructure v1.1.0 // indirect
4141
github.com/modern-go/reflect2 v1.0.1
4242
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.34.0
@@ -49,7 +49,6 @@ require (
4949
github.com/stretchr/testify v1.7.0
5050
github.com/tidwall/gjson v1.9.3 // indirect
5151
github.com/tidwall/sjson v1.1.1 // indirect
52-
github.com/urso/magetools v0.0.0-20200125210132-c2e338f92f3a // indirect
5352
github.com/xeipuuv/gojsonschema v1.2.0
5453
go.elastic.co/apm v1.15.0
5554
go.elastic.co/apm/module/apmelasticsearch v1.15.0
@@ -62,19 +61,19 @@ require (
6261
go.opentelemetry.io/collector/model v0.34.0
6362
go.uber.org/atomic v1.9.0 // indirect
6463
go.uber.org/multierr v1.7.0 // indirect
65-
go.uber.org/zap v1.19.1
66-
golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa // indirect
64+
go.uber.org/zap v1.20.0
65+
golang.org/x/crypto v0.0.0-20220112180741-5e0467b6c7ce // indirect
6766
golang.org/x/mod v0.5.1 // indirect
68-
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2
67+
golang.org/x/net v0.0.0-20220121210141-e204ce36a2ba
6968
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
70-
golang.org/x/sys v0.0.0-20211113001501-0c823b97ae02 // indirect
71-
golang.org/x/time v0.0.0-20210611083556-38a9dc6acbc6
72-
golang.org/x/tools v0.1.7
73-
google.golang.org/genproto v0.0.0-20211115160612-a5da7257a6f7 // indirect
74-
google.golang.org/grpc v1.42.0
69+
golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect
70+
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac
71+
golang.org/x/tools v0.1.8
72+
google.golang.org/genproto v0.0.0-20220118154757-00ab72f36ad5 // indirect
73+
google.golang.org/grpc v1.44.0
7574
gopkg.in/yaml.v2 v2.4.0 // indirect
7675
gotest.tools/gotestsum v1.7.0
77-
howett.net/plist v0.0.0-20201203080718-1454fab16a06 // indirect
76+
howett.net/plist v1.0.0 // indirect
7877
)
7978

8079
require gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
@@ -102,9 +101,8 @@ require (
102101
github.com/elastic/go-lumber v0.1.0 // indirect
103102
github.com/elastic/go-seccomp-bpf v1.2.0 // indirect
104103
github.com/elastic/go-structform v0.0.9 // indirect
105-
github.com/elastic/go-txfile v0.0.8 // indirect
106104
github.com/elastic/go-windows v1.0.1 // indirect
107-
github.com/elastic/gosigar v0.14.1 // indirect
105+
github.com/elastic/gosigar v0.14.2 // indirect
108106
github.com/felixge/httpsnoop v1.0.2 // indirect
109107
github.com/fsnotify/fsnotify v1.5.1 // indirect
110108
github.com/go-logr/logr v0.4.0 // indirect
@@ -153,7 +151,6 @@ require (
153151
github.com/tklauser/go-sysconf v0.3.5 // indirect
154152
github.com/tklauser/numcpus v0.2.2 // indirect
155153
github.com/urso/diag v0.0.0-20200210123136-21b3cc8eb797 // indirect
156-
github.com/urso/go-bin v0.0.0-20180220135811-781c575c9f0e // indirect
157154
github.com/urso/sderr v0.0.0-20210525210834-52b04e8f5c71 // indirect
158155
github.com/xdg/scram v1.0.3 // indirect
159156
github.com/xdg/stringprep v1.0.3 // indirect
@@ -168,8 +165,8 @@ require (
168165
go.opentelemetry.io/otel/metric v0.22.0 // indirect
169166
go.opentelemetry.io/otel/trace v1.0.0-RC2 // indirect
170167
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
171-
golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c // indirect
172-
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect
168+
golang.org/x/oauth2 v0.0.0-20211005180243-6b3c2da341f1 // indirect
169+
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
173170
golang.org/x/text v0.3.7 // indirect
174171
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
175172
google.golang.org/appengine v1.6.7 // indirect

0 commit comments

Comments
 (0)