Skip to content

Commit e90a75f

Browse files
authored
refactor(client-proxy): remove in-memory sandbox catalog fallback (#2636)
1 parent f2c360d commit e90a75f

6 files changed

Lines changed: 149 additions & 122 deletions

File tree

packages/api/internal/orchestrator/orchestrator.go

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -110,12 +110,7 @@ func New(
110110
}
111111
analyticsInstance.Init(ctx)
112112

113-
var routingCatalog e2bcatalog.SandboxesCatalog
114-
if redisClient != nil {
115-
routingCatalog = e2bcatalog.NewRedisSandboxCatalog(redisClient)
116-
} else {
117-
routingCatalog = e2bcatalog.NewMemorySandboxesCatalog()
118-
}
113+
routingCatalog := e2bcatalog.NewRedisSandboxCatalog(redisClient)
119114

120115
// We will need to either use Redis or Consul's KV for storing active sandboxes to keep everything in sync,
121116
// right now we load them from Orchestrator

packages/client-proxy/go.mod

Lines changed: 39 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,34 +24,71 @@ require (
2424

2525
require (
2626
connectrpc.com/connect v1.18.1 // indirect
27+
dario.cat/mergo v1.0.2 // indirect
28+
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
29+
github.com/Microsoft/go-winio v0.6.2 // indirect
30+
github.com/bsm/redislock v0.9.4 // indirect
31+
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
2732
github.com/cenkalti/backoff/v5 v5.0.3 // indirect
2833
github.com/cespare/xxhash/v2 v2.3.0 // indirect
34+
github.com/containerd/errdefs v1.0.0 // indirect
35+
github.com/containerd/errdefs/pkg v0.3.0 // indirect
36+
github.com/containerd/log v0.1.0 // indirect
37+
github.com/containerd/platforms v0.2.1 // indirect
38+
github.com/cpuguy83/dockercfg v0.3.2 // indirect
2939
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
3040
github.com/dchest/uniuri v1.2.0 // indirect
3141
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
42+
github.com/distribution/reference v0.6.0 // indirect
43+
github.com/docker/go-connections v0.6.0 // indirect
44+
github.com/docker/go-units v0.5.0 // indirect
45+
github.com/ebitengine/purego v0.10.0 // indirect
46+
github.com/felixge/httpsnoop v1.0.4 // indirect
3247
github.com/go-logr/logr v1.4.3 // indirect
3348
github.com/go-logr/stdr v1.2.2 // indirect
49+
github.com/go-ole/go-ole v1.3.0 // indirect
3450
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
3551
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.2 // indirect
3652
github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0 // indirect
37-
github.com/jellydator/ttlcache/v3 v3.4.0 // indirect
3853
github.com/josharian/intern v1.0.0 // indirect
54+
github.com/klauspost/compress v1.18.5 // indirect
3955
github.com/launchdarkly/ccache v1.1.0 // indirect
4056
github.com/launchdarkly/eventsource v1.10.0 // indirect
4157
github.com/launchdarkly/go-jsonstream/v3 v3.1.0 // indirect
4258
github.com/launchdarkly/go-sdk-common/v3 v3.3.0 // indirect
4359
github.com/launchdarkly/go-sdk-events/v3 v3.5.0 // indirect
4460
github.com/launchdarkly/go-semver v1.0.3 // indirect
4561
github.com/launchdarkly/go-server-sdk-evaluation/v3 v3.0.1 // indirect
62+
github.com/lufia/plan9stats v0.0.0-20240909124753-873cd0166683 // indirect
63+
github.com/magiconair/properties v1.8.10 // indirect
4664
github.com/mailru/easyjson v0.9.1 // indirect
65+
github.com/moby/docker-image-spec v1.3.1 // indirect
66+
github.com/moby/go-archive v0.2.0 // indirect
67+
github.com/moby/moby/api v1.54.1 // indirect
68+
github.com/moby/moby/client v0.4.0 // indirect
69+
github.com/moby/patternmatcher v0.6.1 // indirect
70+
github.com/moby/sys/sequential v0.6.0 // indirect
71+
github.com/moby/sys/user v0.4.0 // indirect
72+
github.com/moby/sys/userns v0.1.0 // indirect
73+
github.com/moby/term v0.5.2 // indirect
74+
github.com/opencontainers/go-digest v1.0.0 // indirect
75+
github.com/opencontainers/image-spec v1.1.1 // indirect
4776
github.com/orcaman/concurrent-map/v2 v2.0.1 // indirect
4877
github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
4978
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
79+
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
5080
github.com/redis/go-redis/extra/rediscmd/v9 v9.17.3 // indirect
5181
github.com/redis/go-redis/extra/redisotel/v9 v9.17.3 // indirect
5282
github.com/redis/go-redis/v9 v9.17.3 // indirect
83+
github.com/shirou/gopsutil/v4 v4.26.3 // indirect
84+
github.com/sirupsen/logrus v1.9.4 // indirect
85+
github.com/testcontainers/testcontainers-go v0.42.0 // indirect
86+
github.com/tklauser/go-sysconf v0.3.16 // indirect
87+
github.com/tklauser/numcpus v0.11.0 // indirect
88+
github.com/yusufpapurcu/wmi v1.2.4 // indirect
5389
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
5490
go.opentelemetry.io/contrib/bridges/otelzap v0.14.0 // indirect
91+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.67.0 // indirect
5592
go.opentelemetry.io/contrib/instrumentation/runtime v0.66.0 // indirect
5693
go.opentelemetry.io/otel v1.43.0 // indirect
5794
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.15.0 // indirect
@@ -66,6 +103,7 @@ require (
66103
go.opentelemetry.io/otel/trace v1.43.0 // indirect
67104
go.opentelemetry.io/proto/otlp v1.10.0 // indirect
68105
go.uber.org/multierr v1.11.0 // indirect
106+
golang.org/x/crypto v0.50.0 // indirect
69107
golang.org/x/exp v0.0.0-20260212183809-81e46e3db34a // indirect
70108
golang.org/x/mod v0.35.0 // indirect
71109
golang.org/x/net v0.53.0 // indirect

0 commit comments

Comments
 (0)