Merge branch 'main' into 525-create-edit-mode-on-the-test-details-screen

.github/workflows/build.yml

@@ -10,6 +10,7 @@ on:
     branches: [ main ]
     paths-ignore:
       - 'docs/**'
+      - 'cli/**'
 
 jobs:
 

api/trace.yaml

@@ -27,11 +27,11 @@ components:
         name:
           type: string
         startTime:
-          type: string
-          format: date-time
+          type: integer
+          description: span start time in unix milli format
         endTime:
-          type: string
-          format: date-time
+          type: integer
+          description: span end time in unix milli format
         attributes:
           type: object
           description: Key-Value of span attributes

server/analytics/analytics.go

@@ -10,7 +10,7 @@ import (
 	"runtime"
 
 	"github.com/denisbrodbeck/machineid"
-	"github.com/kubeshop/tracetest/config"
+	"github.com/kubeshop/tracetest/server/config"
 )
 
 const (

server/analytics/analytics_test.go

@@ -3,8 +3,8 @@ package analytics_test
 import (
 	"testing"
 
-	"github.com/kubeshop/tracetest/analytics"
-	"github.com/kubeshop/tracetest/config"
+	"github.com/kubeshop/tracetest/server/analytics"
+	"github.com/kubeshop/tracetest/server/config"
 	"github.com/stretchr/testify/assert"
 )
 

server/app/app.go

@@ -9,15 +9,15 @@ import (
 	"regexp"
 	"text/template"
 
-	"github.com/kubeshop/tracetest/analytics"
-	"github.com/kubeshop/tracetest/config"
-	"github.com/kubeshop/tracetest/executor"
-	httpServer "github.com/kubeshop/tracetest/http"
-	"github.com/kubeshop/tracetest/http/websocket"
-	"github.com/kubeshop/tracetest/model"
-	"github.com/kubeshop/tracetest/openapi"
-	"github.com/kubeshop/tracetest/subscription"
-	"github.com/kubeshop/tracetest/tracedb"
+	"github.com/kubeshop/tracetest/server/analytics"
+	"github.com/kubeshop/tracetest/server/config"
+	"github.com/kubeshop/tracetest/server/executor"
+	httpServer "github.com/kubeshop/tracetest/server/http"
+	"github.com/kubeshop/tracetest/server/http/websocket"
+	"github.com/kubeshop/tracetest/server/model"
+	"github.com/kubeshop/tracetest/server/openapi"
+	"github.com/kubeshop/tracetest/server/subscription"
+	"github.com/kubeshop/tracetest/server/tracedb"
 )
 
 type App struct {
@@ -82,7 +82,7 @@ func (a *App) Start() error {
 	runner.Start(5) // worker count. should be configurable
 	defer runner.Stop()
 
-	controller := httpServer.NewController(a.traceDB, a.db, runner, assertionRunner)
+	controller := httpServer.NewController(a.db, runner, assertionRunner)
 	apiApiController := openapi.NewApiApiController(controller)
 
 	router := openapi.NewRouter(apiApiController)

server/assertions/assertions.go

@@ -1,9 +1,9 @@
 package assertions
 
 import (
-	"github.com/kubeshop/tracetest/assertions/selectors"
-	"github.com/kubeshop/tracetest/model"
-	"github.com/kubeshop/tracetest/traces"
+	"github.com/kubeshop/tracetest/server/assertions/selectors"
+	"github.com/kubeshop/tracetest/server/model"
+	"github.com/kubeshop/tracetest/server/traces"
 	"go.opentelemetry.io/otel/trace"
 )
 

server/assertions/assetions_test.go

@@ -3,11 +3,11 @@ package assertions_test
 import (
 	"testing"
 
-	"github.com/kubeshop/tracetest/assertions"
-	"github.com/kubeshop/tracetest/assertions/comparator"
-	"github.com/kubeshop/tracetest/id"
-	"github.com/kubeshop/tracetest/model"
-	"github.com/kubeshop/tracetest/traces"
+	"github.com/kubeshop/tracetest/server/assertions"
+	"github.com/kubeshop/tracetest/server/assertions/comparator"
+	"github.com/kubeshop/tracetest/server/id"
+	"github.com/kubeshop/tracetest/server/model"
+	"github.com/kubeshop/tracetest/server/traces"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

server/assertions/comparator/basic_test.go

@@ -3,7 +3,7 @@ package comparator_test
 import (
 	"testing"
 
-	"github.com/kubeshop/tracetest/assertions/comparator"
+	"github.com/kubeshop/tracetest/server/assertions/comparator"
 	"github.com/stretchr/testify/assert"
 )
 

server/assertions/comparator/comparators_test.go

@@ -3,7 +3,7 @@ package comparator_test
 import (
 	"testing"
 
-	"github.com/kubeshop/tracetest/assertions/comparator"
+	"github.com/kubeshop/tracetest/server/assertions/comparator"
 	"github.com/stretchr/testify/assert"
 )
 

server/assertions/selectors/builder.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 
 	"github.com/alecthomas/participle/v2"
-	"github.com/kubeshop/tracetest/assertions/comparator"
-	"github.com/kubeshop/tracetest/traces"
+	"github.com/kubeshop/tracetest/server/assertions/comparator"
+	"github.com/kubeshop/tracetest/server/traces"
 )
 
 var defaultParser *SelectorParser

server/assertions/selectors/builder_test.go

@@ -3,7 +3,7 @@ package selectors_test
 import (
 	"testing"
 
-	"github.com/kubeshop/tracetest/assertions/selectors"
+	"github.com/kubeshop/tracetest/server/assertions/selectors"
 	"github.com/stretchr/testify/assert"
 )
 

server/assertions/selectors/parser_test.go

@@ -3,7 +3,7 @@ package selectors_test
 import (
 	"testing"
 
-	"github.com/kubeshop/tracetest/assertions/selectors"
+	"github.com/kubeshop/tracetest/server/assertions/selectors"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

server/assertions/selectors/pseudo_classes.go

@@ -1,7 +1,7 @@
 package selectors
 
 import (
-	"github.com/kubeshop/tracetest/traces"
+	"github.com/kubeshop/tracetest/server/traces"
 )
 
 type PseudoClass interface {

server/assertions/selectors/search.go

@@ -1,7 +1,7 @@
 package selectors
 
 import (
-	"github.com/kubeshop/tracetest/traces"
+	"github.com/kubeshop/tracetest/server/traces"
 	"go.opentelemetry.io/otel/trace"
 )
 

server/assertions/selectors/selector.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"strconv"
 
-	"github.com/kubeshop/tracetest/model"
-	"github.com/kubeshop/tracetest/traces"
+	"github.com/kubeshop/tracetest/server/model"
+	"github.com/kubeshop/tracetest/server/traces"
 )
 
 func FromSpanQuery(sq model.SpanQuery) Selector {

server/assertions/selectors/selector_test.go

@@ -3,9 +3,9 @@ package selectors_test
 import (
 	"testing"
 
-	"github.com/kubeshop/tracetest/assertions/selectors"
-	"github.com/kubeshop/tracetest/id"
-	"github.com/kubeshop/tracetest/traces"
+	"github.com/kubeshop/tracetest/server/assertions/selectors"
+	"github.com/kubeshop/tracetest/server/id"
+	"github.com/kubeshop/tracetest/server/traces"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"go.opentelemetry.io/otel/trace"

server/config/config_test.go

@@ -4,7 +4,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/kubeshop/tracetest/config"
+	"github.com/kubeshop/tracetest/server/config"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"go.opentelemetry.io/collector/config/configgrpc"

server/executor/assertion_runner.go

@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/kubeshop/tracetest/assertions"
-	"github.com/kubeshop/tracetest/model"
+	"github.com/kubeshop/tracetest/server/assertions"
+	"github.com/kubeshop/tracetest/server/model"
 )
 
 type AssertionRequest struct {

server/executor/assertion_runner_test.go

@@ -8,10 +8,10 @@ import (
 	"os"
 	"testing"
 
-	"github.com/kubeshop/tracetest/executor"
-	"github.com/kubeshop/tracetest/id"
-	"github.com/kubeshop/tracetest/model"
-	"github.com/kubeshop/tracetest/testmock"
+	"github.com/kubeshop/tracetest/server/executor"
+	"github.com/kubeshop/tracetest/server/id"
+	"github.com/kubeshop/tracetest/server/model"
+	"github.com/kubeshop/tracetest/server/testmock"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

server/executor/executor.go

@@ -8,7 +8,7 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/kubeshop/tracetest/model"
+	"github.com/kubeshop/tracetest/server/model"
 	"go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp"
 	"go.opentelemetry.io/contrib/propagators/aws/xray"
 	"go.opentelemetry.io/contrib/propagators/b3"

server/executor/executor_test.go

@@ -6,9 +6,9 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"github.com/kubeshop/tracetest/executor"
-	"github.com/kubeshop/tracetest/id"
-	"github.com/kubeshop/tracetest/model"
+	"github.com/kubeshop/tracetest/server/executor"
+	"github.com/kubeshop/tracetest/server/id"
+	"github.com/kubeshop/tracetest/server/model"
 	"github.com/stretchr/testify/assert"
 )
 

server/executor/integration_test.go

@@ -9,10 +9,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/kubeshop/tracetest/app"
-	"github.com/kubeshop/tracetest/model"
-	"github.com/kubeshop/tracetest/openapi"
-	"github.com/kubeshop/tracetest/testmock"
+	"github.com/kubeshop/tracetest/server/app"
+	"github.com/kubeshop/tracetest/server/model"
+	"github.com/kubeshop/tracetest/server/openapi"
+	"github.com/kubeshop/tracetest/server/testmock"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

server/executor/runner.go

@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/kubeshop/tracetest/id"
-	"github.com/kubeshop/tracetest/model"
+	"github.com/kubeshop/tracetest/server/id"
+	"github.com/kubeshop/tracetest/server/model"
 	"go.opentelemetry.io/otel/trace"
 )
 

server/executor/runner_test.go

@@ -5,10 +5,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/kubeshop/tracetest/executor"
-	"github.com/kubeshop/tracetest/id"
-	"github.com/kubeshop/tracetest/model"
-	"github.com/kubeshop/tracetest/testdb"
+	"github.com/kubeshop/tracetest/server/executor"
+	"github.com/kubeshop/tracetest/server/id"
+	"github.com/kubeshop/tracetest/server/model"
+	"github.com/kubeshop/tracetest/server/testdb"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"

server/executor/trace_poller.go

@@ -7,10 +7,10 @@ import (
 	"math"
 	"time"
 
-	"github.com/kubeshop/tracetest/model"
-	"github.com/kubeshop/tracetest/subscription"
-	"github.com/kubeshop/tracetest/tracedb"
-	"github.com/kubeshop/tracetest/traces"
+	"github.com/kubeshop/tracetest/server/model"
+	"github.com/kubeshop/tracetest/server/subscription"
+	"github.com/kubeshop/tracetest/server/tracedb"
+	"github.com/kubeshop/tracetest/server/traces"
 	v1 "go.opentelemetry.io/proto/otlp/trace/v1"
 )