Skip to content

Commit

Permalink
build(deps): bump github.com/elastic/apm-aggregation from 0.0.0-20230…
Browse files Browse the repository at this point in the history 
…815024520-e75a37d9ddd6 to 1.0.1 (#12934)

* build(deps): bump github.com/elastic/apm-aggregation

Bumps [github.com/elastic/apm-aggregation](https://github.com/elastic/apm-aggregation) from 0.0.0-20230815024520-e75a37d9ddd6 to 1.0.1.
- [Release notes](https://github.com/elastic/apm-aggregation/releases)
- [Commits](https://github.com/elastic/apm-aggregation/commits/v1.0.1)

---
updated-dependencies:
- dependency-name: github.com/elastic/apm-aggregation
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>

* Update NOTICE.txt

* fix: remove event.received from aggregated events

* Update NOTICE.txt

* Update NOTICE.txt

* Update NOTICE.txt

---------

Signed-off-by: dependabot[bot] <[email protected]>
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 <[email protected]>
Co-authored-by: Andrew Wilkins <[email protected]>
  • Loading branch information
@dependabot @github-actions
@kruskall @axw
4 people authored Jun 10, 2024
1 parent abb752b commit 66e5b64
Show file tree
Hide file tree
Showing 4 changed files with 56 additions and 230 deletions.
62 changes: 31 additions & 31 deletions NOTICE.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -260,11 +260,11 @@ SOFTWARE.

--------------------------------------------------------------------------------
Dependency : github.com/elastic/apm-aggregation
Version: v0.0.0-20230815024520-e75a37d9ddd6
Version: v1.0.1
Licence type (autodetected): Elastic-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/elastic/apm-aggregation@v0.0.0-20230815024520-e75a37d9ddd6/LICENSE.txt:
Contents of probable licence file $GOMODCACHE/github.com/elastic/apm-aggregation@v1.0.1/LICENSE.txt:

Elastic License 2.0

Expand Down Expand Up @@ -7246,11 +7246,11 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

--------------------------------------------------------------------------------
Dependency : github.com/cockroachdb/errors
Version: v1.8.1
Version: v1.11.1
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/cockroachdb/errors@v1.8.1/LICENSE:
Contents of probable licence file $GOMODCACHE/github.com/cockroachdb/errors@v1.11.1/LICENSE:

Apache License
Version 2.0, January 2004
Expand Down Expand Up @@ -7457,11 +7457,11 @@ Contents of probable licence file $GOMODCACHE/github.com/cockroachdb/[email protected]

--------------------------------------------------------------------------------
Dependency : github.com/cockroachdb/logtags
Version: v0.0.0-20190617123548-eb05cc24525f
Version: v0.0.0-20230118201751-21c54148d20b
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/cockroachdb/[email protected]20190617123548-eb05cc24525f/LICENSE:
Contents of probable licence file $GOMODCACHE/github.com/cockroachdb/[email protected]20230118201751-21c54148d20b/LICENSE:

Apache License
Version 2.0, January 2004
Expand Down Expand Up @@ -7668,11 +7668,11 @@ Contents of probable licence file $GOMODCACHE/github.com/cockroachdb/logtags@v0.

--------------------------------------------------------------------------------
Dependency : github.com/cockroachdb/pebble
Version: v0.0.0-20230627193317-c807f60529a3
Version: v1.1.0
Licence type (autodetected): BSD-3-Clause
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/cockroachdb/pebble@v0.0.0-20230627193317-c807f60529a3/LICENSE:
Contents of probable licence file $GOMODCACHE/github.com/cockroachdb/pebble@v1.1.0/LICENSE:

Copyright (c) 2011 The LevelDB-Go Authors. All rights reserved.

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

--------------------------------------------------------------------------------
Dependency : github.com/cockroachdb/redact
Version: v1.0.8
Version: v1.1.5
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/cockroachdb/redact@v1.0.8/LICENSE:
Contents of probable licence file $GOMODCACHE/github.com/cockroachdb/redact@v1.1.5/LICENSE:

Apache License
Version 2.0, January 2004
Expand Down Expand Up @@ -7914,32 +7914,13 @@ Contents of probable licence file $GOMODCACHE/github.com/cockroachdb/[email protected]
limitations under the License.


--------------------------------------------------------------------------------
Dependency : github.com/cockroachdb/sentry-go
Version: v0.6.1-cockroachdb.2
Licence type (autodetected): BSD-2-Clause
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/cockroachdb/[email protected]/LICENSE:

Copyright (c) 2019 Sentry (https://sentry.io) and individual contributors.
All rights reserved.

Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
* 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.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.


--------------------------------------------------------------------------------
Dependency : github.com/cockroachdb/tokenbucket
Version: v0.0.0-20230613231145-182959a1fad6
Version: v0.0.0-20230807174530-cc333fc44b06
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/cockroachdb/[email protected]20230613231145-182959a1fad6/LICENSE:
Contents of probable licence file $GOMODCACHE/github.com/cockroachdb/[email protected]20230807174530-cc333fc44b06/LICENSE:

Apache License
Version 2.0, January 2004
Expand Down Expand Up @@ -10121,6 +10102,25 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.


--------------------------------------------------------------------------------
Dependency : github.com/getsentry/sentry-go
Version: v0.18.0
Licence type (autodetected): BSD-2-Clause
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/getsentry/[email protected]/LICENSE:

Copyright (c) 2019 Sentry (https://sentry.io) and individual contributors.
All rights reserved.

Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
* 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.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.


--------------------------------------------------------------------------------
Dependency : github.com/go-logr/logr
Version: v1.4.1
Expand Down
14 changes: 7 additions & 7 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ 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 v0.0.0-20230815024520-e75a37d9ddd6
github.com/elastic/apm-aggregation v1.0.1
github.com/elastic/apm-data v1.2.0
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240605182926-90f9e8f6e48e
github.com/elastic/elastic-agent-client/v7 v7.11.0
Expand Down Expand Up @@ -69,12 +69,11 @@ require (
github.com/axiomhq/hyperloglog v0.0.0-20230201085229-3ddf4bad03dc // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash v1.1.0 // indirect
github.com/cockroachdb/errors v1.8.1 // indirect
github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f // indirect
github.com/cockroachdb/pebble v0.0.0-20230627193317-c807f60529a3 // indirect
github.com/cockroachdb/redact v1.0.8 // indirect
github.com/cockroachdb/sentry-go v0.6.1-cockroachdb.2 // indirect
github.com/cockroachdb/tokenbucket v0.0.0-20230613231145-182959a1fad6 // indirect
github.com/cockroachdb/errors v1.11.1 // indirect
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect
github.com/cockroachdb/pebble v1.1.0 // indirect
github.com/cockroachdb/redact v1.1.5 // indirect
github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/dgraph-io/ristretto v0.1.1 // indirect
github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect
Expand All @@ -95,6 +94,7 @@ require (
github.com/elastic/pkcs8 v1.0.0 // indirect
github.com/fatih/color v1.15.0 // indirect
github.com/frankban/quicktest v1.14.0 // indirect
github.com/getsentry/sentry-go v0.18.0 // indirect
github.com/go-logr/logr v1.4.1 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-ole/go-ole v1.2.6 // indirect
Expand Down
Loading

0 comments on commit 66e5b64

Please sign in to comment.