fix(httpDispatcher): bug. No logger passed in causing a crash. (#254)

* fix httpDispatcher bug. No logger passed in

* fix lint error

* make Http HTTP

Author: thomaszurkan-optimizely

pkg/event/dispatcher.go

@@ -37,14 +37,14 @@ type Dispatcher interface {
 	DispatchEvent(event LogEvent) (bool, error)
 }
 
-// HTTPEventDispatcher is the HTTP implementation of the Dispatcher interface
-type HTTPEventDispatcher struct {
+// httpEventDispatcher is the HTTP implementation of the Dispatcher interface
+type httpEventDispatcher struct {
 	requester *utils.HTTPRequester
 	logger logging.OptimizelyLogProducer
 }
 
 // DispatchEvent dispatches event with callback
-func (ed *HTTPEventDispatcher) DispatchEvent(event LogEvent) (bool, error) {
+func (ed *httpEventDispatcher) DispatchEvent(event LogEvent) (bool, error) {
 
 	_, _, code, err := ed.requester.Post(event.EndPoint, event.Event)
 
@@ -65,6 +65,18 @@ func (ed *HTTPEventDispatcher) DispatchEvent(event LogEvent) (bool, error) {
 	return success, err
 }
 
+// NewHTTPEventDispatcher creates a full http dispatcher. The requester and logger parameters can be nil.
+func NewHTTPEventDispatcher(sdkKey string, requester *utils.HTTPRequester, logger logging.OptimizelyLogProducer) Dispatcher {
+	if requester == nil {
+		requester = utils.NewHTTPRequester(logging.GetLogger(sdkKey, "HTTPRequester"))
+	}
+	if logger == nil {
+		logger = logging.GetLogger(sdkKey, "httpEventDispatcher")
+	}
+
+	return &httpEventDispatcher{requester: requester, logger: logger}
+}
+
 // QueueEventDispatcher is a queued version of the event Dispatcher that queues, returns success, and dispatches events in the background
 type QueueEventDispatcher struct {
 	eventQueue     Queue
@@ -161,9 +173,8 @@ func NewQueueEventDispatcher(sdkKey string, metricsRegistry metrics.Registry) *Q
 	}
 
 	return &QueueEventDispatcher{
-		eventQueue: NewInMemoryQueue(defaultQueueSize),
-		Dispatcher: &HTTPEventDispatcher{requester: utils.NewHTTPRequester(logging.GetLogger(sdkKey, "HTTPRequester"))},
-
+		eventQueue:        NewInMemoryQueue(defaultQueueSize),
+		Dispatcher:        NewHTTPEventDispatcher(sdkKey, nil, nil),
 		queueSize:         dispatcherMetricsRegistry.GetGauge(metrics.DispatcherQueueSize),
 		retryFlushCounter: dispatcherMetricsRegistry.GetCounter(metrics.DispatcherRetryFlush),
 		failFlushCounter:  dispatcherMetricsRegistry.GetCounter(metrics.DispatcherFailedFlush),

pkg/event/dispatcher_test.go

@@ -104,6 +104,13 @@ func TestQueueEventDispatcher_DispatchEvent(t *testing.T) {
 	metricsRegistry := NewMetricsRegistry()
 
 	q := NewQueueEventDispatcher("", metricsRegistry)
+
+	assert.True(t, q.Dispatcher != nil)
+	if d,ok := q.Dispatcher.(*httpEventDispatcher); ok {
+		assert.True(t, d.requester != nil && d.logger != nil)
+	} else {
+		assert.True(t, false)
+	}
 	sender := &MockDispatcher{Events: NewInMemoryQueue(100)}
 	q.Dispatcher = sender
 

pkg/event/processor_test.go

@@ -425,7 +425,7 @@ func TestChanQueueEventProcessor_ProcessImpression(t *testing.T) {
 	processor := NewBatchEventProcessor(
 		WithQueueSize(100),
 		WithQueue(NewInMemoryQueue(100)),
-		WithEventDispatcher(&HTTPEventDispatcher{requester: utils.NewHTTPRequester(logging.GetLogger("", "NewHTTPRequester"))}))
+		WithEventDispatcher(NewHTTPEventDispatcher("", nil, nil)))
 
 	eg.Go(processor.Start)