Merge branch 'main' into feat-ux-test-creation

.github/workflows/pull-request.yaml

@@ -304,9 +304,9 @@ jobs:
           TEST_ENV="${{ matrix.test_env }}" \
           ./run.bash || (cat /tmp/docker-log; exit 1)
 
-  trace-testing:
+  trace-testing-memory:
     needs: [build-docker]
-    name: Tracetesting API Server
+    name: Tracetesting API Server (InMemory)
     runs-on: ubuntu-latest
 
     steps:
@@ -333,6 +333,35 @@ jobs:
           ./scripts/wait-for-port.sh 11633
           ./run.sh tracetests || (cat /tmp/docker-log; exit 1)
 
+  trace-testing-nats:
+    needs: [build-docker]
+    name: Tracetesting API Server (NATS)
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - uses: actions/download-artifact@v3
+        with:
+          name: tracetest-dist
+          path: dist/
+
+      - name: Import image
+        run: |
+          docker load --input dist/image.tar
+
+      - name: Start services
+        run: |
+          ./run.sh down up
+          ./run.sh tracetest-logs > /tmp/docker-log &
+      - name: Run tests
+        run: |
+          chmod +x ./dist/tracetest ./dist/tracetest-server
+
+          ./scripts/wait-for-port.sh 11633
+          NATS=true ./run.sh tracetests || (cat /tmp/docker-log; exit 1)
+
   e2e-cli:
     name: CLI e2e tests
     needs: [build-docker]

agent/client/client.go

@@ -2,18 +2,30 @@ package client
 
 import (
 	"context"
+	"errors"
 	"fmt"
+	"io"
+	"log"
 	"os"
 	"strings"
+	"sync"
 	"time"
 
+	retry "github.com/avast/retry-go"
 	"github.com/kubeshop/tracetest/agent/proto"
 	"google.golang.org/grpc"
 )
 
