Skip to content

Store err logs #7493

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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+10 −35
Open

Store err logs #7493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
179613f
[shard-distributor]Remove error logs from store level
gazi-yestemirova Nov 26, 2025
03dc6a8
update tests
gazi-yestemirova Nov 26, 2025
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
17 changes: 4 additions & 13 deletions service/sharddistributor/store/wrappers/metered/base.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import (

"github.com/uber/cadence/common/clock"
"github.com/uber/cadence/common/log"
"github.com/uber/cadence/common/log/tag"
"github.com/uber/cadence/common/metrics"
"github.com/uber/cadence/service/sharddistributor/store"
)
Expand All @@ -38,18 +37,11 @@ type base struct {
timeSource clock.TimeSource
}

func (p *base) updateErrorMetricPerNamespace(scope metrics.ScopeIdx, err error, scopeWithNamespaceTags metrics.Scope, logger log.Logger) {
logger = logger.Helper()

switch {
case errors.Is(err, store.ErrExecutorNotFound):
func (p *base) updateErrorMetricPerNamespace(err error, scopeWithNamespaceTags metrics.Scope) {
if errors.Is(err, store.ErrExecutorNotFound) {
scopeWithNamespaceTags.IncCounter(metrics.ShardDistributorStoreExecutorNotFound)
logger.Error("Executor not found.", tag.Error(err), tag.MetricScope(int(scope)))
case errors.Is(err, store.ErrShardNotFound):
// this is expected, so we don't want to log it
default:
logger.Error("Store failed with internal error.", tag.Error(err), tag.MetricScope(int(scope))) // int???
}

scopeWithNamespaceTags.IncCounter(metrics.ShardDistributorStoreFailuresPerNamespace)
}

Expand All @@ -62,9 +54,8 @@ func (p *base) call(scope metrics.ScopeIdx, op func() error, tags ...metrics.Tag
duration := p.timeSource.Since(before)
metricsScope.RecordHistogramDuration(metrics.ShardDistributorStoreLatencyHistogramPerNamespace, duration)

logger := p.logger.Helper()
if err != nil {
p.updateErrorMetricPerNamespace(scope, err, metricsScope, logger)
p.updateErrorMetricPerNamespace(err, metricsScope)
}
return err
}
28 changes: 6 additions & 22 deletions service/sharddistributor/store/wrappers/metered/metered_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import (

"github.com/uber/cadence/common/clock"
"github.com/uber/cadence/common/log"
"github.com/uber/cadence/common/log/tag"
"github.com/uber/cadence/common/metrics"
"github.com/uber/cadence/common/types"
"github.com/uber/cadence/service/sharddistributor/store"
Expand All @@ -31,33 +30,19 @@ func TestMeteredStore_GetHeartbeat(t *testing.T) {
}

tests := []struct {
name string
setupMocks func(logger *log.MockLogger)
error error
name string
error error
}{
{
name: "Success",
setupMocks: func(logger *log.MockLogger) {},
error: nil,
name: "Success",
error: nil,
},
{
name: "NotFound",
setupMocks: func(logger *log.MockLogger) {
logger.EXPECT().Error(
"Executor not found.",
[]tag.Tag{tag.Error(store.ErrExecutorNotFound), tag.MetricScope(int(metrics.ShardDistributorStoreGetHeartbeatScope))},
).Times(1)
},
name: "NotFound",
error: store.ErrExecutorNotFound,
},
{
name: "Failure",
setupMocks: func(logger *log.MockLogger) {
logger.EXPECT().Error(
"Store failed with internal error.",
[]tag.Tag{tag.Error(&types.InternalServiceError{}), tag.MetricScope(int(metrics.ShardDistributorStoreGetHeartbeatScope))},
).Times(1)
},
name: "Failure",
error: &types.InternalServiceError{},
},
}
Expand All @@ -79,7 +64,6 @@ func TestMeteredStore_GetHeartbeat(t *testing.T) {
mockLogger.EXPECT().Helper().Return(mockLogger).AnyTimes()

wrapped := NewStore(mockHandler, metricsClient, mockLogger, timeSource).(*meteredStore)
tt.setupMocks(mockLogger)

gotHeartbeat, gotAssignedState, err := wrapped.GetHeartbeat(context.Background(), _testNamespace, _testExecutorID)

Expand Down
Loading