From 55f9eb59ee96a6c8e17c9a976c99570fed29a363 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 16:05:28 +0000 Subject: [PATCH] build(deps): bump github.com/elastic/apm-data from 1.12.0 to 1.13.1 (#14007) * build(deps): bump github.com/elastic/apm-data from 1.12.0 to 1.13.1 Bumps [github.com/elastic/apm-data](https://github.com/elastic/apm-data) from 1.12.0 to 1.13.1. - [Release notes](https://github.com/elastic/apm-data/releases) - [Commits](https://github.com/elastic/apm-data/compare/v1.12.0...v1.13.1) --- updated-dependencies: - dependency-name: github.com/elastic/apm-data dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * Update NOTICE.txt * fix: resolve compile error * feat: bump apm-aggregation library * feat: update notice file --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: kruskal <99559985+kruskall@users.noreply.github.com> --- NOTICE.txt | 20 +++++++++---------- go.mod | 10 +++++----- go.sum | 20 +++++++++---------- internal/beater/otlp/clientmetadata.go | 6 +++--- internal/beater/processors.go | 2 +- internal/model/modelprocessor/libraryframe.go | 2 +- internal/r8/deobfuscator.go | 2 +- internal/sourcemap/processor.go | 2 +- .../sampling/eventstorage/storage.go | 2 +- x-pack/apm-server/sampling/processor.go | 1 - 10 files changed, 33 insertions(+), 34 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index d1760256498..9dbb676b076 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -260,11 +260,11 @@ SOFTWARE. -------------------------------------------------------------------------------- Dependency : github.com/elastic/apm-aggregation -Version: v1.0.2 +Version: v1.1.0 Licence type (autodetected): Elastic-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/apm-aggregation@v1.0.2/LICENSE.txt: +Contents of probable licence file $GOMODCACHE/github.com/elastic/apm-aggregation@v1.1.0/LICENSE.txt: Elastic License 2.0 @@ -362,11 +362,11 @@ these terms. -------------------------------------------------------------------------------- Dependency : github.com/elastic/apm-data -Version: v1.12.0 +Version: v1.13.1 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/apm-data@v1.12.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/elastic/apm-data@v1.13.1/LICENSE: Apache License Version 2.0, January 2004 @@ -7157,11 +7157,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -------------------------------------------------------------------------------- Dependency : github.com/axiomhq/hyperloglog -Version: v0.0.0-20230201085229-3ddf4bad03dc +Version: v0.2.0 Licence type (autodetected): MIT -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/axiomhq/hyperloglog@v0.0.0-20230201085229-3ddf4bad03dc/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/axiomhq/hyperloglog@v0.2.0/LICENSE: Copyright (c) 2021, Axiom, Inc. @@ -7880,11 +7880,11 @@ Contents of probable licence file $GOMODCACHE/github.com/cockroachdb/logtags@v0. -------------------------------------------------------------------------------- Dependency : github.com/cockroachdb/pebble -Version: v1.1.1 +Version: v1.1.2 Licence type (autodetected): BSD-3-Clause -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/cockroachdb/pebble@v1.1.1/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/cockroachdb/pebble@v1.1.2/LICENSE: Copyright (c) 2011 The LevelDB-Go Authors. All rights reserved. @@ -9844,11 +9844,11 @@ limitations under the License. -------------------------------------------------------------------------------- Dependency : github.com/elastic/opentelemetry-lib -Version: v0.8.1 +Version: v0.9.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/opentelemetry-lib@v0.8.1/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/elastic/opentelemetry-lib@v0.9.0/LICENSE: Apache License Version 2.0, January 2004 diff --git a/go.mod b/go.mod index 8f9c3b13b14..f4ea590a405 100644 --- a/go.mod +++ b/go.mod @@ -6,8 +6,8 @@ require ( github.com/cespare/xxhash/v2 v2.3.0 github.com/dgraph-io/badger/v2 v2.2007.4 github.com/dustin/go-humanize v1.0.1 - github.com/elastic/apm-aggregation v1.0.2 - github.com/elastic/apm-data v1.12.0 + github.com/elastic/apm-aggregation v1.1.0 + github.com/elastic/apm-data v1.13.1 github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240823193033-af33fad4d50b github.com/elastic/elastic-agent-client/v7 v7.15.0 github.com/elastic/elastic-agent-libs v0.10.0 @@ -64,13 +64,13 @@ require ( github.com/Shopify/sarama v1.38.1 // indirect github.com/apache/thrift v0.20.0 // indirect github.com/armon/go-radix v1.0.0 // indirect - github.com/axiomhq/hyperloglog v0.0.0-20230201085229-3ddf4bad03dc // indirect + github.com/axiomhq/hyperloglog v0.2.0 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash v1.1.0 // indirect github.com/cockroachdb/errors v1.11.3 // indirect github.com/cockroachdb/fifo v0.0.0-20240606204812-0bbfbd93a7ce // indirect github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect - github.com/cockroachdb/pebble v1.1.1 // indirect + github.com/cockroachdb/pebble v1.1.2 // indirect github.com/cockroachdb/redact v1.1.5 // indirect github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect github.com/containerd/errdefs v0.1.0 // indirect @@ -90,7 +90,7 @@ require ( github.com/elastic/go-structform v0.0.10 // indirect github.com/elastic/go-windows v1.0.1 // indirect github.com/elastic/gosigar v0.14.3 // indirect - github.com/elastic/opentelemetry-lib v0.8.1 // indirect + github.com/elastic/opentelemetry-lib v0.9.0 // indirect github.com/elastic/pkcs8 v1.0.0 // indirect github.com/fatih/color v1.16.0 // indirect github.com/frankban/quicktest v1.14.0 // indirect diff --git a/go.sum b/go.sum index 3104a7a74c0..6ae462290fe 100644 --- a/go.sum +++ b/go.sum @@ -56,8 +56,8 @@ github.com/aws/aws-sdk-go-v2/service/sts v1.30.5 h1:OMsEmCyz2i89XwRwPouAJvhj81wI github.com/aws/aws-sdk-go-v2/service/sts v1.30.5/go.mod h1:vmSqFK+BVIwVpDAGZB3CoCXHzurt4qBE8lf+I/kRTh0= github.com/aws/smithy-go v1.20.4 h1:2HK1zBdPgRbjFOHlfeQZfpC4r72MOb9bZkiFwggKO+4= github.com/aws/smithy-go v1.20.4/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg= -github.com/axiomhq/hyperloglog v0.0.0-20230201085229-3ddf4bad03dc h1:Keo7wQ7UODUaHcEi7ltENhbAK2VgZjfat6mLy03tQzo= -github.com/axiomhq/hyperloglog v0.0.0-20230201085229-3ddf4bad03dc/go.mod h1:k08r+Yj1PRAmuayFiRK6MYuR5Ve4IuZtTfxErMIh0+c= +github.com/axiomhq/hyperloglog v0.2.0 h1:u1XT3yyY1rjzlWuP6NQIrV4bRYHOaqZaovqjcBEvZJo= +github.com/axiomhq/hyperloglog v0.2.0/go.mod h1:GcgMjz9gaDKZ3G0UMS6Fq/VkZ4l7uGgcJyxA7M+omIM= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= @@ -74,8 +74,8 @@ github.com/cockroachdb/fifo v0.0.0-20240606204812-0bbfbd93a7ce h1:giXvy4KSc/6g/e github.com/cockroachdb/fifo v0.0.0-20240606204812-0bbfbd93a7ce/go.mod h1:9/y3cnZ5GKakj/H4y9r9GTjCvAFta7KLgSHPJJYc52M= github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b h1:r6VH0faHjZeQy818SGhaone5OnYfxFR/+AzdY3sf5aE= github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs= -github.com/cockroachdb/pebble v1.1.1 h1:XnKU22oiCLy2Xn8vp1re67cXg4SAasg/WDt1NtcRFaw= -github.com/cockroachdb/pebble v1.1.1/go.mod h1:4exszw1r40423ZsmkG/09AFEG83I0uDgfujJdbL6kYU= +github.com/cockroachdb/pebble v1.1.2 h1:CUh2IPtR4swHlEj48Rhfzw6l/d0qA31fItcIszQVIsA= +github.com/cockroachdb/pebble v1.1.2/go.mod h1:4exszw1r40423ZsmkG/09AFEG83I0uDgfujJdbL6kYU= github.com/cockroachdb/redact v1.1.5 h1:u1PMllDkdFfPWaNGMyLD1+so+aq3uUItthCFqzwPJ30= github.com/cockroachdb/redact v1.1.5/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 h1:zuQyyAKVxetITBuuhv3BI9cMrmStnpT18zmgmTxunpo= @@ -129,10 +129,10 @@ github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3 h1:Oy0F4A github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3/go.mod h1:YvSRo5mw33fLEx1+DlK6L2VV43tJt5Eyel9n9XBcR+0= github.com/eapache/queue v1.1.0 h1:YOEu7KNc61ntiQlcEeUIoDTJ2o8mQznoNvUhiigpIqc= github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= -github.com/elastic/apm-aggregation v1.0.2 h1:nvplp5pUGHAvRf8M6G4+UAxx55i+TpEpIda02JE/DEU= -github.com/elastic/apm-aggregation v1.0.2/go.mod h1:cprQyd9TAvUTmyqY/J1ZX4cwU88vbVP9uhNKdEC/dsg= -github.com/elastic/apm-data v1.12.0 h1:cvd519HNnoYYmOYCsBvEtF5i8uVgXWDk6HFbXHQvegU= -github.com/elastic/apm-data v1.12.0/go.mod h1:dkXFH/LWAf5DekU11/f0wvFLO2et34SZ8duJCbTm+y0= +github.com/elastic/apm-aggregation v1.1.0 h1:eTHGd5w99JoRFJ763MJP6nUX4hkkeSil3KWiip7YtJY= +github.com/elastic/apm-aggregation v1.1.0/go.mod h1:YBQ77Jt7vOy2/7w4q5SsEifhc0V02dJxRcyyeC6HsvQ= +github.com/elastic/apm-data v1.13.1 h1:vQUWqi9H6QC4FCZ05kILkE+2BeKWw6iT+NXXyadWJm8= +github.com/elastic/apm-data v1.13.1/go.mod h1:m2FSH7alN07VmtmN10KmgxAa8tgXlJDe/rC0g4FnZUI= github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240823193033-af33fad4d50b h1:i3WdOw//Vg76Vseqxgn47GPTVqUSucAdE42jkih1ViM= github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240823193033-af33fad4d50b/go.mod h1:m8d3EBr2z7YvWfxRgoE7SsUNbMTpyWXi67fG7B7vn7w= github.com/elastic/elastic-agent-autodiscover v0.8.1 h1:u6TWqh7wfevu6S4GUq4SIxYBRo4b/P5RZmx/rSvT10A= @@ -163,8 +163,8 @@ github.com/elastic/go-windows v1.0.1 h1:AlYZOldA+UJ0/2nBuqWdo90GFCgG9xuyw9SYzGUt github.com/elastic/go-windows v1.0.1/go.mod h1:FoVvqWSun28vaDQPbj2Elfc0JahhPB7WQEGa3c814Ss= github.com/elastic/gosigar v0.14.3 h1:xwkKwPia+hSfg9GqrCUKYdId102m9qTJIIr7egmK/uo= github.com/elastic/gosigar v0.14.3/go.mod h1:iXRIGg2tLnu7LBdpqzyQfGDEidKCfWcCMS0WKyPWoMs= -github.com/elastic/opentelemetry-lib v0.8.1 h1:1QnrlBsaDKKlTlTMajgQTYdOFg42rAZLU/CH9DKZ3vE= -github.com/elastic/opentelemetry-lib v0.8.1/go.mod h1:ttRzVFcQKjogveyhxDTRMD+s6Igi5XHqV7HcU933lR8= +github.com/elastic/opentelemetry-lib v0.9.0 h1:auMnq5zxqnB3eQNNdfz8+mtooy0D8+2ZEusU0sHeDj4= +github.com/elastic/opentelemetry-lib v0.9.0/go.mod h1:H4ECk7whGn41etgYL4zQWJ2BWN5xwP2A5HUIIwNrM9Y= github.com/elastic/pkcs8 v1.0.0 h1:HhitlUKxhN288kcNcYkjW6/ouvuwJWd9ioxpjnD9jVA= github.com/elastic/pkcs8 v1.0.0/go.mod h1:ipsZToJfq1MxclVTwpG7U/bgeDtf+0HkUiOxebk95+0= github.com/elastic/sarama v1.19.1-0.20210823122811-11c3ef800752 h1:5/RUNg7rkIvayjPhAIoI3v8p45NfWcfWs5DZSElycis= diff --git a/internal/beater/otlp/clientmetadata.go b/internal/beater/otlp/clientmetadata.go index fe5a72aa3c7..7d355a0208c 100644 --- a/internal/beater/otlp/clientmetadata.go +++ b/internal/beater/otlp/clientmetadata.go @@ -45,7 +45,7 @@ func SetClientMetadata(ctx context.Context, batch *modelpb.Batch) error { if event.GetSource().GetIp() == nil { if tcpAddr, ok := clientMetadata.SourceAddr.(*net.TCPAddr); ok { if event.Source == nil { - event.Source = modelpb.SourceFromVTPool() + event.Source = &modelpb.Source{} } sourceAddrPort := tcpAddr.AddrPort() event.Source.Ip = modelpb.Addr2IP(sourceAddrPort.Addr().Unmap()) @@ -54,12 +54,12 @@ func SetClientMetadata(ctx context.Context, batch *modelpb.Batch) error { } if event.GetClient().GetIp() == nil && clientMetadata.ClientIP.IsValid() { if event.Client == nil { - event.Client = modelpb.ClientFromVTPool() + event.Client = &modelpb.Client{} } event.Client.Ip = modelpb.Addr2IP(clientMetadata.ClientIP) } if clientMetadata.SourceNATIP.IsValid() { - event.Source.Nat = modelpb.NATFromVTPool() + event.Source.Nat = &modelpb.NAT{} event.Source.Nat.Ip = modelpb.Addr2IP(clientMetadata.SourceNATIP) } } diff --git a/internal/beater/processors.go b/internal/beater/processors.go index 65e8b07daa0..dd57b430ed0 100644 --- a/internal/beater/processors.go +++ b/internal/beater/processors.go @@ -74,7 +74,7 @@ func newObserverBatchProcessor() modelpb.ProcessBatchFunc { return func(ctx context.Context, b *modelpb.Batch) error { for i := range *b { if (*b)[i].Observer == nil { - (*b)[i].Observer = modelpb.ObserverFromVTPool() + (*b)[i].Observer = &modelpb.Observer{} } observer := (*b)[i].Observer observer.Hostname = hostname diff --git a/internal/model/modelprocessor/libraryframe.go b/internal/model/modelprocessor/libraryframe.go index 7e7a803053b..9d33e8ff767 100644 --- a/internal/model/modelprocessor/libraryframe.go +++ b/internal/model/modelprocessor/libraryframe.go @@ -68,7 +68,7 @@ func (s SetLibraryFrame) processException(ctx context.Context, exception *modelp func (s SetLibraryFrame) processStacktraceFrames(ctx context.Context, frames ...*modelpb.StacktraceFrame) { for _, frame := range frames { if frame.Original == nil { - frame.Original = modelpb.OriginalFromVTPool() + frame.Original = &modelpb.Original{} } frame.Original.LibraryFrame = frame.LibraryFrame frame.LibraryFrame = frame.Filename != "" && s.Pattern.MatchString(frame.Filename) || diff --git a/internal/r8/deobfuscator.go b/internal/r8/deobfuscator.go index 8249e6674c4..e56eeaf0f65 100644 --- a/internal/r8/deobfuscator.go +++ b/internal/r8/deobfuscator.go @@ -107,7 +107,7 @@ func resolveMappings(types map[string]StacktraceType, mapReader io.Reader) error for _, frames := range stacktraceType.methods { for _, frame := range frames { if frame.Original == nil { - frame.Original = modelpb.OriginalFromVTPool() + frame.Original = &modelpb.Original{} } // Multiple frames might point to the same class, so we need to deobfuscate the class name for them all. frame.Original.Classname = obfuscatedName diff --git a/internal/sourcemap/processor.go b/internal/sourcemap/processor.go index 003ce3f30d1..ea05f649a5d 100644 --- a/internal/sourcemap/processor.go +++ b/internal/sourcemap/processor.go @@ -135,7 +135,7 @@ func (p BatchProcessor) processStacktraceFrame( } if frame.Original == nil { - frame.Original = modelpb.OriginalFromVTPool() + frame.Original = &modelpb.Original{} } // Store original source information. diff --git a/x-pack/apm-server/sampling/eventstorage/storage.go b/x-pack/apm-server/sampling/eventstorage/storage.go index 9f7d4fc2d69..d8dad34ab7d 100644 --- a/x-pack/apm-server/sampling/eventstorage/storage.go +++ b/x-pack/apm-server/sampling/eventstorage/storage.go @@ -300,7 +300,7 @@ func (rw *ReadWriter) ReadTraceEvents(traceID string, out *modelpb.Batch) error } switch item.UserMeta() { case entryMetaTraceEvent: - event := modelpb.APMEventFromVTPool() + event := &modelpb.APMEvent{} if err := item.Value(func(data []byte) error { if err := rw.s.codec.DecodeEvent(data, event); err != nil { return fmt.Errorf("codec failed to decode event: %w", err) diff --git a/x-pack/apm-server/sampling/processor.go b/x-pack/apm-server/sampling/processor.go index 94b3ae3df99..82dc2df59aa 100644 --- a/x-pack/apm-server/sampling/processor.go +++ b/x-pack/apm-server/sampling/processor.go @@ -547,7 +547,6 @@ func (p *Processor) Run() error { } for i := range events { - events[i].ReturnToVTPool() events[i] = nil // not required but ensure that there is no ref to the freed event } }