Skip to content

8.0 update beats #7137

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Jan 26, 2022
Merged

8.0 update beats #7137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f382d96
Update to elastic/beats@13de35e26893
simitt Jan 26, 2022
32f16ae
Update Makefile
simitt Jan 26, 2022
f1abcb9
Update deprecated grpc.WithInsecure()
simitt Jan 26, 2022
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
2 changes: 1 addition & 1 deletion .go-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.17.1
1.17.5
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.17.1
FROM golang:1.17.5
MAINTAINER Nicolas Ruflin <[email protected]>

RUN set -x && \
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ update-beats: update-beats-module update

.PHONY: update-beats-module
update-beats-module:
$(GO) get -d -u $(BEATS_MODULE)@$(BEATS_VERSION) && $(GO) mod tidy
$(GO) get -d -u $(BEATS_MODULE)@$(BEATS_VERSION) && $(GO) mod tidy -compat=1.17
cp -f $$($(GO) list -m -f {{.Dir}} $(BEATS_MODULE))/.go-version .go-version
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" {} \;
sed -i'.bck' -E -e "s#(:go-version): [0-9]+\.[0-9]+\.[0-9]+#\1: $$(cat .go-version)#g" docs/version.asciidoc
Expand Down
482 changes: 30 additions & 452 deletions NOTICE.txt
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion beater/jaeger/grpc_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import (
"go.opentelemetry.io/collector/model/pdata"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/credentials/insecure"
"google.golang.org/grpc/status"

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

go srv.Serve(lis)
t.Cleanup(srv.GracefulStop)
conn, err := grpc.Dial(lis.Addr().String(), grpc.WithInsecure())
conn, err := grpc.Dial(lis.Addr().String(), grpc.WithTransportCredentials(insecure.NewCredentials()))
require.NoError(t, err)
t.Cleanup(func() { conn.Close() })
return conn
Expand Down
3 changes: 2 additions & 1 deletion beater/otlp/grpc_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import (
"go.opentelemetry.io/collector/model/otlpgrpc"
"go.opentelemetry.io/collector/model/pdata"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"
"google.golang.org/grpc/status"

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

go srv.Serve(lis)
t.Cleanup(srv.GracefulStop)
conn, err := grpc.Dial(lis.Addr().String(), grpc.WithInsecure())
conn, err := grpc.Dial(lis.Addr().String(), grpc.WithTransportCredentials(insecure.NewCredentials()))
require.NoError(t, err)
t.Cleanup(func() { conn.Close() })
return conn
Expand Down
5 changes: 3 additions & 2 deletions beater/server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ import (
"github.com/stretchr/testify/require"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/credentials/insecure"
"google.golang.org/grpc/metadata"
"google.golang.org/grpc/status"

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

baseURL, err := url.Parse(server.baseURL)
require.NoError(t, err)
conn, err := grpc.Dial(baseURL.Host, grpc.WithInsecure())
conn, err := grpc.Dial(baseURL.Host, grpc.WithTransportCredentials(insecure.NewCredentials()))
require.NoError(t, err)
defer conn.Close()

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

conn, err := grpc.Dial(baseURL.Host, grpc.WithInsecure())
conn, err := grpc.Dial(baseURL.Host, grpc.WithTransportCredentials(insecure.NewCredentials()))
require.NoError(t, err)
defer conn.Close()

Expand Down
2 changes: 1 addition & 1 deletion docs/version.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// doc-branch can be: master, 8.0, 8.1, etc.
:doc-branch: master
:go-version: 1.17.1
:go-version: 1.17.5
:python: 3.7
:docker: 1.12
:docker-compose: 1.11
Expand Down
41 changes: 19 additions & 22 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ require (
github.com/dgraph-io/badger/v2 v2.2007.3-0.20201012072640-f5a7e0a1c83b
github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect
github.com/dlclark/regexp2 v1.4.0 // indirect
github.com/dop251/goja v0.0.0-20211115154819-26ebff68a7d5 // indirect
github.com/dop251/goja v0.0.0-20220124171016-cfb079cdc7b4 // indirect
github.com/dop251/goja_nodejs v0.0.0-20211022123610-8dd9abb0616d // indirect
github.com/dustin/go-humanize v1.0.0
github.com/elastic/apm-server/approvaltest v0.0.0-00010101000000-000000000000
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20211115162123-4d7e91351f6e
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20220126085914-13de35e26893
github.com/elastic/ecs v1.12.0
github.com/elastic/elastic-agent-client/v7 v7.0.0-20210922110810-e6f1f402a9ed // indirect
github.com/elastic/gmux v0.2.0
Expand All @@ -24,19 +24,19 @@ require (
github.com/elastic/go-ucfg v0.8.4
github.com/fatih/color v1.13.0 // indirect
github.com/go-sourcemap/sourcemap v2.1.3+incompatible
github.com/gofrs/uuid v4.1.0+incompatible
github.com/gofrs/uuid v4.2.0+incompatible
github.com/gogo/protobuf v1.3.2
github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-multierror v1.1.1
github.com/hashicorp/golang-lru v0.5.4
github.com/jaegertracing/jaeger v1.25.0
github.com/jcchavezs/porto v0.4.0 // indirect
github.com/josephspurrier/goversioninfo v1.3.0 // indirect
github.com/josephspurrier/goversioninfo v1.4.0 // indirect
github.com/json-iterator/go v1.1.11
github.com/libp2p/go-reuseport v0.0.2
github.com/magefile/mage v1.11.0
github.com/mattn/go-colorable v0.1.11 // indirect
github.com/magefile/mage v1.12.1
github.com/mattn/go-colorable v0.1.12 // indirect
github.com/mitchellh/hashstructure v1.1.0 // indirect
github.com/modern-go/reflect2 v1.0.1
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.34.0
Expand All @@ -49,7 +49,6 @@ require (
github.com/stretchr/testify v1.7.0
github.com/tidwall/gjson v1.9.3 // indirect
github.com/tidwall/sjson v1.1.1 // indirect
github.com/urso/magetools v0.0.0-20200125210132-c2e338f92f3a // indirect
github.com/xeipuuv/gojsonschema v1.2.0
go.elastic.co/apm v1.15.0
go.elastic.co/apm/module/apmelasticsearch v1.15.0
Expand All @@ -62,19 +61,19 @@ require (
go.opentelemetry.io/collector/model v0.34.0
go.uber.org/atomic v1.9.0 // indirect
go.uber.org/multierr v1.7.0 // indirect
go.uber.org/zap v1.19.1
golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa // indirect
go.uber.org/zap v1.20.0
golang.org/x/crypto v0.0.0-20220112180741-5e0467b6c7ce // indirect
golang.org/x/mod v0.5.1 // indirect
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2
golang.org/x/net v0.0.0-20220121210141-e204ce36a2ba
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
golang.org/x/sys v0.0.0-20211113001501-0c823b97ae02 // indirect
golang.org/x/time v0.0.0-20210611083556-38a9dc6acbc6
golang.org/x/tools v0.1.7
google.golang.org/genproto v0.0.0-20211115160612-a5da7257a6f7 // indirect
google.golang.org/grpc v1.42.0
golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac
golang.org/x/tools v0.1.8
google.golang.org/genproto v0.0.0-20220118154757-00ab72f36ad5 // indirect
google.golang.org/grpc v1.44.0
gopkg.in/yaml.v2 v2.4.0 // indirect
gotest.tools/gotestsum v1.7.0
howett.net/plist v0.0.0-20201203080718-1454fab16a06 // indirect
howett.net/plist v1.0.0 // indirect
)

require gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
Expand Down Expand Up @@ -102,9 +101,8 @@ require (
github.com/elastic/go-lumber v0.1.0 // indirect
github.com/elastic/go-seccomp-bpf v1.2.0 // indirect
github.com/elastic/go-structform v0.0.9 // indirect
github.com/elastic/go-txfile v0.0.8 // indirect
github.com/elastic/go-windows v1.0.1 // indirect
github.com/elastic/gosigar v0.14.1 // indirect
github.com/elastic/gosigar v0.14.2 // indirect
github.com/felixge/httpsnoop v1.0.2 // indirect
github.com/fsnotify/fsnotify v1.5.1 // indirect
github.com/go-logr/logr v0.4.0 // indirect
Expand Down Expand Up @@ -153,7 +151,6 @@ require (
github.com/tklauser/go-sysconf v0.3.5 // indirect
github.com/tklauser/numcpus v0.2.2 // indirect
github.com/urso/diag v0.0.0-20200210123136-21b3cc8eb797 // indirect
github.com/urso/go-bin v0.0.0-20180220135811-781c575c9f0e // indirect
github.com/urso/sderr v0.0.0-20210525210834-52b04e8f5c71 // indirect
github.com/xdg/scram v1.0.3 // indirect
github.com/xdg/stringprep v1.0.3 // indirect
Expand All @@ -168,8 +165,8 @@ require (
go.opentelemetry.io/otel/metric v0.22.0 // indirect
go.opentelemetry.io/otel/trace v1.0.0-RC2 // indirect
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c // indirect
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect
golang.org/x/oauth2 v0.0.0-20211005180243-6b3c2da341f1 // indirect
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
google.golang.org/appengine v1.6.7 // indirect
Expand Down
Loading