update module name

optimizely · Jan 18, 2024 · 35433e9 · 35433e9
1 parent d51a3b1
commit 35433e9
Show file tree

Hide file tree

Showing 127 changed files with 375 additions and 368 deletions.
diff --git a/README.md b/README.md
@@ -18,8 +18,11 @@ Refer to the [Go SDK's developer documentation](https://docs.developers.optimize
 
 Requires Golang version:
 
-- For v2: 1.21.0 or higher
-- For < v2: 1.12 or higher 
+| SDK Version  | Required Golang Version  |
+|--------------|--------------------------|
+|   v2.0.0     |     1.21.0 or higher     |
+| < v2.0.0     |     1.13 or higher       |
+
 
 ### Install the SDK
 

diff --git a/examples/benchmark/main.go b/examples/benchmark/main.go
@@ -9,9 +9,9 @@ import (
 
 	"github.com/pkg/profile"
 
-	"github.com/optimizely/go-sdk/pkg/client"
-	"github.com/optimizely/go-sdk/pkg/decision"
-	"github.com/optimizely/go-sdk/pkg/entities"
+	"github.com/optimizely/go-sdk/v2/pkg/client"
+	"github.com/optimizely/go-sdk/v2/pkg/decision"
+	"github.com/optimizely/go-sdk/v2/pkg/entities"
 )
 
 func stressTest() {

diff --git a/examples/main.go b/examples/main.go
@@ -7,10 +7,10 @@ import (
 	"fmt"
 	"time"
 
-	optimizely "github.com/optimizely/go-sdk"
-	"github.com/optimizely/go-sdk/pkg/client"
-	"github.com/optimizely/go-sdk/pkg/event"
-	"github.com/optimizely/go-sdk/pkg/logging"
+	optimizely "github.com/optimizely/go-sdk/v2"
+	"github.com/optimizely/go-sdk/v2/pkg/client"
+	"github.com/optimizely/go-sdk/v2/pkg/event"
+	"github.com/optimizely/go-sdk/v2/pkg/logging"
 )
 
 func main() {

diff --git a/go.mod b/go.mod
@@ -1,5 +1,4 @@
-module github.com/optimizely/go-sdk
-
+module github.com/optimizely/go-sdk/v2
 go 1.21.0
 
 require (

diff --git a/optimizely.go b/optimizely.go
@@ -17,8 +17,8 @@
 package optimizely
 
 import (
-	"github.com/optimizely/go-sdk/pkg/client"
-	"github.com/optimizely/go-sdk/pkg/entities"
+	"github.com/optimizely/go-sdk/v2/pkg/client"
+	"github.com/optimizely/go-sdk/v2/pkg/entities"
 )
 
 // Client returns an OptimizelyClient instantiated with the given key and options

diff --git a/pkg/client/client.go b/pkg/client/client.go
@@ -28,20 +28,20 @@ import (
 
 	"github.com/hashicorp/go-multierror"
 
-	"github.com/optimizely/go-sdk/pkg/config"
-	"github.com/optimizely/go-sdk/pkg/decide"
-	"github.com/optimizely/go-sdk/pkg/decision"
-	pkgReasons "github.com/optimizely/go-sdk/pkg/decision/reasons"
-	"github.com/optimizely/go-sdk/pkg/entities"
-	"github.com/optimizely/go-sdk/pkg/event"
-	"github.com/optimizely/go-sdk/pkg/logging"
-	"github.com/optimizely/go-sdk/pkg/notification"
-	"github.com/optimizely/go-sdk/pkg/odp"
-	pkgOdpSegment "github.com/optimizely/go-sdk/pkg/odp/segment"
-	pkgOdpUtils "github.com/optimizely/go-sdk/pkg/odp/utils"
-	"github.com/optimizely/go-sdk/pkg/optimizelyjson"
-	"github.com/optimizely/go-sdk/pkg/tracing"
-	"github.com/optimizely/go-sdk/pkg/utils"
+	"github.com/optimizely/go-sdk/v2/pkg/config"
+	"github.com/optimizely/go-sdk/v2/pkg/decide"
+	"github.com/optimizely/go-sdk/v2/pkg/decision"
+	pkgReasons "github.com/optimizely/go-sdk/v2/pkg/decision/reasons"
+	"github.com/optimizely/go-sdk/v2/pkg/entities"
+	"github.com/optimizely/go-sdk/v2/pkg/event"
+	"github.com/optimizely/go-sdk/v2/pkg/logging"
+	"github.com/optimizely/go-sdk/v2/pkg/notification"
+	"github.com/optimizely/go-sdk/v2/pkg/odp"
+	pkgOdpSegment "github.com/optimizely/go-sdk/v2/pkg/odp/segment"
+	pkgOdpUtils "github.com/optimizely/go-sdk/v2/pkg/odp/utils"
+	"github.com/optimizely/go-sdk/v2/pkg/optimizelyjson"
+	"github.com/optimizely/go-sdk/v2/pkg/tracing"
+	"github.com/optimizely/go-sdk/v2/pkg/utils"
 )
 
 const (

diff --git a/pkg/client/client_test.go b/pkg/client/client_test.go
@@ -29,18 +29,18 @@ import (
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/optimizely/go-sdk/pkg/config"
-	"github.com/optimizely/go-sdk/pkg/decide"
-	"github.com/optimizely/go-sdk/pkg/decision"
-	"github.com/optimizely/go-sdk/pkg/entities"
-	"github.com/optimizely/go-sdk/pkg/event"
-	"github.com/optimizely/go-sdk/pkg/logging"
-	"github.com/optimizely/go-sdk/pkg/notification"
-	"github.com/optimizely/go-sdk/pkg/odp"
-	"github.com/optimizely/go-sdk/pkg/odp/segment"
-	pkgOdpUtils "github.com/optimizely/go-sdk/pkg/odp/utils"
-	"github.com/optimizely/go-sdk/pkg/tracing"
-	"github.com/optimizely/go-sdk/pkg/utils"
+	"github.com/optimizely/go-sdk/v2/pkg/config"
+	"github.com/optimizely/go-sdk/v2/pkg/decide"
+	"github.com/optimizely/go-sdk/v2/pkg/decision"
+	"github.com/optimizely/go-sdk/v2/pkg/entities"
+	"github.com/optimizely/go-sdk/v2/pkg/event"
+	"github.com/optimizely/go-sdk/v2/pkg/logging"
+	"github.com/optimizely/go-sdk/v2/pkg/notification"
+	"github.com/optimizely/go-sdk/v2/pkg/odp"
+	"github.com/optimizely/go-sdk/v2/pkg/odp/segment"
+	pkgOdpUtils "github.com/optimizely/go-sdk/v2/pkg/odp/utils"
+	"github.com/optimizely/go-sdk/v2/pkg/tracing"
+	"github.com/optimizely/go-sdk/v2/pkg/utils"
 )
 
 func ValidProjectConfigManager() *MockProjectConfigManager {

diff --git a/pkg/client/factory.go b/pkg/client/factory.go
@@ -22,18 +22,18 @@ import (
 	"errors"
 	"time"
 
-	"github.com/optimizely/go-sdk/pkg/config"
-	"github.com/optimizely/go-sdk/pkg/decide"
-	"github.com/optimizely/go-sdk/pkg/decision"
-	"github.com/optimizely/go-sdk/pkg/event"
-	"github.com/optimizely/go-sdk/pkg/logging"
-	"github.com/optimizely/go-sdk/pkg/metrics"
-	"github.com/optimizely/go-sdk/pkg/notification"
-	"github.com/optimizely/go-sdk/pkg/odp"
-	pkgUtils "github.com/optimizely/go-sdk/pkg/odp/utils"
-	"github.com/optimizely/go-sdk/pkg/registry"
-	"github.com/optimizely/go-sdk/pkg/tracing"
-	"github.com/optimizely/go-sdk/pkg/utils"
+	"github.com/optimizely/go-sdk/v2/pkg/config"
+	"github.com/optimizely/go-sdk/v2/pkg/decide"
+	"github.com/optimizely/go-sdk/v2/pkg/decision"
+	"github.com/optimizely/go-sdk/v2/pkg/event"
+	"github.com/optimizely/go-sdk/v2/pkg/logging"
+	"github.com/optimizely/go-sdk/v2/pkg/metrics"
+	"github.com/optimizely/go-sdk/v2/pkg/notification"
+	"github.com/optimizely/go-sdk/v2/pkg/odp"
+	pkgUtils "github.com/optimizely/go-sdk/v2/pkg/odp/utils"
+	"github.com/optimizely/go-sdk/v2/pkg/registry"
+	"github.com/optimizely/go-sdk/v2/pkg/tracing"
+	"github.com/optimizely/go-sdk/v2/pkg/utils"
 )
 
 // OptimizelyFactory is used to customize and construct an instance of the OptimizelyClient.

diff --git a/pkg/client/factory_test.go b/pkg/client/factory_test.go
@@ -27,20 +27,20 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 
-	"github.com/optimizely/go-sdk/pkg/config"
-	"github.com/optimizely/go-sdk/pkg/decide"
-	"github.com/optimizely/go-sdk/pkg/decision"
-	"github.com/optimizely/go-sdk/pkg/event"
-	"github.com/optimizely/go-sdk/pkg/metrics"
-	"github.com/optimizely/go-sdk/pkg/notification"
-	"github.com/optimizely/go-sdk/pkg/odp"
-	"github.com/optimizely/go-sdk/pkg/odp/cache"
-	pkgOdpEvent "github.com/optimizely/go-sdk/pkg/odp/event"
-	pkgOdpSegment "github.com/optimizely/go-sdk/pkg/odp/segment"
-	pkgOdpUtils "github.com/optimizely/go-sdk/pkg/odp/utils"
-	"github.com/optimizely/go-sdk/pkg/registry"
-	"github.com/optimizely/go-sdk/pkg/tracing"
-	"github.com/optimizely/go-sdk/pkg/utils"
+	"github.com/optimizely/go-sdk/v2/pkg/config"
+	"github.com/optimizely/go-sdk/v2/pkg/decide"
+	"github.com/optimizely/go-sdk/v2/pkg/decision"
+	"github.com/optimizely/go-sdk/v2/pkg/event"
+	"github.com/optimizely/go-sdk/v2/pkg/metrics"
+	"github.com/optimizely/go-sdk/v2/pkg/notification"
+	"github.com/optimizely/go-sdk/v2/pkg/odp"
+	"github.com/optimizely/go-sdk/v2/pkg/odp/cache"
+	pkgOdpEvent "github.com/optimizely/go-sdk/v2/pkg/odp/event"
+	pkgOdpSegment "github.com/optimizely/go-sdk/v2/pkg/odp/segment"
+	pkgOdpUtils "github.com/optimizely/go-sdk/v2/pkg/odp/utils"
+	"github.com/optimizely/go-sdk/v2/pkg/registry"
+	"github.com/optimizely/go-sdk/v2/pkg/tracing"
+	"github.com/optimizely/go-sdk/v2/pkg/utils"
 )
 
 type MockRequester struct {

diff --git a/pkg/client/fixtures_test.go b/pkg/client/fixtures_test.go
@@ -20,12 +20,12 @@ package client
 import (
 	"fmt"
 
-	"github.com/optimizely/go-sdk/pkg/config"
-	"github.com/optimizely/go-sdk/pkg/decide"
-	"github.com/optimizely/go-sdk/pkg/decision"
-	"github.com/optimizely/go-sdk/pkg/entities"
-	"github.com/optimizely/go-sdk/pkg/event"
-	"github.com/optimizely/go-sdk/pkg/notification"
+	"github.com/optimizely/go-sdk/v2/pkg/config"
+	"github.com/optimizely/go-sdk/v2/pkg/decide"
+	"github.com/optimizely/go-sdk/v2/pkg/decision"
+	"github.com/optimizely/go-sdk/v2/pkg/entities"
+	"github.com/optimizely/go-sdk/v2/pkg/event"
+	"github.com/optimizely/go-sdk/v2/pkg/notification"
 	"github.com/stretchr/testify/mock"
 )
 

diff --git a/pkg/client/optimizely_decision.go b/pkg/client/optimizely_decision.go
@@ -18,7 +18,7 @@
 package client
 
 import (
-	"github.com/optimizely/go-sdk/pkg/optimizelyjson"
+	"github.com/optimizely/go-sdk/v2/pkg/optimizelyjson"
 )
 
 // OptimizelyDecision defines the decision returned by decide api.

diff --git a/pkg/client/optimizely_decision_test.go b/pkg/client/optimizely_decision_test.go
@@ -20,7 +20,7 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/optimizely/go-sdk/pkg/optimizelyjson"
+	"github.com/optimizely/go-sdk/v2/pkg/optimizelyjson"
 
 	"github.com/stretchr/testify/suite"
 )

diff --git a/pkg/client/optimizely_user_context.go b/pkg/client/optimizely_user_context.go
@@ -21,10 +21,10 @@ import (
 	"errors"
 	"sync"
 
-	"github.com/optimizely/go-sdk/pkg/decide"
-	pkgDecision "github.com/optimizely/go-sdk/pkg/decision"
-	"github.com/optimizely/go-sdk/pkg/entities"
-	pkgOdpSegment "github.com/optimizely/go-sdk/pkg/odp/segment"
+	"github.com/optimizely/go-sdk/v2/pkg/decide"
+	pkgDecision "github.com/optimizely/go-sdk/v2/pkg/decision"
+	"github.com/optimizely/go-sdk/v2/pkg/entities"
+	pkgOdpSegment "github.com/optimizely/go-sdk/v2/pkg/odp/segment"
 )
 
 // OptimizelyUserContext defines user contexts that the SDK will use to make decisions for.

diff --git a/pkg/client/optimizely_user_context_odp_test.go b/pkg/client/optimizely_user_context_odp_test.go
@@ -26,11 +26,11 @@ import (
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/optimizely/go-sdk/pkg/config/datafileprojectconfig"
-	"github.com/optimizely/go-sdk/pkg/logging"
-	"github.com/optimizely/go-sdk/pkg/odp"
-	"github.com/optimizely/go-sdk/pkg/odp/event"
-	"github.com/optimizely/go-sdk/pkg/odp/segment"
+	"github.com/optimizely/go-sdk/v2/pkg/config/datafileprojectconfig"
+	"github.com/optimizely/go-sdk/v2/pkg/logging"
+	"github.com/optimizely/go-sdk/v2/pkg/odp"
+	"github.com/optimizely/go-sdk/v2/pkg/odp/event"
+	"github.com/optimizely/go-sdk/v2/pkg/odp/segment"
 )
 
 type OptimizelyUserContextODPTestSuite struct {

diff --git a/pkg/client/optimizely_user_context_test.go b/pkg/client/optimizely_user_context_test.go
@@ -25,12 +25,12 @@ import (
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/optimizely/go-sdk/pkg/decide"
-	"github.com/optimizely/go-sdk/pkg/decision"
-	"github.com/optimizely/go-sdk/pkg/entities"
-	"github.com/optimizely/go-sdk/pkg/event"
-	"github.com/optimizely/go-sdk/pkg/notification"
-	"github.com/optimizely/go-sdk/pkg/optimizelyjson"
+	"github.com/optimizely/go-sdk/v2/pkg/decide"
+	"github.com/optimizely/go-sdk/v2/pkg/decision"
+	"github.com/optimizely/go-sdk/v2/pkg/entities"
+	"github.com/optimizely/go-sdk/v2/pkg/event"
+	"github.com/optimizely/go-sdk/v2/pkg/notification"
+	"github.com/optimizely/go-sdk/v2/pkg/optimizelyjson"
 )
 
 var doOnce sync.Once // required since we only need to read datafile once

diff --git a/pkg/config/datafileprojectconfig/config.go b/pkg/config/datafileprojectconfig/config.go
@@ -21,9 +21,9 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/optimizely/go-sdk/pkg/config/datafileprojectconfig/mappers"
-	"github.com/optimizely/go-sdk/pkg/entities"
-	"github.com/optimizely/go-sdk/pkg/logging"
+	"github.com/optimizely/go-sdk/v2/pkg/config/datafileprojectconfig/mappers"
+	"github.com/optimizely/go-sdk/v2/pkg/entities"
+	"github.com/optimizely/go-sdk/v2/pkg/logging"
 )
 
 var datafileVersions = map[string]struct{}{

diff --git a/pkg/config/datafileprojectconfig/config_test.go b/pkg/config/datafileprojectconfig/config_test.go
@@ -24,8 +24,8 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/optimizely/go-sdk/pkg/entities"
-	"github.com/optimizely/go-sdk/pkg/logging"
+	"github.com/optimizely/go-sdk/v2/pkg/entities"
+	"github.com/optimizely/go-sdk/v2/pkg/logging"
 
 	"github.com/stretchr/testify/assert"
 )

diff --git a/pkg/config/datafileprojectconfig/entities/entities.go b/pkg/config/datafileprojectconfig/entities/entities.go
@@ -17,7 +17,7 @@
 // Package entities has entity definitions
 package entities
 
-import "github.com/optimizely/go-sdk/pkg/entities"
+import "github.com/optimizely/go-sdk/v2/pkg/entities"
 
 // Audience represents an Audience object from the Optimizely datafile
 type Audience struct {

diff --git a/pkg/config/datafileprojectconfig/json_parser.go b/pkg/config/datafileprojectconfig/json_parser.go
@@ -18,9 +18,9 @@
 package datafileprojectconfig
 
 import (
-	"github.com/optimizely/go-sdk/pkg/config/datafileprojectconfig/entities"
+	"github.com/optimizely/go-sdk/v2/pkg/config/datafileprojectconfig/entities"
 
-	"github.com/json-iterator/go"
+	jsoniter "github.com/json-iterator/go"
 )
 
 var json = jsoniter.ConfigCompatibleWithStandardLibrary

diff --git a/pkg/config/datafileprojectconfig/json_parser_test.go b/pkg/config/datafileprojectconfig/json_parser_test.go
@@ -21,7 +21,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/optimizely/go-sdk/pkg/config/datafileprojectconfig/entities"
+	"github.com/optimizely/go-sdk/v2/pkg/config/datafileprojectconfig/entities"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/pkg/config/datafileprojectconfig/mappers/attribute.go b/pkg/config/datafileprojectconfig/mappers/attribute.go
@@ -18,8 +18,8 @@
 package mappers
 
 import (
-	datafileEntities "github.com/optimizely/go-sdk/pkg/config/datafileprojectconfig/entities"
-	"github.com/optimizely/go-sdk/pkg/entities"
+	datafileEntities "github.com/optimizely/go-sdk/v2/pkg/config/datafileprojectconfig/entities"
+	"github.com/optimizely/go-sdk/v2/pkg/entities"
 )
 
 // MapAttributes maps the raw datafile attribute entities to SDK Attribute entities

diff --git a/pkg/config/datafileprojectconfig/mappers/attribute_test.go b/pkg/config/datafileprojectconfig/mappers/attribute_test.go
@@ -19,8 +19,8 @@ package mappers
 import (
 	"testing"
 
-	datafileEntities "github.com/optimizely/go-sdk/pkg/config/datafileprojectconfig/entities"
-	"github.com/optimizely/go-sdk/pkg/entities"
+	datafileEntities "github.com/optimizely/go-sdk/v2/pkg/config/datafileprojectconfig/entities"
+	"github.com/optimizely/go-sdk/v2/pkg/entities"
 
 	"github.com/stretchr/testify/assert"
 )

diff --git a/pkg/config/datafileprojectconfig/mappers/audience.go b/pkg/config/datafileprojectconfig/mappers/audience.go
@@ -18,8 +18,8 @@
 package mappers
 
 import (
-	datafileEntities "github.com/optimizely/go-sdk/pkg/config/datafileprojectconfig/entities"
-	"github.com/optimizely/go-sdk/pkg/entities"
+	datafileEntities "github.com/optimizely/go-sdk/v2/pkg/config/datafileprojectconfig/entities"
+	"github.com/optimizely/go-sdk/v2/pkg/entities"
 )
 
 // MapAudiences maps the raw datafile audience entities to SDK Audience entities

diff --git a/pkg/config/datafileprojectconfig/mappers/audience_test.go b/pkg/config/datafileprojectconfig/mappers/audience_test.go
@@ -20,8 +20,8 @@ package mappers
 import (
 	"testing"
 
-	datafileEntities "github.com/optimizely/go-sdk/pkg/config/datafileprojectconfig/entities"
-	"github.com/optimizely/go-sdk/pkg/entities"
+	datafileEntities "github.com/optimizely/go-sdk/v2/pkg/config/datafileprojectconfig/entities"
+	"github.com/optimizely/go-sdk/v2/pkg/entities"
 
 	"github.com/stretchr/testify/assert"
 )

diff --git a/pkg/config/datafileprojectconfig/mappers/condition_trees.go b/pkg/config/datafileprojectconfig/mappers/condition_trees.go
@@ -22,8 +22,8 @@ import (
 	"reflect"
 
 	jsoniter "github.com/json-iterator/go"
-	"github.com/optimizely/go-sdk/pkg/decision/evaluator/matchers"
-	"github.com/optimizely/go-sdk/pkg/entities"
+	"github.com/optimizely/go-sdk/v2/pkg/decision/evaluator/matchers"
+	"github.com/optimizely/go-sdk/v2/pkg/entities"
 )
 
 var errEmptyTree = errors.New("empty tree")

diff --git a/pkg/config/datafileprojectconfig/mappers/condition_trees_test.go b/pkg/config/datafileprojectconfig/mappers/condition_trees_test.go
@@ -19,8 +19,8 @@ package mappers
 import (
 	"testing"
 
-	datafileConfig "github.com/optimizely/go-sdk/pkg/config/datafileprojectconfig/entities"
-	"github.com/optimizely/go-sdk/pkg/entities"
+	datafileConfig "github.com/optimizely/go-sdk/v2/pkg/config/datafileprojectconfig/entities"
+	"github.com/optimizely/go-sdk/v2/pkg/entities"
 	"github.com/stretchr/testify/assert"
 )