Skip to content
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

Update to elastic/beats@27e76c567711 #5382

Merged
merged 6 commits into from
Jun 2, 2021
Merged
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
2 changes: 1 addition & 1 deletion .go-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.15.12
1.16.4
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.15.12
FROM golang:1.16.4
MAINTAINER Nicolas Ruflin <ruflin@elastic.co>

RUN set -x && \
Expand Down
46 changes: 23 additions & 23 deletions NOTICE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -576,11 +576,11 @@ SOFTWARE.

--------------------------------------------------------------------------------
Dependency : github.com/elastic/beats/v7
Version: v7.0.0-alpha2.0.20210512112333-7d75d02b1f0c
Version: v7.0.0-alpha2.0.20210531144435-27e76c567711
Licence type (autodetected): Elastic
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20210512112333-7d75d02b1f0c/LICENSE.txt:
Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20210531144435-27e76c567711/LICENSE.txt:

Source code in this repository is variously licensed under the Apache License
Version 2.0, an Apache compatible license, or the Elastic License. Outside of
Expand Down Expand Up @@ -3512,11 +3512,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

--------------------------------------------------------------------------------
Dependency : go.elastic.co/apm
Version: v1.11.0
Version: v1.12.0
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/go.elastic.co/apm@v1.11.0/LICENSE:
Contents of probable licence file $GOMODCACHE/go.elastic.co/apm@v1.12.0/LICENSE:

Apache License
Version 2.0, January 2004
Expand Down Expand Up @@ -4630,11 +4630,11 @@ THE SOFTWARE.

--------------------------------------------------------------------------------
Dependency : go.uber.org/zap
Version: v1.16.0
Version: v1.17.0
Licence type (autodetected): MIT
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/go.uber.org/zap@v1.16.0/LICENSE.txt:
Contents of probable licence file $GOMODCACHE/go.uber.org/zap@v1.17.0/LICENSE.txt:

Copyright (c) 2016-2017 Uber Technologies, Inc.

Expand All @@ -4659,11 +4659,11 @@ THE SOFTWARE.

--------------------------------------------------------------------------------
Dependency : golang.org/x/net
Version: v0.0.0-20210510120150-4163338589ed
Version: v0.0.0-20210525063256-abc453219eb5
Licence type (autodetected): BSD-3-Clause
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/golang.org/x/net@v0.0.0-20210510120150-4163338589ed/LICENSE:
Contents of probable licence file $GOMODCACHE/golang.org/x/net@v0.0.0-20210525063256-abc453219eb5/LICENSE:

Copyright (c) 2009 The Go Authors. All rights reserved.

Expand Down Expand Up @@ -4770,11 +4770,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

--------------------------------------------------------------------------------
Dependency : google.golang.org/grpc
Version: v1.37.1
Version: v1.38.0
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/google.golang.org/grpc@v1.37.1/LICENSE:
Contents of probable licence file $GOMODCACHE/google.golang.org/grpc@v1.38.0/LICENSE:


Apache License
Expand Down Expand Up @@ -5906,12 +5906,12 @@ THE SOFTWARE.


--------------------------------------------------------------------------------
Dependency : github.com/Microsoft/go-winio
Version: v0.4.16
Dependency : github.com/bi-zone/go-winio
Version: v0.4.15
Licence type (autodetected): MIT
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/!microsoft/go-winio@v0.4.16/LICENSE:
Contents of probable licence file $GOMODCACHE/github.com/bi-zone/go-winio@v0.4.15/LICENSE:

The MIT License (MIT)

Expand Down Expand Up @@ -10081,11 +10081,11 @@ limitations under the License.

--------------------------------------------------------------------------------
Dependency : github.com/fatih/color
Version: v1.10.0
Version: v1.12.0
Licence type (autodetected): MIT
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/fatih/color@v1.10.0/LICENSE.md:
Contents of probable licence file $GOMODCACHE/github.com/fatih/color@v1.12.0/LICENSE.md:

The MIT License (MIT)

Expand Down Expand Up @@ -14635,11 +14635,11 @@ SOFTWARE.

