Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions NOTICE-fips.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ Third party libraries used by the Elastic Beats project:


--------------------------------------------------------------------------------
Dependency : github.com/cenkalti/backoff/v4
Version: v4.3.0
Dependency : github.com/cenkalti/backoff/v7
Version: v7.0.0
Licence type (autodetected): MIT
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/cenkalti/backoff/v4@v4.3.0/LICENSE:
Contents of probable licence file $GOMODCACHE/github.com/cenkalti/backoff/v7@v7.0.0/LICENSE:

The MIT License (MIT)

Expand All @@ -40,12 +40,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.


--------------------------------------------------------------------------------
Dependency : github.com/dgraph-io/ristretto
Version: v0.2.0
Dependency : github.com/dgraph-io/ristretto/v2
Version: v2.4.2
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/dgraph-io/ristretto@v0.2.0/LICENSE:
Contents of probable licence file $GOMODCACHE/github.com/dgraph-io/ristretto/v2@v2.4.2/LICENSE:

Apache License
Version 2.0, January 2004
Expand Down
12 changes: 6 additions & 6 deletions NOTICE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ Third party libraries used by the Elastic Beats project:


--------------------------------------------------------------------------------
Dependency : github.com/cenkalti/backoff/v4
Version: v4.3.0
Dependency : github.com/cenkalti/backoff/v7
Version: v7.0.0
Licence type (autodetected): MIT
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/cenkalti/backoff/v4@v4.3.0/LICENSE:
Contents of probable licence file $GOMODCACHE/github.com/cenkalti/backoff/v7@v7.0.0/LICENSE:

The MIT License (MIT)

Expand All @@ -40,12 +40,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.


--------------------------------------------------------------------------------
Dependency : github.com/dgraph-io/ristretto
Version: v0.2.0
Dependency : github.com/dgraph-io/ristretto/v2
Version: v2.4.2
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/dgraph-io/ristretto@v0.2.0/LICENSE:
Contents of probable licence file $GOMODCACHE/github.com/dgraph-io/ristretto/v2@v2.4.2/LICENSE:

Apache License
Version 2.0, January 2004
Expand Down
2 changes: 1 addition & 1 deletion dev-tools/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ require (
github.com/go-openapi/swag v0.23.0 // indirect
github.com/google/licenseclassifier v0.0.0-20250213175939-b5d1a3369749 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/jstemmer/go-junit-report v1.0.0 // indirect
github.com/jstemmer/go-junit-report/v2 v2.1.0 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
github.com/oapi-codegen/oapi-codegen/v2 v2.5.0 // indirect
Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ go 1.26.8

require (
github.com/Pallinder/go-randomdata v1.2.0
github.com/cenkalti/backoff/v4 v4.3.0
github.com/dgraph-io/ristretto v0.2.0
github.com/cenkalti/backoff/v7 v7.0.0
github.com/dgraph-io/ristretto/v2 v2.4.2
github.com/docker/go-units v0.5.0
github.com/elastic/elastic-agent-client/v7 v7.18.1
github.com/elastic/elastic-agent-libs v0.46.3
Expand Down
12 changes: 6 additions & 6 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgI
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
github.com/bmatcuk/doublestar v1.1.1/go.mod h1:UD6OnuiIn0yFxxA2le/rnRU1G4RaI4UvFv1sNto9p6w=
github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8=
github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
github.com/cenkalti/backoff/v7 v7.0.0 h1:ZP+QAaaOnVUHo+ufFpZ835hbT3x2fy+h2lecVEosZ6A=
github.com/cenkalti/backoff/v7 v7.0.0/go.mod h1:qcKBGwsu4hpxHtQ8tWYsQ+ifzx2+sS+Xx/3jfe30lI8=
github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
github.com/containerd/errdefs v1.0.0 h1:tg5yIfIlQIrxYtu9ajqY42W3lpS19XqdxRQeEwYG8PI=
Expand All @@ -23,10 +23,10 @@ github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6N
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/dgraph-io/ristretto v0.2.0 h1:XAfl+7cmoUDWW/2Lx8TGZQjjxIQ2Ley9DSf52dru4WE=
github.com/dgraph-io/ristretto v0.2.0/go.mod h1:8uBHCU/PBV4Ag0CJrP47b9Ofby5dqWNh4FicAdoqFNU=
github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 h1:fAjc9m62+UWV/WAFKLNi6ZS0675eEUC9y3AlwSbQu1Y=
github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=
github.com/dgraph-io/ristretto/v2 v2.4.2 h1:x0cvjmUKxt764Yxdk2nr94we1AvPPAMh1rh5TQ+Jo80=
github.com/dgraph-io/ristretto/v2 v2.4.2/go.mod h1:0KsrXtXvnv0EqnzyowllbVJB8yBonswa2lTCK2gGo9E=
github.com/dgryski/go-farm v0.0.0-20240924180020-3414d57e47da h1:aIftn67I1fkbMa512G+w+Pxci9hJPB8oMnkcP3iZF38=
github.com/dgryski/go-farm v0.0.0-20240924180020-3414d57e47da/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=
github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
github.com/docker/go-connections v0.7.0 h1:6SsRfJddP22WMrCkj19x9WKjEDTB+ahsdiGYf0mN39c=
Expand Down
6 changes: 3 additions & 3 deletions internal/pkg/cache/impl.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
)

type Cacher interface {
Get(key any) (any, bool)
Set(key, value any, cost int64) bool
SetWithTTL(key, value any, cost int64, ttl time.Duration) bool
Get(key string) (any, bool)
Set(key string, value any, cost int64) bool
SetWithTTL(key string, value any, cost int64, ttl time.Duration) bool
Close()
}
6 changes: 3 additions & 3 deletions internal/pkg/cache/impl_integration.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ func newCache(_ config.Cache) (Cacher, error) {

type NoCache struct{}

func (c *NoCache) Get(_ any) (any, bool) {
func (c *NoCache) Get(_ string) (any, bool) {
return nil, false
}

func (c *NoCache) Set(_ any, _ any, _ int64) bool {
func (c *NoCache) Set(_ string, _ any, _ int64) bool {
return true
}

func (c *NoCache) SetWithTTL(_, _ any, _ int64, _ time.Duration) bool {
func (c *NoCache) SetWithTTL(_ string, _ any, _ int64, _ time.Duration) bool {
return true
}

Expand Down
4 changes: 2 additions & 2 deletions internal/pkg/cache/impl_ristretto.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
package cache

import (
"github.com/dgraph-io/ristretto"
"github.com/dgraph-io/ristretto/v2"

"github.com/elastic/fleet-server/v7/internal/pkg/config"
)

func newCache(cfg config.Cache) (Cacher, error) {
rcfg := &ristretto.Config{
rcfg := &ristretto.Config[string, any]{
NumCounters: cfg.NumCounters,
MaxCost: cfg.MaxCost,
BufferItems: 64,
Expand Down
2 changes: 1 addition & 1 deletion internal/pkg/es/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"github.com/elastic/fleet-server/v7/internal/pkg/config"
"github.com/rs/zerolog"

backoff "github.com/cenkalti/backoff/v4"
backoff "github.com/cenkalti/backoff/v7"
"github.com/elastic/go-elasticsearch/v8"
)

Expand Down
Loading