Skip to content

[no-impl] Pass a closure to visitDataBlobs #262

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
JayChung0258 wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

[no-impl] Pass a closure to visitDataBlobs #262

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c7742e4
Pass a closure to visitDataBlobs
JayChung0258 Aug 25, 2026
58b0f7d
Name the blob visitor parameter visitEvents
JayChung0258 Aug 25, 2026
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
27 changes: 18 additions & 9 deletions interceptor/reflection.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,11 @@ type stringMatcher func(name string) (string, bool)
// It returns whether anything was matched and any error it encountered.
type visitor func(logger log.Logger, obj any, match stringMatcher) (bool, error)

// blobVisitor visits the history events deserialized from a data blob. Callers close over
// whatever matching state they need, since a data blob starts a fresh traversal that cannot
// see the enclosing message.
type blobVisitor func(events []*history.HistoryEvent) (bool, error)

// visitNamespace uses reflection to recursively visit all fields
// in the given object. When it finds namespace string fields, it invokes
// the provided match function.
Expand Down Expand Up @@ -180,7 +185,9 @@ func visitNamespace(logger log.Logger, obj any, match stringMatcher) (bool, erro
}
return visit.Skip, nil
} else if dataBlobFieldNames[fieldType.Name] {
changed, err := visitDataBlobs(logger, vwp, match, visitNamespace)
changed, err := visitDataBlobs(logger, vwp, func(events []*history.HistoryEvent) (bool, error) {
return visitNamespace(logger, events, match)
})
matched = matched || changed
if err != nil {
return visit.Stop, err
Expand Down Expand Up @@ -225,7 +232,9 @@ func visitSearchAttributes(logger log.Logger, obj any, match stringMatcher) (boo
return action, nil
}
if dataBlobFieldNames[fieldType.Name] {
changed, err := visitDataBlobs(logger, vwp, match, visitSearchAttributes)
changed, err := visitDataBlobs(logger, vwp, func(events []*history.HistoryEvent) (bool, error) {
return visitSearchAttributes(logger, events, match)
})
matched = matched || changed
if err != nil {
return visit.Stop, err
Expand Down Expand Up @@ -287,10 +296,10 @@ func getParentFieldType(vwp visit.ValueWithParent) (result reflect.StructField,
return fieldType, action
}

func visitDataBlobs(logger log.Logger, vwp visit.ValueWithParent, match stringMatcher, visitor visitor) (bool, error) {
func visitDataBlobs(logger log.Logger, vwp visit.ValueWithParent, visitEvents blobVisitor) (bool, error) {
switch evt := vwp.Interface().(type) {
case []*common.DataBlob:
newEvts, matched, changed, err := translateDataBlobs(logger, match, visitor, evt...)
newEvts, matched, changed, err := translateDataBlobs(logger, visitEvents, evt...)
if err != nil {
return matched, err
}
Expand All @@ -301,7 +310,7 @@ func visitDataBlobs(logger log.Logger, vwp visit.ValueWithParent, match stringMa
}
return matched, nil
case *common.DataBlob:
newEvt, matched, changed, err := translateOneDataBlob(logger, match, visitor, evt)
newEvt, matched, changed, err := translateOneDataBlob(logger, visitEvents, evt)
if err != nil {
return matched, err
}
Expand All @@ -316,9 +325,9 @@ func visitDataBlobs(logger log.Logger, vwp visit.ValueWithParent, match stringMa
}
}

func translateDataBlobs(logger log.Logger, match stringMatcher, visitor visitor, blobs ...*common.DataBlob) (result []*common.DataBlob, anyMatched, anyChanged bool, retErr error) {
func translateDataBlobs(logger log.Logger, visitEvents blobVisitor, blobs ...*common.DataBlob) (result []*common.DataBlob, anyMatched, anyChanged bool, retErr error) {
for i, blob := range blobs {
newBlob, matched, changed, err := translateOneDataBlob(logger, match, visitor, blob)
newBlob, matched, changed, err := translateOneDataBlob(logger, visitEvents, blob)
anyChanged = anyChanged || changed
anyMatched = anyMatched || matched
if err != nil {
Expand All @@ -329,7 +338,7 @@ func translateDataBlobs(logger log.Logger, match stringMatcher, visitor visitor,
return blobs, anyMatched, anyChanged, nil
}

func translateOneDataBlob(logger log.Logger, match stringMatcher, visitor visitor, blob *common.DataBlob) (result *common.DataBlob, matched, changed bool, retErr error) {
func translateOneDataBlob(logger log.Logger, visitEvents blobVisitor, blob *common.DataBlob) (result *common.DataBlob, matched, changed bool, retErr error) {
if blob == nil || len(blob.Data) == 0 {
return blob, matched, changed, nil
}
Expand All @@ -356,7 +365,7 @@ func translateOneDataBlob(logger log.Logger, match stringMatcher, visitor visito
}
}

m, err := visitor(logger, events, match)
m, err := visitEvents(events)
matched = matched || m
if err != nil {
return blob, matched, changed, err
Expand Down
Loading