luciano/vmware-go-kcl-v2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix broken tests (#50)

Browse source 
Fix some broken unit and integ tests introduced by last commit.

Tests:
1. hmake test
2. Run integration test on Goland IDE and make sure all pass.

Signed-off-by: Tao Jiang <taoj@vmware.com>
This commit is contained in:
Tao Jiang 2019-11-06 08:35:08 -06:00
parent 21980a54e3
commit eb56e3b1d7
3 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
clientlibrary/config/config_test.go
View file

@ -35,7 +35,8 @@ func TestConfig(t *testing.T) {
WithTaskBackoffTimeMillis(10) WithTaskBackoffTimeMillis(10)
assert.Equal(t, "appName", kclConfig.ApplicationName) assert.Equal(t, "appName", kclConfig.ApplicationName)
assert.Equal(t, 500, kclConfig.TaskBackoffTimeMillis) assert.Equal(t, 500, kclConfig.FailoverTimeMillis)
assert.Equal(t, 10, kclConfig.TaskBackoffTimeMillis)
contextLogger := kclConfig.Logger.WithFields(logger.Fields{"key1": "value1"}) contextLogger := kclConfig.Logger.WithFields(logger.Fields{"key1": "value1"})
contextLogger.Debugf("Starting with default logger") contextLogger.Debugf("Starting with default logger")

4
clientlibrary/worker/worker.go
View file

@ -69,8 +69,8 @@ type Worker struct {
// NewWorker constructs a Worker instance for processing Kinesis stream data. // NewWorker constructs a Worker instance for processing Kinesis stream data.
func NewWorker(factory kcl.IRecordProcessorFactory, kclConfig *config.KinesisClientLibConfiguration) *Worker { func NewWorker(factory kcl.IRecordProcessorFactory, kclConfig *config.KinesisClientLibConfiguration) *Worker {
var mService metrics.MonitoringService mService := kclConfig.MonitoringService
if kclConfig.MonitoringService == nil { if mService == nil {
// Replaces nil with noop monitor service (not emitting any metrics). // Replaces nil with noop monitor service (not emitting any metrics).
mService = metrics.NoopMonitoringService{} mService = metrics.NoopMonitoringService{}
} }

8
test/worker_test.go
View file

@ -35,6 +35,8 @@ import (
cfg "github.com/vmware/vmware-go-kcl/clientlibrary/config" cfg "github.com/vmware/vmware-go-kcl/clientlibrary/config"
kc "github.com/vmware/vmware-go-kcl/clientlibrary/interfaces" kc "github.com/vmware/vmware-go-kcl/clientlibrary/interfaces"
"github.com/vmware/vmware-go-kcl/clientlibrary/metrics" "github.com/vmware/vmware-go-kcl/clientlibrary/metrics"
"github.com/vmware/vmware-go-kcl/clientlibrary/metrics/cloudwatch"
"github.com/vmware/vmware-go-kcl/clientlibrary/metrics/prometheus"
"github.com/vmware/vmware-go-kcl/clientlibrary/utils" "github.com/vmware/vmware-go-kcl/clientlibrary/utils"
wk "github.com/vmware/vmware-go-kcl/clientlibrary/worker" wk "github.com/vmware/vmware-go-kcl/clientlibrary/worker"
"github.com/vmware/vmware-go-kcl/logger" "github.com/vmware/vmware-go-kcl/logger"
@ -237,14 +239,14 @@ func runTest(kclConfig *cfg.KinesisClientLibConfiguration, triggersig bool, t *t
func getMetricsConfig(kclConfig *cfg.KinesisClientLibConfiguration, service string) metrics.MonitoringService { func getMetricsConfig(kclConfig *cfg.KinesisClientLibConfiguration, service string) metrics.MonitoringService {
if service == "cloudwatch" { if service == "cloudwatch" {
return metrics.NewDetailedCloudWatchMonitoringService(kclConfig.RegionName, return cloudwatch.NewMonitoringServiceWithOptions(kclConfig.RegionName,
kclConfig.KinesisCredentials, kclConfig.KinesisCredentials,
kclConfig.Logger, kclConfig.Logger,
metrics.DEFAULT_CLOUDWATCH_METRICS_BUFFER_DURATION) cloudwatch.DEFAULT_CLOUDWATCH_METRICS_BUFFER_DURATION)
} }
if service == "prometheus" { if service == "prometheus" {
return metrics.NewPrometheusMonitoringService(":8080", regionName, kclConfig.Logger) return prometheus.NewMonitoringService(":8080", regionName, kclConfig.Logger)
} }
return nil return nil