From d3db6580c3e229b06417542c584628f3450234f4 Mon Sep 17 00:00:00 2001 From: Carson Ip Date: Wed, 16 Aug 2023 12:52:03 +0100 Subject: [PATCH] make check-full --- NOTICE.txt | 56 +++++++++++++++++++++++++++--------------------------- go.mod | 4 ++-- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index 37cae43636..a3d4c89692 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -9,6 +9,34 @@ Third party libraries used by the Elastic APM Server project: ================================================================================ +-------------------------------------------------------------------------------- +Dependency : github.com/axiomhq/hyperloglog +Version: v0.0.0-20230201085229-3ddf4bad03dc +Licence type (autodetected): MIT +-------------------------------------------------------------------------------- + +Contents of probable licence file $GOMODCACHE/github.com/axiomhq/hyperloglog@v0.0.0-20230201085229-3ddf4bad03dc/LICENSE: + +Copyright (c) 2021, Axiom, Inc. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER 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/cespare/xxhash/v2 Version: v2.2.0 @@ -7304,34 +7332,6 @@ 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/axiomhq/hyperloglog -Version: v0.0.0-20230201085229-3ddf4bad03dc -Licence type (autodetected): MIT --------------------------------------------------------------------------------- - -Contents of probable licence file $GOMODCACHE/github.com/axiomhq/hyperloglog@v0.0.0-20230201085229-3ddf4bad03dc/LICENSE: - -Copyright (c) 2021, Axiom, Inc. - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER 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/beorn7/perks Version: v1.0.1 diff --git a/go.mod b/go.mod index 3df9567787..a1ccb3e337 100644 --- a/go.mod +++ b/go.mod @@ -3,6 +3,7 @@ module github.com/elastic/apm-server go 1.20 require ( + github.com/axiomhq/hyperloglog v0.0.0-20230201085229-3ddf4bad03dc github.com/cespare/xxhash/v2 v2.2.0 github.com/dgraph-io/badger/v2 v2.2007.3-0.20201012072640-f5a7e0a1c83b github.com/dustin/go-humanize v1.0.1 @@ -15,6 +16,7 @@ require ( github.com/elastic/gmux v0.2.0 github.com/elastic/go-docappender v0.2.1-0.20230724080315-b714d6181871 github.com/elastic/go-elasticsearch/v8 v8.9.0 + github.com/elastic/go-hdrhistogram v0.1.0 github.com/elastic/go-sysinfo v1.11.0 github.com/elastic/go-ucfg v0.8.6 github.com/go-sourcemap/sourcemap v2.1.3+incompatible @@ -64,7 +66,6 @@ require ( github.com/Shopify/sarama v1.38.1 // indirect github.com/apache/thrift v0.18.1 // indirect github.com/armon/go-radix v1.0.0 // indirect - 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 @@ -86,7 +87,6 @@ require ( github.com/eapache/queue v1.1.0 // indirect github.com/elastic/elastic-agent-shipper-client v0.5.1-0.20230228231646-f04347b666f3 // indirect github.com/elastic/elastic-transport-go/v8 v8.3.0 // indirect - github.com/elastic/go-hdrhistogram v0.1.0 // indirect github.com/elastic/go-licenser v0.4.1 // indirect github.com/elastic/go-lumber v0.1.2-0.20220819171948-335fde24ea0f // indirect github.com/elastic/go-structform v0.0.10 // indirect