Skip to content

Commit 847db44

Browse files
authored
Fixing panics in test activities (#1374)
* Fixing panics in test activities
1 parent bcd0462 commit 847db44

8 files changed

+26
-8
lines changed

internal/internal_poller_autoscaler.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,10 @@ func newPollerScaler(
8383
options pollerAutoScalerOptions,
8484
logger *zap.Logger,
8585
hooks ...func()) *pollerAutoScaler {
86-
ctx, cancel := context.WithCancel(context.Background())
8786
if !options.Enabled {
8887
return nil
8988
}
90-
89+
ctx, cancel := context.WithCancel(context.Background())
9190
return &pollerAutoScaler{
9291
isDryRun: options.DryRun,
9392
cooldownTime: options.Cooldown,

internal/internal_task_handlers.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1406,6 +1406,12 @@ func newActivityTaskHandlerWithCustomProvider(
14061406
registry *registry,
14071407
activityProvider activityProvider,
14081408
) ActivityTaskHandler {
1409+
if params.Tracer == nil {
1410+
params.Tracer = opentracing.NoopTracer{}
1411+
}
1412+
if params.WorkerStats.ActivityTracker == nil {
1413+
params.WorkerStats.ActivityTracker = debug.NewNoopActivityTracker()
1414+
}
14091415
return &activityTaskHandlerImpl{
14101416
taskListName: params.TaskList,
14111417
identity: params.Identity,

internal/internal_task_handlers_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1248,7 +1248,6 @@ func (t *TaskHandlersTestSuite) TestLocalActivityRetry_DecisionHeartbeatFail() {
12481248
WorkerOptions: WorkerOptions{
12491249
Identity: "test-id-1",
12501250
Logger: t.logger,
1251-
Tracer: opentracing.NoopTracer{},
12521251
},
12531252
WorkerStopChannel: stopCh,
12541253
}

internal/internal_task_pollers.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -525,6 +525,12 @@ func (wtp *workflowTaskPoller) RespondTaskCompleted(completedRequest interface{}
525525
}
526526

527527
func newLocalActivityPoller(params workerExecutionParameters, laTunnel *localActivityTunnel) *localActivityTaskPoller {
528+
if params.Tracer == nil {
529+
params.Tracer = opentracing.NoopTracer{}
530+
}
531+
if params.WorkerStats.ActivityTracker == nil {
532+
params.WorkerStats.ActivityTracker = debug.NewNoopActivityTracker()
533+
}
528534
handler := &localActivityTaskHandler{
529535
userContext: params.UserContext,
530536
metricsScope: metrics.NewTaggedScope(params.MetricsScope),

internal/internal_worker.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,9 @@ func newWorkflowWorker(
165165
}
166166

167167
func ensureRequiredParams(params *workerExecutionParameters) {
168+
if params.Tracer == nil {
169+
params.Tracer = opentracing.NoopTracer{}
170+
}
168171
if params.Identity == "" {
169172
params.Identity = getWorkerIdentity(params.TaskList)
170173
}

internal/internal_worker_interfaces_test.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ import (
2828
"time"
2929

3030
"github.com/golang/mock/gomock"
31-
"github.com/opentracing/opentracing-go"
3231
"github.com/stretchr/testify/suite"
3332
"go.uber.org/zap/zaptest"
3433

@@ -184,7 +183,7 @@ func (s *InterfacesTestSuite) TestInterface() {
184183
MaxConcurrentActivityTaskPollers: 4,
185184
MaxConcurrentDecisionTaskPollers: 4,
186185
Logger: zaptest.NewLogger(s.T()),
187-
Tracer: opentracing.NoopTracer{}},
186+
},
188187
}
189188

190189
domainStatus := m.DomainStatusRegistered
@@ -216,7 +215,7 @@ func (s *InterfacesTestSuite) TestInterface() {
216215
MaxConcurrentActivityTaskPollers: 10,
217216
MaxConcurrentDecisionTaskPollers: 10,
218217
Logger: zaptest.NewLogger(s.T()),
219-
Tracer: opentracing.NoopTracer{}},
218+
},
220219
}
221220

222221
// Register activity instances and launch the worker.

internal/internal_worker_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,7 @@ func (s *internalWorkerTestSuite) TestNoActivitiesOrWorkflows() {
274274
assert.Empty(t, w.registry.getRegisteredActivities())
275275
assert.Empty(t, w.registry.GetRegisteredWorkflowTypes())
276276
assert.NoError(t, w.Start())
277+
w.Stop()
277278
}
278279

279280
func (s *internalWorkerTestSuite) TestWorkerStartFailsWithInvalidDomain() {
@@ -1141,8 +1142,8 @@ func TestWorkerOptionNonDefaults(t *testing.T) {
11411142
DataConverter: &defaultDataConverter{},
11421143
BackgroundActivityContext: context.Background(),
11431144
Logger: zap.NewNop(),
1144-
MetricsScope: tally.NoopScope,
1145-
Tracer: opentracing.NoopTracer{},
1145+
MetricsScope: tally.NewTestScope("", nil),
1146+
Tracer: opentracing.GlobalTracer(),
11461147
}
11471148

11481149
aggWorker, err := newAggregatedWorker(nil, domain, taskList, options)

internal/worker_test.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@ import (
2626
"github.com/stretchr/testify/assert"
2727
)
2828

29+
func TestMain(m *testing.M) {
30+
EnableVerboseLogging(true)
31+
m.Run()
32+
}
33+
2934
func Test_NewWorker(t *testing.T) {
3035
tests := []struct {
3136
name string

0 commit comments

Comments
 (0)