mmerged with latest

Author: mmelograno

CHANGES.txt

@@ -1,4 +1,5 @@
-5.10.0 (Dec 20, 2024)
+5.10.0 (Jan 17, 2024)
+- Added support for the new impressions tracking toggle available on feature flags, both respecting the setting. Read more in our docs.
 - Added support for arm64.
 - Fixed vulnerabilities:
    - Updated golang image to 1.23.4.

LICENSE

@@ -1,4 +1,4 @@
-Copyright © 2024 Split Software, Inc.
+Copyright © 2025 Split Software, Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

go.mod

@@ -8,7 +8,7 @@ require (
 	github.com/gin-gonic/gin v1.10.0
 	github.com/google/uuid v1.3.0
 	github.com/splitio/gincache v1.0.1
-	github.com/splitio/go-split-commons/v6 v6.0.2
+	github.com/splitio/go-split-commons/v6 v6.1.0
 	github.com/splitio/go-toolkit/v5 v5.4.0
 	github.com/stretchr/testify v1.9.0
 	go.etcd.io/bbolt v1.3.6

go.sum

@@ -93,8 +93,8 @@ github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUA
 github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE=
 github.com/splitio/gincache v1.0.1 h1:dLYdANY/BqH4KcUMCe/LluLyV5WtuE/LEdQWRE06IXU=
 github.com/splitio/gincache v1.0.1/go.mod h1:CcgJDSM9Af75kyBH0724v55URVwMBuSj5x1eCWIOECY=
-github.com/splitio/go-split-commons/v6 v6.0.2 h1:uvrNjyGCOHUjxVTB1pDUA+UB20WypoxpeLkgkgX5v+U=
-github.com/splitio/go-split-commons/v6 v6.0.2/go.mod h1:D/XIY/9Hmfk9ivWsRsJVp439kEdmHbzUi3PKzQQDOXY=
+github.com/splitio/go-split-commons/v6 v6.1.0 h1:k3mwr12DF6gbEaV8XXU/tSAQlPkIEuzIgTEneYhGg2I=
+github.com/splitio/go-split-commons/v6 v6.1.0/go.mod h1:D/XIY/9Hmfk9ivWsRsJVp439kEdmHbzUi3PKzQQDOXY=
 github.com/splitio/go-toolkit/v5 v5.4.0 h1:g5WFpRhQomnXCmvfsNOWV4s5AuUrWIZ+amM68G8NBKM=
 github.com/splitio/go-toolkit/v5 v5.4.0/go.mod h1:xYhUvV1gga9/1029Wbp5pjnR6Cy8nvBpjw99wAbsMko=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=

splitio/proxy/controllers/sdk_test.go

@@ -25,6 +25,56 @@ import (
 	psmocks "github.com/splitio/split-synchronizer/v5/splitio/proxy/storage/mocks"
 )
 
+func TestSplitChangesImpressionsDisabled(t *testing.T) {
+	gin.SetMode(gin.TestMode)
+
+	var splitStorage psmocks.ProxySplitStorageMock
+	splitStorage.On("ChangesSince", int64(-1), []string(nil)).
+		Return(&dtos.SplitChangesDTO{Since: -1, Till: 1, Splits: []dtos.SplitDTO{{Name: "s1", Status: "ACTIVE", ImpressionsDisabled: true}, {Name: "s2", Status: "ACTIVE"}}}, nil).
+		Once()
+
+	var splitFetcher splitFetcherMock
+	var largeSegmentStorageMock largeSegmentStorageMock
+
+	resp := httptest.NewRecorder()
+	ctx, router := gin.CreateTestContext(resp)
+	logger := logging.NewLogger(nil)
+	group := router.Group("/api")
+	controller := NewSdkServerController(
+		logger,
+		&splitFetcher,
+		&splitStorage,
+		nil,
+		flagsets.NewMatcher(false, nil),
+		&largeSegmentStorageMock,
+	)
+	controller.Register(group)
+
+	ctx.Request, _ = http.NewRequest(http.MethodGet, "/api/splitChanges?since=-1", nil)
+	ctx.Request.Header.Set("Authorization", "Bearer someApiKey")
+	ctx.Request.Header.Set("SplitSDKVersion", "go-1.1.1")
+	ctx.Request.Header.Set("SplitSDKMachineIp", "1.2.3.4")
+	ctx.Request.Header.Set("SplitSDKMachineName", "ip-1-2-3-4")
+	router.ServeHTTP(resp, ctx.Request)
+
+	assert.Equal(t, 200, resp.Code)
+
+	body, err := io.ReadAll(resp.Body)
+	assert.Nil(t, err)
+
+	var s dtos.SplitChangesDTO
+	err = json.Unmarshal(body, &s)
+	assert.Nil(t, err)
+	assert.Equal(t, 2, len(s.Splits))
+	assert.Equal(t, int64(-1), s.Since)
+	assert.Equal(t, int64(1), s.Till)
+	assert.True(t, s.Splits[0].ImpressionsDisabled)
+	assert.False(t, s.Splits[1].ImpressionsDisabled)
+
+	splitStorage.AssertExpectations(t)
+	splitFetcher.AssertExpectations(t)
+}
+
 func TestSplitChangesRecentSince(t *testing.T) {
 	gin.SetMode(gin.TestMode)
 

splitio/proxy/proxy_test.go

@@ -33,7 +33,7 @@ func TestSplitChangesEndpoints(t *testing.T) {
 	assert.Equal(t, 401, status)
 
 	splitStorage.On("ChangesSince", int64(-1), []string(nil)).
-		Return(&dtos.SplitChangesDTO{Since: -1, Till: 1, Splits: []dtos.SplitDTO{{Name: "split1"}}}, nil).
+		Return(&dtos.SplitChangesDTO{Since: -1, Till: 1, Splits: []dtos.SplitDTO{{Name: "split1", ImpressionsDisabled: true}}}, nil).
 		Once()
 
 	// Make a proper request
@@ -55,6 +55,7 @@ func TestSplitChangesEndpoints(t *testing.T) {
 	assert.Equal(t, int64(-1), changes.Since)
 	assert.Equal(t, int64(1), changes.Till)
 	assert.Equal(t, "split1", changes.Splits[0].Name)
+	assert.True(t, changes.Splits[0].ImpressionsDisabled)
 	assert.Equal(t, "application/json; charset=utf-8", headers.Get("Content-Type"))
 
 	// Lets evict the key (simulating a change in splits and re-check)
@@ -69,6 +70,7 @@ func TestSplitChangesEndpoints(t *testing.T) {
 	assert.Equal(t, int64(-1), changes.Since)
 	assert.Equal(t, int64(2), changes.Till)
 	assert.Equal(t, "split2", changes.Splits[0].Name)
+	assert.False(t, changes.Splits[0].ImpressionsDisabled)
 	assert.Equal(t, "application/json; charset=utf-8", headers.Get("Content-Type"))
 
 }