+const (
+	ReconnectRetryAttempts     = 6
+	ReconnectRetryAttemptDelay = 1 * time.Second
+	defaultPingPeriod          = 30 * time.Second
+)
+
 type Config struct {
-	APIKey    string
-	AgentName string
+	APIKey     string
+	AgentName  string
+	PingPeriod time.Duration
 }
 
 type SessionConfig struct {
@@ -22,6 +34,8 @@ type SessionConfig struct {
 }
 
 type Client struct {
+	mutex         sync.Mutex
+	endpoint      string
 	conn          *grpc.ClientConn
 	config        Config
 	sessionConfig *SessionConfig
@@ -69,7 +83,10 @@ func (c *Client) Start(ctx context.Context) error {
 		return err
 	}
 
-	c.startHearthBeat(ctx)
+	err = c.startHearthBeat(ctx)
+	if err != nil {
+		return err
+	}
 
 	return nil
 }
@@ -144,3 +161,49 @@ func (c *Client) getName() (string, error) {
 func isCancelledError(err error) bool {
 	return err != nil && strings.Contains(err.Error(), "context canceled")
 }
+
+func (c *Client) reconnect() error {
+	// connection is not working. We need to reconnect
+	err := retry.Do(func() error {
+		return c.connect(context.Background())
+	}, retry.Attempts(ReconnectRetryAttempts), retry.Delay(ReconnectRetryAttemptDelay))
+
+	if err != nil {
+		return fmt.Errorf("could not reconnect to server: %w", err)
+	}
+
+	return c.Start(context.Background())
+}
+
+func (c *Client) handleDisconnectionError(inputErr error) (bool, error) {
+	if !isConnectionError(inputErr) {
+		// if it's nil or any error other than the one we care about, return it and let the caller handle it
+		return false, inputErr
+	}
+
+	err := retry.Do(func() error {
+		return c.reconnect()
+	})
+
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	return true, nil
+}
+
+func isConnectionError(err error) bool {
+	return err != nil && strings.Contains(err.Error(), "connection refused")
+}
+
+func isEndOfFileError(err error) bool {
+	if err == nil {
+		return false
+	}
+
+	if isEof := errors.Is(err, io.EOF); isEof {
+		return true
+	}
+
+	return strings.Contains(err.Error(), "EOF")
+}

agent/client/connector.go

@@ -13,16 +13,28 @@ import (
 )
 
 func Connect(ctx context.Context, endpoint string, opts ...Option) (*Client, error) {
-	conn, err := connect(ctx, endpoint)
-	if err != nil {
-		return nil, err
+	config := Config{
+		PingPeriod: defaultPingPeriod,
+	}
+
+	client := &Client{
+		endpoint:                    endpoint,
+		config:                      config,
+		triggerListener:             triggerListener,
+		pollListener:                pollListener,
+		shutdownListener:            shutdownListener,
+		dataStoreConnectionListener: dataStoreConnectionListener,
 	}
 
-	client := &Client{conn: conn}
 	for _, opt := range opts {
 		opt(client)
 	}
 
+	err := client.connect(ctx)
+	if err != nil {
+		return nil, err
+	}
+
 	return client, nil
 }
 
@@ -42,25 +54,30 @@ var retryPolicy = `{
 	}]
 }`
 
-func connect(ctx context.Context, endpoint string) (*grpc.ClientConn, error) {
+func (c *Client) connect(ctx context.Context) error {
+	c.mutex.Lock()
+	defer c.mutex.Unlock()
+
 	ctx, cancel := context.WithTimeout(ctx, 5*time.Second)
 	defer cancel()
 
-	transportCredentials, err := getTransportCredentialsForEndpoint(endpoint)
+	transportCredentials, err := getTransportCredentialsForEndpoint(c.endpoint)
 	if err != nil {
-		return nil, fmt.Errorf("could not get transport credentials: %w", err)
+		return fmt.Errorf("could not get transport credentials: %w", err)
 	}
 
 	conn, err := grpc.DialContext(
-		ctx, endpoint,
+		ctx, c.endpoint,
 		grpc.WithTransportCredentials(transportCredentials),
 		grpc.WithDefaultServiceConfig(retryPolicy),
+		grpc.WithIdleTimeout(0), // disable grpc idle timeout
 	)
 	if err != nil {
-		return nil, fmt.Errorf("could not connect to server: %w", err)
+		return fmt.Errorf("could not connect to server: %w", err)
 	}
 
-	return conn, nil
+	c.conn = conn
+	return nil
 }
 
 func getTransportCredentialsForEndpoint(endpoint string) (credentials.TransportCredentials, error) {

agent/client/default_listeners.go

@@ -0,0 +1,23 @@
+package client
+
+import (
+	"context"
+
+	"github.com/kubeshop/tracetest/agent/proto"
+)
+
+func triggerListener(_ context.Context, _ *proto.TriggerRequest) error {
+	return nil
+}
+
+func pollListener(_ context.Context, _ *proto.PollingRequest) error {
+	return nil
+}
+
+func shutdownListener(_ context.Context, _ *proto.ShutdownRequest) error {
+	return nil
+}
+
+func dataStoreConnectionListener(_ context.Context, _ *proto.DataStoreConnectionTestRequest) error {
+	return nil
+}

agent/client/mocks/grpc_server.go

@@ -7,6 +7,8 @@ import (
 	"net"
 	"sync"
 
+	"github.com/avast/retry-go"
+	"github.com/kubeshop/tracetest/agent/client"
 	"github.com/kubeshop/tracetest/agent/proto"
 	"google.golang.org/grpc"
 )
@@ -21,6 +23,8 @@ type GrpcServerMock struct {
 
 	lastTriggerResponse *proto.TriggerResponse
 	lastPollingResponse *proto.PollingResponse
+
+	server *grpc.Server
 }
 
 func NewGrpcServer() *GrpcServerMock {
@@ -33,7 +37,12 @@ func NewGrpcServer() *GrpcServerMock {
 	var wg sync.WaitGroup
 	wg.Add(1)
 
-	go server.start(&wg)
+	err := retry.Do(func() error {
+		return server.start(&wg, 0)
+	}, retry.Attempts(client.ReconnectRetryAttempts), retry.Delay(client.ReconnectRetryAttemptDelay))
+	if err != nil {
+		log.Fatal(err)
+	}
 
 	wg.Wait()
 
@@ -44,21 +53,28 @@ func (s *GrpcServerMock) Addr() string {
 	return fmt.Sprintf("localhost:%d", s.port)
 }
 
-func (s *GrpcServerMock) start(wg *sync.WaitGroup) {
-	lis, err := net.Listen("tcp", ":0")
+func (s *GrpcServerMock) start(wg *sync.WaitGroup, port int) error {
+	lis, err := net.Listen("tcp", fmt.Sprintf(":%d", port))
 	if err != nil {
-		log.Fatalf("failed to listen: %v", err)
+		return fmt.Errorf("failed to listen: %w", err)
 	}
 
 	s.port = lis.Addr().(*net.TCPAddr).Port
 
 	server := grpc.NewServer()
 	proto.RegisterOrchestratorServer(server, s)
 
+	s.server = server
+
 	wg.Done()
-	if err := server.Serve(lis); err != nil {
-		log.Fatalf("failed to serve: %v", err)
-	}
+
+	go func() {
+		if err := server.Serve(lis); err != nil {
+			log.Fatal("failed to serve: %w", err)
+		}
+	}()
+
+	return nil
 }
 
 func (s *GrpcServerMock) Connect(ctx context.Context, req *proto.ConnectRequest) (*proto.AgentConfiguration, error) {
@@ -166,3 +182,7 @@ func (s *GrpcServerMock) TerminateConnection(reason string) {
 		Reason: reason,
 	}
 }
+
+func (s *GrpcServerMock) Stop() {
+	s.server.Stop()
+}

agent/client/options.go

@@ -1,5 +1,7 @@
 package client
 
+import "time"
+
 type Option func(*Client)
 
 func WithAPIKey(apiKey string) Option {
@@ -13,3 +15,9 @@ func WithAgentName(name string) Option {
 		c.config.AgentName = name
 	}
 }
+
+func WithPingPeriod(period time.Duration) Option {
+	return func(c *Client) {
+		c.config.PingPeriod = period
+	}
+}

agent/client/workflow_listen_for_ds_connection_tests.go

@@ -2,10 +2,9 @@ package client
 
 import (
 	"context"
-	"errors"
 	"fmt"
-	"io"
 	"log"
+	"time"
 
 	"github.com/kubeshop/tracetest/agent/proto"
 )
@@ -22,12 +21,19 @@ func (c *Client) startDataStoreConnectionTestListener(ctx context.Context) error
 		for {
 			req := proto.DataStoreConnectionTestRequest{}
 			err := stream.RecvMsg(&req)
-			if errors.Is(err, io.EOF) || isCancelledError(err) {
+			if isEndOfFileError(err) || isCancelledError(err) {
+				return
+			}
+
+			reconnected, err := c.handleDisconnectionError(err)
+			if reconnected {
 				return
 			}
 
 			if err != nil {
-				log.Fatal("could not get message from ds connection stream: %w", err)
+				log.Println("could not get message from data store connection stream: %w", err)
+				time.Sleep(1 * time.Second)
+				continue
 			}
 
 			// TODO: Get ctx from request