--------------------------------------------------------------------------------
Dependency : github.com/mattn/go-isatty
Version: v0.0.12
Version: v0.0.13
Licence type (autodetected): MIT
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/mattn/go-isatty@v0.0.12/LICENSE:
Contents of probable licence file $GOMODCACHE/github.com/mattn/go-isatty@v0.0.13/LICENSE:

Copyright (c) Yasuhiro MATSUMOTO <mattn.jp@gmail.com>

Expand Down Expand Up @@ -18294,11 +18294,11 @@ THE SOFTWARE.

--------------------------------------------------------------------------------
Dependency : golang.org/x/crypto
Version: v0.0.0-20210506145944-38f3c27a63bf
Version: v0.0.0-20210513164829-c07d793c2f9a
Licence type (autodetected): BSD-3-Clause
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/golang.org/x/crypto@v0.0.0-20210506145944-38f3c27a63bf/LICENSE:
Contents of probable licence file $GOMODCACHE/golang.org/x/crypto@v0.0.0-20210513164829-c07d793c2f9a/LICENSE:

Copyright (c) 2009 The Go Authors. All rights reserved.

Expand Down Expand Up @@ -18368,11 +18368,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

--------------------------------------------------------------------------------
Dependency : golang.org/x/sys
Version: v0.0.0-20210511113859-b0526f3d8744
Version: v0.0.0-20210531225629-47163c9f4e4f
Licence type (autodetected): BSD-3-Clause
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/golang.org/x/sys@v0.0.0-20210511113859-b0526f3d8744/LICENSE:
Contents of probable licence file $GOMODCACHE/golang.org/x/sys@v0.0.0-20210531225629-47163c9f4e4f/LICENSE:

Copyright (c) 2009 The Go Authors. All rights reserved.

Expand Down Expand Up @@ -18479,11 +18479,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

--------------------------------------------------------------------------------
Dependency : google.golang.org/genproto
Version: v0.0.0-20210510173355-fb37daa5cd7a
Version: v0.0.0-20210524171403-669157292da3
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/google.golang.org/genproto@v0.0.0-20210510173355-fb37daa5cd7a/LICENSE:
Contents of probable licence file $GOMODCACHE/google.golang.org/genproto@v0.0.0-20210524171403-669157292da3/LICENSE:


