diff --git a/go.mod b/go.mod index aea00c1..fc627c8 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ toolchain go1.23.4 require ( github.com/go-logr/logr v1.4.2 github.com/go-logr/zapr v1.3.0 - github.com/l7mp/stunner v1.0.0 + github.com/l7mp/stunner v1.0.1-0.20241211122243-0e133b6efce9 github.com/onsi/ginkgo/v2 v2.21.0 github.com/onsi/gomega v1.35.1 github.com/stretchr/testify v1.10.0 @@ -32,6 +32,7 @@ require ( github.com/fxamacker/cbor/v2 v2.7.0 // indirect github.com/getkin/kin-openapi v0.128.0 // indirect github.com/go-errors/errors v1.5.1 // indirect + github.com/go-logr/stdr v1.2.2 // indirect github.com/go-openapi/jsonpointer v0.21.0 // indirect github.com/go-openapi/jsonreference v0.21.0 // indirect github.com/go-openapi/swag v0.23.0 // indirect @@ -79,6 +80,12 @@ require ( github.com/wlynxg/anet v0.0.5 // indirect github.com/x448/float16 v0.8.4 // indirect github.com/xlab/treeprint v1.2.0 // indirect + go.opentelemetry.io/otel v1.31.0 // indirect + go.opentelemetry.io/otel/exporters/prometheus v0.53.0 // indirect + go.opentelemetry.io/otel/metric v1.31.0 // indirect + go.opentelemetry.io/otel/sdk v1.31.0 // indirect + go.opentelemetry.io/otel/sdk/metric v1.31.0 // indirect + go.opentelemetry.io/otel/trace v1.31.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/exp v0.0.0-20241210194714-1829a127f884 // indirect golang.org/x/net v0.32.0 // indirect diff --git a/go.sum b/go.sum index 2e70bd3..e2b7f04 100644 --- a/go.sum +++ b/go.sum @@ -33,8 +33,11 @@ github.com/getkin/kin-openapi v0.128.0 h1:jqq3D9vC9pPq1dGcOCv7yOp1DaEe7c/T1vzcLb github.com/getkin/kin-openapi v0.128.0/go.mod h1:OZrfXzUfGrNbsKj+xmFBx6E5c6yH3At/tAKSc2UszXM= github.com/go-errors/errors v1.5.1 h1:ZwEMSLRCapFLflTpT7NKaAc7ukJ8ZPEjzlxt8rPN8bk= github.com/go-errors/errors v1.5.1/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og= +github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= +github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-logr/zapr v1.3.0 h1:XGdV8XW8zdwFiwOA2Dryh1gj2KRQyOOoNmBy4EplIcQ= github.com/go-logr/zapr v1.3.0/go.mod h1:YKepepNBd1u/oyhd/yQmtjVXmm9uML4IXUgMOwR8/Gg= github.com/go-openapi/jsonpointer v0.21.0 h1:YgdVicSA9vH5RiHs9TZW5oyafXZFc6+2Vc1rr/O9oNQ= @@ -92,8 +95,8 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= -github.com/l7mp/stunner v1.0.0 h1:EWSOGcfewFTv1t/B4i2irEzlt1b7XvtwJSASvI91ibg= -github.com/l7mp/stunner v1.0.0/go.mod h1:WHEv3UlwiZKb45PLPv39VuUGzTXBT5BzzN3V8wG4Slc= +github.com/l7mp/stunner v1.0.1-0.20241211122243-0e133b6efce9 h1:wGqg79ud5RHhC9f/lnhlVL3oCiU7nmoICg3D1+64TbA= +github.com/l7mp/stunner v1.0.1-0.20241211122243-0e133b6efce9/go.mod h1:7i5Mzk/0LShx9obvZxpuBv+XRY3Ifq+ycRGqRoa2dz8= github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de h1:9TO3cAIGXtEhnIaL+V+BEER86oLrvS+kWobKpbJuye0= github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= @@ -169,6 +172,18 @@ github.com/xlab/treeprint v1.2.0 h1:HzHnuAF1plUN2zGlAFHbSQP2qJ0ZAD3XF5XD7OesXRQ= github.com/xlab/treeprint v1.2.0/go.mod h1:gj5Gd3gPdKtR1ikdDK6fnFLdmIS0X30kTTuNd/WEJu0= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +go.opentelemetry.io/otel v1.31.0 h1:NsJcKPIW0D0H3NgzPDHmo0WW6SptzPdqg/L1zsIm2hY= +go.opentelemetry.io/otel v1.31.0/go.mod h1:O0C14Yl9FgkjqcCZAsE053C13OaddMYr/hz6clDkEJE= +go.opentelemetry.io/otel/exporters/prometheus v0.53.0 h1:QXobPHrwiGLM4ufrY3EOmDPJpo2P90UuFau4CDPJA/I= +go.opentelemetry.io/otel/exporters/prometheus v0.53.0/go.mod h1:WOAXGr3D00CfzmFxtTV1eR0GpoHuPEu+HJT8UWW2SIU= +go.opentelemetry.io/otel/metric v1.31.0 h1:FSErL0ATQAmYHUIzSezZibnyVlft1ybhy4ozRPcF2fE= +go.opentelemetry.io/otel/metric v1.31.0/go.mod h1:C3dEloVbLuYoX41KpmAhOqNriGbA+qqH6PQ5E5mUfnY= +go.opentelemetry.io/otel/sdk v1.31.0 h1:xLY3abVHYZ5HSfOg3l2E5LUj2Cwva5Y7yGxnSW9H5Gk= +go.opentelemetry.io/otel/sdk v1.31.0/go.mod h1:TfRbMdhvxIIr/B2N2LQW2S5v9m3gOQ/08KsbbO5BPT0= +go.opentelemetry.io/otel/sdk/metric v1.31.0 h1:i9hxxLJF/9kkvfHppyLL55aW7iIJz4JjxTeYusH7zMc= +go.opentelemetry.io/otel/sdk/metric v1.31.0/go.mod h1:CRInTMVvNhUKgSAMbKyTMxqOBC0zgyxzW55lZzX43Y8= +go.opentelemetry.io/otel/trace v1.31.0 h1:ffjsj1aRouKewfr85U2aGagJ46+MvodynlQ1HYdmJys= +go.opentelemetry.io/otel/trace v1.31.0/go.mod h1:TXZkRk7SM2ZQLtR6eoAWQFIHPvzQ06FJAsO1tJg480A= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= diff --git a/internal/config/server_test.go b/internal/config/server_test.go index cf3988f..21a7c2d 100644 --- a/internal/config/server_test.go +++ b/internal/config/server_test.go @@ -93,9 +93,9 @@ func TestConfigDiscovery(t *testing.T) { defer close(ch1) ch2 := make(chan *stnrv1.StunnerConfig, 10) defer close(ch2) - err = cdsc1.Watch(ctx, ch1) + err = cdsc1.Watch(ctx, ch1, true) assert.NoError(t, err, "watcher setup 1") - err = cdsc2.Watch(ctx, ch2) + err = cdsc2.Watch(ctx, ch2, true) assert.NoError(t, err, "watcher setup 2") time.Sleep(50 * time.Millisecond) @@ -215,7 +215,7 @@ func TestConfigDiscovery(t *testing.T) { ch3 := make(chan *stnrv1.StunnerConfig, 10) defer close(ch3) ctx2, cancel2 := context.WithCancel(context.Background()) - err = cdsc3.Watch(ctx2, ch3) + err = cdsc3.Watch(ctx2, ch3, false) assert.NoError(t, err, "watcher setup") time.Sleep(50 * time.Millisecond) @@ -326,7 +326,7 @@ func TestConfigDiscovery(t *testing.T) { defer close(ch3) ctx2, cancel2 = context.WithCancel(context.Background()) defer cancel2() - err = cdsc3.Watch(ctx2, ch3) + err = cdsc3.Watch(ctx2, ch3, false) assert.NoError(t, err, "watcher setup") time.Sleep(50 * time.Millisecond) diff --git a/test/finalizer_test.go b/test/finalizer_test.go index 7d4db12..cab52f9 100644 --- a/test/finalizer_test.go +++ b/test/finalizer_test.go @@ -69,7 +69,7 @@ func testFinalizer() { cdsClient, err = cdsclient.New(cdsServerAddr, "testnamespace/gateway-1", logger.NewLoggerFactory(stunnerLogLevel)) Expect(err).Should(Succeed()) - Expect(cdsClient.Watch(clientCtx, ch)).Should(Succeed()) + Expect(cdsClient.Watch(clientCtx, ch, false)).Should(Succeed()) }) AfterAll(func() { diff --git a/test/managed_mode_endpoints_controller_test.go b/test/managed_mode_endpoints_controller_test.go index 1feaadc..1595ed6 100644 --- a/test/managed_mode_endpoints_controller_test.go +++ b/test/managed_mode_endpoints_controller_test.go @@ -66,7 +66,7 @@ func testManagedModeEndpointController() { cdsClient, err = cdsclient.New(cdsServerAddr, "testnamespace/gateway-1", logger.NewLoggerFactory(stunnerLogLevel)) Expect(err).Should(Succeed()) - Expect(cdsClient.Watch(clientCtx, ch)).Should(Succeed()) + Expect(cdsClient.Watch(clientCtx, ch, false)).Should(Succeed()) }) AfterAll(func() { diff --git a/test/managed_mode_test.go b/test/managed_mode_test.go index 278ee09..2a7fb41 100644 --- a/test/managed_mode_test.go +++ b/test/managed_mode_test.go @@ -75,7 +75,7 @@ func testManagedMode() { cdsClient, err = cdsclient.New(cdsServerAddr, "testnamespace/gateway-1", logger.NewLoggerFactory(stunnerLogLevel)) Expect(err).Should(Succeed()) - Expect(cdsClient.Watch(clientCtx, ch)).Should(Succeed()) + Expect(cdsClient.Watch(clientCtx, ch, false)).Should(Succeed()) }) AfterAll(func() { @@ -2065,10 +2065,10 @@ func testManagedMode() { logger := logger.NewLoggerFactory(stunnerLogLevel) cdsClient1, err = cdsclient.New(cdsServerAddr, "testnamespace/gateway-1", logger) Expect(err).Should(Succeed()) - Expect(cdsClient1.Watch(clientCtx, ch1)).Should(Succeed()) + Expect(cdsClient1.Watch(clientCtx, ch1, false)).Should(Succeed()) cdsClient2, err = cdsclient.New(cdsServerAddr, "testnamespace/gateway-2", logger) Expect(err).Should(Succeed()) - Expect(cdsClient2.Watch(clientCtx, ch2)).Should(Succeed()) + Expect(cdsClient2.Watch(clientCtx, ch2, false)).Should(Succeed()) }) AfterAll(func() { @@ -2824,10 +2824,10 @@ func testManagedMode() { logger := logger.NewLoggerFactory(stunnerLogLevel) cdsClient1, err = cdsclient.New(cdsServerAddr, "testnamespace/gateway-1", logger) Expect(err).Should(Succeed()) - Expect(cdsClient1.Watch(clientCtx, ch1)).Should(Succeed()) + Expect(cdsClient1.Watch(clientCtx, ch1, false)).Should(Succeed()) cdsClient2, err = cdsclient.New(cdsServerAddr, "testnamespace/gateway-2", logger) Expect(err).Should(Succeed()) - Expect(cdsClient2.Watch(clientCtx, ch2)).Should(Succeed()) + Expect(cdsClient2.Watch(clientCtx, ch2, false)).Should(Succeed()) }) AfterAll(func() {