Merge branch 'master' into mpirnovar-holdouts-projconfig-fssdk-11551

Author: Mat001

pkg/client/client_test.go

@@ -177,6 +177,10 @@ func (TestConfig) GetClientVersion() string {
 	return "1.0.0"
 }
 
+func (TestConfig) GetRegion() string {
+	return "US"
+}
+
 type MockODPManager struct {
 	odp.Manager
 	mock.Mock
@@ -347,6 +351,7 @@ func TestSendODPEvent(t *testing.T) {
 
 func TestTrack(t *testing.T) {
 	mockProcessor := new(MockProcessor)
+	mockProcessor.Events = make([]event.UserEvent, 0) // Initialize Events slice
 	mockDecisionService := new(MockDecisionService)
 	mockProcessor.On("ProcessEvent", mock.AnythingOfType("UserEvent")).Return(true)
 

pkg/client/fixtures_test.go

@@ -82,6 +82,10 @@ func (c *MockProjectConfig) SendFlagDecisions() bool {
 	return false
 }
 
+func (c *MockProjectConfig) GetRegion() string {
+	return "US"
+}
+
 type MockProjectConfigManager struct {
 	projectConfig config.ProjectConfig
 	mock.Mock

pkg/cmab/service_test.go

@@ -224,6 +224,11 @@ func (m *MockProjectConfig) GetDatafile() string {
 	return args.String(0)
 }
 
+func (m *MockProjectConfig) GetRegion() string {
+	args := m.Called()
+	return args.String(0)
+}
+
 type CmabServiceTestSuite struct {
 	suite.Suite
 	mockClient     *MockCmabClient

pkg/config/datafileprojectconfig/config.go

@@ -57,6 +57,7 @@ type DatafileProjectConfig struct {
 	sendFlagDecisions    bool
 	sdkKey               string
 	environmentKey       string
+	region               string
 
 	flagVariationsMap map[string][]entities.Variation
 }
@@ -275,6 +276,11 @@ func (c DatafileProjectConfig) GetFlagVariationsMap() map[string][]entities.Vari
 	return c.flagVariationsMap
 }
 
+// GetRegion returns the region for the datafile
+func (c DatafileProjectConfig) GetRegion() string {
+	return c.region
+}
+
 // NewDatafileProjectConfig initializes a new datafile from a json byte array using the default JSON datafile parser
 func NewDatafileProjectConfig(jsonDatafile []byte, logger logging.OptimizelyLogProducer) (*DatafileProjectConfig, error) {
 	datafile, err := Parse(jsonDatafile)
@@ -326,6 +332,11 @@ func NewDatafileProjectConfig(jsonDatafile []byte, logger logging.OptimizelyLogP
 		attributeKeyMap[attribute.Key] = attribute
 	}
 
+	region := datafile.Region
+	if region == "" {
+		region = "US"
+	}
+
 	config := &DatafileProjectConfig{
 		hostForODP:           hostForODP,
 		publicKeyForODP:      publicKeyForODP,
@@ -353,6 +364,7 @@ func NewDatafileProjectConfig(jsonDatafile []byte, logger logging.OptimizelyLogP
 		flagVariationsMap:    flagVariationsMap,
 		attributeKeyMap:      attributeKeyMap,
 		attributeIDToKeyMap:  attributeIDToKeyMap,
+		region:               region,
 	}
 
 	logger.Info("Datafile is valid.")

pkg/config/datafileprojectconfig/entities/entities.go

@@ -142,4 +142,5 @@ type Datafile struct {
 	SendFlagDecisions bool          `json:"sendFlagDecisions"`
 	SDKKey            string        `json:"sdkKey,omitempty"`
 	EnvironmentKey    string        `json:"environmentKey,omitempty"`
+	Region            string        `json:"region,omitempty"`
 }

pkg/config/interface.go

@@ -55,6 +55,7 @@ type ProjectConfig interface {
 	GetEnvironmentKey() string
 	GetAttributes() []entities.Attribute
 	GetFlagVariationsMap() map[string][]entities.Variation
+	GetRegion() string
 }
 
 // ProjectConfigManager maintains an instance of the ProjectConfig

pkg/decision/evaluator/audience_evaluator_test.go

@@ -195,6 +195,11 @@ func (m *MockProjectConfig) GetDatafile() string {
 	return args.String(0)
 }
 
+func (m *MockProjectConfig) GetRegion() string {
+	args := m.Called()
+	return args.String(0)
+}
+
 // MockLogger is a mock implementation of OptimizelyLogProducer
 // (This declaration has been removed to resolve the redeclaration error)
 

pkg/event/dispatcher_test.go

@@ -122,7 +122,7 @@ func TestQueueEventDispatcher_DispatchEvent(t *testing.T) {
 	batch := createBatchEvent(conversionUserEvent, createVisitorFromUserEvent(conversionUserEvent))
 	assert.Equal(t, conversionUserEvent.Timestamp, batch.Visitors[0].Snapshots[0].Events[0].Timestamp)
 
-	logEvent := createLogEvent(batch, DefaultEventEndPoint)
+	logEvent := createLogEvent(batch, EventEndPoints["US"])
 
 	success, _ := q.DispatchEvent(logEvent)
 
@@ -181,7 +181,7 @@ func TestQueueEventDispatcher_FailDispath(t *testing.T) {
 	batch := createBatchEvent(conversionUserEvent, createVisitorFromUserEvent(conversionUserEvent))
 	assert.Equal(t, conversionUserEvent.Timestamp, batch.Visitors[0].Snapshots[0].Events[0].Timestamp)
 
-	logEvent := createLogEvent(batch, DefaultEventEndPoint)
+	logEvent := createLogEvent(batch, EventEndPoints["US"])
 
 	q.DispatchEvent(logEvent)
 
@@ -221,7 +221,7 @@ func TestQueueEventDispatcher_WaitForDispatchingEventsOnClose(t *testing.T) {
 		batch := createBatchEvent(conversionUserEvent, createVisitorFromUserEvent(conversionUserEvent))
 		assert.Equal(t, conversionUserEvent.Timestamp, batch.Visitors[0].Snapshots[0].Events[0].Timestamp)
 
-		logEvent := createLogEvent(batch, DefaultEventEndPoint)
+		logEvent := createLogEvent(batch, EventEndPoints["US"])
 
 		success, _ := q.DispatchEvent(logEvent)
 

pkg/event/events.go

@@ -26,6 +26,7 @@ type Context struct {
 	ClientName    string `json:"client_name"`
 	AnonymizeIP   bool   `json:"anonymize_ip"`
 	BotFiltering  bool   `json:"bot_filtering"`
+	Region        string `json:"region"`
 }
 
 // UserEvent represents a user event
@@ -87,6 +88,7 @@ type Batch struct {
 	ClientName      string    `json:"client_name"`
 	AnonymizeIP     bool      `json:"anonymize_ip"`
 	EnrichDecisions bool      `json:"enrich_decisions"`
+	Region          string    `json:"region"`
 }
 
 // Visitor represents a visitor of an eventbatch

pkg/event/factory.go

@@ -19,6 +19,7 @@ package event
 
 import (
 	"errors"
+	"log"
 	"strings"
 	"time"
 
@@ -37,7 +38,26 @@ const botFilteringKey = "$opt_bot_filtering"
 const revenueKey = "revenue"
 const valueKey = "value"
 
+// SupportedRegions maps of supported regions for event endpoints
+var SupportedRegions = map[string]bool{"US": true, "EU": true}
+
+func getEventEndPoint(region, eventEndPoint string) string {
+	if eventEndPoint != "" {
+		return eventEndPoint
+	}
+
+	region = strings.ToUpper(region)
+
+	if !SupportedRegions[region] {
+		log.Print("Unsupported region provided for event endpoint. Defaulting to US.")
+		region = "US"
+	}
+
+	return EventEndPoints[region]
+}
+
 func createLogEvent(event Batch, eventEndPoint string) LogEvent {
+	eventEndPoint = getEventEndPoint(event.Region, eventEndPoint)
 	return LogEvent{EndPoint: eventEndPoint, Event: event}
 }
 
@@ -55,6 +75,7 @@ func CreateEventContext(projectConfig config.ProjectConfig) Context {
 	context.ClientVersion = Version
 	context.AnonymizeIP = projectConfig.GetAnonymizeIP()
 	context.BotFiltering = projectConfig.GetBotFiltering()
+	context.Region = projectConfig.GetRegion()
 
 	return context
 }
@@ -253,6 +274,7 @@ func createBatchEvent(userEvent UserEvent, visitor Visitor) Batch {
 	eventBatch.ClientVersion = userEvent.EventContext.ClientVersion
 	eventBatch.AnonymizeIP = userEvent.EventContext.AnonymizeIP
 	eventBatch.EnrichDecisions = true
+	eventBatch.Region = userEvent.EventContext.Region
 
 	return eventBatch
 }