-
Notifications
You must be signed in to change notification settings - Fork 525
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update to elastic/beats@2871d29be93a (#5454)
* Update to elastic/beats@2871d29be93a * upgrade go version to 1.15.6 related to #5374 (cherry picked from commit 1860de4) # Conflicts: # NOTICE.txt # changelogs/head.asciidoc # docs/version.asciidoc # go.mod # go.sum # include/fields.go
- Loading branch information
Showing
10 changed files
with
128 additions
and
14 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| 1.16.4 | ||
| 1.16.5 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| FROM golang:1.16.4 | ||
| FROM golang:1.16.5 | ||
| MAINTAINER Nicolas Ruflin <[email protected]> | ||
|
|
||
| RUN set -x && \ | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -576,11 +576,19 @@ SOFTWARE. | |
|
|
||
| -------------------------------------------------------------------------------- | ||
| Dependency : github.com/elastic/beats/v7 | ||
| <<<<<<< HEAD | ||
| Version: v7.0.0-alpha2.0.20210601231209-d95f6bab8554 | ||
| Licence type (autodetected): Elastic | ||
| -------------------------------------------------------------------------------- | ||
|
|
||
| Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected]/LICENSE.txt: | ||
| ======= | ||
| Version: v7.0.0-alpha2.0.20210614232151-2871d29be93a | ||
| Licence type (autodetected): Elastic | ||
| -------------------------------------------------------------------------------- | ||
|
|
||
| Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected]/LICENSE.txt: | ||
| >>>>>>> 1860de4b (Update to elastic/beats@2871d29be93a (#5454)) | ||
|
|
||
| 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 | ||
|
|
@@ -4601,11 +4609,11 @@ Contents of probable licence file LICENSE: | |
|
|
||
| -------------------------------------------------------------------------------- | ||
| Dependency : go.uber.org/atomic | ||
| Version: v1.7.0 | ||
| Version: v1.8.0 | ||
| Licence type (autodetected): MIT | ||
| -------------------------------------------------------------------------------- | ||
|
|
||
| Contents of probable licence file $GOMODCACHE/go.uber.org/atomic@v1.7.0/LICENSE.txt: | ||
| Contents of probable licence file $GOMODCACHE/go.uber.org/atomic@v1.8.0/LICENSE.txt: | ||
|
|
||
| Copyright (c) 2016 Uber Technologies, Inc. | ||
|
|
||
|
|
@@ -4659,11 +4667,11 @@ THE SOFTWARE. | |
|
|
||
| -------------------------------------------------------------------------------- | ||
| Dependency : golang.org/x/net | ||
| Version: v0.0.0-20210525063256-abc453219eb5 | ||
| Version: v0.0.0-20210614182718-04defd469f4e | ||
| Licence type (autodetected): BSD-3-Clause | ||
| -------------------------------------------------------------------------------- | ||
|
|
||
| Contents of probable licence file $GOMODCACHE/golang.org/x/[email protected]20210525063256-abc453219eb5/LICENSE: | ||
| Contents of probable licence file $GOMODCACHE/golang.org/x/[email protected]20210614182718-04defd469f4e/LICENSE: | ||
|
|
||
| Copyright (c) 2009 The Go Authors. All rights reserved. | ||
|
|
||
|
|
@@ -15664,6 +15672,23 @@ Licence type (autodetected): BSD-2-Clause-FreeBSD | |
| -------------------------------------------------------------------------------- | ||
|
|
||
| Contents of probable licence file $GOMODCACHE/github.com/rcrowley/[email protected]/LICENSE: | ||
| <<<<<<< HEAD | ||
|
|
||
| Copyright 2012 Richard Crowley. All rights reserved. | ||
|
|
||
| Redistribution and use in source and binary forms, with or without | ||
| modification, are permitted provided that the following conditions are | ||
| met: | ||
|
|
||
| 1. Redistributions of source code must retain the above copyright | ||
| notice, this list of conditions and the following disclaimer. | ||
|
|
||
| 2. Redistributions in binary form must reproduce the above | ||
| copyright notice, this list of conditions and the following | ||
| disclaimer in the documentation and/or other materials provided | ||
| with the distribution. | ||
|
|
||
| ======= | ||
|
|
||
| Copyright 2012 Richard Crowley. All rights reserved. | ||
|
|
||
|
|
@@ -15679,6 +15704,7 @@ met: | |
| disclaimer in the documentation and/or other materials provided | ||
| with the distribution. | ||
|
|
||
| >>>>>>> 1860de4b (Update to elastic/beats@2871d29be93a (#5454)) | ||
| THIS SOFTWARE IS PROVIDED BY RICHARD CROWLEY ``AS IS'' AND ANY EXPRESS | ||
| OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
| WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
|
|
@@ -17944,11 +17970,19 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | |
|
|
||
| -------------------------------------------------------------------------------- | ||
| Dependency : golang.org/x/sys | ||
| <<<<<<< HEAD | ||
| Version: v0.0.0-20210601080250-7ecdf8ef093b | ||
| Licence type (autodetected): BSD-3-Clause | ||
| -------------------------------------------------------------------------------- | ||
|
|
||
| Contents of probable licence file $GOMODCACHE/golang.org/x/[email protected]/LICENSE: | ||
| ======= | ||
| Version: v0.0.0-20210615035016-665e8c7367d1 | ||
| Licence type (autodetected): BSD-3-Clause | ||
| -------------------------------------------------------------------------------- | ||
|
|
||
| Contents of probable licence file $GOMODCACHE/golang.org/x/[email protected]/LICENSE: | ||
| >>>>>>> 1860de4b (Update to elastic/beats@2871d29be93a (#5454)) | ||
|
|
||
| Copyright (c) 2009 The Go Authors. All rights reserved. | ||
|
|
||
|
|
@@ -18055,11 +18089,19 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | |
|
|
||
| -------------------------------------------------------------------------------- | ||
| Dependency : google.golang.org/genproto | ||
| <<<<<<< HEAD | ||
| Version: v0.0.0-20210601170153-0befbe3492e2 | ||
| Licence type (autodetected): Apache-2.0 | ||
| -------------------------------------------------------------------------------- | ||
|
|
||
| Contents of probable licence file $GOMODCACHE/google.golang.org/[email protected]/LICENSE: | ||
| ======= | ||
| Version: v0.0.0-20210614182748-5b3b54cad159 | ||
| Licence type (autodetected): Apache-2.0 | ||
| -------------------------------------------------------------------------------- | ||
|
|
||
| Contents of probable licence file $GOMODCACHE/google.golang.org/[email protected]/LICENSE: | ||
| >>>>>>> 1860de4b (Update to elastic/beats@2871d29be93a (#5454)) | ||
|
|
||
|
|
||
| Apache License | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| [[release-notes-head]] | ||
| == APM Server version HEAD | ||
|
|
||
| https://github.com/elastic/apm-server/compare/7.13\...master[View commits] | ||
|
|
||
| [float] | ||
| ==== Breaking Changes | ||
| * Removed monitoring counters `apm-server.processor.stream.errors.{queue,server,closed}` {pull}5453[5453] | ||
|
|
||
| [float] | ||
| ==== Bug fixes | ||
| * Fix panic due to misaligned 64-bit access on 32-bit architectures {pull}5277[5277] | ||
| * Fixed tail-based sampling pubsub to use _seq_no correctly {pull}5126[5126] | ||
| * Removed service name from dataset {pull}5451[5451] | ||
|
|
||
| [float] | ||
| ==== Intake API Changes | ||
|
|
||
| [float] | ||
| ==== 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] | ||
| * 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.5 {pull}5454[5454] | ||
| * Add units to metric fields {pull}5395[5395] | ||
| * Add support for adjusting OTel event timestamps using `telemetry.sdk.elastic_export_timestamp` {pull}5433[5433] | ||
| * Add support for OpenTelemetry labels describing mobile connectivity {pull}5436[5436] | ||
|
|
||
| [float] | ||
| ==== Deprecated |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| FROM golang:1.16.4 | ||
| FROM golang:1.16.5 | ||
| MAINTAINER Nicolas Ruflin <[email protected]> | ||
|
|
||
| RUN apt-get update | ||
|
|
@@ -28,7 +28,7 @@ COPY --chown=$UID go.mod go.sum ./ | |
| COPY --chown=$UID approvaltest/go.mod approvaltest/go.sum ./approvaltest/ | ||
| COPY --chown=$UID systemtest/go.mod systemtest/go.sum ./systemtest/ | ||
| COPY --chown=$UID internal/otel_collector/go.mod internal/otel_collector/go.sum ./internal/otel_collector/ | ||
| RUN go mod download | ||
| RUN go mod download all | ||
| RUN cd approvaltest && go mod download | ||
| RUN cd systemtest && go mod download | ||
|
|
||
|
|
||