Skip to content

Commit

Permalink
[updatecli] Update to elastic/beats@5b41c60f8a02 (#14640)
Browse files Browse the repository at this point in the history
* chore: Update to elastic/beats@5b41c60f8a02

Made with ❤️️ by updatecli

* lint: update deprecated methods

---------

Co-authored-by: elastic-observability-automation[bot] <180520183+elastic-observability-automation[bot]@users.noreply.github.com>
Co-authored-by: kruskal <99559985+kruskall@users.noreply.github.com>
  • Loading branch information
1 parent f597c66 commit 02a9051
Show file tree
Hide file tree
Showing 9 changed files with 178 additions and 174 deletions.
2 changes: 1 addition & 1 deletion .go-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.22.7
1.22.9
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.22.7
FROM golang:1.22.9

RUN set -x && \
apt-get update && \
Expand Down
86 changes: 43 additions & 43 deletions NOTICE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ Third party libraries used by the Elastic APM Server project:

--------------------------------------------------------------------------------
Dependency : github.com/apache/thrift
Version: v0.16.0
Version: v0.17.0
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/apache/thrift@v0.16.0/LICENSE:
Contents of probable licence file $GOMODCACHE/github.com/apache/thrift@v0.17.0/LICENSE:


Apache License
Expand Down Expand Up @@ -576,11 +576,11 @@ SOFTWARE.

--------------------------------------------------------------------------------
Dependency : github.com/elastic/beats/v7
Version: v7.17.25-0.20240927201625-f7feb7be891d
Version: v7.17.26-0.20241113151608-5b41c60f8a02
Licence type (autodetected): Elastic
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.17.25-0.20240927201625-f7feb7be891d/LICENSE.txt:
Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.17.26-0.20241113151608-5b41c60f8a02/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 @@ -5104,11 +5104,11 @@ THE SOFTWARE.

--------------------------------------------------------------------------------
Dependency : golang.org/x/net
Version: v0.24.0
Version: v0.26.0
Licence type (autodetected): BSD-3-Clause
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/golang.org/x/net@v0.24.0/LICENSE:
Contents of probable licence file $GOMODCACHE/golang.org/x/net@v0.26.0/LICENSE:

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

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

--------------------------------------------------------------------------------
Dependency : golang.org/x/sync
Version: v0.5.0
Version: v0.7.0
Licence type (autodetected): BSD-3-Clause
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/golang.org/x/sync@v0.5.0/LICENSE:
Contents of probable licence file $GOMODCACHE/golang.org/x/sync@v0.7.0/LICENSE:

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

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

--------------------------------------------------------------------------------
Dependency : golang.org/x/time
Version: v0.3.0
Version: v0.5.0
Licence type (autodetected): BSD-3-Clause
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/golang.org/x/time@v0.3.0/LICENSE:
Contents of probable licence file $GOMODCACHE/golang.org/x/time@v0.5.0/LICENSE:

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

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

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

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


Apache License
Expand Down Expand Up @@ -10531,11 +10531,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

--------------------------------------------------------------------------------
Dependency : github.com/felixge/httpsnoop
Version: v1.0.3
Version: v1.0.4
Licence type (autodetected): MIT
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/felixge/httpsnoop@v1.0.3/LICENSE.txt:
Contents of probable licence file $GOMODCACHE/github.com/felixge/httpsnoop@v1.0.4/LICENSE.txt:

Copyright (c) 2016 Felix Geisendörfer (felix@debuggable.com)

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

--------------------------------------------------------------------------------
Dependency : github.com/go-logr/logr
Version: v1.3.0
Version: v1.4.1
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/go-logr/logr@v1.3.0/LICENSE:
Contents of probable licence file $GOMODCACHE/github.com/go-logr/logr@v1.4.1/LICENSE:

Apache License
Version 2.0, January 2004
Expand Down Expand Up @@ -11301,7 +11301,7 @@ Apache License

--------------------------------------------------------------------------------
Dependency : github.com/golang/glog
Version: v1.1.2
Version: v1.2.0
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Expand Down Expand Up @@ -11772,11 +11772,11 @@ Contents of probable licence file $GOMODCACHE/github.com/gomodule/redigo@v1.8.3/

--------------------------------------------------------------------------------
Dependency : github.com/google/flatbuffers
Version: v23.3.3+incompatible
Version: v23.5.26+incompatible
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/google/flatbuffers@v23.3.3+incompatible/LICENSE:
Contents of probable licence file $GOMODCACHE/github.com/google/flatbuffers@v23.5.26+incompatible/LICENSE:


Apache License
Expand Down Expand Up @@ -15199,11 +15199,11 @@ SOFTWARE.

--------------------------------------------------------------------------------
Dependency : github.com/klauspost/compress
Version: v1.15.9
Version: v1.16.7
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/klauspost/compress@v1.15.9/LICENSE:
Contents of probable licence file $GOMODCACHE/github.com/klauspost/compress@v1.16.7/LICENSE:

Copyright (c) 2012 The Go Authors. All rights reserved.
Copyright (c) 2019 Klaus Post. All rights reserved.
Expand Down Expand Up @@ -18977,11 +18977,11 @@ Contents of probable licence file $GOMODCACHE/go.opencensus.io@v0.24.0/LICENSE:

--------------------------------------------------------------------------------
Dependency : go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc
Version: v0.46.0
Version: v0.49.0
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc@v0.46.0/LICENSE:
Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc@v0.49.0/LICENSE:

Apache License
Version 2.0, January 2004
Expand Down Expand Up @@ -19188,11 +19188,11 @@ Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/contrib/instru

--------------------------------------------------------------------------------
Dependency : go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp
Version: v0.45.0
Version: v0.49.0
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp@v0.45.0/LICENSE:
Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp@v0.49.0/LICENSE:

Apache License
Version 2.0, January 2004
Expand Down Expand Up @@ -19399,11 +19399,11 @@ Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/contrib/instru

--------------------------------------------------------------------------------
Dependency : go.opentelemetry.io/otel
Version: v1.20.0
Version: v1.24.0
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel@v1.20.0/LICENSE:
Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel@v1.24.0/LICENSE:

Apache License
Version 2.0, January 2004
Expand Down Expand Up @@ -19610,11 +19610,11 @@ Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel@v1.20.0/L

--------------------------------------------------------------------------------
Dependency : go.opentelemetry.io/otel/metric
Version: v1.20.0
Version: v1.24.0
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/metric@v1.20.0/LICENSE:
Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/metric@v1.24.0/LICENSE:

Apache License
Version 2.0, January 2004
Expand Down Expand Up @@ -19821,11 +19821,11 @@ Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/metric@v1

--------------------------------------------------------------------------------
Dependency : go.opentelemetry.io/otel/trace
Version: v1.20.0
Version: v1.24.0
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/trace@v1.20.0/LICENSE:
Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/trace@v1.24.0/LICENSE:

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

--------------------------------------------------------------------------------
Dependency : golang.org/x/crypto
Version: v0.22.0
Version: v0.24.0
Licence type (autodetected): BSD-3-Clause
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/golang.org/x/crypto@v0.22.0/LICENSE:
Contents of probable licence file $GOMODCACHE/golang.org/x/crypto@v0.24.0/LICENSE:

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

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

--------------------------------------------------------------------------------
Dependency : golang.org/x/oauth2
Version: v0.11.0
Version: v0.18.0
Licence type (autodetected): BSD-3-Clause
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/golang.org/x/oauth2@v0.11.0/LICENSE:
Contents of probable licence file $GOMODCACHE/golang.org/x/oauth2@v0.18.0/LICENSE:

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

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

--------------------------------------------------------------------------------
Dependency : golang.org/x/sys
Version: v0.20.0
Version: v0.21.0
Licence type (autodetected): BSD-3-Clause
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/golang.org/x/sys@v0.20.0/LICENSE:
Contents of probable licence file $GOMODCACHE/golang.org/x/sys@v0.21.0/LICENSE:

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

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

--------------------------------------------------------------------------------
Dependency : golang.org/x/term
Version: v0.19.0
Version: v0.21.0
Licence type (autodetected): BSD-3-Clause
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/golang.org/x/term@v0.19.0/LICENSE:
Contents of probable licence file $GOMODCACHE/golang.org/x/term@v0.21.0/LICENSE:

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

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

--------------------------------------------------------------------------------
Dependency : golang.org/x/text
Version: v0.14.0
Version: v0.16.0
Licence type (autodetected): BSD-3-Clause
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/golang.org/x/text@v0.14.0/LICENSE:
Contents of probable licence file $GOMODCACHE/golang.org/x/text@v0.16.0/LICENSE:

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

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

--------------------------------------------------------------------------------
Dependency : google.golang.org/genproto/googleapis/rpc
Version: v0.0.0-20230822172742-b8732ec3820d
Version: v0.0.0-20240318140521-94a12d6c2237
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/google.golang.org/genproto/googleapis/rpc@v0.0.0-20230822172742-b8732ec3820d/LICENSE:
Contents of probable licence file $GOMODCACHE/google.golang.org/genproto/googleapis/rpc@v0.0.0-20240318140521-94a12d6c2237/LICENSE:


Apache License
Expand Down
2 changes: 1 addition & 1 deletion beater/jaeger/server_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,7 @@ func (tc *testcase) setup(t *testing.T) {
}

if tc.cfg.JaegerConfig.GRPC.Enabled {
client, err := grpc.Dial(tc.server.grpc.listener.Addr().String(), tc.grpcDialOpts...)
client, err := grpc.NewClient(tc.server.grpc.listener.Addr().String(), tc.grpcDialOpts...)
if tc.grpcDialShouldFail {
require.Error(t, err)
} else {
Expand Down
2 changes: 1 addition & 1 deletion beater/otlp/grpc_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,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.WithTransportCredentials(
conn, err := grpc.NewClient(lis.Addr().String(), grpc.WithTransportCredentials(
insecure.NewCredentials(),
))
require.NoError(t, err)
Expand Down
4 changes: 2 additions & 2 deletions beater/server_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,7 @@ func TestServerJaegerGRPC(t *testing.T) {
baseURL, err := url.Parse(server.baseURL)
require.NoError(t, err)

conn, err := grpc.Dial(baseURL.Host, grpc.WithTransportCredentials(
conn, err := grpc.NewClient(baseURL.Host, grpc.WithTransportCredentials(
insecure.NewCredentials(),
))
require.NoError(t, err)
Expand Down Expand Up @@ -440,7 +440,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.WithTransportCredentials(
conn, err := grpc.NewClient(baseURL.Host, grpc.WithTransportCredentials(
insecure.NewCredentials(),
))
require.NoError(t, err)
Expand Down
Loading

0 comments on commit 02a9051

Please sign in to comment.