Apache License
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ To get started with APM, see our [Quick start guide](https://www.elastic.co/guid

### Requirements

* [Golang](https://golang.org/dl/) 1.15.12
* [Golang](https://golang.org/dl/) 1.16.4

### Install

Expand Down
2 changes: 1 addition & 1 deletion changelogs/head.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ https://github.com/elastic/apm-server/compare/7.13\...master[View commits]
==== Added
* Support setting agent configuration from apm-server.yml {pull}5177[5177]
* Add metric_type and unit to field metadata of system metrics {pull}5230[5230]
* Upgrade Go to 1.15.12 {pull}[]
* Display apm-server url in fleet ui's apm-server integration {pull}4895[4895]
* Translate otel messaging.* semantic conventions to ECS {pull}5334[5334]
* Add support for dynamic histogram metrics {pull}5239[5239]
* Tail-sampling processor now resumes subscription from previous position after restart {pull}5350[5350]
* Add support for histograms to metrics intake {pull}5360[5360]
* Upgrade Go to 1.16.4 {pull}5381[5381]

[float]
==== Deprecated
2 changes: 1 addition & 1 deletion docs/version.asciidoc
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.15.12
:go-version: 1.16.4
:python: 3.7
:docker: 1.12
:docker-compose: 1.11
Expand Down
26 changes: 16 additions & 10 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ require (
github.com/dop251/goja_nodejs v0.0.0-20210225215109-d91c329300e7 // 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.20210512112333-7d75d02b1f0c
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20210531144435-27e76c567711
github.com/elastic/ecs v1.8.0
github.com/elastic/elastic-agent-client/v7 v7.0.0-20210407144825-cc1c33cfa1d0 // indirect
github.com/elastic/elastic-package v0.0.0-20210310173719-3b8f76516ae3
Expand All @@ -23,7 +23,7 @@ require (
github.com/elastic/go-hdrhistogram v0.1.0
github.com/elastic/go-licenser v0.3.1
github.com/elastic/go-ucfg v0.8.4-0.20200415140258-1232bd4774a6
github.com/fatih/color v1.10.0 // indirect
github.com/fatih/color v1.12.0 // indirect
github.com/go-sourcemap/sourcemap v2.1.3+incompatible
github.com/gofrs/uuid v4.0.0+incompatible
github.com/gogo/googleapis v1.3.1-0.20190914144012-b8d18e97a9a1 // indirect
Expand All @@ -37,10 +37,12 @@ require (
github.com/json-iterator/go v1.1.10
github.com/jstemmer/go-junit-report v0.9.1
github.com/magefile/mage v1.11.0
github.com/mattn/go-isatty v0.0.13 // indirect
github.com/mitchellh/hashstructure v1.1.0 // indirect
github.com/modern-go/reflect2 v1.0.1
github.com/patrickmn/go-cache v2.1.0+incompatible
github.com/pkg/errors v0.9.1
github.com/poy/eachers v0.0.0-20181020210610-23942921fe77 // indirect
github.com/prometheus/procfs v0.6.0 // indirect
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
github.com/reviewdog/reviewdog v0.9.17
Expand All @@ -53,7 +55,7 @@ require (
github.com/tidwall/sjson v1.1.1
github.com/urso/magetools v0.0.0-20200125210132-c2e338f92f3a // indirect
github.com/xeipuuv/gojsonschema v1.2.0
go.elastic.co/apm v1.11.0
go.elastic.co/apm v1.12.0
go.elastic.co/apm/module/apmelasticsearch v1.7.2
go.elastic.co/apm/module/apmgrpc v1.7.0
go.elastic.co/apm/module/apmhttp v1.7.2
Expand All @@ -63,22 +65,26 @@ require (
go.opentelemetry.io/collector v0.22.0
go.uber.org/atomic v1.7.0
go.uber.org/multierr v1.7.0 // indirect
go.uber.org/zap v1.16.0
golang.org/x/crypto v0.0.0-20210506145944-38f3c27a63bf // indirect
golang.org/x/net v0.0.0-20210510120150-4163338589ed
go.uber.org/zap v1.17.0
golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a // indirect
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
golang.org/x/net v0.0.0-20210525063256-abc453219eb5
golang.org/x/sync v0.0.0-20201207232520-09787c993a3a
golang.org/x/sys v0.0.0-20210511113859-b0526f3d8744 // indirect
golang.org/x/sys v0.0.0-20210531225629-47163c9f4e4f // indirect
golang.org/x/time v0.0.0-20201208040808-7e3f01d25324
golang.org/x/tools v0.1.1
google.golang.org/genproto v0.0.0-20210510173355-fb37daa5cd7a // indirect
google.golang.org/grpc v1.37.1
golang.org/x/tools v0.1.2
google.golang.org/genproto v0.0.0-20210524171403-669157292da3 // indirect
google.golang.org/grpc v1.38.0
gopkg.in/yaml.v2 v2.4.0
gotest.tools/gotestsum v0.6.0
honnef.co/go/tools v0.1.1
howett.net/plist v0.0.0-20201203080718-1454fab16a06 // indirect
k8s.io/client-go v12.0.0+incompatible // indirect
)

replace (
github.com/Azure/go-autorest => github.com/Azure/go-autorest v12.2.0+incompatible
github.com/Microsoft/go-winio => github.com/bi-zone/go-winio v0.4.15
github.com/Shopify/sarama => github.com/elastic/sarama v1.19.1-0.20210120173147-5c8cb347d877
github.com/docker/docker => github.com/docker/engine v0.0.0-20191113042239-ea84732a7725
github.com/docker/go-plugins-helpers => github.com/elastic/go-plugins-helpers v0.0.0-20200207104224-bdf17607b79f
Expand Down
Loading