Skip to content

Commit e505269

Browse files
committed
remove per event filtering
1 parent 49113c4 commit e505269

File tree

4 files changed

+11
-74
lines changed

4 files changed

+11
-74
lines changed

internal/dev_server/events/base.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
package events
2+
3+
type Base struct {
4+
Kind string `json:"kind"`
5+
}

internal/dev_server/events/filter.go

Lines changed: 0 additions & 16 deletions
This file was deleted.

internal/dev_server/events/filter_test.go

Lines changed: 0 additions & 40 deletions
This file was deleted.

internal/dev_server/sdk/sdk_events.go

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,17 @@ package sdk
33
import (
44
"context"
55
"encoding/json"
6+
"io"
7+
"log"
8+
"net/http"
9+
610
"github.com/google/uuid"
711
"github.com/launchdarkly/ldcli/internal/dev_server/events"
812
"github.com/launchdarkly/ldcli/internal/dev_server/model"
913
"github.com/pkg/errors"
10-
"io"
11-
"log"
12-
"net/http"
1314
)
1415

15-
func newSdkEventObserver(updateChan chan<- Message, ctx context.Context, filter events.Filter) sdkEventObserver {
16+
func newSdkEventObserver(updateChan chan<- Message, ctx context.Context) sdkEventObserver {
1617
debugSessionKey := uuid.New().String()
1718
db := model.EventStoreFromContext(ctx)
1819
err := db.CreateDebugSession(ctx, debugSessionKey)
@@ -23,15 +24,13 @@ func newSdkEventObserver(updateChan chan<- Message, ctx context.Context, filter
2324
debugSessionKey: debugSessionKey,
2425
ctx: ctx,
2526
updateChan: updateChan,
26-
filter: filter,
2727
}
2828
}
2929

3030
type sdkEventObserver struct {
3131
ctx context.Context
3232
debugSessionKey string
3333
updateChan chan<- Message
34-
filter events.Filter
3534
}
3635

3736
func (o sdkEventObserver) Handle(message interface{}) {
@@ -47,10 +46,6 @@ func (o sdkEventObserver) Handle(message interface{}) {
4746
return
4847
}
4948

50-
if !o.filter.Matches(event) {
51-
return
52-
}
53-
5449
db := model.EventStoreFromContext(o.ctx)
5550

5651
err = db.WriteEvent(o.ctx, o.debugSessionKey, event.Kind, str)
@@ -93,15 +88,8 @@ func SdkEventsTeeHandler(writer http.ResponseWriter, request *http.Request) {
9388
Message{Event: TYPE_PUT, Data: []byte{}},
9489
)
9590
defer close(updateChan)
96-
filter := events.Filter{}
97-
98-
query := request.URL.Query()
99-
kind := query.Get("kind")
100-
if kind != "" {
101-
filter.Kind = &kind
102-
}
10391

104-
observerId := observers.RegisterObserver(newSdkEventObserver(updateChan, request.Context(), filter))
92+
observerId := observers.RegisterObserver(newSdkEventObserver(updateChan, request.Context()))
10593
defer func() {
10694
ok := observers.DeregisterObserver(observerId)
10795
if !ok {

0 commit comments

Comments
 (0)