diff --git a/Makefile b/Makefile index 02a86cf850ae..73baeb218393 100644 --- a/Makefile +++ b/Makefile @@ -32,7 +32,7 @@ SIGNOZ_DOCKER_IMAGE ?= signoz SIGNOZ_COMMUNITY_DOCKER_IMAGE ?= signoz-community # Build-time Go variables -PACKAGE?=go.signoz.io/signoz +PACKAGE?=github.com/SigNoz/signoz buildVersion=${PACKAGE}/pkg/query-service/version.buildVersion buildHash=${PACKAGE}/pkg/query-service/version.buildHash buildTime=${PACKAGE}/pkg/query-service/version.buildTime diff --git a/ee/http/middleware/pat.go b/ee/http/middleware/pat.go index a9ec1ff06d7f..292d209dd99b 100644 --- a/ee/http/middleware/pat.go +++ b/ee/http/middleware/pat.go @@ -4,9 +4,9 @@ import ( "net/http" "time" + "github.com/SigNoz/signoz/pkg/types" + "github.com/SigNoz/signoz/pkg/types/authtypes" "github.com/uptrace/bun" - "go.signoz.io/signoz/pkg/types" - "go.signoz.io/signoz/pkg/types/authtypes" "go.uber.org/zap" ) diff --git a/ee/query-service/.goreleaser.yaml b/ee/query-service/.goreleaser.yaml index 83a6a8101e22..66ba7182d12e 100644 --- a/ee/query-service/.goreleaser.yaml +++ b/ee/query-service/.goreleaser.yaml @@ -33,12 +33,12 @@ builds: - -X github.com/SigNoz/signoz/pkg/query-service/version.version={{ .Version }} - -X main.commit={{ .Commit }} -X main.date={{ .CommitDate }} - -X main.builtBy=goreleaser - - -X go.signoz.io/signoz/pkg/query-service/version.buildVersion={{ .Version }} - - -X go.signoz.io/signoz/pkg/query-service/version.buildHash={{ .ShortCommit }} - - -X go.signoz.io/signoz/pkg/query-service/version.buildTime={{ .Date }} - - -X go.signoz.io/signoz/pkg/query-service/version.gitBranch={{ .Branch }} - - -X go.signoz.io/signoz/ee/query-service/constants.ZeusURL=https://api.signoz.cloud - - -X go.signoz.io/signoz/ee/query-service/constants.LicenseSignozIo=https://license.signoz.io/api/v1 + - -X github.com/SigNoz/signoz/pkg/query-service/version.buildVersion={{ .Version }} + - -X github.com/SigNoz/signoz/pkg/query-service/version.buildHash={{ .ShortCommit }} + - -X github.com/SigNoz/signoz/pkg/query-service/version.buildTime={{ .Date }} + - -X github.com/SigNoz/signoz/pkg/query-service/version.gitBranch={{ .Branch }} + - -X github.com/SigNoz/signoz/ee/query-service/constants.ZeusURL=https://api.signoz.cloud + - -X github.com/SigNoz/signoz/ee/query-service/constants.LicenseSignozIo=https://license.signoz.io/api/v1 - >- {{- if eq .Os "linux" }}-linkmode external -extldflags '-static'{{- end }} mod_timestamp: "{{ .CommitTimestamp }}" diff --git a/ee/query-service/anomaly/daily.go b/ee/query-service/anomaly/daily.go index bbafe1618e63..035c40624494 100644 --- a/ee/query-service/anomaly/daily.go +++ b/ee/query-service/anomaly/daily.go @@ -3,8 +3,8 @@ package anomaly import ( "context" - querierV2 "go.signoz.io/signoz/pkg/query-service/app/querier/v2" - "go.signoz.io/signoz/pkg/query-service/app/queryBuilder" + querierV2 "github.com/SigNoz/signoz/pkg/query-service/app/querier/v2" + "github.com/SigNoz/signoz/pkg/query-service/app/queryBuilder" ) type DailyProvider struct { diff --git a/ee/query-service/anomaly/hourly.go b/ee/query-service/anomaly/hourly.go index 1ee08655f037..ac0739adac21 100644 --- a/ee/query-service/anomaly/hourly.go +++ b/ee/query-service/anomaly/hourly.go @@ -3,8 +3,8 @@ package anomaly import ( "context" - querierV2 "go.signoz.io/signoz/pkg/query-service/app/querier/v2" - "go.signoz.io/signoz/pkg/query-service/app/queryBuilder" + querierV2 "github.com/SigNoz/signoz/pkg/query-service/app/querier/v2" + "github.com/SigNoz/signoz/pkg/query-service/app/queryBuilder" ) type HourlyProvider struct { diff --git a/ee/query-service/anomaly/params.go b/ee/query-service/anomaly/params.go index b0107493d7e3..9cfa5a6414e5 100644 --- a/ee/query-service/anomaly/params.go +++ b/ee/query-service/anomaly/params.go @@ -4,8 +4,8 @@ import ( "math" "time" - "go.signoz.io/signoz/pkg/query-service/common" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" + "github.com/SigNoz/signoz/pkg/query-service/common" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" ) type Seasonality string diff --git a/ee/query-service/anomaly/seasonal.go b/ee/query-service/anomaly/seasonal.go index c77acc0a8e6f..900145f4a7a5 100644 --- a/ee/query-service/anomaly/seasonal.go +++ b/ee/query-service/anomaly/seasonal.go @@ -5,11 +5,11 @@ import ( "math" "time" - "go.signoz.io/signoz/pkg/query-service/cache" - "go.signoz.io/signoz/pkg/query-service/interfaces" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" - "go.signoz.io/signoz/pkg/query-service/postprocess" - "go.signoz.io/signoz/pkg/query-service/utils/labels" + "github.com/SigNoz/signoz/pkg/query-service/cache" + "github.com/SigNoz/signoz/pkg/query-service/interfaces" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" + "github.com/SigNoz/signoz/pkg/query-service/postprocess" + "github.com/SigNoz/signoz/pkg/query-service/utils/labels" "go.uber.org/zap" ) diff --git a/ee/query-service/anomaly/weekly.go b/ee/query-service/anomaly/weekly.go index 407e7e64403d..35551e4caf47 100644 --- a/ee/query-service/anomaly/weekly.go +++ b/ee/query-service/anomaly/weekly.go @@ -3,8 +3,8 @@ package anomaly import ( "context" - querierV2 "go.signoz.io/signoz/pkg/query-service/app/querier/v2" - "go.signoz.io/signoz/pkg/query-service/app/queryBuilder" + querierV2 "github.com/SigNoz/signoz/pkg/query-service/app/querier/v2" + "github.com/SigNoz/signoz/pkg/query-service/app/queryBuilder" ) type WeeklyProvider struct { diff --git a/ee/query-service/app/api/api.go b/ee/query-service/app/api/api.go index 6b57928c852d..862062147314 100644 --- a/ee/query-service/app/api/api.go +++ b/ee/query-service/app/api/api.go @@ -5,24 +5,24 @@ import ( "net/http/httputil" "time" + "github.com/SigNoz/signoz/ee/query-service/dao" + "github.com/SigNoz/signoz/ee/query-service/integrations/gateway" + "github.com/SigNoz/signoz/ee/query-service/interfaces" + "github.com/SigNoz/signoz/ee/query-service/license" + "github.com/SigNoz/signoz/ee/query-service/usage" + "github.com/SigNoz/signoz/pkg/alertmanager" + baseapp "github.com/SigNoz/signoz/pkg/query-service/app" + "github.com/SigNoz/signoz/pkg/query-service/app/cloudintegrations" + "github.com/SigNoz/signoz/pkg/query-service/app/integrations" + "github.com/SigNoz/signoz/pkg/query-service/app/logparsingpipeline" + "github.com/SigNoz/signoz/pkg/query-service/cache" + baseint "github.com/SigNoz/signoz/pkg/query-service/interfaces" + basemodel "github.com/SigNoz/signoz/pkg/query-service/model" + rules "github.com/SigNoz/signoz/pkg/query-service/rules" + "github.com/SigNoz/signoz/pkg/query-service/version" + "github.com/SigNoz/signoz/pkg/signoz" + "github.com/SigNoz/signoz/pkg/types/authtypes" "github.com/gorilla/mux" - "go.signoz.io/signoz/ee/query-service/dao" - "go.signoz.io/signoz/ee/query-service/integrations/gateway" - "go.signoz.io/signoz/ee/query-service/interfaces" - "go.signoz.io/signoz/ee/query-service/license" - "go.signoz.io/signoz/ee/query-service/usage" - "go.signoz.io/signoz/pkg/alertmanager" - baseapp "go.signoz.io/signoz/pkg/query-service/app" - "go.signoz.io/signoz/pkg/query-service/app/cloudintegrations" - "go.signoz.io/signoz/pkg/query-service/app/integrations" - "go.signoz.io/signoz/pkg/query-service/app/logparsingpipeline" - "go.signoz.io/signoz/pkg/query-service/cache" - baseint "go.signoz.io/signoz/pkg/query-service/interfaces" - basemodel "go.signoz.io/signoz/pkg/query-service/model" - rules "go.signoz.io/signoz/pkg/query-service/rules" - "go.signoz.io/signoz/pkg/query-service/version" - "go.signoz.io/signoz/pkg/signoz" - "go.signoz.io/signoz/pkg/types/authtypes" ) type APIHandlerOptions struct { diff --git a/ee/query-service/app/api/auth.go b/ee/query-service/app/api/auth.go index 6ae3241975a9..03e3c7030a6a 100644 --- a/ee/query-service/app/api/auth.go +++ b/ee/query-service/app/api/auth.go @@ -12,10 +12,10 @@ import ( "github.com/gorilla/mux" "go.uber.org/zap" - "go.signoz.io/signoz/ee/query-service/constants" - "go.signoz.io/signoz/ee/query-service/model" - baseauth "go.signoz.io/signoz/pkg/query-service/auth" - basemodel "go.signoz.io/signoz/pkg/query-service/model" + "github.com/SigNoz/signoz/ee/query-service/constants" + "github.com/SigNoz/signoz/ee/query-service/model" + baseauth "github.com/SigNoz/signoz/pkg/query-service/auth" + basemodel "github.com/SigNoz/signoz/pkg/query-service/model" ) func parseRequest(r *http.Request, req interface{}) error { diff --git a/ee/query-service/app/api/cloudIntegrations.go b/ee/query-service/app/api/cloudIntegrations.go index 38643fb96c21..13ac372f65f4 100644 --- a/ee/query-service/app/api/cloudIntegrations.go +++ b/ee/query-service/app/api/cloudIntegrations.go @@ -10,15 +10,15 @@ import ( "strings" "time" + "github.com/SigNoz/signoz/ee/query-service/constants" + "github.com/SigNoz/signoz/ee/query-service/model" + "github.com/SigNoz/signoz/pkg/query-service/auth" + baseconstants "github.com/SigNoz/signoz/pkg/query-service/constants" + "github.com/SigNoz/signoz/pkg/query-service/dao" + basemodel "github.com/SigNoz/signoz/pkg/query-service/model" + "github.com/SigNoz/signoz/pkg/types" "github.com/google/uuid" "github.com/gorilla/mux" - "go.signoz.io/signoz/ee/query-service/constants" - "go.signoz.io/signoz/ee/query-service/model" - "go.signoz.io/signoz/pkg/query-service/auth" - baseconstants "go.signoz.io/signoz/pkg/query-service/constants" - "go.signoz.io/signoz/pkg/query-service/dao" - basemodel "go.signoz.io/signoz/pkg/query-service/model" - "go.signoz.io/signoz/pkg/types" "go.uber.org/zap" ) diff --git a/ee/query-service/app/api/dashboard.go b/ee/query-service/app/api/dashboard.go index 61c78dfe4d73..7a9a75bcc6e1 100644 --- a/ee/query-service/app/api/dashboard.go +++ b/ee/query-service/app/api/dashboard.go @@ -4,12 +4,12 @@ import ( "net/http" "strings" + "github.com/SigNoz/signoz/pkg/errors" + "github.com/SigNoz/signoz/pkg/http/render" + "github.com/SigNoz/signoz/pkg/query-service/app/dashboards" + "github.com/SigNoz/signoz/pkg/query-service/auth" + "github.com/SigNoz/signoz/pkg/types/authtypes" "github.com/gorilla/mux" - "go.signoz.io/signoz/pkg/errors" - "go.signoz.io/signoz/pkg/http/render" - "go.signoz.io/signoz/pkg/query-service/app/dashboards" - "go.signoz.io/signoz/pkg/query-service/auth" - "go.signoz.io/signoz/pkg/types/authtypes" ) func (ah *APIHandler) lockDashboard(w http.ResponseWriter, r *http.Request) { diff --git a/ee/query-service/app/api/domains.go b/ee/query-service/app/api/domains.go index f825bc59de8b..6e99183ffec4 100644 --- a/ee/query-service/app/api/domains.go +++ b/ee/query-service/app/api/domains.go @@ -6,10 +6,10 @@ import ( "fmt" "net/http" + "github.com/SigNoz/signoz/ee/query-service/model" + "github.com/SigNoz/signoz/ee/types" "github.com/google/uuid" "github.com/gorilla/mux" - "go.signoz.io/signoz/ee/query-service/model" - "go.signoz.io/signoz/ee/types" ) func (ah *APIHandler) listDomainsByOrg(w http.ResponseWriter, r *http.Request) { diff --git a/ee/query-service/app/api/featureFlags.go b/ee/query-service/app/api/featureFlags.go index d5af0ab62620..1feca4b7645b 100644 --- a/ee/query-service/app/api/featureFlags.go +++ b/ee/query-service/app/api/featureFlags.go @@ -8,8 +8,8 @@ import ( "net/http" "time" - "go.signoz.io/signoz/ee/query-service/constants" - basemodel "go.signoz.io/signoz/pkg/query-service/model" + "github.com/SigNoz/signoz/ee/query-service/constants" + basemodel "github.com/SigNoz/signoz/pkg/query-service/model" "go.uber.org/zap" ) diff --git a/ee/query-service/app/api/featureFlags_test.go b/ee/query-service/app/api/featureFlags_test.go index 99a7be1521ca..e64e2ea135c7 100644 --- a/ee/query-service/app/api/featureFlags_test.go +++ b/ee/query-service/app/api/featureFlags_test.go @@ -3,8 +3,8 @@ package api import ( "testing" + basemodel "github.com/SigNoz/signoz/pkg/query-service/model" "github.com/stretchr/testify/assert" - basemodel "go.signoz.io/signoz/pkg/query-service/model" ) func TestMergeFeatureSets(t *testing.T) { diff --git a/ee/query-service/app/api/gateway.go b/ee/query-service/app/api/gateway.go index 1154911a2633..54fc1759ed1a 100644 --- a/ee/query-service/app/api/gateway.go +++ b/ee/query-service/app/api/gateway.go @@ -4,7 +4,7 @@ import ( "net/http" "strings" - "go.signoz.io/signoz/ee/query-service/integrations/gateway" + "github.com/SigNoz/signoz/ee/query-service/integrations/gateway" ) func (ah *APIHandler) ServeGatewayHTTP(rw http.ResponseWriter, req *http.Request) { diff --git a/ee/query-service/app/api/license.go b/ee/query-service/app/api/license.go index 33b79501129d..a3d0f65077fa 100644 --- a/ee/query-service/app/api/license.go +++ b/ee/query-service/app/api/license.go @@ -5,10 +5,10 @@ import ( "fmt" "net/http" - "go.signoz.io/signoz/ee/query-service/constants" - "go.signoz.io/signoz/ee/query-service/integrations/signozio" - "go.signoz.io/signoz/ee/query-service/model" - "go.signoz.io/signoz/pkg/http/render" + "github.com/SigNoz/signoz/ee/query-service/constants" + "github.com/SigNoz/signoz/ee/query-service/integrations/signozio" + "github.com/SigNoz/signoz/ee/query-service/model" + "github.com/SigNoz/signoz/pkg/http/render" ) type DayWiseBreakdown struct { diff --git a/ee/query-service/app/api/pat.go b/ee/query-service/app/api/pat.go index 0b318c499dca..3b50fd00310d 100644 --- a/ee/query-service/app/api/pat.go +++ b/ee/query-service/app/api/pat.go @@ -9,12 +9,12 @@ import ( "net/http" "time" + "github.com/SigNoz/signoz/ee/query-service/model" + "github.com/SigNoz/signoz/pkg/query-service/auth" + baseconstants "github.com/SigNoz/signoz/pkg/query-service/constants" + basemodel "github.com/SigNoz/signoz/pkg/query-service/model" + "github.com/SigNoz/signoz/pkg/types" "github.com/gorilla/mux" - "go.signoz.io/signoz/ee/query-service/model" - "go.signoz.io/signoz/pkg/query-service/auth" - baseconstants "go.signoz.io/signoz/pkg/query-service/constants" - basemodel "go.signoz.io/signoz/pkg/query-service/model" - "go.signoz.io/signoz/pkg/types" "go.uber.org/zap" ) diff --git a/ee/query-service/app/api/queryrange.go b/ee/query-service/app/api/queryrange.go index 6047eeeb10e7..6a9c49ba4dfb 100644 --- a/ee/query-service/app/api/queryrange.go +++ b/ee/query-service/app/api/queryrange.go @@ -6,11 +6,11 @@ import ( "io" "net/http" - "go.signoz.io/signoz/ee/query-service/anomaly" - baseapp "go.signoz.io/signoz/pkg/query-service/app" - "go.signoz.io/signoz/pkg/query-service/app/queryBuilder" - "go.signoz.io/signoz/pkg/query-service/model" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" + "github.com/SigNoz/signoz/ee/query-service/anomaly" + baseapp "github.com/SigNoz/signoz/pkg/query-service/app" + "github.com/SigNoz/signoz/pkg/query-service/app/queryBuilder" + "github.com/SigNoz/signoz/pkg/query-service/model" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" "go.uber.org/zap" ) diff --git a/ee/query-service/app/api/response.go b/ee/query-service/app/api/response.go index fef5f89798b0..7537d26228ce 100644 --- a/ee/query-service/app/api/response.go +++ b/ee/query-service/app/api/response.go @@ -3,8 +3,8 @@ package api import ( "net/http" - baseapp "go.signoz.io/signoz/pkg/query-service/app" - basemodel "go.signoz.io/signoz/pkg/query-service/model" + baseapp "github.com/SigNoz/signoz/pkg/query-service/app" + basemodel "github.com/SigNoz/signoz/pkg/query-service/model" ) func RespondError(w http.ResponseWriter, apiErr basemodel.BaseApiError, data interface{}) { diff --git a/ee/query-service/app/api/traces.go b/ee/query-service/app/api/traces.go index 3864fc672edb..965c8128c6ce 100644 --- a/ee/query-service/app/api/traces.go +++ b/ee/query-service/app/api/traces.go @@ -3,10 +3,10 @@ package api import ( "net/http" - "go.signoz.io/signoz/ee/query-service/app/db" - "go.signoz.io/signoz/ee/query-service/model" - baseapp "go.signoz.io/signoz/pkg/query-service/app" - basemodel "go.signoz.io/signoz/pkg/query-service/model" + "github.com/SigNoz/signoz/ee/query-service/app/db" + "github.com/SigNoz/signoz/ee/query-service/model" + baseapp "github.com/SigNoz/signoz/pkg/query-service/app" + basemodel "github.com/SigNoz/signoz/pkg/query-service/model" "go.uber.org/zap" ) diff --git a/ee/query-service/app/db/reader.go b/ee/query-service/app/db/reader.go index 121d89d5b36a..d7652acdc294 100644 --- a/ee/query-service/app/db/reader.go +++ b/ee/query-service/app/db/reader.go @@ -7,9 +7,9 @@ import ( "github.com/jmoiron/sqlx" - "go.signoz.io/signoz/pkg/cache" - basechr "go.signoz.io/signoz/pkg/query-service/app/clickhouseReader" - "go.signoz.io/signoz/pkg/query-service/interfaces" + "github.com/SigNoz/signoz/pkg/cache" + basechr "github.com/SigNoz/signoz/pkg/query-service/app/clickhouseReader" + "github.com/SigNoz/signoz/pkg/query-service/interfaces" ) type ClickhouseReader struct { diff --git a/ee/query-service/app/db/trace.go b/ee/query-service/app/db/trace.go index 497f56e0593a..3a3420c30650 100644 --- a/ee/query-service/app/db/trace.go +++ b/ee/query-service/app/db/trace.go @@ -4,8 +4,8 @@ import ( "errors" "strconv" - "go.signoz.io/signoz/ee/query-service/model" - basemodel "go.signoz.io/signoz/pkg/query-service/model" + "github.com/SigNoz/signoz/ee/query-service/model" + basemodel "github.com/SigNoz/signoz/pkg/query-service/model" "go.uber.org/zap" ) diff --git a/ee/query-service/app/server.go b/ee/query-service/app/server.go index 3aa7a80aad07..b13b24a5d0ec 100644 --- a/ee/query-service/app/server.go +++ b/ee/query-service/app/server.go @@ -12,47 +12,47 @@ import ( "github.com/gorilla/handlers" "github.com/jmoiron/sqlx" + eemiddleware "github.com/SigNoz/signoz/ee/http/middleware" + "github.com/SigNoz/signoz/ee/query-service/app/api" + "github.com/SigNoz/signoz/ee/query-service/app/db" + "github.com/SigNoz/signoz/ee/query-service/constants" + "github.com/SigNoz/signoz/ee/query-service/dao" + "github.com/SigNoz/signoz/ee/query-service/integrations/gateway" + "github.com/SigNoz/signoz/ee/query-service/interfaces" + "github.com/SigNoz/signoz/ee/query-service/rules" + "github.com/SigNoz/signoz/pkg/alertmanager" + "github.com/SigNoz/signoz/pkg/http/middleware" + "github.com/SigNoz/signoz/pkg/query-service/auth" + "github.com/SigNoz/signoz/pkg/signoz" + "github.com/SigNoz/signoz/pkg/sqlstore" + "github.com/SigNoz/signoz/pkg/types" + "github.com/SigNoz/signoz/pkg/types/authtypes" + "github.com/SigNoz/signoz/pkg/web" "github.com/rs/cors" "github.com/soheilhy/cmux" - eemiddleware "go.signoz.io/signoz/ee/http/middleware" - "go.signoz.io/signoz/ee/query-service/app/api" - "go.signoz.io/signoz/ee/query-service/app/db" - "go.signoz.io/signoz/ee/query-service/constants" - "go.signoz.io/signoz/ee/query-service/dao" - "go.signoz.io/signoz/ee/query-service/integrations/gateway" - "go.signoz.io/signoz/ee/query-service/interfaces" - "go.signoz.io/signoz/ee/query-service/rules" - "go.signoz.io/signoz/pkg/alertmanager" - "go.signoz.io/signoz/pkg/http/middleware" - "go.signoz.io/signoz/pkg/query-service/auth" - "go.signoz.io/signoz/pkg/signoz" - "go.signoz.io/signoz/pkg/sqlstore" - "go.signoz.io/signoz/pkg/types" - "go.signoz.io/signoz/pkg/types/authtypes" - "go.signoz.io/signoz/pkg/web" - licensepkg "go.signoz.io/signoz/ee/query-service/license" - "go.signoz.io/signoz/ee/query-service/usage" + licensepkg "github.com/SigNoz/signoz/ee/query-service/license" + "github.com/SigNoz/signoz/ee/query-service/usage" - "go.signoz.io/signoz/pkg/query-service/agentConf" - baseapp "go.signoz.io/signoz/pkg/query-service/app" - "go.signoz.io/signoz/pkg/query-service/app/cloudintegrations" - "go.signoz.io/signoz/pkg/query-service/app/dashboards" - baseexplorer "go.signoz.io/signoz/pkg/query-service/app/explorer" - "go.signoz.io/signoz/pkg/query-service/app/integrations" - "go.signoz.io/signoz/pkg/query-service/app/logparsingpipeline" - "go.signoz.io/signoz/pkg/query-service/app/opamp" - opAmpModel "go.signoz.io/signoz/pkg/query-service/app/opamp/model" - "go.signoz.io/signoz/pkg/query-service/app/preferences" - "go.signoz.io/signoz/pkg/query-service/cache" - baseconst "go.signoz.io/signoz/pkg/query-service/constants" - "go.signoz.io/signoz/pkg/query-service/healthcheck" - baseint "go.signoz.io/signoz/pkg/query-service/interfaces" - basemodel "go.signoz.io/signoz/pkg/query-service/model" - pqle "go.signoz.io/signoz/pkg/query-service/pqlEngine" - baserules "go.signoz.io/signoz/pkg/query-service/rules" - "go.signoz.io/signoz/pkg/query-service/telemetry" - "go.signoz.io/signoz/pkg/query-service/utils" + "github.com/SigNoz/signoz/pkg/query-service/agentConf" + baseapp "github.com/SigNoz/signoz/pkg/query-service/app" + "github.com/SigNoz/signoz/pkg/query-service/app/cloudintegrations" + "github.com/SigNoz/signoz/pkg/query-service/app/dashboards" + baseexplorer "github.com/SigNoz/signoz/pkg/query-service/app/explorer" + "github.com/SigNoz/signoz/pkg/query-service/app/integrations" + "github.com/SigNoz/signoz/pkg/query-service/app/logparsingpipeline" + "github.com/SigNoz/signoz/pkg/query-service/app/opamp" + opAmpModel "github.com/SigNoz/signoz/pkg/query-service/app/opamp/model" + "github.com/SigNoz/signoz/pkg/query-service/app/preferences" + "github.com/SigNoz/signoz/pkg/query-service/cache" + baseconst "github.com/SigNoz/signoz/pkg/query-service/constants" + "github.com/SigNoz/signoz/pkg/query-service/healthcheck" + baseint "github.com/SigNoz/signoz/pkg/query-service/interfaces" + basemodel "github.com/SigNoz/signoz/pkg/query-service/model" + pqle "github.com/SigNoz/signoz/pkg/query-service/pqlEngine" + baserules "github.com/SigNoz/signoz/pkg/query-service/rules" + "github.com/SigNoz/signoz/pkg/query-service/telemetry" + "github.com/SigNoz/signoz/pkg/query-service/utils" "go.uber.org/zap" ) diff --git a/ee/query-service/dao/factory.go b/ee/query-service/dao/factory.go index 3da11bad0cac..eb146c368881 100644 --- a/ee/query-service/dao/factory.go +++ b/ee/query-service/dao/factory.go @@ -1,8 +1,8 @@ package dao import ( - "go.signoz.io/signoz/ee/query-service/dao/sqlite" - "go.signoz.io/signoz/pkg/sqlstore" + "github.com/SigNoz/signoz/ee/query-service/dao/sqlite" + "github.com/SigNoz/signoz/pkg/sqlstore" ) func InitDao(sqlStore sqlstore.SQLStore) (ModelDao, error) { diff --git a/ee/query-service/dao/interface.go b/ee/query-service/dao/interface.go index 2d5cbc476d7b..bb2bc764d5c6 100644 --- a/ee/query-service/dao/interface.go +++ b/ee/query-service/dao/interface.go @@ -4,15 +4,15 @@ import ( "context" "net/url" + "github.com/SigNoz/signoz/ee/query-service/model" + "github.com/SigNoz/signoz/ee/types" + basedao "github.com/SigNoz/signoz/pkg/query-service/dao" + baseint "github.com/SigNoz/signoz/pkg/query-service/interfaces" + basemodel "github.com/SigNoz/signoz/pkg/query-service/model" + ossTypes "github.com/SigNoz/signoz/pkg/types" + "github.com/SigNoz/signoz/pkg/types/authtypes" "github.com/google/uuid" "github.com/uptrace/bun" - "go.signoz.io/signoz/ee/query-service/model" - "go.signoz.io/signoz/ee/types" - basedao "go.signoz.io/signoz/pkg/query-service/dao" - baseint "go.signoz.io/signoz/pkg/query-service/interfaces" - basemodel "go.signoz.io/signoz/pkg/query-service/model" - ossTypes "go.signoz.io/signoz/pkg/types" - "go.signoz.io/signoz/pkg/types/authtypes" ) type ModelDao interface { diff --git a/ee/query-service/dao/sqlite/auth.go b/ee/query-service/dao/sqlite/auth.go index d1f2ab3c90f8..c0c8290b6c75 100644 --- a/ee/query-service/dao/sqlite/auth.go +++ b/ee/query-service/dao/sqlite/auth.go @@ -7,15 +7,15 @@ import ( "strings" "time" + "github.com/SigNoz/signoz/ee/query-service/constants" + "github.com/SigNoz/signoz/ee/query-service/model" + baseauth "github.com/SigNoz/signoz/pkg/query-service/auth" + baseconst "github.com/SigNoz/signoz/pkg/query-service/constants" + basemodel "github.com/SigNoz/signoz/pkg/query-service/model" + "github.com/SigNoz/signoz/pkg/query-service/utils" + "github.com/SigNoz/signoz/pkg/types" + "github.com/SigNoz/signoz/pkg/types/authtypes" "github.com/google/uuid" - "go.signoz.io/signoz/ee/query-service/constants" - "go.signoz.io/signoz/ee/query-service/model" - baseauth "go.signoz.io/signoz/pkg/query-service/auth" - baseconst "go.signoz.io/signoz/pkg/query-service/constants" - basemodel "go.signoz.io/signoz/pkg/query-service/model" - "go.signoz.io/signoz/pkg/query-service/utils" - "go.signoz.io/signoz/pkg/types" - "go.signoz.io/signoz/pkg/types/authtypes" "go.uber.org/zap" ) diff --git a/ee/query-service/dao/sqlite/domain.go b/ee/query-service/dao/sqlite/domain.go index a3a8192b06a5..1fe63c995e91 100644 --- a/ee/query-service/dao/sqlite/domain.go +++ b/ee/query-service/dao/sqlite/domain.go @@ -9,11 +9,11 @@ import ( "strings" "time" + "github.com/SigNoz/signoz/ee/query-service/model" + "github.com/SigNoz/signoz/ee/types" + basemodel "github.com/SigNoz/signoz/pkg/query-service/model" + ossTypes "github.com/SigNoz/signoz/pkg/types" "github.com/google/uuid" - "go.signoz.io/signoz/ee/query-service/model" - "go.signoz.io/signoz/ee/types" - basemodel "go.signoz.io/signoz/pkg/query-service/model" - ossTypes "go.signoz.io/signoz/pkg/types" "go.uber.org/zap" ) diff --git a/ee/query-service/dao/sqlite/modelDao.go b/ee/query-service/dao/sqlite/modelDao.go index dbacfa646b28..f50c5b16bb63 100644 --- a/ee/query-service/dao/sqlite/modelDao.go +++ b/ee/query-service/dao/sqlite/modelDao.go @@ -3,11 +3,11 @@ package sqlite import ( "fmt" + basedao "github.com/SigNoz/signoz/pkg/query-service/dao" + basedsql "github.com/SigNoz/signoz/pkg/query-service/dao/sqlite" + baseint "github.com/SigNoz/signoz/pkg/query-service/interfaces" + "github.com/SigNoz/signoz/pkg/sqlstore" "github.com/uptrace/bun" - basedao "go.signoz.io/signoz/pkg/query-service/dao" - basedsql "go.signoz.io/signoz/pkg/query-service/dao/sqlite" - baseint "go.signoz.io/signoz/pkg/query-service/interfaces" - "go.signoz.io/signoz/pkg/sqlstore" ) type modelDao struct { diff --git a/ee/query-service/dao/sqlite/pat.go b/ee/query-service/dao/sqlite/pat.go index ef04c2bd4f58..7cc5b96380d2 100644 --- a/ee/query-service/dao/sqlite/pat.go +++ b/ee/query-service/dao/sqlite/pat.go @@ -5,9 +5,9 @@ import ( "fmt" "time" - "go.signoz.io/signoz/ee/query-service/model" - basemodel "go.signoz.io/signoz/pkg/query-service/model" - "go.signoz.io/signoz/pkg/types" + "github.com/SigNoz/signoz/ee/query-service/model" + basemodel "github.com/SigNoz/signoz/pkg/query-service/model" + "github.com/SigNoz/signoz/pkg/types" "go.uber.org/zap" ) diff --git a/ee/query-service/integrations/signozio/signozio.go b/ee/query-service/integrations/signozio/signozio.go index d57132e04b61..ff4f307441d2 100644 --- a/ee/query-service/integrations/signozio/signozio.go +++ b/ee/query-service/integrations/signozio/signozio.go @@ -11,8 +11,8 @@ import ( "github.com/pkg/errors" - "go.signoz.io/signoz/ee/query-service/constants" - "go.signoz.io/signoz/ee/query-service/model" + "github.com/SigNoz/signoz/ee/query-service/constants" + "github.com/SigNoz/signoz/ee/query-service/model" ) var C *Client diff --git a/ee/query-service/interfaces/connector.go b/ee/query-service/interfaces/connector.go index 5428e421fa7f..71435e16161a 100644 --- a/ee/query-service/interfaces/connector.go +++ b/ee/query-service/interfaces/connector.go @@ -1,7 +1,7 @@ package interfaces import ( - baseint "go.signoz.io/signoz/pkg/query-service/interfaces" + baseint "github.com/SigNoz/signoz/pkg/query-service/interfaces" ) // Connector defines methods for interaction diff --git a/ee/query-service/license/db.go b/ee/query-service/license/db.go index 021dc2b67629..0f30ec78db58 100644 --- a/ee/query-service/license/db.go +++ b/ee/query-service/license/db.go @@ -11,9 +11,9 @@ import ( "github.com/mattn/go-sqlite3" "github.com/uptrace/bun" - "go.signoz.io/signoz/ee/query-service/model" - basemodel "go.signoz.io/signoz/pkg/query-service/model" - "go.signoz.io/signoz/pkg/types" + "github.com/SigNoz/signoz/ee/query-service/model" + basemodel "github.com/SigNoz/signoz/pkg/query-service/model" + "github.com/SigNoz/signoz/pkg/types" "go.uber.org/zap" ) diff --git a/ee/query-service/license/manager.go b/ee/query-service/license/manager.go index 7ad62e0068ab..900a5dd75e4e 100644 --- a/ee/query-service/license/manager.go +++ b/ee/query-service/license/manager.go @@ -11,14 +11,14 @@ import ( "sync" - baseconstants "go.signoz.io/signoz/pkg/query-service/constants" - "go.signoz.io/signoz/pkg/types" - "go.signoz.io/signoz/pkg/types/authtypes" + baseconstants "github.com/SigNoz/signoz/pkg/query-service/constants" + "github.com/SigNoz/signoz/pkg/types" + "github.com/SigNoz/signoz/pkg/types/authtypes" - validate "go.signoz.io/signoz/ee/query-service/integrations/signozio" - "go.signoz.io/signoz/ee/query-service/model" - basemodel "go.signoz.io/signoz/pkg/query-service/model" - "go.signoz.io/signoz/pkg/query-service/telemetry" + validate "github.com/SigNoz/signoz/ee/query-service/integrations/signozio" + "github.com/SigNoz/signoz/ee/query-service/model" + basemodel "github.com/SigNoz/signoz/pkg/query-service/model" + "github.com/SigNoz/signoz/pkg/query-service/telemetry" "go.uber.org/zap" ) diff --git a/ee/query-service/main.go b/ee/query-service/main.go index 79284d439fa2..06c5695bca3f 100644 --- a/ee/query-service/main.go +++ b/ee/query-service/main.go @@ -9,17 +9,17 @@ import ( "strconv" "time" + "github.com/SigNoz/signoz/ee/query-service/app" + "github.com/SigNoz/signoz/pkg/config" + "github.com/SigNoz/signoz/pkg/config/envprovider" + "github.com/SigNoz/signoz/pkg/config/fileprovider" + "github.com/SigNoz/signoz/pkg/query-service/auth" + baseconst "github.com/SigNoz/signoz/pkg/query-service/constants" + "github.com/SigNoz/signoz/pkg/query-service/version" + "github.com/SigNoz/signoz/pkg/signoz" + "github.com/SigNoz/signoz/pkg/types/authtypes" "go.opentelemetry.io/otel/sdk/resource" semconv "go.opentelemetry.io/otel/semconv/v1.4.0" - "go.signoz.io/signoz/ee/query-service/app" - "go.signoz.io/signoz/pkg/config" - "go.signoz.io/signoz/pkg/config/envprovider" - "go.signoz.io/signoz/pkg/config/fileprovider" - "go.signoz.io/signoz/pkg/query-service/auth" - baseconst "go.signoz.io/signoz/pkg/query-service/constants" - "go.signoz.io/signoz/pkg/query-service/version" - "go.signoz.io/signoz/pkg/signoz" - "go.signoz.io/signoz/pkg/types/authtypes" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" diff --git a/ee/query-service/model/auth.go b/ee/query-service/model/auth.go index 9ad83cb3981e..fd7ecad9d0ea 100644 --- a/ee/query-service/model/auth.go +++ b/ee/query-service/model/auth.go @@ -1,7 +1,7 @@ package model import ( - basemodel "go.signoz.io/signoz/pkg/query-service/model" + basemodel "github.com/SigNoz/signoz/pkg/query-service/model" ) // GettableInvitation overrides base object and adds precheck into diff --git a/ee/query-service/model/errors.go b/ee/query-service/model/errors.go index efc780be95c1..cbbb0e4cc30d 100644 --- a/ee/query-service/model/errors.go +++ b/ee/query-service/model/errors.go @@ -3,7 +3,7 @@ package model import ( "fmt" - basemodel "go.signoz.io/signoz/pkg/query-service/model" + basemodel "github.com/SigNoz/signoz/pkg/query-service/model" ) type ApiError struct { diff --git a/ee/query-service/model/license.go b/ee/query-service/model/license.go index d7c8cb49dc97..4b5a63174e8e 100644 --- a/ee/query-service/model/license.go +++ b/ee/query-service/model/license.go @@ -6,8 +6,8 @@ import ( "reflect" "time" + basemodel "github.com/SigNoz/signoz/pkg/query-service/model" "github.com/pkg/errors" - basemodel "go.signoz.io/signoz/pkg/query-service/model" ) type License struct { diff --git a/ee/query-service/model/license_test.go b/ee/query-service/model/license_test.go index 24c74eee0967..5ba585c4b62f 100644 --- a/ee/query-service/model/license_test.go +++ b/ee/query-service/model/license_test.go @@ -4,10 +4,10 @@ import ( "encoding/json" "testing" + "github.com/SigNoz/signoz/pkg/query-service/model" "github.com/pkg/errors" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.signoz.io/signoz/pkg/query-service/model" ) func TestNewLicenseV3(t *testing.T) { diff --git a/ee/query-service/model/pat.go b/ee/query-service/model/pat.go index 3128702c3cc2..53003aa89157 100644 --- a/ee/query-service/model/pat.go +++ b/ee/query-service/model/pat.go @@ -1,6 +1,6 @@ package model -import "go.signoz.io/signoz/pkg/types" +import "github.com/SigNoz/signoz/pkg/types" type User struct { Id string `json:"id" db:"id"` diff --git a/ee/query-service/model/plans.go b/ee/query-service/model/plans.go index 6dbfa8ba562c..8c390beef3f0 100644 --- a/ee/query-service/model/plans.go +++ b/ee/query-service/model/plans.go @@ -1,8 +1,8 @@ package model import ( - "go.signoz.io/signoz/pkg/query-service/constants" - basemodel "go.signoz.io/signoz/pkg/query-service/model" + "github.com/SigNoz/signoz/pkg/query-service/constants" + basemodel "github.com/SigNoz/signoz/pkg/query-service/model" ) const SSO = "SSO" diff --git a/ee/query-service/rules/anomaly.go b/ee/query-service/rules/anomaly.go index ceec23747e26..7478c65321f2 100644 --- a/ee/query-service/rules/anomaly.go +++ b/ee/query-service/rules/anomaly.go @@ -11,22 +11,22 @@ import ( "go.uber.org/zap" - "go.signoz.io/signoz/ee/query-service/anomaly" - "go.signoz.io/signoz/pkg/query-service/cache" - "go.signoz.io/signoz/pkg/query-service/common" - "go.signoz.io/signoz/pkg/query-service/model" + "github.com/SigNoz/signoz/ee/query-service/anomaly" + "github.com/SigNoz/signoz/pkg/query-service/cache" + "github.com/SigNoz/signoz/pkg/query-service/common" + "github.com/SigNoz/signoz/pkg/query-service/model" - querierV2 "go.signoz.io/signoz/pkg/query-service/app/querier/v2" - "go.signoz.io/signoz/pkg/query-service/app/queryBuilder" - "go.signoz.io/signoz/pkg/query-service/interfaces" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" - "go.signoz.io/signoz/pkg/query-service/utils/labels" - "go.signoz.io/signoz/pkg/query-service/utils/times" - "go.signoz.io/signoz/pkg/query-service/utils/timestamp" + querierV2 "github.com/SigNoz/signoz/pkg/query-service/app/querier/v2" + "github.com/SigNoz/signoz/pkg/query-service/app/queryBuilder" + "github.com/SigNoz/signoz/pkg/query-service/interfaces" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" + "github.com/SigNoz/signoz/pkg/query-service/utils/labels" + "github.com/SigNoz/signoz/pkg/query-service/utils/times" + "github.com/SigNoz/signoz/pkg/query-service/utils/timestamp" - "go.signoz.io/signoz/pkg/query-service/formatter" + "github.com/SigNoz/signoz/pkg/query-service/formatter" - baserules "go.signoz.io/signoz/pkg/query-service/rules" + baserules "github.com/SigNoz/signoz/pkg/query-service/rules" yaml "gopkg.in/yaml.v2" ) diff --git a/ee/query-service/rules/manager.go b/ee/query-service/rules/manager.go index e28afbdb2e8f..bccdc08adf35 100644 --- a/ee/query-service/rules/manager.go +++ b/ee/query-service/rules/manager.go @@ -5,10 +5,10 @@ import ( "fmt" "time" + basemodel "github.com/SigNoz/signoz/pkg/query-service/model" + baserules "github.com/SigNoz/signoz/pkg/query-service/rules" + "github.com/SigNoz/signoz/pkg/query-service/utils/labels" "github.com/google/uuid" - basemodel "go.signoz.io/signoz/pkg/query-service/model" - baserules "go.signoz.io/signoz/pkg/query-service/rules" - "go.signoz.io/signoz/pkg/query-service/utils/labels" "go.uber.org/zap" ) diff --git a/ee/query-service/sso/saml/request.go b/ee/query-service/sso/saml/request.go index c9788d0ff38b..73851ef82831 100644 --- a/ee/query-service/sso/saml/request.go +++ b/ee/query-service/sso/saml/request.go @@ -7,9 +7,9 @@ import ( "fmt" "strings" + "github.com/SigNoz/signoz/pkg/query-service/constants" saml2 "github.com/russellhaering/gosaml2" dsig "github.com/russellhaering/goxmldsig" - "go.signoz.io/signoz/pkg/query-service/constants" "go.uber.org/zap" ) diff --git a/ee/query-service/usage/manager.go b/ee/query-service/usage/manager.go index 2ed475b4dd77..bcd154b21dc4 100644 --- a/ee/query-service/usage/manager.go +++ b/ee/query-service/usage/manager.go @@ -15,11 +15,11 @@ import ( "go.uber.org/zap" - "go.signoz.io/signoz/ee/query-service/dao" - licenseserver "go.signoz.io/signoz/ee/query-service/integrations/signozio" - "go.signoz.io/signoz/ee/query-service/license" - "go.signoz.io/signoz/ee/query-service/model" - "go.signoz.io/signoz/pkg/query-service/utils/encryption" + "github.com/SigNoz/signoz/ee/query-service/dao" + licenseserver "github.com/SigNoz/signoz/ee/query-service/integrations/signozio" + "github.com/SigNoz/signoz/ee/query-service/license" + "github.com/SigNoz/signoz/ee/query-service/model" + "github.com/SigNoz/signoz/pkg/query-service/utils/encryption" ) const ( diff --git a/ee/types/domain.go b/ee/types/domain.go index 2d98cff63a1a..5cba2223020b 100644 --- a/ee/types/domain.go +++ b/ee/types/domain.go @@ -6,13 +6,13 @@ import ( "net/url" "strings" + "github.com/SigNoz/signoz/ee/query-service/sso" + "github.com/SigNoz/signoz/ee/query-service/sso/saml" + "github.com/SigNoz/signoz/pkg/types" "github.com/google/uuid" "github.com/pkg/errors" saml2 "github.com/russellhaering/gosaml2" "github.com/uptrace/bun" - "go.signoz.io/signoz/ee/query-service/sso" - "go.signoz.io/signoz/ee/query-service/sso/saml" - "go.signoz.io/signoz/pkg/types" "go.uber.org/zap" ) diff --git a/ee/types/sso.go b/ee/types/sso.go index 1e36f97ba2a5..9ad640cd75bb 100644 --- a/ee/types/sso.go +++ b/ee/types/sso.go @@ -5,8 +5,8 @@ import ( "fmt" "net/url" + "github.com/SigNoz/signoz/ee/query-service/sso" "github.com/coreos/go-oidc/v3/oidc" - "go.signoz.io/signoz/ee/query-service/sso" "golang.org/x/oauth2" ) diff --git a/go.mod b/go.mod index f5f4ec34b407..3d456796f7ea 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module go.signoz.io/signoz +module github.com/SigNoz/signoz go 1.22.0 diff --git a/pkg/alertmanager/alertmanager.go b/pkg/alertmanager/alertmanager.go index 79c6a76ce7f8..c0605a58d218 100644 --- a/pkg/alertmanager/alertmanager.go +++ b/pkg/alertmanager/alertmanager.go @@ -3,9 +3,9 @@ package alertmanager import ( "context" - "go.signoz.io/signoz/pkg/errors" - "go.signoz.io/signoz/pkg/factory" - "go.signoz.io/signoz/pkg/types/alertmanagertypes" + "github.com/SigNoz/signoz/pkg/errors" + "github.com/SigNoz/signoz/pkg/factory" + "github.com/SigNoz/signoz/pkg/types/alertmanagertypes" ) var ( diff --git a/pkg/alertmanager/alertmanagerbatcher/batcher.go b/pkg/alertmanager/alertmanagerbatcher/batcher.go index 34e68d280642..977321b014ef 100644 --- a/pkg/alertmanager/alertmanagerbatcher/batcher.go +++ b/pkg/alertmanager/alertmanagerbatcher/batcher.go @@ -6,7 +6,7 @@ import ( "sync" - "go.signoz.io/signoz/pkg/types/alertmanagertypes" + "github.com/SigNoz/signoz/pkg/types/alertmanagertypes" ) // Batcher is responsible for batching alerts and broadcasting them on a channel. diff --git a/pkg/alertmanager/alertmanagerbatcher/batcher_test.go b/pkg/alertmanager/alertmanagerbatcher/batcher_test.go index 517c16a1ea18..5f01215f6364 100644 --- a/pkg/alertmanager/alertmanagerbatcher/batcher_test.go +++ b/pkg/alertmanager/alertmanagerbatcher/batcher_test.go @@ -6,8 +6,8 @@ import ( "log/slog" "testing" + "github.com/SigNoz/signoz/pkg/types/alertmanagertypes" "github.com/stretchr/testify/assert" - "go.signoz.io/signoz/pkg/types/alertmanagertypes" ) func TestBatcherWithOneAlertAndDefaultConfigs(t *testing.T) { diff --git a/pkg/alertmanager/alertmanagerserver/config.go b/pkg/alertmanager/alertmanagerserver/config.go index c7e06297d5ac..47549473e202 100644 --- a/pkg/alertmanager/alertmanagerserver/config.go +++ b/pkg/alertmanager/alertmanagerserver/config.go @@ -4,9 +4,9 @@ import ( "net/url" "time" + "github.com/SigNoz/signoz/pkg/types/alertmanagertypes" "github.com/prometheus/alertmanager/config" "github.com/prometheus/common/model" - "go.signoz.io/signoz/pkg/types/alertmanagertypes" ) type Config struct { diff --git a/pkg/alertmanager/alertmanagerserver/server.go b/pkg/alertmanager/alertmanagerserver/server.go index 9bcca2a506da..f53be783db97 100644 --- a/pkg/alertmanager/alertmanagerserver/server.go +++ b/pkg/alertmanager/alertmanagerserver/server.go @@ -7,6 +7,8 @@ import ( "sync" "time" + "github.com/SigNoz/signoz/pkg/errors" + "github.com/SigNoz/signoz/pkg/types/alertmanagertypes" "github.com/prometheus/alertmanager/dispatch" "github.com/prometheus/alertmanager/featurecontrol" "github.com/prometheus/alertmanager/inhibit" @@ -18,8 +20,6 @@ import ( "github.com/prometheus/alertmanager/timeinterval" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/common/model" - "go.signoz.io/signoz/pkg/errors" - "go.signoz.io/signoz/pkg/types/alertmanagertypes" ) var ( diff --git a/pkg/alertmanager/alertmanagerserver/server_test.go b/pkg/alertmanager/alertmanagerserver/server_test.go index 142e49884f28..f5cc5fe67004 100644 --- a/pkg/alertmanager/alertmanagerserver/server_test.go +++ b/pkg/alertmanager/alertmanagerserver/server_test.go @@ -11,6 +11,8 @@ import ( "testing" "time" + "github.com/SigNoz/signoz/pkg/types/alertmanagertypes" + "github.com/SigNoz/signoz/pkg/types/alertmanagertypes/alertmanagertypestest" "github.com/go-openapi/strfmt" "github.com/prometheus/alertmanager/api/v2/models" "github.com/prometheus/alertmanager/config" @@ -18,8 +20,6 @@ import ( commoncfg "github.com/prometheus/common/config" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.signoz.io/signoz/pkg/types/alertmanagertypes" - "go.signoz.io/signoz/pkg/types/alertmanagertypes/alertmanagertypestest" ) func TestServerSetConfigAndStop(t *testing.T) { diff --git a/pkg/alertmanager/alertmanagerstore/sqlalertmanagerstore/config.go b/pkg/alertmanager/alertmanagerstore/sqlalertmanagerstore/config.go index 0a0e21c38510..c2c4a05348f5 100644 --- a/pkg/alertmanager/alertmanagerstore/sqlalertmanagerstore/config.go +++ b/pkg/alertmanager/alertmanagerstore/sqlalertmanagerstore/config.go @@ -5,11 +5,11 @@ import ( "database/sql" "strconv" + "github.com/SigNoz/signoz/pkg/errors" + "github.com/SigNoz/signoz/pkg/sqlstore" + "github.com/SigNoz/signoz/pkg/types/alertmanagertypes" "github.com/tidwall/gjson" "github.com/uptrace/bun" - "go.signoz.io/signoz/pkg/errors" - "go.signoz.io/signoz/pkg/sqlstore" - "go.signoz.io/signoz/pkg/types/alertmanagertypes" ) type config struct { diff --git a/pkg/alertmanager/alertmanagerstore/sqlalertmanagerstore/state.go b/pkg/alertmanager/alertmanagerstore/sqlalertmanagerstore/state.go index 008db2cda3ce..5c4e6acefad0 100644 --- a/pkg/alertmanager/alertmanagerstore/sqlalertmanagerstore/state.go +++ b/pkg/alertmanager/alertmanagerstore/sqlalertmanagerstore/state.go @@ -4,9 +4,9 @@ import ( "context" "database/sql" - "go.signoz.io/signoz/pkg/errors" - "go.signoz.io/signoz/pkg/sqlstore" - "go.signoz.io/signoz/pkg/types/alertmanagertypes" + "github.com/SigNoz/signoz/pkg/errors" + "github.com/SigNoz/signoz/pkg/sqlstore" + "github.com/SigNoz/signoz/pkg/types/alertmanagertypes" ) type state struct { diff --git a/pkg/alertmanager/api.go b/pkg/alertmanager/api.go index b71cbb203462..d0f5bd94df5e 100644 --- a/pkg/alertmanager/api.go +++ b/pkg/alertmanager/api.go @@ -7,11 +7,11 @@ import ( "strconv" "time" + "github.com/SigNoz/signoz/pkg/errors" + "github.com/SigNoz/signoz/pkg/http/render" + "github.com/SigNoz/signoz/pkg/types/alertmanagertypes" + "github.com/SigNoz/signoz/pkg/types/authtypes" "github.com/gorilla/mux" - "go.signoz.io/signoz/pkg/errors" - "go.signoz.io/signoz/pkg/http/render" - "go.signoz.io/signoz/pkg/types/alertmanagertypes" - "go.signoz.io/signoz/pkg/types/authtypes" ) type API struct { diff --git a/pkg/alertmanager/config.go b/pkg/alertmanager/config.go index 03deab8fdd81..2b47c7bc8fff 100644 --- a/pkg/alertmanager/config.go +++ b/pkg/alertmanager/config.go @@ -4,8 +4,8 @@ import ( "net/url" "time" - "go.signoz.io/signoz/pkg/alertmanager/alertmanagerserver" - "go.signoz.io/signoz/pkg/factory" + "github.com/SigNoz/signoz/pkg/alertmanager/alertmanagerserver" + "github.com/SigNoz/signoz/pkg/factory" ) type Config struct { diff --git a/pkg/alertmanager/config_test.go b/pkg/alertmanager/config_test.go index 62038f5406fe..30b35aac3df9 100644 --- a/pkg/alertmanager/config_test.go +++ b/pkg/alertmanager/config_test.go @@ -6,12 +6,12 @@ import ( "testing" "time" + "github.com/SigNoz/signoz/pkg/config" + "github.com/SigNoz/signoz/pkg/config/envprovider" + "github.com/SigNoz/signoz/pkg/factory" "github.com/prometheus/common/model" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.signoz.io/signoz/pkg/config" - "go.signoz.io/signoz/pkg/config/envprovider" - "go.signoz.io/signoz/pkg/factory" ) func TestNewWithEnvProvider(t *testing.T) { diff --git a/pkg/alertmanager/legacyalertmanager/provider.go b/pkg/alertmanager/legacyalertmanager/provider.go index 09a8d894a8a8..05d9ae5c5447 100644 --- a/pkg/alertmanager/legacyalertmanager/provider.go +++ b/pkg/alertmanager/legacyalertmanager/provider.go @@ -10,13 +10,13 @@ import ( "net/url" "time" + "github.com/SigNoz/signoz/pkg/alertmanager" + "github.com/SigNoz/signoz/pkg/alertmanager/alertmanagerbatcher" + "github.com/SigNoz/signoz/pkg/alertmanager/alertmanagerstore/sqlalertmanagerstore" + "github.com/SigNoz/signoz/pkg/factory" + "github.com/SigNoz/signoz/pkg/sqlstore" + "github.com/SigNoz/signoz/pkg/types/alertmanagertypes" "github.com/tidwall/gjson" - "go.signoz.io/signoz/pkg/alertmanager" - "go.signoz.io/signoz/pkg/alertmanager/alertmanagerbatcher" - "go.signoz.io/signoz/pkg/alertmanager/alertmanagerstore/sqlalertmanagerstore" - "go.signoz.io/signoz/pkg/factory" - "go.signoz.io/signoz/pkg/sqlstore" - "go.signoz.io/signoz/pkg/types/alertmanagertypes" ) type postableAlert struct { @@ -47,7 +47,7 @@ func NewFactory(sqlstore sqlstore.SQLStore) factory.ProviderFactory[alertmanager } func New(ctx context.Context, providerSettings factory.ProviderSettings, config alertmanager.Config, sqlstore sqlstore.SQLStore) (*provider, error) { - settings := factory.NewScopedProviderSettings(providerSettings, "go.signoz.io/signoz/pkg/alertmanager/legacyalertmanager") + settings := factory.NewScopedProviderSettings(providerSettings, "github.com/SigNoz/signoz/pkg/alertmanager/legacyalertmanager") configStore := sqlalertmanagerstore.NewConfigStore(sqlstore) return &provider{ diff --git a/pkg/alertmanager/service.go b/pkg/alertmanager/service.go index 3ddafb5e36e5..10d7fb244626 100644 --- a/pkg/alertmanager/service.go +++ b/pkg/alertmanager/service.go @@ -4,10 +4,10 @@ import ( "context" "sync" - "go.signoz.io/signoz/pkg/alertmanager/alertmanagerserver" - "go.signoz.io/signoz/pkg/errors" - "go.signoz.io/signoz/pkg/factory" - "go.signoz.io/signoz/pkg/types/alertmanagertypes" + "github.com/SigNoz/signoz/pkg/alertmanager/alertmanagerserver" + "github.com/SigNoz/signoz/pkg/errors" + "github.com/SigNoz/signoz/pkg/factory" + "github.com/SigNoz/signoz/pkg/types/alertmanagertypes" ) type Service struct { diff --git a/pkg/alertmanager/signozalertmanager/provider.go b/pkg/alertmanager/signozalertmanager/provider.go index 122a292a9797..1920733a1fbb 100644 --- a/pkg/alertmanager/signozalertmanager/provider.go +++ b/pkg/alertmanager/signozalertmanager/provider.go @@ -4,12 +4,12 @@ import ( "context" "time" - "go.signoz.io/signoz/pkg/alertmanager" - "go.signoz.io/signoz/pkg/alertmanager/alertmanagerstore/sqlalertmanagerstore" - "go.signoz.io/signoz/pkg/errors" - "go.signoz.io/signoz/pkg/factory" - "go.signoz.io/signoz/pkg/sqlstore" - "go.signoz.io/signoz/pkg/types/alertmanagertypes" + "github.com/SigNoz/signoz/pkg/alertmanager" + "github.com/SigNoz/signoz/pkg/alertmanager/alertmanagerstore/sqlalertmanagerstore" + "github.com/SigNoz/signoz/pkg/errors" + "github.com/SigNoz/signoz/pkg/factory" + "github.com/SigNoz/signoz/pkg/sqlstore" + "github.com/SigNoz/signoz/pkg/types/alertmanagertypes" ) type provider struct { @@ -28,7 +28,7 @@ func NewFactory(sqlstore sqlstore.SQLStore) factory.ProviderFactory[alertmanager } func New(ctx context.Context, providerSettings factory.ProviderSettings, config alertmanager.Config, sqlstore sqlstore.SQLStore) (*provider, error) { - settings := factory.NewScopedProviderSettings(providerSettings, "go.signoz.io/signoz/pkg/alertmanager/signozalertmanager") + settings := factory.NewScopedProviderSettings(providerSettings, "github.com/SigNoz/signoz/pkg/alertmanager/signozalertmanager") configStore := sqlalertmanagerstore.NewConfigStore(sqlstore) stateStore := sqlalertmanagerstore.NewStateStore(sqlstore) diff --git a/pkg/apiserver/config.go b/pkg/apiserver/config.go index e505c312c2df..e87d80924305 100644 --- a/pkg/apiserver/config.go +++ b/pkg/apiserver/config.go @@ -3,7 +3,7 @@ package apiserver import ( "time" - "go.signoz.io/signoz/pkg/factory" + "github.com/SigNoz/signoz/pkg/factory" ) // Config holds the configuration for config. diff --git a/pkg/apiserver/config_test.go b/pkg/apiserver/config_test.go index 373deaae282e..4c1320fb7d96 100644 --- a/pkg/apiserver/config_test.go +++ b/pkg/apiserver/config_test.go @@ -5,11 +5,11 @@ import ( "testing" "time" + "github.com/SigNoz/signoz/pkg/config" + "github.com/SigNoz/signoz/pkg/config/envprovider" + "github.com/SigNoz/signoz/pkg/factory" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.signoz.io/signoz/pkg/config" - "go.signoz.io/signoz/pkg/config/envprovider" - "go.signoz.io/signoz/pkg/factory" ) func TestNewWithEnvProvider(t *testing.T) { diff --git a/pkg/cache/config.go b/pkg/cache/config.go index ad80b6275a81..aec67ced0277 100644 --- a/pkg/cache/config.go +++ b/pkg/cache/config.go @@ -3,8 +3,8 @@ package cache import ( "time" + "github.com/SigNoz/signoz/pkg/factory" go_cache "github.com/patrickmn/go-cache" - "go.signoz.io/signoz/pkg/factory" ) type Memory struct { diff --git a/pkg/cache/memorycache/provider.go b/pkg/cache/memorycache/provider.go index ccc2bfd5bea4..9dc4ce085d6f 100644 --- a/pkg/cache/memorycache/provider.go +++ b/pkg/cache/memorycache/provider.go @@ -6,9 +6,9 @@ import ( "reflect" "time" + "github.com/SigNoz/signoz/pkg/cache" + "github.com/SigNoz/signoz/pkg/factory" go_cache "github.com/patrickmn/go-cache" - "go.signoz.io/signoz/pkg/cache" - "go.signoz.io/signoz/pkg/factory" ) type provider struct { diff --git a/pkg/cache/memorycache/provider_test.go b/pkg/cache/memorycache/provider_test.go index abc816c050ab..1d89f486b2f6 100644 --- a/pkg/cache/memorycache/provider_test.go +++ b/pkg/cache/memorycache/provider_test.go @@ -6,10 +6,10 @@ import ( "testing" "time" + "github.com/SigNoz/signoz/pkg/cache" + "github.com/SigNoz/signoz/pkg/factory/factorytest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.signoz.io/signoz/pkg/cache" - "go.signoz.io/signoz/pkg/factory/factorytest" ) // TestNew tests the New function diff --git a/pkg/cache/rediscache/provider.go b/pkg/cache/rediscache/provider.go index 171f08cf646a..a9bc249abf9a 100644 --- a/pkg/cache/rediscache/provider.go +++ b/pkg/cache/rediscache/provider.go @@ -6,9 +6,9 @@ import ( "fmt" "time" + "github.com/SigNoz/signoz/pkg/cache" + "github.com/SigNoz/signoz/pkg/factory" "github.com/go-redis/redis/v8" - "go.signoz.io/signoz/pkg/cache" - "go.signoz.io/signoz/pkg/factory" "go.uber.org/zap" ) diff --git a/pkg/cache/rediscache/provider_test.go b/pkg/cache/rediscache/provider_test.go index 6de4b5e46595..7fa70ef33172 100644 --- a/pkg/cache/rediscache/provider_test.go +++ b/pkg/cache/rediscache/provider_test.go @@ -6,9 +6,9 @@ import ( "testing" "time" + _cache "github.com/SigNoz/signoz/pkg/cache" "github.com/go-redis/redismock/v8" "github.com/stretchr/testify/assert" - _cache "go.signoz.io/signoz/pkg/cache" ) type CacheableEntity struct { diff --git a/pkg/config/config.go b/pkg/config/config.go index 1261816ba386..1d12d1213bdc 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -3,7 +3,7 @@ package config import ( "context" - "go.signoz.io/signoz/pkg/factory" + "github.com/SigNoz/signoz/pkg/factory" ) func New(ctx context.Context, resolverConfig ResolverConfig, configFactories []factory.ConfigFactory) (*Conf, error) { diff --git a/pkg/config/configtest/config.go b/pkg/config/configtest/config.go index 87f34c3426a3..7fa15a47a208 100644 --- a/pkg/config/configtest/config.go +++ b/pkg/config/configtest/config.go @@ -1,8 +1,8 @@ package configtest import ( - "go.signoz.io/signoz/pkg/config" - "go.signoz.io/signoz/pkg/config/envprovider" + "github.com/SigNoz/signoz/pkg/config" + "github.com/SigNoz/signoz/pkg/config/envprovider" ) func NewResolverConfig() config.ResolverConfig { diff --git a/pkg/config/envprovider/provider.go b/pkg/config/envprovider/provider.go index 3f6a591a505d..7a4bd1947c45 100644 --- a/pkg/config/envprovider/provider.go +++ b/pkg/config/envprovider/provider.go @@ -4,8 +4,8 @@ import ( "context" "strings" + "github.com/SigNoz/signoz/pkg/config" koanfenv "github.com/knadh/koanf/providers/env" - "go.signoz.io/signoz/pkg/config" ) const ( diff --git a/pkg/config/envprovider/provider_test.go b/pkg/config/envprovider/provider_test.go index 43a095e7dcfc..6cebb92bc54b 100644 --- a/pkg/config/envprovider/provider_test.go +++ b/pkg/config/envprovider/provider_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" + "github.com/SigNoz/signoz/pkg/config" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.signoz.io/signoz/pkg/config" ) func TestGetWithStrings(t *testing.T) { diff --git a/pkg/config/fileprovider/provider.go b/pkg/config/fileprovider/provider.go index fb184f9c5285..b8b8728d188a 100644 --- a/pkg/config/fileprovider/provider.go +++ b/pkg/config/fileprovider/provider.go @@ -3,9 +3,9 @@ package fileprovider import ( "context" + "github.com/SigNoz/signoz/pkg/config" koanfyaml "github.com/knadh/koanf/parsers/yaml" koanffile "github.com/knadh/koanf/providers/file" - "go.signoz.io/signoz/pkg/config" ) const ( diff --git a/pkg/config/fileprovider/provider_test.go b/pkg/config/fileprovider/provider_test.go index 647672c8eac6..a8db05bebbd2 100644 --- a/pkg/config/fileprovider/provider_test.go +++ b/pkg/config/fileprovider/provider_test.go @@ -5,9 +5,9 @@ import ( "path/filepath" "testing" + "github.com/SigNoz/signoz/pkg/config" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.signoz.io/signoz/pkg/config" ) func TestGetWithStrings(t *testing.T) { diff --git a/pkg/factory/factorytest/settings.go b/pkg/factory/factorytest/settings.go index ee1a61ff21eb..34074dbec4e2 100644 --- a/pkg/factory/factorytest/settings.go +++ b/pkg/factory/factorytest/settings.go @@ -1,8 +1,8 @@ package factorytest import ( - "go.signoz.io/signoz/pkg/factory" - "go.signoz.io/signoz/pkg/instrumentation/instrumentationtest" + "github.com/SigNoz/signoz/pkg/factory" + "github.com/SigNoz/signoz/pkg/instrumentation/instrumentationtest" ) func NewSettings() factory.ProviderSettings { diff --git a/pkg/http/middleware/analytics.go b/pkg/http/middleware/analytics.go index fcdc25d6b23d..dd0104459c0e 100644 --- a/pkg/http/middleware/analytics.go +++ b/pkg/http/middleware/analytics.go @@ -7,10 +7,10 @@ import ( "net/http" "regexp" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" + "github.com/SigNoz/signoz/pkg/query-service/telemetry" + "github.com/SigNoz/signoz/pkg/types/authtypes" "github.com/gorilla/mux" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" - "go.signoz.io/signoz/pkg/query-service/telemetry" - "go.signoz.io/signoz/pkg/types/authtypes" "go.uber.org/zap" ) diff --git a/pkg/http/middleware/auth.go b/pkg/http/middleware/auth.go index 5ee3ba7de470..a9626c4fa335 100644 --- a/pkg/http/middleware/auth.go +++ b/pkg/http/middleware/auth.go @@ -3,7 +3,7 @@ package middleware import ( "net/http" - "go.signoz.io/signoz/pkg/types/authtypes" + "github.com/SigNoz/signoz/pkg/types/authtypes" "go.uber.org/zap" ) diff --git a/pkg/http/middleware/logging.go b/pkg/http/middleware/logging.go index 9376f4805fd9..a9c666418ddd 100644 --- a/pkg/http/middleware/logging.go +++ b/pkg/http/middleware/logging.go @@ -9,10 +9,10 @@ import ( "strings" "time" + "github.com/SigNoz/signoz/pkg/query-service/common" + "github.com/SigNoz/signoz/pkg/types/authtypes" "github.com/gorilla/mux" semconv "go.opentelemetry.io/otel/semconv/v1.26.0" - "go.signoz.io/signoz/pkg/query-service/common" - "go.signoz.io/signoz/pkg/types/authtypes" "go.uber.org/zap" ) diff --git a/pkg/http/render/render.go b/pkg/http/render/render.go index 97206a6eb824..fc2cf44d7b51 100644 --- a/pkg/http/render/render.go +++ b/pkg/http/render/render.go @@ -3,8 +3,8 @@ package render import ( "net/http" + "github.com/SigNoz/signoz/pkg/errors" jsoniter "github.com/json-iterator/go" - "go.signoz.io/signoz/pkg/errors" ) var json = jsoniter.ConfigCompatibleWithStandardLibrary diff --git a/pkg/http/render/render_test.go b/pkg/http/render/render_test.go index 6017c2e711a5..5b6b28149ce1 100644 --- a/pkg/http/render/render_test.go +++ b/pkg/http/render/render_test.go @@ -8,9 +8,9 @@ import ( "net/http" "testing" + "github.com/SigNoz/signoz/pkg/errors" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.signoz.io/signoz/pkg/errors" ) func TestSuccess(t *testing.T) { diff --git a/pkg/http/server/server.go b/pkg/http/server/server.go index 50d268f24c5d..449eff28f82a 100644 --- a/pkg/http/server/server.go +++ b/pkg/http/server/server.go @@ -6,7 +6,7 @@ import ( "net/http" "time" - "go.signoz.io/signoz/pkg/factory" + "github.com/SigNoz/signoz/pkg/factory" "go.uber.org/zap" ) diff --git a/pkg/instrumentation/config.go b/pkg/instrumentation/config.go index bc1149ec88c3..6a7223441c22 100644 --- a/pkg/instrumentation/config.go +++ b/pkg/instrumentation/config.go @@ -3,8 +3,8 @@ package instrumentation import ( "log/slog" + "github.com/SigNoz/signoz/pkg/factory" contribsdkconfig "go.opentelemetry.io/contrib/config" - "go.signoz.io/signoz/pkg/factory" ) // Config holds the configuration for all instrumentation components. diff --git a/pkg/instrumentation/config_test.go b/pkg/instrumentation/config_test.go index b04b3cd2493f..52ac5acdef8a 100644 --- a/pkg/instrumentation/config_test.go +++ b/pkg/instrumentation/config_test.go @@ -5,11 +5,11 @@ import ( "log/slog" "testing" + "github.com/SigNoz/signoz/pkg/config" + "github.com/SigNoz/signoz/pkg/config/envprovider" + "github.com/SigNoz/signoz/pkg/factory" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.signoz.io/signoz/pkg/config" - "go.signoz.io/signoz/pkg/config/envprovider" - "go.signoz.io/signoz/pkg/factory" ) func TestNewWithEnvProvider(t *testing.T) { diff --git a/pkg/instrumentation/instrumentation.go b/pkg/instrumentation/instrumentation.go index 8bacc9dfa29a..c9ec2dbda6ef 100644 --- a/pkg/instrumentation/instrumentation.go +++ b/pkg/instrumentation/instrumentation.go @@ -3,11 +3,11 @@ package instrumentation import ( "log/slog" + "github.com/SigNoz/signoz/pkg/factory" "github.com/prometheus/client_golang/prometheus" sdkmetric "go.opentelemetry.io/otel/metric" sdkresource "go.opentelemetry.io/otel/sdk/resource" sdktrace "go.opentelemetry.io/otel/trace" - "go.signoz.io/signoz/pkg/factory" ) // Instrumentation provides the core components for application instrumentation. diff --git a/pkg/instrumentation/instrumentationtest/instrumentation.go b/pkg/instrumentation/instrumentationtest/instrumentation.go index c0bd5633876b..cd6625dd46b9 100644 --- a/pkg/instrumentation/instrumentationtest/instrumentation.go +++ b/pkg/instrumentation/instrumentationtest/instrumentation.go @@ -4,13 +4,13 @@ import ( "io" "log/slog" + "github.com/SigNoz/signoz/pkg/factory" + "github.com/SigNoz/signoz/pkg/instrumentation" "github.com/prometheus/client_golang/prometheus" sdkmetric "go.opentelemetry.io/otel/metric" noopmetric "go.opentelemetry.io/otel/metric/noop" sdktrace "go.opentelemetry.io/otel/trace" nooptrace "go.opentelemetry.io/otel/trace/noop" - "go.signoz.io/signoz/pkg/factory" - "go.signoz.io/signoz/pkg/instrumentation" ) type noopInstrumentation struct { diff --git a/pkg/instrumentation/logger.go b/pkg/instrumentation/logger.go index dd08f4bedcda..808e1e655704 100644 --- a/pkg/instrumentation/logger.go +++ b/pkg/instrumentation/logger.go @@ -4,7 +4,7 @@ import ( "log/slog" "os" - "go.signoz.io/signoz/pkg/instrumentation/loghandler" + "github.com/SigNoz/signoz/pkg/instrumentation/loghandler" ) func NewLogger(config Config, wrappers ...loghandler.Wrapper) *slog.Logger { diff --git a/pkg/instrumentation/sdk.go b/pkg/instrumentation/sdk.go index c31cf5796df7..766599563914 100644 --- a/pkg/instrumentation/sdk.go +++ b/pkg/instrumentation/sdk.go @@ -4,6 +4,8 @@ import ( "context" "log/slog" + "github.com/SigNoz/signoz/pkg/factory" + "github.com/SigNoz/signoz/pkg/version" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/collectors" contribsdkconfig "go.opentelemetry.io/contrib/config" @@ -11,8 +13,6 @@ import ( sdkresource "go.opentelemetry.io/otel/sdk/resource" semconv "go.opentelemetry.io/otel/semconv/v1.26.0" sdktrace "go.opentelemetry.io/otel/trace" - "go.signoz.io/signoz/pkg/factory" - "go.signoz.io/signoz/pkg/version" ) var _ factory.Service = (*SDK)(nil) diff --git a/pkg/query-service/.goreleaser.yaml b/pkg/query-service/.goreleaser.yaml index e47c62eb868d..d4f5ffa04a1f 100644 --- a/pkg/query-service/.goreleaser.yaml +++ b/pkg/query-service/.goreleaser.yaml @@ -33,10 +33,10 @@ builds: - -X github.com/SigNoz/signoz/pkg/query-service/version.version={{ .Version }} - -X main.commit={{ .Commit }} -X main.date={{ .CommitDate }} - -X main.builtBy=goreleaser - - -X go.signoz.io/signoz/pkg/query-service/version.buildVersion={{ .Version }} - - -X go.signoz.io/signoz/pkg/query-service/version.buildHash={{ .ShortCommit }} - - -X go.signoz.io/signoz/pkg/query-service/version.buildTime={{ .Date }} - - -X go.signoz.io/signoz/pkg/query-service/version.gitBranch={{ .Branch }} + - -X github.com/SigNoz/signoz/pkg/query-service/version.buildVersion={{ .Version }} + - -X github.com/SigNoz/signoz/pkg/query-service/version.buildHash={{ .ShortCommit }} + - -X github.com/SigNoz/signoz/pkg/query-service/version.buildTime={{ .Date }} + - -X github.com/SigNoz/signoz/pkg/query-service/version.gitBranch={{ .Branch }} - >- {{- if eq .Os "linux" }}-linkmode external -extldflags '-static'{{- end }} mod_timestamp: "{{ .CommitTimestamp }}" diff --git a/pkg/query-service/agentConf/agent_features.go b/pkg/query-service/agentConf/agent_features.go index f10d4fbf66c5..c0e615a88dd1 100644 --- a/pkg/query-service/agentConf/agent_features.go +++ b/pkg/query-service/agentConf/agent_features.go @@ -1,6 +1,6 @@ package agentConf -import "go.signoz.io/signoz/pkg/query-service/model" +import "github.com/SigNoz/signoz/pkg/query-service/model" // Interface for features implemented via agent config. // Eg: ingestion side signal pre-processing features like log processing pipelines etc diff --git a/pkg/query-service/agentConf/db.go b/pkg/query-service/agentConf/db.go index 848de7578047..9f02672598c8 100644 --- a/pkg/query-service/agentConf/db.go +++ b/pkg/query-service/agentConf/db.go @@ -5,10 +5,10 @@ import ( "database/sql" "fmt" + "github.com/SigNoz/signoz/pkg/query-service/model" "github.com/google/uuid" "github.com/jmoiron/sqlx" "github.com/pkg/errors" - "go.signoz.io/signoz/pkg/query-service/model" "go.uber.org/zap" "golang.org/x/exp/slices" ) diff --git a/pkg/query-service/agentConf/manager.go b/pkg/query-service/agentConf/manager.go index 61fd70ab901e..8a9da7741fe6 100644 --- a/pkg/query-service/agentConf/manager.go +++ b/pkg/query-service/agentConf/manager.go @@ -8,13 +8,13 @@ import ( "sync" "sync/atomic" + "github.com/SigNoz/signoz/pkg/query-service/app/opamp" + filterprocessor "github.com/SigNoz/signoz/pkg/query-service/app/opamp/otelconfig/filterprocessor" + tsp "github.com/SigNoz/signoz/pkg/query-service/app/opamp/otelconfig/tailsampler" + "github.com/SigNoz/signoz/pkg/query-service/model" "github.com/google/uuid" "github.com/jmoiron/sqlx" "github.com/pkg/errors" - "go.signoz.io/signoz/pkg/query-service/app/opamp" - filterprocessor "go.signoz.io/signoz/pkg/query-service/app/opamp/otelconfig/filterprocessor" - tsp "go.signoz.io/signoz/pkg/query-service/app/opamp/otelconfig/tailsampler" - "go.signoz.io/signoz/pkg/query-service/model" "go.uber.org/zap" yaml "gopkg.in/yaml.v3" ) diff --git a/pkg/query-service/app/apdex.go b/pkg/query-service/app/apdex.go index df6f03ccde13..a3e99e174411 100644 --- a/pkg/query-service/app/apdex.go +++ b/pkg/query-service/app/apdex.go @@ -5,9 +5,9 @@ import ( "net/http" "strings" - "go.signoz.io/signoz/pkg/query-service/dao" - "go.signoz.io/signoz/pkg/query-service/model" - "go.signoz.io/signoz/pkg/types/authtypes" + "github.com/SigNoz/signoz/pkg/query-service/dao" + "github.com/SigNoz/signoz/pkg/query-service/model" + "github.com/SigNoz/signoz/pkg/types/authtypes" ) func (aH *APIHandler) setApdexSettings(w http.ResponseWriter, r *http.Request) { diff --git a/pkg/query-service/app/auth.go b/pkg/query-service/app/auth.go index 30ac833ee583..196cf6560987 100644 --- a/pkg/query-service/app/auth.go +++ b/pkg/query-service/app/auth.go @@ -5,11 +5,11 @@ import ( "errors" "net/http" + "github.com/SigNoz/signoz/pkg/query-service/auth" + "github.com/SigNoz/signoz/pkg/query-service/constants" + "github.com/SigNoz/signoz/pkg/query-service/model" + "github.com/SigNoz/signoz/pkg/types" "github.com/gorilla/mux" - "go.signoz.io/signoz/pkg/query-service/auth" - "go.signoz.io/signoz/pkg/query-service/constants" - "go.signoz.io/signoz/pkg/query-service/model" - "go.signoz.io/signoz/pkg/types" ) type AuthMiddleware struct { diff --git a/pkg/query-service/app/clickhouseReader/filter_suggestions.go b/pkg/query-service/app/clickhouseReader/filter_suggestions.go index eeda450050ff..248d08553621 100644 --- a/pkg/query-service/app/clickhouseReader/filter_suggestions.go +++ b/pkg/query-service/app/clickhouseReader/filter_suggestions.go @@ -9,8 +9,8 @@ import ( "strings" "github.com/SigNoz/signoz-otel-collector/utils/fingerprint" - "go.signoz.io/signoz/pkg/query-service/model" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" + "github.com/SigNoz/signoz/pkg/query-service/model" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" "go.uber.org/zap" ) diff --git a/pkg/query-service/app/clickhouseReader/query_progress/inmemory_tracker.go b/pkg/query-service/app/clickhouseReader/query_progress/inmemory_tracker.go index fcefe4cd7c24..b99c2070af3d 100644 --- a/pkg/query-service/app/clickhouseReader/query_progress/inmemory_tracker.go +++ b/pkg/query-service/app/clickhouseReader/query_progress/inmemory_tracker.go @@ -5,8 +5,8 @@ import ( "sync" "github.com/ClickHouse/clickhouse-go/v2" + "github.com/SigNoz/signoz/pkg/query-service/model" "github.com/google/uuid" - "go.signoz.io/signoz/pkg/query-service/model" "go.uber.org/zap" "golang.org/x/exp/maps" ) diff --git a/pkg/query-service/app/clickhouseReader/query_progress/tracker.go b/pkg/query-service/app/clickhouseReader/query_progress/tracker.go index c783dfbd5b3c..8c4fa3695abb 100644 --- a/pkg/query-service/app/clickhouseReader/query_progress/tracker.go +++ b/pkg/query-service/app/clickhouseReader/query_progress/tracker.go @@ -2,7 +2,7 @@ package queryprogress import ( "github.com/ClickHouse/clickhouse-go/v2" - "go.signoz.io/signoz/pkg/query-service/model" + "github.com/SigNoz/signoz/pkg/query-service/model" ) type QueryProgressTracker interface { diff --git a/pkg/query-service/app/clickhouseReader/query_progress/tracker_test.go b/pkg/query-service/app/clickhouseReader/query_progress/tracker_test.go index 9a51cd0fe639..169151bfa797 100644 --- a/pkg/query-service/app/clickhouseReader/query_progress/tracker_test.go +++ b/pkg/query-service/app/clickhouseReader/query_progress/tracker_test.go @@ -5,8 +5,8 @@ import ( "time" "github.com/ClickHouse/clickhouse-go/v2" + "github.com/SigNoz/signoz/pkg/query-service/model" "github.com/stretchr/testify/require" - "go.signoz.io/signoz/pkg/query-service/model" ) func TestQueryProgressTracking(t *testing.T) { diff --git a/pkg/query-service/app/clickhouseReader/reader.go b/pkg/query-service/app/clickhouseReader/reader.go index e253a3c44fc3..afbfaf63cec6 100644 --- a/pkg/query-service/app/clickhouseReader/reader.go +++ b/pkg/query-service/app/clickhouseReader/reader.go @@ -16,7 +16,7 @@ import ( "sync" "time" - "go.signoz.io/signoz/pkg/query-service/model/metrics_explorer" + "github.com/SigNoz/signoz/pkg/query-service/model/metrics_explorer" "github.com/go-kit/log" "github.com/go-kit/log/level" @@ -34,27 +34,27 @@ import ( "github.com/ClickHouse/clickhouse-go/v2" "github.com/ClickHouse/clickhouse-go/v2/lib/driver" + "github.com/SigNoz/signoz/pkg/cache" + "github.com/SigNoz/signoz/pkg/types/authtypes" "github.com/jmoiron/sqlx" - "go.signoz.io/signoz/pkg/cache" - "go.signoz.io/signoz/pkg/types/authtypes" promModel "github.com/prometheus/common/model" "go.uber.org/zap" - queryprogress "go.signoz.io/signoz/pkg/query-service/app/clickhouseReader/query_progress" - "go.signoz.io/signoz/pkg/query-service/app/logs" - "go.signoz.io/signoz/pkg/query-service/app/resource" - "go.signoz.io/signoz/pkg/query-service/app/services" - "go.signoz.io/signoz/pkg/query-service/app/traces/tracedetail" - "go.signoz.io/signoz/pkg/query-service/common" - "go.signoz.io/signoz/pkg/query-service/constants" - chErrors "go.signoz.io/signoz/pkg/query-service/errors" - "go.signoz.io/signoz/pkg/query-service/interfaces" - "go.signoz.io/signoz/pkg/query-service/metrics" - "go.signoz.io/signoz/pkg/query-service/model" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" - "go.signoz.io/signoz/pkg/query-service/telemetry" - "go.signoz.io/signoz/pkg/query-service/utils" + queryprogress "github.com/SigNoz/signoz/pkg/query-service/app/clickhouseReader/query_progress" + "github.com/SigNoz/signoz/pkg/query-service/app/logs" + "github.com/SigNoz/signoz/pkg/query-service/app/resource" + "github.com/SigNoz/signoz/pkg/query-service/app/services" + "github.com/SigNoz/signoz/pkg/query-service/app/traces/tracedetail" + "github.com/SigNoz/signoz/pkg/query-service/common" + "github.com/SigNoz/signoz/pkg/query-service/constants" + chErrors "github.com/SigNoz/signoz/pkg/query-service/errors" + "github.com/SigNoz/signoz/pkg/query-service/interfaces" + "github.com/SigNoz/signoz/pkg/query-service/metrics" + "github.com/SigNoz/signoz/pkg/query-service/model" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" + "github.com/SigNoz/signoz/pkg/query-service/telemetry" + "github.com/SigNoz/signoz/pkg/query-service/utils" ) const ( @@ -1143,7 +1143,7 @@ func (r *ClickHouseReader) GetUsage(ctx context.Context, queryParams *model.GetU func (r *ClickHouseReader) SearchTracesV2(ctx context.Context, params *model.SearchTracesParams, smartTraceAlgorithm func(payload []model.SearchSpanResponseItem, targetSpanId string, - levelUp int, levelDown int, spanLimit int) ([]model.SearchSpansResult, error)) (*[]model.SearchSpansResult, error) { + levelUp int, levelDown int, spanLimit int) ([]model.SearchSpansResult, error)) (*[]model.SearchSpansResult, error) { searchSpansResult := []model.SearchSpansResult{ { Columns: []string{"__time", "SpanId", "TraceId", "ServiceName", "Name", "Kind", "DurationNano", "TagsKeys", "TagsValues", "References", "Events", "HasError", "StatusMessage", "StatusCodeString", "SpanKind"}, @@ -1291,7 +1291,7 @@ func (r *ClickHouseReader) SearchTracesV2(ctx context.Context, params *model.Sea func (r *ClickHouseReader) SearchTraces(ctx context.Context, params *model.SearchTracesParams, smartTraceAlgorithm func(payload []model.SearchSpanResponseItem, targetSpanId string, - levelUp int, levelDown int, spanLimit int) ([]model.SearchSpansResult, error)) (*[]model.SearchSpansResult, error) { + levelUp int, levelDown int, spanLimit int) ([]model.SearchSpansResult, error)) (*[]model.SearchSpansResult, error) { if r.useTraceNewSchema { return r.SearchTracesV2(ctx, params, smartTraceAlgorithm) diff --git a/pkg/query-service/app/cloudintegrations/accountsRepo.go b/pkg/query-service/app/cloudintegrations/accountsRepo.go index 3e6882c9cb14..905254abf078 100644 --- a/pkg/query-service/app/cloudintegrations/accountsRepo.go +++ b/pkg/query-service/app/cloudintegrations/accountsRepo.go @@ -7,9 +7,9 @@ import ( "strings" "time" + "github.com/SigNoz/signoz/pkg/query-service/model" "github.com/google/uuid" "github.com/jmoiron/sqlx" - "go.signoz.io/signoz/pkg/query-service/model" ) type cloudProviderAccountsRepository interface { diff --git a/pkg/query-service/app/cloudintegrations/availableServices.go b/pkg/query-service/app/cloudintegrations/availableServices.go index bf2262e7f88a..5edd2e3f8397 100644 --- a/pkg/query-service/app/cloudintegrations/availableServices.go +++ b/pkg/query-service/app/cloudintegrations/availableServices.go @@ -9,9 +9,9 @@ import ( "path" "sort" + "github.com/SigNoz/signoz/pkg/query-service/app/integrations" + "github.com/SigNoz/signoz/pkg/query-service/model" koanfJson "github.com/knadh/koanf/parsers/json" - "go.signoz.io/signoz/pkg/query-service/app/integrations" - "go.signoz.io/signoz/pkg/query-service/model" "golang.org/x/exp/maps" ) diff --git a/pkg/query-service/app/cloudintegrations/availableServices_test.go b/pkg/query-service/app/cloudintegrations/availableServices_test.go index cdc222463a89..96e915f158d4 100644 --- a/pkg/query-service/app/cloudintegrations/availableServices_test.go +++ b/pkg/query-service/app/cloudintegrations/availableServices_test.go @@ -3,8 +3,8 @@ package cloudintegrations import ( "testing" + "github.com/SigNoz/signoz/pkg/query-service/model" "github.com/stretchr/testify/require" - "go.signoz.io/signoz/pkg/query-service/model" ) func TestAvailableServices(t *testing.T) { diff --git a/pkg/query-service/app/cloudintegrations/controller.go b/pkg/query-service/app/cloudintegrations/controller.go index c26af1d79d7e..d91a47bb0e75 100644 --- a/pkg/query-service/app/cloudintegrations/controller.go +++ b/pkg/query-service/app/cloudintegrations/controller.go @@ -8,9 +8,9 @@ import ( "strings" "time" - "go.signoz.io/signoz/pkg/query-service/model" - "go.signoz.io/signoz/pkg/sqlstore" - "go.signoz.io/signoz/pkg/types" + "github.com/SigNoz/signoz/pkg/query-service/model" + "github.com/SigNoz/signoz/pkg/sqlstore" + "github.com/SigNoz/signoz/pkg/types" "golang.org/x/exp/maps" ) diff --git a/pkg/query-service/app/cloudintegrations/controller_test.go b/pkg/query-service/app/cloudintegrations/controller_test.go index 8bf4e7368087..05c6dac2873e 100644 --- a/pkg/query-service/app/cloudintegrations/controller_test.go +++ b/pkg/query-service/app/cloudintegrations/controller_test.go @@ -4,10 +4,10 @@ import ( "context" "testing" + "github.com/SigNoz/signoz/pkg/query-service/model" + "github.com/SigNoz/signoz/pkg/query-service/utils" "github.com/google/uuid" "github.com/stretchr/testify/require" - "go.signoz.io/signoz/pkg/query-service/model" - "go.signoz.io/signoz/pkg/query-service/utils" ) func TestRegenerateConnectionUrlWithUpdatedConfig(t *testing.T) { diff --git a/pkg/query-service/app/cloudintegrations/model.go b/pkg/query-service/app/cloudintegrations/model.go index 63c33a274f98..8dc83f2e9f1a 100644 --- a/pkg/query-service/app/cloudintegrations/model.go +++ b/pkg/query-service/app/cloudintegrations/model.go @@ -6,7 +6,7 @@ import ( "fmt" "time" - "go.signoz.io/signoz/pkg/types" + "github.com/SigNoz/signoz/pkg/types" ) // Represents a cloud provider account for cloud integrations diff --git a/pkg/query-service/app/cloudintegrations/serviceConfigRepo.go b/pkg/query-service/app/cloudintegrations/serviceConfigRepo.go index c746c8eaa495..e3d4ac634afc 100644 --- a/pkg/query-service/app/cloudintegrations/serviceConfigRepo.go +++ b/pkg/query-service/app/cloudintegrations/serviceConfigRepo.go @@ -5,8 +5,8 @@ import ( "database/sql" "fmt" + "github.com/SigNoz/signoz/pkg/query-service/model" "github.com/jmoiron/sqlx" - "go.signoz.io/signoz/pkg/query-service/model" ) type serviceConfigRepository interface { diff --git a/pkg/query-service/app/dashboards/model.go b/pkg/query-service/app/dashboards/model.go index 60798cea49d5..c90eb0690e83 100644 --- a/pkg/query-service/app/dashboards/model.go +++ b/pkg/query-service/app/dashboards/model.go @@ -9,13 +9,13 @@ import ( "strings" "time" + "github.com/SigNoz/signoz/pkg/query-service/interfaces" + "github.com/SigNoz/signoz/pkg/query-service/model" + "github.com/SigNoz/signoz/pkg/types" "github.com/google/uuid" "github.com/uptrace/bun" - "go.signoz.io/signoz/pkg/query-service/interfaces" - "go.signoz.io/signoz/pkg/query-service/model" - "go.signoz.io/signoz/pkg/types" - "go.signoz.io/signoz/pkg/query-service/telemetry" + "github.com/SigNoz/signoz/pkg/query-service/telemetry" "go.uber.org/zap" ) diff --git a/pkg/query-service/app/explorer/db.go b/pkg/query-service/app/explorer/db.go index 7320e799e7b4..c397034059c8 100644 --- a/pkg/query-service/app/explorer/db.go +++ b/pkg/query-service/app/explorer/db.go @@ -8,13 +8,13 @@ import ( "strings" "time" + "github.com/SigNoz/signoz/pkg/query-service/model" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" + "github.com/SigNoz/signoz/pkg/query-service/telemetry" + "github.com/SigNoz/signoz/pkg/types" + "github.com/SigNoz/signoz/pkg/types/authtypes" "github.com/google/uuid" "github.com/uptrace/bun" - "go.signoz.io/signoz/pkg/query-service/model" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" - "go.signoz.io/signoz/pkg/query-service/telemetry" - "go.signoz.io/signoz/pkg/types" - "go.signoz.io/signoz/pkg/types/authtypes" "go.uber.org/zap" ) diff --git a/pkg/query-service/app/http_handler.go b/pkg/query-service/app/http_handler.go index d4a2f6935d5d..ab746c3ccbee 100644 --- a/pkg/query-service/app/http_handler.go +++ b/pkg/query-service/app/http_handler.go @@ -18,11 +18,11 @@ import ( "text/template" "time" - "go.signoz.io/signoz/pkg/alertmanager" - errorsV2 "go.signoz.io/signoz/pkg/errors" - "go.signoz.io/signoz/pkg/http/render" - "go.signoz.io/signoz/pkg/query-service/app/metricsexplorer" - "go.signoz.io/signoz/pkg/signoz" + "github.com/SigNoz/signoz/pkg/alertmanager" + errorsV2 "github.com/SigNoz/signoz/pkg/errors" + "github.com/SigNoz/signoz/pkg/http/render" + "github.com/SigNoz/signoz/pkg/query-service/app/metricsexplorer" + "github.com/SigNoz/signoz/pkg/signoz" "github.com/gorilla/mux" "github.com/gorilla/websocket" @@ -30,44 +30,44 @@ import ( _ "github.com/mattn/go-sqlite3" "github.com/prometheus/prometheus/promql" - "go.signoz.io/signoz/pkg/query-service/agentConf" - "go.signoz.io/signoz/pkg/query-service/app/cloudintegrations" - "go.signoz.io/signoz/pkg/query-service/app/dashboards" - "go.signoz.io/signoz/pkg/query-service/app/explorer" - "go.signoz.io/signoz/pkg/query-service/app/inframetrics" - "go.signoz.io/signoz/pkg/query-service/app/integrations" - queues2 "go.signoz.io/signoz/pkg/query-service/app/integrations/messagingQueues/queues" - "go.signoz.io/signoz/pkg/query-service/app/integrations/thirdPartyApi" - "go.signoz.io/signoz/pkg/query-service/app/logs" - logsv3 "go.signoz.io/signoz/pkg/query-service/app/logs/v3" - logsv4 "go.signoz.io/signoz/pkg/query-service/app/logs/v4" - "go.signoz.io/signoz/pkg/query-service/app/metrics" - metricsv3 "go.signoz.io/signoz/pkg/query-service/app/metrics/v3" - "go.signoz.io/signoz/pkg/query-service/app/preferences" - "go.signoz.io/signoz/pkg/query-service/app/querier" - querierV2 "go.signoz.io/signoz/pkg/query-service/app/querier/v2" - "go.signoz.io/signoz/pkg/query-service/app/queryBuilder" - tracesV3 "go.signoz.io/signoz/pkg/query-service/app/traces/v3" - tracesV4 "go.signoz.io/signoz/pkg/query-service/app/traces/v4" - "go.signoz.io/signoz/pkg/query-service/auth" - "go.signoz.io/signoz/pkg/query-service/cache" - "go.signoz.io/signoz/pkg/query-service/constants" - "go.signoz.io/signoz/pkg/query-service/contextlinks" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" - "go.signoz.io/signoz/pkg/query-service/postprocess" - "go.signoz.io/signoz/pkg/types" - "go.signoz.io/signoz/pkg/types/authtypes" + "github.com/SigNoz/signoz/pkg/query-service/agentConf" + "github.com/SigNoz/signoz/pkg/query-service/app/cloudintegrations" + "github.com/SigNoz/signoz/pkg/query-service/app/dashboards" + "github.com/SigNoz/signoz/pkg/query-service/app/explorer" + "github.com/SigNoz/signoz/pkg/query-service/app/inframetrics" + "github.com/SigNoz/signoz/pkg/query-service/app/integrations" + queues2 "github.com/SigNoz/signoz/pkg/query-service/app/integrations/messagingQueues/queues" + "github.com/SigNoz/signoz/pkg/query-service/app/integrations/thirdPartyApi" + "github.com/SigNoz/signoz/pkg/query-service/app/logs" + logsv3 "github.com/SigNoz/signoz/pkg/query-service/app/logs/v3" + logsv4 "github.com/SigNoz/signoz/pkg/query-service/app/logs/v4" + "github.com/SigNoz/signoz/pkg/query-service/app/metrics" + metricsv3 "github.com/SigNoz/signoz/pkg/query-service/app/metrics/v3" + "github.com/SigNoz/signoz/pkg/query-service/app/preferences" + "github.com/SigNoz/signoz/pkg/query-service/app/querier" + querierV2 "github.com/SigNoz/signoz/pkg/query-service/app/querier/v2" + "github.com/SigNoz/signoz/pkg/query-service/app/queryBuilder" + tracesV3 "github.com/SigNoz/signoz/pkg/query-service/app/traces/v3" + tracesV4 "github.com/SigNoz/signoz/pkg/query-service/app/traces/v4" + "github.com/SigNoz/signoz/pkg/query-service/auth" + "github.com/SigNoz/signoz/pkg/query-service/cache" + "github.com/SigNoz/signoz/pkg/query-service/constants" + "github.com/SigNoz/signoz/pkg/query-service/contextlinks" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" + "github.com/SigNoz/signoz/pkg/query-service/postprocess" + "github.com/SigNoz/signoz/pkg/types" + "github.com/SigNoz/signoz/pkg/types/authtypes" "go.uber.org/zap" - "go.signoz.io/signoz/pkg/query-service/app/integrations/messagingQueues/kafka" - "go.signoz.io/signoz/pkg/query-service/app/logparsingpipeline" - "go.signoz.io/signoz/pkg/query-service/dao" - "go.signoz.io/signoz/pkg/query-service/interfaces" - "go.signoz.io/signoz/pkg/query-service/model" - "go.signoz.io/signoz/pkg/query-service/rules" - "go.signoz.io/signoz/pkg/query-service/telemetry" - "go.signoz.io/signoz/pkg/query-service/version" + "github.com/SigNoz/signoz/pkg/query-service/app/integrations/messagingQueues/kafka" + "github.com/SigNoz/signoz/pkg/query-service/app/logparsingpipeline" + "github.com/SigNoz/signoz/pkg/query-service/dao" + "github.com/SigNoz/signoz/pkg/query-service/interfaces" + "github.com/SigNoz/signoz/pkg/query-service/model" + "github.com/SigNoz/signoz/pkg/query-service/rules" + "github.com/SigNoz/signoz/pkg/query-service/telemetry" + "github.com/SigNoz/signoz/pkg/query-service/version" ) type status string @@ -296,7 +296,7 @@ func NewAPIHandler(opts APIHandlerOpts) (*APIHandler, error) { return aH, nil } -// todo(remove): Implemented at render package (go.signoz.io/signoz/pkg/http/render) with the new error structure +// todo(remove): Implemented at render package (github.com/SigNoz/signoz/pkg/http/render) with the new error structure type structuredResponse struct { Data interface{} `json:"data"` Total int `json:"total"` @@ -305,13 +305,13 @@ type structuredResponse struct { Errors []structuredError `json:"errors"` } -// todo(remove): Implemented at render package (go.signoz.io/signoz/pkg/http/render) with the new error structure +// todo(remove): Implemented at render package (github.com/SigNoz/signoz/pkg/http/render) with the new error structure type structuredError struct { Code int `json:"code,omitempty"` Msg string `json:"msg"` } -// todo(remove): Implemented at render package (go.signoz.io/signoz/pkg/http/render) with the new error structure +// todo(remove): Implemented at render package (github.com/SigNoz/signoz/pkg/http/render) with the new error structure type ApiResponse struct { Status status `json:"status"` Data interface{} `json:"data,omitempty"` @@ -319,7 +319,7 @@ type ApiResponse struct { Error string `json:"error,omitempty"` } -// todo(remove): Implemented at render package (go.signoz.io/signoz/pkg/http/render) with the new error structure +// todo(remove): Implemented at render package (github.com/SigNoz/signoz/pkg/http/render) with the new error structure func RespondError(w http.ResponseWriter, apiErr model.BaseApiError, data interface{}) { json := jsoniter.ConfigCompatibleWithStandardLibrary b, err := json.Marshal(&ApiResponse{ @@ -365,7 +365,7 @@ func RespondError(w http.ResponseWriter, apiErr model.BaseApiError, data interfa } } -// todo(remove): Implemented at render package (go.signoz.io/signoz/pkg/http/render) with the new error structure +// todo(remove): Implemented at render package (github.com/SigNoz/signoz/pkg/http/render) with the new error structure func writeHttpResponse(w http.ResponseWriter, data interface{}) { json := jsoniter.ConfigCompatibleWithStandardLibrary b, err := json.Marshal(&ApiResponse{ @@ -482,7 +482,7 @@ func (aH *APIHandler) RegisterQueryRangeV4Routes(router *mux.Router, am *AuthMid subRouter.HandleFunc("/metric/metric_metadata", am.ViewAccess(aH.getMetricMetadata)).Methods(http.MethodGet) } -// todo(remove): Implemented at render package (go.signoz.io/signoz/pkg/http/render) with the new error structure +// todo(remove): Implemented at render package (github.com/SigNoz/signoz/pkg/http/render) with the new error structure func (aH *APIHandler) Respond(w http.ResponseWriter, data interface{}) { writeHttpResponse(w, data) } diff --git a/pkg/query-service/app/http_handler_test.go b/pkg/query-service/app/http_handler_test.go index 6993d37168d2..ee25a56fc636 100644 --- a/pkg/query-service/app/http_handler_test.go +++ b/pkg/query-service/app/http_handler_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "go.signoz.io/signoz/pkg/query-service/model" + "github.com/SigNoz/signoz/pkg/query-service/model" ) func TestPrepareQuery(t *testing.T) { diff --git a/pkg/query-service/app/infra.go b/pkg/query-service/app/infra.go index eb32af3e083a..2a19f5ae8cd4 100644 --- a/pkg/query-service/app/infra.go +++ b/pkg/query-service/app/infra.go @@ -4,7 +4,7 @@ import ( "encoding/json" "net/http" - "go.signoz.io/signoz/pkg/query-service/model" + "github.com/SigNoz/signoz/pkg/query-service/model" ) func (aH *APIHandler) getHostAttributeKeys(w http.ResponseWriter, r *http.Request) { diff --git a/pkg/query-service/app/inframetrics/clusters.go b/pkg/query-service/app/inframetrics/clusters.go index af1e098856a1..9c6479188de2 100644 --- a/pkg/query-service/app/inframetrics/clusters.go +++ b/pkg/query-service/app/inframetrics/clusters.go @@ -5,12 +5,12 @@ import ( "math" "sort" - "go.signoz.io/signoz/pkg/query-service/app/metrics/v4/helpers" - "go.signoz.io/signoz/pkg/query-service/common" - "go.signoz.io/signoz/pkg/query-service/interfaces" - "go.signoz.io/signoz/pkg/query-service/model" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" - "go.signoz.io/signoz/pkg/query-service/postprocess" + "github.com/SigNoz/signoz/pkg/query-service/app/metrics/v4/helpers" + "github.com/SigNoz/signoz/pkg/query-service/common" + "github.com/SigNoz/signoz/pkg/query-service/interfaces" + "github.com/SigNoz/signoz/pkg/query-service/model" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" + "github.com/SigNoz/signoz/pkg/query-service/postprocess" "golang.org/x/exp/slices" ) diff --git a/pkg/query-service/app/inframetrics/common.go b/pkg/query-service/app/inframetrics/common.go index d2012ef2a567..8f7a6bab4b66 100644 --- a/pkg/query-service/app/inframetrics/common.go +++ b/pkg/query-service/app/inframetrics/common.go @@ -4,8 +4,8 @@ import ( "strings" "time" - "go.signoz.io/signoz/pkg/query-service/constants" - "go.signoz.io/signoz/pkg/query-service/model" + "github.com/SigNoz/signoz/pkg/query-service/constants" + "github.com/SigNoz/signoz/pkg/query-service/model" ) var ( diff --git a/pkg/query-service/app/inframetrics/daemonsets.go b/pkg/query-service/app/inframetrics/daemonsets.go index c4db9b20841d..1d4f2893c3fc 100644 --- a/pkg/query-service/app/inframetrics/daemonsets.go +++ b/pkg/query-service/app/inframetrics/daemonsets.go @@ -5,12 +5,12 @@ import ( "math" "sort" - "go.signoz.io/signoz/pkg/query-service/app/metrics/v4/helpers" - "go.signoz.io/signoz/pkg/query-service/common" - "go.signoz.io/signoz/pkg/query-service/interfaces" - "go.signoz.io/signoz/pkg/query-service/model" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" - "go.signoz.io/signoz/pkg/query-service/postprocess" + "github.com/SigNoz/signoz/pkg/query-service/app/metrics/v4/helpers" + "github.com/SigNoz/signoz/pkg/query-service/common" + "github.com/SigNoz/signoz/pkg/query-service/interfaces" + "github.com/SigNoz/signoz/pkg/query-service/model" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" + "github.com/SigNoz/signoz/pkg/query-service/postprocess" "golang.org/x/exp/slices" ) diff --git a/pkg/query-service/app/inframetrics/deployments.go b/pkg/query-service/app/inframetrics/deployments.go index 346a186f4690..88fe62bcde86 100644 --- a/pkg/query-service/app/inframetrics/deployments.go +++ b/pkg/query-service/app/inframetrics/deployments.go @@ -5,12 +5,12 @@ import ( "math" "sort" - "go.signoz.io/signoz/pkg/query-service/app/metrics/v4/helpers" - "go.signoz.io/signoz/pkg/query-service/common" - "go.signoz.io/signoz/pkg/query-service/interfaces" - "go.signoz.io/signoz/pkg/query-service/model" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" - "go.signoz.io/signoz/pkg/query-service/postprocess" + "github.com/SigNoz/signoz/pkg/query-service/app/metrics/v4/helpers" + "github.com/SigNoz/signoz/pkg/query-service/common" + "github.com/SigNoz/signoz/pkg/query-service/interfaces" + "github.com/SigNoz/signoz/pkg/query-service/model" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" + "github.com/SigNoz/signoz/pkg/query-service/postprocess" "golang.org/x/exp/slices" ) diff --git a/pkg/query-service/app/inframetrics/hosts.go b/pkg/query-service/app/inframetrics/hosts.go index 39a5ea283067..7a080cfd3bf6 100644 --- a/pkg/query-service/app/inframetrics/hosts.go +++ b/pkg/query-service/app/inframetrics/hosts.go @@ -9,13 +9,13 @@ import ( "strings" "time" - "go.signoz.io/signoz/pkg/query-service/app/metrics/v4/helpers" - "go.signoz.io/signoz/pkg/query-service/common" - "go.signoz.io/signoz/pkg/query-service/constants" - "go.signoz.io/signoz/pkg/query-service/interfaces" - "go.signoz.io/signoz/pkg/query-service/model" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" - "go.signoz.io/signoz/pkg/query-service/postprocess" + "github.com/SigNoz/signoz/pkg/query-service/app/metrics/v4/helpers" + "github.com/SigNoz/signoz/pkg/query-service/common" + "github.com/SigNoz/signoz/pkg/query-service/constants" + "github.com/SigNoz/signoz/pkg/query-service/interfaces" + "github.com/SigNoz/signoz/pkg/query-service/model" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" + "github.com/SigNoz/signoz/pkg/query-service/postprocess" "go.uber.org/zap" "golang.org/x/exp/maps" "golang.org/x/exp/slices" diff --git a/pkg/query-service/app/inframetrics/hosts_query.go b/pkg/query-service/app/inframetrics/hosts_query.go index dff79631278a..1fbb1863410c 100644 --- a/pkg/query-service/app/inframetrics/hosts_query.go +++ b/pkg/query-service/app/inframetrics/hosts_query.go @@ -1,6 +1,6 @@ package inframetrics -import v3 "go.signoz.io/signoz/pkg/query-service/model/v3" +import v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" var HostsTableListQuery = v3.QueryRangeParamsV3{ CompositeQuery: &v3.CompositeQuery{ diff --git a/pkg/query-service/app/inframetrics/jobs.go b/pkg/query-service/app/inframetrics/jobs.go index dc36954e54e9..4fc3ede13259 100644 --- a/pkg/query-service/app/inframetrics/jobs.go +++ b/pkg/query-service/app/inframetrics/jobs.go @@ -5,12 +5,12 @@ import ( "math" "sort" - "go.signoz.io/signoz/pkg/query-service/app/metrics/v4/helpers" - "go.signoz.io/signoz/pkg/query-service/common" - "go.signoz.io/signoz/pkg/query-service/interfaces" - "go.signoz.io/signoz/pkg/query-service/model" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" - "go.signoz.io/signoz/pkg/query-service/postprocess" + "github.com/SigNoz/signoz/pkg/query-service/app/metrics/v4/helpers" + "github.com/SigNoz/signoz/pkg/query-service/common" + "github.com/SigNoz/signoz/pkg/query-service/interfaces" + "github.com/SigNoz/signoz/pkg/query-service/model" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" + "github.com/SigNoz/signoz/pkg/query-service/postprocess" "golang.org/x/exp/slices" ) diff --git a/pkg/query-service/app/inframetrics/namespaces.go b/pkg/query-service/app/inframetrics/namespaces.go index 9772bdd6ab63..1e595f8d421b 100644 --- a/pkg/query-service/app/inframetrics/namespaces.go +++ b/pkg/query-service/app/inframetrics/namespaces.go @@ -5,12 +5,12 @@ import ( "math" "sort" - "go.signoz.io/signoz/pkg/query-service/app/metrics/v4/helpers" - "go.signoz.io/signoz/pkg/query-service/common" - "go.signoz.io/signoz/pkg/query-service/interfaces" - "go.signoz.io/signoz/pkg/query-service/model" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" - "go.signoz.io/signoz/pkg/query-service/postprocess" + "github.com/SigNoz/signoz/pkg/query-service/app/metrics/v4/helpers" + "github.com/SigNoz/signoz/pkg/query-service/common" + "github.com/SigNoz/signoz/pkg/query-service/interfaces" + "github.com/SigNoz/signoz/pkg/query-service/model" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" + "github.com/SigNoz/signoz/pkg/query-service/postprocess" "golang.org/x/exp/slices" ) diff --git a/pkg/query-service/app/inframetrics/nodes.go b/pkg/query-service/app/inframetrics/nodes.go index 3515e662fd11..6d9c5ea04089 100644 --- a/pkg/query-service/app/inframetrics/nodes.go +++ b/pkg/query-service/app/inframetrics/nodes.go @@ -7,13 +7,13 @@ import ( "sort" "strings" - "go.signoz.io/signoz/pkg/query-service/app/metrics/v4/helpers" - "go.signoz.io/signoz/pkg/query-service/common" - "go.signoz.io/signoz/pkg/query-service/constants" - "go.signoz.io/signoz/pkg/query-service/interfaces" - "go.signoz.io/signoz/pkg/query-service/model" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" - "go.signoz.io/signoz/pkg/query-service/postprocess" + "github.com/SigNoz/signoz/pkg/query-service/app/metrics/v4/helpers" + "github.com/SigNoz/signoz/pkg/query-service/common" + "github.com/SigNoz/signoz/pkg/query-service/constants" + "github.com/SigNoz/signoz/pkg/query-service/interfaces" + "github.com/SigNoz/signoz/pkg/query-service/model" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" + "github.com/SigNoz/signoz/pkg/query-service/postprocess" "golang.org/x/exp/slices" ) diff --git a/pkg/query-service/app/inframetrics/nodes_query.go b/pkg/query-service/app/inframetrics/nodes_query.go index 2dbb9df27b39..5bbf4b49a68c 100644 --- a/pkg/query-service/app/inframetrics/nodes_query.go +++ b/pkg/query-service/app/inframetrics/nodes_query.go @@ -1,6 +1,6 @@ package inframetrics -import v3 "go.signoz.io/signoz/pkg/query-service/model/v3" +import v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" var NodesTableListQuery = v3.QueryRangeParamsV3{ CompositeQuery: &v3.CompositeQuery{ diff --git a/pkg/query-service/app/inframetrics/pods.go b/pkg/query-service/app/inframetrics/pods.go index ef6636e5a94b..a87beee57432 100644 --- a/pkg/query-service/app/inframetrics/pods.go +++ b/pkg/query-service/app/inframetrics/pods.go @@ -7,13 +7,13 @@ import ( "sort" "strings" - "go.signoz.io/signoz/pkg/query-service/app/metrics/v4/helpers" - "go.signoz.io/signoz/pkg/query-service/common" - "go.signoz.io/signoz/pkg/query-service/constants" - "go.signoz.io/signoz/pkg/query-service/interfaces" - "go.signoz.io/signoz/pkg/query-service/model" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" - "go.signoz.io/signoz/pkg/query-service/postprocess" + "github.com/SigNoz/signoz/pkg/query-service/app/metrics/v4/helpers" + "github.com/SigNoz/signoz/pkg/query-service/common" + "github.com/SigNoz/signoz/pkg/query-service/constants" + "github.com/SigNoz/signoz/pkg/query-service/interfaces" + "github.com/SigNoz/signoz/pkg/query-service/model" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" + "github.com/SigNoz/signoz/pkg/query-service/postprocess" "golang.org/x/exp/slices" ) diff --git a/pkg/query-service/app/inframetrics/pods_query.go b/pkg/query-service/app/inframetrics/pods_query.go index 900a934e80ed..27ccbbdd6cbf 100644 --- a/pkg/query-service/app/inframetrics/pods_query.go +++ b/pkg/query-service/app/inframetrics/pods_query.go @@ -1,6 +1,6 @@ package inframetrics -import v3 "go.signoz.io/signoz/pkg/query-service/model/v3" +import v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" var PodsTableListQuery = v3.QueryRangeParamsV3{ CompositeQuery: &v3.CompositeQuery{ diff --git a/pkg/query-service/app/inframetrics/process_query.go b/pkg/query-service/app/inframetrics/process_query.go index 88a329cba505..cbda7f9edd56 100644 --- a/pkg/query-service/app/inframetrics/process_query.go +++ b/pkg/query-service/app/inframetrics/process_query.go @@ -1,6 +1,6 @@ package inframetrics -import v3 "go.signoz.io/signoz/pkg/query-service/model/v3" +import v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" var ProcessesTableListQuery = v3.QueryRangeParamsV3{ CompositeQuery: &v3.CompositeQuery{ diff --git a/pkg/query-service/app/inframetrics/processes.go b/pkg/query-service/app/inframetrics/processes.go index 2f98efdcfccd..925b60667901 100644 --- a/pkg/query-service/app/inframetrics/processes.go +++ b/pkg/query-service/app/inframetrics/processes.go @@ -5,12 +5,12 @@ import ( "math" "sort" - "go.signoz.io/signoz/pkg/query-service/app/metrics/v4/helpers" - "go.signoz.io/signoz/pkg/query-service/common" - "go.signoz.io/signoz/pkg/query-service/interfaces" - "go.signoz.io/signoz/pkg/query-service/model" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" - "go.signoz.io/signoz/pkg/query-service/postprocess" + "github.com/SigNoz/signoz/pkg/query-service/app/metrics/v4/helpers" + "github.com/SigNoz/signoz/pkg/query-service/common" + "github.com/SigNoz/signoz/pkg/query-service/interfaces" + "github.com/SigNoz/signoz/pkg/query-service/model" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" + "github.com/SigNoz/signoz/pkg/query-service/postprocess" "golang.org/x/exp/slices" ) diff --git a/pkg/query-service/app/inframetrics/pvcs.go b/pkg/query-service/app/inframetrics/pvcs.go index 4b1a57b84a24..e56b63790404 100644 --- a/pkg/query-service/app/inframetrics/pvcs.go +++ b/pkg/query-service/app/inframetrics/pvcs.go @@ -5,12 +5,12 @@ import ( "math" "sort" - "go.signoz.io/signoz/pkg/query-service/app/metrics/v4/helpers" - "go.signoz.io/signoz/pkg/query-service/common" - "go.signoz.io/signoz/pkg/query-service/interfaces" - "go.signoz.io/signoz/pkg/query-service/model" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" - "go.signoz.io/signoz/pkg/query-service/postprocess" + "github.com/SigNoz/signoz/pkg/query-service/app/metrics/v4/helpers" + "github.com/SigNoz/signoz/pkg/query-service/common" + "github.com/SigNoz/signoz/pkg/query-service/interfaces" + "github.com/SigNoz/signoz/pkg/query-service/model" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" + "github.com/SigNoz/signoz/pkg/query-service/postprocess" "golang.org/x/exp/slices" ) diff --git a/pkg/query-service/app/inframetrics/pvcs_query.go b/pkg/query-service/app/inframetrics/pvcs_query.go index 1e4ddd4510d9..16895d155c8b 100644 --- a/pkg/query-service/app/inframetrics/pvcs_query.go +++ b/pkg/query-service/app/inframetrics/pvcs_query.go @@ -1,6 +1,6 @@ package inframetrics -import v3 "go.signoz.io/signoz/pkg/query-service/model/v3" +import v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" var PvcsTableListQuery = v3.QueryRangeParamsV3{ CompositeQuery: &v3.CompositeQuery{ diff --git a/pkg/query-service/app/inframetrics/statefulsets.go b/pkg/query-service/app/inframetrics/statefulsets.go index e4562e17b416..7ec540e3336a 100644 --- a/pkg/query-service/app/inframetrics/statefulsets.go +++ b/pkg/query-service/app/inframetrics/statefulsets.go @@ -5,12 +5,12 @@ import ( "math" "sort" - "go.signoz.io/signoz/pkg/query-service/app/metrics/v4/helpers" - "go.signoz.io/signoz/pkg/query-service/common" - "go.signoz.io/signoz/pkg/query-service/interfaces" - "go.signoz.io/signoz/pkg/query-service/model" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" - "go.signoz.io/signoz/pkg/query-service/postprocess" + "github.com/SigNoz/signoz/pkg/query-service/app/metrics/v4/helpers" + "github.com/SigNoz/signoz/pkg/query-service/common" + "github.com/SigNoz/signoz/pkg/query-service/interfaces" + "github.com/SigNoz/signoz/pkg/query-service/model" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" + "github.com/SigNoz/signoz/pkg/query-service/postprocess" "golang.org/x/exp/slices" ) diff --git a/pkg/query-service/app/inframetrics/workload_query.go b/pkg/query-service/app/inframetrics/workload_query.go index 8481c207566c..435b23725b01 100644 --- a/pkg/query-service/app/inframetrics/workload_query.go +++ b/pkg/query-service/app/inframetrics/workload_query.go @@ -1,6 +1,6 @@ package inframetrics -import v3 "go.signoz.io/signoz/pkg/query-service/model/v3" +import v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" var ( metricNamesForWorkloads = map[string]string{ diff --git a/pkg/query-service/app/integrations/builtin.go b/pkg/query-service/app/integrations/builtin.go index 5314412c9f48..6ea1c41f3fb2 100644 --- a/pkg/query-service/app/integrations/builtin.go +++ b/pkg/query-service/app/integrations/builtin.go @@ -13,8 +13,8 @@ import ( "io/fs" "path" + "github.com/SigNoz/signoz/pkg/query-service/model" koanfJson "github.com/knadh/koanf/parsers/json" - "go.signoz.io/signoz/pkg/query-service/model" "golang.org/x/exp/maps" "golang.org/x/exp/slices" ) diff --git a/pkg/query-service/app/integrations/controller.go b/pkg/query-service/app/integrations/controller.go index d2113148b0aa..d2c987d6da0c 100644 --- a/pkg/query-service/app/integrations/controller.go +++ b/pkg/query-service/app/integrations/controller.go @@ -4,11 +4,11 @@ import ( "context" "fmt" - "go.signoz.io/signoz/pkg/query-service/agentConf" - "go.signoz.io/signoz/pkg/query-service/app/logparsingpipeline" - "go.signoz.io/signoz/pkg/query-service/model" - "go.signoz.io/signoz/pkg/sqlstore" - "go.signoz.io/signoz/pkg/types" + "github.com/SigNoz/signoz/pkg/query-service/agentConf" + "github.com/SigNoz/signoz/pkg/query-service/app/logparsingpipeline" + "github.com/SigNoz/signoz/pkg/query-service/model" + "github.com/SigNoz/signoz/pkg/sqlstore" + "github.com/SigNoz/signoz/pkg/types" ) type Controller struct { diff --git a/pkg/query-service/app/integrations/manager.go b/pkg/query-service/app/integrations/manager.go index 7e0c36130837..26a1ab6c1cc2 100644 --- a/pkg/query-service/app/integrations/manager.go +++ b/pkg/query-service/app/integrations/manager.go @@ -7,13 +7,13 @@ import ( "strings" "time" + "github.com/SigNoz/signoz/pkg/query-service/app/logparsingpipeline" + "github.com/SigNoz/signoz/pkg/query-service/model" + "github.com/SigNoz/signoz/pkg/query-service/rules" + "github.com/SigNoz/signoz/pkg/query-service/utils" + "github.com/SigNoz/signoz/pkg/types" "github.com/google/uuid" "github.com/jmoiron/sqlx" - "go.signoz.io/signoz/pkg/query-service/app/logparsingpipeline" - "go.signoz.io/signoz/pkg/query-service/model" - "go.signoz.io/signoz/pkg/query-service/rules" - "go.signoz.io/signoz/pkg/query-service/utils" - "go.signoz.io/signoz/pkg/types" ) type IntegrationAuthor struct { diff --git a/pkg/query-service/app/integrations/messagingQueues/kafka/translator.go b/pkg/query-service/app/integrations/messagingQueues/kafka/translator.go index f5a669755f4c..bf5c37099cce 100644 --- a/pkg/query-service/app/integrations/messagingQueues/kafka/translator.go +++ b/pkg/query-service/app/integrations/messagingQueues/kafka/translator.go @@ -2,9 +2,9 @@ package kafka import ( "fmt" - "go.signoz.io/signoz/pkg/query-service/common" - "go.signoz.io/signoz/pkg/query-service/constants" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" + "github.com/SigNoz/signoz/pkg/query-service/common" + "github.com/SigNoz/signoz/pkg/query-service/constants" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" ) var defaultStepInterval int64 = 60 diff --git a/pkg/query-service/app/integrations/messagingQueues/queues/model.go b/pkg/query-service/app/integrations/messagingQueues/queues/model.go index eca7bf870c31..ce33caa28b8c 100644 --- a/pkg/query-service/app/integrations/messagingQueues/queues/model.go +++ b/pkg/query-service/app/integrations/messagingQueues/queues/model.go @@ -3,7 +3,7 @@ package queues import ( "fmt" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" ) type QueueListRequest struct { diff --git a/pkg/query-service/app/integrations/messagingQueues/queues/queueOverview.go b/pkg/query-service/app/integrations/messagingQueues/queues/queueOverview.go index cbfe0ad0d16f..12689016c55b 100644 --- a/pkg/query-service/app/integrations/messagingQueues/queues/queueOverview.go +++ b/pkg/query-service/app/integrations/messagingQueues/queues/queueOverview.go @@ -1,7 +1,7 @@ package queues import ( - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" ) func BuildOverviewQuery(queueList *QueueListRequest) (*v3.ClickHouseQuery, error) { diff --git a/pkg/query-service/app/integrations/messagingQueues/queues/sql.go b/pkg/query-service/app/integrations/messagingQueues/queues/sql.go index 450c9d077378..a5d4698aea81 100644 --- a/pkg/query-service/app/integrations/messagingQueues/queues/sql.go +++ b/pkg/query-service/app/integrations/messagingQueues/queues/sql.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" - format "go.signoz.io/signoz/pkg/query-service/utils" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" + format "github.com/SigNoz/signoz/pkg/query-service/utils" ) // generateOverviewSQL builds the ClickHouse SQL query with optional filters. diff --git a/pkg/query-service/app/integrations/pipeline_utils.go b/pkg/query-service/app/integrations/pipeline_utils.go index 49ab5dd82a65..f9e78f3a5341 100644 --- a/pkg/query-service/app/integrations/pipeline_utils.go +++ b/pkg/query-service/app/integrations/pipeline_utils.go @@ -3,8 +3,8 @@ package integrations import ( "strings" - "go.signoz.io/signoz/pkg/query-service/app/logparsingpipeline" - "go.signoz.io/signoz/pkg/query-service/constants" + "github.com/SigNoz/signoz/pkg/query-service/app/logparsingpipeline" + "github.com/SigNoz/signoz/pkg/query-service/constants" ) const IntegrationPipelineIdSeparator string = "--" diff --git a/pkg/query-service/app/integrations/repo.go b/pkg/query-service/app/integrations/repo.go index 9ed46cd247c5..690bb8c0cb9a 100644 --- a/pkg/query-service/app/integrations/repo.go +++ b/pkg/query-service/app/integrations/repo.go @@ -5,8 +5,8 @@ import ( "database/sql/driver" "encoding/json" + "github.com/SigNoz/signoz/pkg/query-service/model" "github.com/pkg/errors" - "go.signoz.io/signoz/pkg/query-service/model" ) // For serializing from db diff --git a/pkg/query-service/app/integrations/sqlite_repo.go b/pkg/query-service/app/integrations/sqlite_repo.go index aebe7bf4ea60..6e2390023cce 100644 --- a/pkg/query-service/app/integrations/sqlite_repo.go +++ b/pkg/query-service/app/integrations/sqlite_repo.go @@ -5,8 +5,8 @@ import ( "fmt" "strings" + "github.com/SigNoz/signoz/pkg/query-service/model" "github.com/jmoiron/sqlx" - "go.signoz.io/signoz/pkg/query-service/model" ) type InstalledIntegrationsSqliteRepo struct { diff --git a/pkg/query-service/app/integrations/test_utils.go b/pkg/query-service/app/integrations/test_utils.go index 2f1b474afcc5..187551e88162 100644 --- a/pkg/query-service/app/integrations/test_utils.go +++ b/pkg/query-service/app/integrations/test_utils.go @@ -5,12 +5,12 @@ import ( "slices" "testing" - "go.signoz.io/signoz/pkg/query-service/app/logparsingpipeline" - "go.signoz.io/signoz/pkg/query-service/model" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" - "go.signoz.io/signoz/pkg/query-service/rules" - "go.signoz.io/signoz/pkg/query-service/utils" - "go.signoz.io/signoz/pkg/types" + "github.com/SigNoz/signoz/pkg/query-service/app/logparsingpipeline" + "github.com/SigNoz/signoz/pkg/query-service/model" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" + "github.com/SigNoz/signoz/pkg/query-service/rules" + "github.com/SigNoz/signoz/pkg/query-service/utils" + "github.com/SigNoz/signoz/pkg/types" ) func NewTestIntegrationsManager(t *testing.T) *Manager { diff --git a/pkg/query-service/app/integrations/thirdPartyApi/model.go b/pkg/query-service/app/integrations/thirdPartyApi/model.go index 7ea5fc86d84b..5dd274b39708 100644 --- a/pkg/query-service/app/integrations/thirdPartyApi/model.go +++ b/pkg/query-service/app/integrations/thirdPartyApi/model.go @@ -1,6 +1,6 @@ package thirdPartyApi -import v3 "go.signoz.io/signoz/pkg/query-service/model/v3" +import v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" type ThirdPartyApis struct { Start int64 `json:"start"` diff --git a/pkg/query-service/app/integrations/thirdPartyApi/translator.go b/pkg/query-service/app/integrations/thirdPartyApi/translator.go index f0e66552fe75..290fb2e91442 100644 --- a/pkg/query-service/app/integrations/thirdPartyApi/translator.go +++ b/pkg/query-service/app/integrations/thirdPartyApi/translator.go @@ -1,7 +1,7 @@ package thirdPartyApi import ( - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" "net" ) diff --git a/pkg/query-service/app/integrations/thirdPartyApi/translator_test.go b/pkg/query-service/app/integrations/thirdPartyApi/translator_test.go index 188af606bc59..171139b93580 100644 --- a/pkg/query-service/app/integrations/thirdPartyApi/translator_test.go +++ b/pkg/query-service/app/integrations/thirdPartyApi/translator_test.go @@ -3,8 +3,8 @@ package thirdPartyApi import ( "testing" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" "github.com/stretchr/testify/assert" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" ) func TestFilterResponse(t *testing.T) { diff --git a/pkg/query-service/app/logparsingpipeline/agent_feature.go b/pkg/query-service/app/logparsingpipeline/agent_feature.go index 3f8cc7df1a12..15da5dea466b 100644 --- a/pkg/query-service/app/logparsingpipeline/agent_feature.go +++ b/pkg/query-service/app/logparsingpipeline/agent_feature.go @@ -1,5 +1,5 @@ package logparsingpipeline -import "go.signoz.io/signoz/pkg/query-service/agentConf" +import "github.com/SigNoz/signoz/pkg/query-service/agentConf" const LogPipelinesFeatureType agentConf.AgentFeatureType = "log_pipelines" diff --git a/pkg/query-service/app/logparsingpipeline/collector_config.go b/pkg/query-service/app/logparsingpipeline/collector_config.go index 516ddf5bacdb..de4c3a17e3b2 100644 --- a/pkg/query-service/app/logparsingpipeline/collector_config.go +++ b/pkg/query-service/app/logparsingpipeline/collector_config.go @@ -8,9 +8,9 @@ import ( "gopkg.in/yaml.v3" + "github.com/SigNoz/signoz/pkg/query-service/constants" + coreModel "github.com/SigNoz/signoz/pkg/query-service/model" "github.com/pkg/errors" - "go.signoz.io/signoz/pkg/query-service/constants" - coreModel "go.signoz.io/signoz/pkg/query-service/model" "go.uber.org/zap" ) diff --git a/pkg/query-service/app/logparsingpipeline/collector_config_test.go b/pkg/query-service/app/logparsingpipeline/collector_config_test.go index 1ddf092e9f7c..79f3a4a367d1 100644 --- a/pkg/query-service/app/logparsingpipeline/collector_config_test.go +++ b/pkg/query-service/app/logparsingpipeline/collector_config_test.go @@ -5,11 +5,11 @@ import ( "fmt" "testing" + "github.com/SigNoz/signoz/pkg/query-service/constants" + "github.com/SigNoz/signoz/pkg/query-service/model" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" . "github.com/smartystreets/goconvey/convey" "github.com/stretchr/testify/require" - "go.signoz.io/signoz/pkg/query-service/constants" - "go.signoz.io/signoz/pkg/query-service/model" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" "gopkg.in/yaml.v3" ) diff --git a/pkg/query-service/app/logparsingpipeline/controller.go b/pkg/query-service/app/logparsingpipeline/controller.go index 645d21741fd9..dfd0c8ffb5df 100644 --- a/pkg/query-service/app/logparsingpipeline/controller.go +++ b/pkg/query-service/app/logparsingpipeline/controller.go @@ -7,14 +7,14 @@ import ( "slices" "strings" + "github.com/SigNoz/signoz/pkg/query-service/agentConf" + "github.com/SigNoz/signoz/pkg/query-service/constants" + "github.com/SigNoz/signoz/pkg/query-service/model" + "github.com/SigNoz/signoz/pkg/query-service/utils" + "github.com/SigNoz/signoz/pkg/types/authtypes" "github.com/google/uuid" "github.com/jmoiron/sqlx" "github.com/pkg/errors" - "go.signoz.io/signoz/pkg/query-service/agentConf" - "go.signoz.io/signoz/pkg/query-service/constants" - "go.signoz.io/signoz/pkg/query-service/model" - "go.signoz.io/signoz/pkg/query-service/utils" - "go.signoz.io/signoz/pkg/types/authtypes" "go.uber.org/zap" ) diff --git a/pkg/query-service/app/logparsingpipeline/db.go b/pkg/query-service/app/logparsingpipeline/db.go index 3a622c4cae9a..bc09f32e2269 100644 --- a/pkg/query-service/app/logparsingpipeline/db.go +++ b/pkg/query-service/app/logparsingpipeline/db.go @@ -6,11 +6,11 @@ import ( "fmt" "time" + "github.com/SigNoz/signoz/pkg/query-service/model" + "github.com/SigNoz/signoz/pkg/types/authtypes" "github.com/google/uuid" "github.com/jmoiron/sqlx" "github.com/pkg/errors" - "go.signoz.io/signoz/pkg/query-service/model" - "go.signoz.io/signoz/pkg/types/authtypes" "go.uber.org/zap" ) diff --git a/pkg/query-service/app/logparsingpipeline/model.go b/pkg/query-service/app/logparsingpipeline/model.go index e37bf8554659..d3e27e23d497 100644 --- a/pkg/query-service/app/logparsingpipeline/model.go +++ b/pkg/query-service/app/logparsingpipeline/model.go @@ -4,8 +4,8 @@ import ( "encoding/json" "time" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" "github.com/pkg/errors" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" ) // Pipeline is stored and also deployed finally to collector config diff --git a/pkg/query-service/app/logparsingpipeline/pipelineBuilder.go b/pkg/query-service/app/logparsingpipeline/pipelineBuilder.go index 07a0ea634686..56268115e9d4 100644 --- a/pkg/query-service/app/logparsingpipeline/pipelineBuilder.go +++ b/pkg/query-service/app/logparsingpipeline/pipelineBuilder.go @@ -6,12 +6,12 @@ import ( "slices" "strings" + "github.com/SigNoz/signoz/pkg/query-service/constants" + "github.com/SigNoz/signoz/pkg/query-service/queryBuilderToExpr" "github.com/antonmedv/expr" "github.com/antonmedv/expr/ast" "github.com/antonmedv/expr/parser" "github.com/pkg/errors" - "go.signoz.io/signoz/pkg/query-service/constants" - "go.signoz.io/signoz/pkg/query-service/queryBuilderToExpr" ) const ( diff --git a/pkg/query-service/app/logparsingpipeline/pipelineBuilder_test.go b/pkg/query-service/app/logparsingpipeline/pipelineBuilder_test.go index 82bb2ab2bf89..d21b37a0142d 100644 --- a/pkg/query-service/app/logparsingpipeline/pipelineBuilder_test.go +++ b/pkg/query-service/app/logparsingpipeline/pipelineBuilder_test.go @@ -7,12 +7,12 @@ import ( "testing" "time" + "github.com/SigNoz/signoz/pkg/query-service/model" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" + "github.com/SigNoz/signoz/pkg/query-service/utils" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/entry" . "github.com/smartystreets/goconvey/convey" "github.com/stretchr/testify/require" - "go.signoz.io/signoz/pkg/query-service/model" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" - "go.signoz.io/signoz/pkg/query-service/utils" ) var prepareProcessorTestData = []struct { diff --git a/pkg/query-service/app/logparsingpipeline/postablePipeline.go b/pkg/query-service/app/logparsingpipeline/postablePipeline.go index 535f47d98910..4c8a20001979 100644 --- a/pkg/query-service/app/logparsingpipeline/postablePipeline.go +++ b/pkg/query-service/app/logparsingpipeline/postablePipeline.go @@ -6,8 +6,8 @@ import ( "regexp" "strings" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" - "go.signoz.io/signoz/pkg/query-service/queryBuilderToExpr" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" + "github.com/SigNoz/signoz/pkg/query-service/queryBuilderToExpr" "golang.org/x/exp/slices" ) diff --git a/pkg/query-service/app/logparsingpipeline/postablePipeline_test.go b/pkg/query-service/app/logparsingpipeline/postablePipeline_test.go index 371799ebab0a..89da545e02a0 100644 --- a/pkg/query-service/app/logparsingpipeline/postablePipeline_test.go +++ b/pkg/query-service/app/logparsingpipeline/postablePipeline_test.go @@ -3,8 +3,8 @@ package logparsingpipeline import ( "testing" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" . "github.com/smartystreets/goconvey/convey" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" ) func TestIsValidPostablePipeline(t *testing.T) { diff --git a/pkg/query-service/app/logparsingpipeline/preview.go b/pkg/query-service/app/logparsingpipeline/preview.go index af713b75a2c1..abecd733ee76 100644 --- a/pkg/query-service/app/logparsingpipeline/preview.go +++ b/pkg/query-service/app/logparsingpipeline/preview.go @@ -9,11 +9,11 @@ import ( "github.com/SigNoz/signoz-otel-collector/pkg/collectorsimulator" _ "github.com/SigNoz/signoz-otel-collector/pkg/parser/grok" "github.com/SigNoz/signoz-otel-collector/processor/signozlogspipelineprocessor" + "github.com/SigNoz/signoz/pkg/query-service/model" "github.com/pkg/errors" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/plog" "go.opentelemetry.io/collector/processor" - "go.signoz.io/signoz/pkg/query-service/model" ) func SimulatePipelinesProcessing( diff --git a/pkg/query-service/app/logparsingpipeline/preview_test.go b/pkg/query-service/app/logparsingpipeline/preview_test.go index 0dd421dad459..b20ce28bf1b9 100644 --- a/pkg/query-service/app/logparsingpipeline/preview_test.go +++ b/pkg/query-service/app/logparsingpipeline/preview_test.go @@ -6,11 +6,11 @@ import ( "testing" "time" + "github.com/SigNoz/signoz/pkg/query-service/model" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" "github.com/google/uuid" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/entry" "github.com/stretchr/testify/require" - "go.signoz.io/signoz/pkg/query-service/model" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" ) func TestPipelinePreview(t *testing.T) { diff --git a/pkg/query-service/app/logparsingpipeline/processors_test.go b/pkg/query-service/app/logparsingpipeline/processors_test.go index 110f9fbb0520..2a440318b9cf 100644 --- a/pkg/query-service/app/logparsingpipeline/processors_test.go +++ b/pkg/query-service/app/logparsingpipeline/processors_test.go @@ -9,10 +9,10 @@ import ( "testing" "time" + "github.com/SigNoz/signoz/pkg/query-service/model" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" + "github.com/SigNoz/signoz/pkg/query-service/utils" "github.com/stretchr/testify/require" - "go.signoz.io/signoz/pkg/query-service/model" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" - "go.signoz.io/signoz/pkg/query-service/utils" ) // Tests for pipeline processors other than the ones diff --git a/pkg/query-service/app/logparsingpipeline/severity_parser_test.go b/pkg/query-service/app/logparsingpipeline/severity_parser_test.go index 12a273d1b052..ee32651b153c 100644 --- a/pkg/query-service/app/logparsingpipeline/severity_parser_test.go +++ b/pkg/query-service/app/logparsingpipeline/severity_parser_test.go @@ -6,9 +6,9 @@ import ( "strings" "testing" + "github.com/SigNoz/signoz/pkg/query-service/model" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" "github.com/stretchr/testify/require" - "go.signoz.io/signoz/pkg/query-service/model" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" ) func TestSeverityParsingProcessor(t *testing.T) { diff --git a/pkg/query-service/app/logparsingpipeline/time_parser_test.go b/pkg/query-service/app/logparsingpipeline/time_parser_test.go index 26a696091f44..6e9aa998edb4 100644 --- a/pkg/query-service/app/logparsingpipeline/time_parser_test.go +++ b/pkg/query-service/app/logparsingpipeline/time_parser_test.go @@ -8,10 +8,10 @@ import ( "testing" "time" + "github.com/SigNoz/signoz/pkg/query-service/model" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" "github.com/antonmedv/expr" "github.com/stretchr/testify/require" - "go.signoz.io/signoz/pkg/query-service/model" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" ) func TestRegexForStrptimeLayout(t *testing.T) { diff --git a/pkg/query-service/app/logs/parser.go b/pkg/query-service/app/logs/parser.go index be524d00da9b..177320805b4c 100644 --- a/pkg/query-service/app/logs/parser.go +++ b/pkg/query-service/app/logs/parser.go @@ -7,9 +7,9 @@ import ( "strconv" "strings" - "go.signoz.io/signoz/pkg/query-service/constants" - "go.signoz.io/signoz/pkg/query-service/model" - "go.signoz.io/signoz/pkg/query-service/utils" + "github.com/SigNoz/signoz/pkg/query-service/constants" + "github.com/SigNoz/signoz/pkg/query-service/model" + "github.com/SigNoz/signoz/pkg/query-service/utils" ) var operatorMapping = map[string]string{ diff --git a/pkg/query-service/app/logs/parser_test.go b/pkg/query-service/app/logs/parser_test.go index f894fcaecd56..860980c5c895 100644 --- a/pkg/query-service/app/logs/parser_test.go +++ b/pkg/query-service/app/logs/parser_test.go @@ -5,8 +5,8 @@ import ( "net/http/httptest" "testing" + "github.com/SigNoz/signoz/pkg/query-service/model" . "github.com/smartystreets/goconvey/convey" - "go.signoz.io/signoz/pkg/query-service/model" ) var correctQueriesTest = []struct { diff --git a/pkg/query-service/app/logs/v3/enrich_query.go b/pkg/query-service/app/logs/v3/enrich_query.go index f6f7c1165ed3..f4bfd8ba950e 100644 --- a/pkg/query-service/app/logs/v3/enrich_query.go +++ b/pkg/query-service/app/logs/v3/enrich_query.go @@ -5,9 +5,9 @@ import ( "strconv" "strings" - "go.signoz.io/signoz/pkg/query-service/constants" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" - "go.signoz.io/signoz/pkg/query-service/utils" + "github.com/SigNoz/signoz/pkg/query-service/constants" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" + "github.com/SigNoz/signoz/pkg/query-service/utils" ) func EnrichmentRequired(params *v3.QueryRangeParamsV3) bool { diff --git a/pkg/query-service/app/logs/v3/enrich_query_test.go b/pkg/query-service/app/logs/v3/enrich_query_test.go index de5e81cb7e68..bea0c8b29ff0 100644 --- a/pkg/query-service/app/logs/v3/enrich_query_test.go +++ b/pkg/query-service/app/logs/v3/enrich_query_test.go @@ -3,8 +3,8 @@ package v3 import ( "testing" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" . "github.com/smartystreets/goconvey/convey" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" ) var testEnrichmentRequiredData = []struct { diff --git a/pkg/query-service/app/logs/v3/json_filter.go b/pkg/query-service/app/logs/v3/json_filter.go index d883b6179779..7123cd45b9ff 100644 --- a/pkg/query-service/app/logs/v3/json_filter.go +++ b/pkg/query-service/app/logs/v3/json_filter.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" - "go.signoz.io/signoz/pkg/query-service/utils" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" + "github.com/SigNoz/signoz/pkg/query-service/utils" ) const ( diff --git a/pkg/query-service/app/logs/v3/json_filter_test.go b/pkg/query-service/app/logs/v3/json_filter_test.go index 060ba63707a3..6e7bc304c14a 100644 --- a/pkg/query-service/app/logs/v3/json_filter_test.go +++ b/pkg/query-service/app/logs/v3/json_filter_test.go @@ -3,8 +3,8 @@ package v3 import ( "testing" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" . "github.com/smartystreets/goconvey/convey" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" ) var testGetJSONFilterKeyData = []struct { diff --git a/pkg/query-service/app/logs/v3/query_builder.go b/pkg/query-service/app/logs/v3/query_builder.go index 8f14fea99df2..94cbbfcafcef 100644 --- a/pkg/query-service/app/logs/v3/query_builder.go +++ b/pkg/query-service/app/logs/v3/query_builder.go @@ -4,9 +4,9 @@ import ( "fmt" "strings" - "go.signoz.io/signoz/pkg/query-service/constants" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" - "go.signoz.io/signoz/pkg/query-service/utils" + "github.com/SigNoz/signoz/pkg/query-service/constants" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" + "github.com/SigNoz/signoz/pkg/query-service/utils" ) var AggregateOperatorToPercentile = map[v3.AggregateOperator]float64{ diff --git a/pkg/query-service/app/logs/v3/query_builder_test.go b/pkg/query-service/app/logs/v3/query_builder_test.go index 958a3fa93fc6..d92aa80c6821 100644 --- a/pkg/query-service/app/logs/v3/query_builder_test.go +++ b/pkg/query-service/app/logs/v3/query_builder_test.go @@ -3,9 +3,9 @@ package v3 import ( "testing" + "github.com/SigNoz/signoz/pkg/query-service/constants" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" . "github.com/smartystreets/goconvey/convey" - "go.signoz.io/signoz/pkg/query-service/constants" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" ) var testGetClickhouseColumnNameData = []struct { diff --git a/pkg/query-service/app/logs/v4/json_filter.go b/pkg/query-service/app/logs/v4/json_filter.go index cde88e748a76..f7351cda72c3 100644 --- a/pkg/query-service/app/logs/v4/json_filter.go +++ b/pkg/query-service/app/logs/v4/json_filter.go @@ -4,9 +4,9 @@ import ( "fmt" "strings" - logsV3 "go.signoz.io/signoz/pkg/query-service/app/logs/v3" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" - "go.signoz.io/signoz/pkg/query-service/utils" + logsV3 "github.com/SigNoz/signoz/pkg/query-service/app/logs/v3" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" + "github.com/SigNoz/signoz/pkg/query-service/utils" ) var jsonLogOperators = map[v3.FilterOperator]string{ diff --git a/pkg/query-service/app/logs/v4/json_filter_test.go b/pkg/query-service/app/logs/v4/json_filter_test.go index bdca6df8dfa4..2456aa4c45a2 100644 --- a/pkg/query-service/app/logs/v4/json_filter_test.go +++ b/pkg/query-service/app/logs/v4/json_filter_test.go @@ -3,9 +3,9 @@ package v4 import ( "testing" + logsV3 "github.com/SigNoz/signoz/pkg/query-service/app/logs/v3" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" . "github.com/smartystreets/goconvey/convey" - logsV3 "go.signoz.io/signoz/pkg/query-service/app/logs/v3" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" ) var testGetJSONFilterData = []struct { diff --git a/pkg/query-service/app/logs/v4/query_builder.go b/pkg/query-service/app/logs/v4/query_builder.go index a808a3b57d67..aed8919d174f 100644 --- a/pkg/query-service/app/logs/v4/query_builder.go +++ b/pkg/query-service/app/logs/v4/query_builder.go @@ -4,11 +4,11 @@ import ( "fmt" "strings" - logsV3 "go.signoz.io/signoz/pkg/query-service/app/logs/v3" - "go.signoz.io/signoz/pkg/query-service/app/resource" - "go.signoz.io/signoz/pkg/query-service/constants" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" - "go.signoz.io/signoz/pkg/query-service/utils" + logsV3 "github.com/SigNoz/signoz/pkg/query-service/app/logs/v3" + "github.com/SigNoz/signoz/pkg/query-service/app/resource" + "github.com/SigNoz/signoz/pkg/query-service/constants" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" + "github.com/SigNoz/signoz/pkg/query-service/utils" ) var logOperators = map[v3.FilterOperator]string{ diff --git a/pkg/query-service/app/logs/v4/query_builder_test.go b/pkg/query-service/app/logs/v4/query_builder_test.go index 4ce3721e1837..0f9a9b2f88ed 100644 --- a/pkg/query-service/app/logs/v4/query_builder_test.go +++ b/pkg/query-service/app/logs/v4/query_builder_test.go @@ -3,8 +3,8 @@ package v4 import ( "testing" - "go.signoz.io/signoz/pkg/query-service/constants" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" + "github.com/SigNoz/signoz/pkg/query-service/constants" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" ) func Test_getClickhouseKey(t *testing.T) { diff --git a/pkg/query-service/app/logs/validator.go b/pkg/query-service/app/logs/validator.go index 03432922dd2e..62eacb665327 100644 --- a/pkg/query-service/app/logs/validator.go +++ b/pkg/query-service/app/logs/validator.go @@ -4,9 +4,9 @@ import ( "fmt" "regexp" - "go.signoz.io/signoz/pkg/query-service/constants" - "go.signoz.io/signoz/pkg/query-service/model" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" + "github.com/SigNoz/signoz/pkg/query-service/constants" + "github.com/SigNoz/signoz/pkg/query-service/model" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" ) func ValidateUpdateFieldPayload(field *model.UpdateField) error { diff --git a/pkg/query-service/app/metrics/query_builder.go b/pkg/query-service/app/metrics/query_builder.go index 3b4e432af872..69d5cfb75a35 100644 --- a/pkg/query-service/app/metrics/query_builder.go +++ b/pkg/query-service/app/metrics/query_builder.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" "go.uber.org/zap" ) diff --git a/pkg/query-service/app/metrics/v3/cumulative_table.go b/pkg/query-service/app/metrics/v3/cumulative_table.go index 84973a1850a7..c4aae6b3ef7b 100644 --- a/pkg/query-service/app/metrics/v3/cumulative_table.go +++ b/pkg/query-service/app/metrics/v3/cumulative_table.go @@ -5,10 +5,10 @@ import ( "math" "strings" - "go.signoz.io/signoz/pkg/query-service/app/metrics/v4/helpers" - "go.signoz.io/signoz/pkg/query-service/constants" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" - "go.signoz.io/signoz/pkg/query-service/utils" + "github.com/SigNoz/signoz/pkg/query-service/app/metrics/v4/helpers" + "github.com/SigNoz/signoz/pkg/query-service/constants" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" + "github.com/SigNoz/signoz/pkg/query-service/utils" ) // This logic is little convoluted for a reason. diff --git a/pkg/query-service/app/metrics/v3/cumulative_table_test.go b/pkg/query-service/app/metrics/v3/cumulative_table_test.go index 426d6a59808d..26b0e3c3eee4 100644 --- a/pkg/query-service/app/metrics/v3/cumulative_table_test.go +++ b/pkg/query-service/app/metrics/v3/cumulative_table_test.go @@ -3,7 +3,7 @@ package v3 import ( "testing" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" ) func TestPanelTableForCumulative(t *testing.T) { diff --git a/pkg/query-service/app/metrics/v3/delta.go b/pkg/query-service/app/metrics/v3/delta.go index 1fe401e3dd6f..e922c448b8fd 100644 --- a/pkg/query-service/app/metrics/v3/delta.go +++ b/pkg/query-service/app/metrics/v3/delta.go @@ -3,10 +3,10 @@ package v3 import ( "fmt" - "go.signoz.io/signoz/pkg/query-service/app/metrics/v4/helpers" - "go.signoz.io/signoz/pkg/query-service/constants" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" - "go.signoz.io/signoz/pkg/query-service/utils" + "github.com/SigNoz/signoz/pkg/query-service/app/metrics/v4/helpers" + "github.com/SigNoz/signoz/pkg/query-service/constants" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" + "github.com/SigNoz/signoz/pkg/query-service/utils" ) func buildDeltaMetricQuery(start, end, step int64, mq *v3.BuilderQuery) (string, error) { diff --git a/pkg/query-service/app/metrics/v3/delta_table.go b/pkg/query-service/app/metrics/v3/delta_table.go index f30f6c233718..b693cba2e976 100644 --- a/pkg/query-service/app/metrics/v3/delta_table.go +++ b/pkg/query-service/app/metrics/v3/delta_table.go @@ -4,10 +4,10 @@ import ( "fmt" "math" - "go.signoz.io/signoz/pkg/query-service/app/metrics/v4/helpers" - "go.signoz.io/signoz/pkg/query-service/constants" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" - "go.signoz.io/signoz/pkg/query-service/utils" + "github.com/SigNoz/signoz/pkg/query-service/app/metrics/v4/helpers" + "github.com/SigNoz/signoz/pkg/query-service/constants" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" + "github.com/SigNoz/signoz/pkg/query-service/utils" ) func buildDeltaMetricQueryForTable(start, end, _ int64, mq *v3.BuilderQuery) (string, error) { diff --git a/pkg/query-service/app/metrics/v3/delta_table_test.go b/pkg/query-service/app/metrics/v3/delta_table_test.go index 02cfdb9b7df5..9da2437bcfff 100644 --- a/pkg/query-service/app/metrics/v3/delta_table_test.go +++ b/pkg/query-service/app/metrics/v3/delta_table_test.go @@ -3,7 +3,7 @@ package v3 import ( "testing" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" ) func TestPanelTableForDelta(t *testing.T) { diff --git a/pkg/query-service/app/metrics/v3/query_builder.go b/pkg/query-service/app/metrics/v3/query_builder.go index 77910b1f3823..0fe6645d15bc 100644 --- a/pkg/query-service/app/metrics/v3/query_builder.go +++ b/pkg/query-service/app/metrics/v3/query_builder.go @@ -5,13 +5,13 @@ import ( "strings" "time" - "go.signoz.io/signoz/pkg/query-service/app/metrics" - "go.signoz.io/signoz/pkg/query-service/app/metrics/v4/helpers" - "go.signoz.io/signoz/pkg/query-service/common" - "go.signoz.io/signoz/pkg/query-service/constants" - "go.signoz.io/signoz/pkg/query-service/model" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" - "go.signoz.io/signoz/pkg/query-service/utils" + "github.com/SigNoz/signoz/pkg/query-service/app/metrics" + "github.com/SigNoz/signoz/pkg/query-service/app/metrics/v4/helpers" + "github.com/SigNoz/signoz/pkg/query-service/common" + "github.com/SigNoz/signoz/pkg/query-service/constants" + "github.com/SigNoz/signoz/pkg/query-service/model" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" + "github.com/SigNoz/signoz/pkg/query-service/utils" ) type Options struct { diff --git a/pkg/query-service/app/metrics/v3/query_builder_test.go b/pkg/query-service/app/metrics/v3/query_builder_test.go index 0aa37f43165f..2174db175b26 100644 --- a/pkg/query-service/app/metrics/v3/query_builder_test.go +++ b/pkg/query-service/app/metrics/v3/query_builder_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" "github.com/stretchr/testify/require" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" ) func TestBuildQuery(t *testing.T) { diff --git a/pkg/query-service/app/metrics/v4/cumulative/table.go b/pkg/query-service/app/metrics/v4/cumulative/table.go index 8ce7dbe0bb7d..a0b30e1ec765 100644 --- a/pkg/query-service/app/metrics/v4/cumulative/table.go +++ b/pkg/query-service/app/metrics/v4/cumulative/table.go @@ -3,8 +3,8 @@ package cumulative import ( "fmt" - "go.signoz.io/signoz/pkg/query-service/app/metrics/v4/helpers" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" + "github.com/SigNoz/signoz/pkg/query-service/app/metrics/v4/helpers" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" ) // PrepareMetricQueryCumulativeTable prepares the query to be used for fetching metrics diff --git a/pkg/query-service/app/metrics/v4/cumulative/table_test.go b/pkg/query-service/app/metrics/v4/cumulative/table_test.go index d256448b52c7..cf81758ceea9 100644 --- a/pkg/query-service/app/metrics/v4/cumulative/table_test.go +++ b/pkg/query-service/app/metrics/v4/cumulative/table_test.go @@ -3,8 +3,8 @@ package cumulative import ( "testing" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" "github.com/stretchr/testify/assert" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" ) func TestPrepareTableQuery(t *testing.T) { diff --git a/pkg/query-service/app/metrics/v4/cumulative/timeseries.go b/pkg/query-service/app/metrics/v4/cumulative/timeseries.go index 2c8e861b4b51..aaf182c723ef 100644 --- a/pkg/query-service/app/metrics/v4/cumulative/timeseries.go +++ b/pkg/query-service/app/metrics/v4/cumulative/timeseries.go @@ -4,10 +4,10 @@ import ( "fmt" "os" - "go.signoz.io/signoz/pkg/query-service/app/metrics/v4/helpers" - "go.signoz.io/signoz/pkg/query-service/constants" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" - "go.signoz.io/signoz/pkg/query-service/utils" + "github.com/SigNoz/signoz/pkg/query-service/app/metrics/v4/helpers" + "github.com/SigNoz/signoz/pkg/query-service/constants" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" + "github.com/SigNoz/signoz/pkg/query-service/utils" ) // See https://clickhouse.com/docs/en/sql-reference/window-functions for more details on `lagInFrame` function diff --git a/pkg/query-service/app/metrics/v4/cumulative/timeseries_test.go b/pkg/query-service/app/metrics/v4/cumulative/timeseries_test.go index 0ba41ab8fd9f..59487e4127e1 100644 --- a/pkg/query-service/app/metrics/v4/cumulative/timeseries_test.go +++ b/pkg/query-service/app/metrics/v4/cumulative/timeseries_test.go @@ -3,8 +3,8 @@ package cumulative import ( "testing" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" "github.com/stretchr/testify/assert" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" ) func TestPrepareTimeAggregationSubQuery(t *testing.T) { diff --git a/pkg/query-service/app/metrics/v4/delta/table.go b/pkg/query-service/app/metrics/v4/delta/table.go index 16297607952c..7cdf5fa39537 100644 --- a/pkg/query-service/app/metrics/v4/delta/table.go +++ b/pkg/query-service/app/metrics/v4/delta/table.go @@ -3,8 +3,8 @@ package delta import ( "fmt" - "go.signoz.io/signoz/pkg/query-service/app/metrics/v4/helpers" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" + "github.com/SigNoz/signoz/pkg/query-service/app/metrics/v4/helpers" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" ) // PrepareMetricQueryDeltaTable builds the query to be used for fetching metrics diff --git a/pkg/query-service/app/metrics/v4/delta/table_test.go b/pkg/query-service/app/metrics/v4/delta/table_test.go index 350ac4c57d5e..512cfeeeba9e 100644 --- a/pkg/query-service/app/metrics/v4/delta/table_test.go +++ b/pkg/query-service/app/metrics/v4/delta/table_test.go @@ -3,8 +3,8 @@ package delta import ( "testing" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" "github.com/stretchr/testify/assert" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" ) func TestPrepareTableQuery(t *testing.T) { diff --git a/pkg/query-service/app/metrics/v4/delta/time_series_test.go b/pkg/query-service/app/metrics/v4/delta/time_series_test.go index 033cd0951107..a34c92ee44c6 100644 --- a/pkg/query-service/app/metrics/v4/delta/time_series_test.go +++ b/pkg/query-service/app/metrics/v4/delta/time_series_test.go @@ -3,8 +3,8 @@ package delta import ( "testing" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" "github.com/stretchr/testify/assert" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" ) func TestPrepareTimeAggregationSubQuery(t *testing.T) { diff --git a/pkg/query-service/app/metrics/v4/delta/timeseries.go b/pkg/query-service/app/metrics/v4/delta/timeseries.go index 1a8dc9743f0b..a23042ebbb7b 100644 --- a/pkg/query-service/app/metrics/v4/delta/timeseries.go +++ b/pkg/query-service/app/metrics/v4/delta/timeseries.go @@ -3,10 +3,10 @@ package delta import ( "fmt" - "go.signoz.io/signoz/pkg/query-service/app/metrics/v4/helpers" - "go.signoz.io/signoz/pkg/query-service/constants" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" - "go.signoz.io/signoz/pkg/query-service/utils" + "github.com/SigNoz/signoz/pkg/query-service/app/metrics/v4/helpers" + "github.com/SigNoz/signoz/pkg/query-service/constants" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" + "github.com/SigNoz/signoz/pkg/query-service/utils" ) // TODO(srikanthccv): support multiple quantiles; see https://github.com/SigNoz/signoz/issues/4016#issuecomment-1838583305 diff --git a/pkg/query-service/app/metrics/v4/helpers/clauses.go b/pkg/query-service/app/metrics/v4/helpers/clauses.go index 3787b40a33de..2bc3c24ef4a5 100644 --- a/pkg/query-service/app/metrics/v4/helpers/clauses.go +++ b/pkg/query-service/app/metrics/v4/helpers/clauses.go @@ -2,10 +2,10 @@ package helpers import ( "fmt" - "go.signoz.io/signoz/pkg/query-service/utils" + "github.com/SigNoz/signoz/pkg/query-service/utils" "strings" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" ) // groupingSets returns a string of comma separated tags for group by clause diff --git a/pkg/query-service/app/metrics/v4/helpers/series_agg_helper.go b/pkg/query-service/app/metrics/v4/helpers/series_agg_helper.go index a4bfcb1be228..bc7be103d00c 100644 --- a/pkg/query-service/app/metrics/v4/helpers/series_agg_helper.go +++ b/pkg/query-service/app/metrics/v4/helpers/series_agg_helper.go @@ -2,7 +2,7 @@ package helpers import ( "fmt" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" ) func AddSecondaryAggregation(seriesAggregator v3.SecondaryAggregation, query string) string { diff --git a/pkg/query-service/app/metrics/v4/helpers/sub_query.go b/pkg/query-service/app/metrics/v4/helpers/sub_query.go index 60a48180d0d5..a5a7eaa17b71 100644 --- a/pkg/query-service/app/metrics/v4/helpers/sub_query.go +++ b/pkg/query-service/app/metrics/v4/helpers/sub_query.go @@ -5,9 +5,9 @@ import ( "strings" "time" - "go.signoz.io/signoz/pkg/query-service/constants" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" - "go.signoz.io/signoz/pkg/query-service/utils" + "github.com/SigNoz/signoz/pkg/query-service/constants" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" + "github.com/SigNoz/signoz/pkg/query-service/utils" ) var ( diff --git a/pkg/query-service/app/metrics/v4/query_builder.go b/pkg/query-service/app/metrics/v4/query_builder.go index 6f4d96b27076..08261995490a 100644 --- a/pkg/query-service/app/metrics/v4/query_builder.go +++ b/pkg/query-service/app/metrics/v4/query_builder.go @@ -4,14 +4,14 @@ import ( "fmt" "time" - "go.signoz.io/signoz/pkg/query-service/app/metrics" - metricsV3 "go.signoz.io/signoz/pkg/query-service/app/metrics/v3" - "go.signoz.io/signoz/pkg/query-service/app/metrics/v4/cumulative" - "go.signoz.io/signoz/pkg/query-service/app/metrics/v4/delta" - "go.signoz.io/signoz/pkg/query-service/app/metrics/v4/helpers" - "go.signoz.io/signoz/pkg/query-service/common" - "go.signoz.io/signoz/pkg/query-service/model" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" + "github.com/SigNoz/signoz/pkg/query-service/app/metrics" + metricsV3 "github.com/SigNoz/signoz/pkg/query-service/app/metrics/v3" + "github.com/SigNoz/signoz/pkg/query-service/app/metrics/v4/cumulative" + "github.com/SigNoz/signoz/pkg/query-service/app/metrics/v4/delta" + "github.com/SigNoz/signoz/pkg/query-service/app/metrics/v4/helpers" + "github.com/SigNoz/signoz/pkg/query-service/common" + "github.com/SigNoz/signoz/pkg/query-service/model" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" ) // PrepareMetricQuery prepares the query to be used for fetching metrics diff --git a/pkg/query-service/app/metrics/v4/query_builder_pre_agg_test.go b/pkg/query-service/app/metrics/v4/query_builder_pre_agg_test.go index 4c1e0b3f2cac..6c7550a6c49e 100644 --- a/pkg/query-service/app/metrics/v4/query_builder_pre_agg_test.go +++ b/pkg/query-service/app/metrics/v4/query_builder_pre_agg_test.go @@ -3,9 +3,9 @@ package v4 import ( "testing" + metricsV3 "github.com/SigNoz/signoz/pkg/query-service/app/metrics/v3" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" "github.com/stretchr/testify/assert" - metricsV3 "go.signoz.io/signoz/pkg/query-service/app/metrics/v3" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" ) func TestPrepareMetricQueryCumulativeRatePreAgg(t *testing.T) { diff --git a/pkg/query-service/app/metrics/v4/query_builder_test.go b/pkg/query-service/app/metrics/v4/query_builder_test.go index 0fe422b45bc7..032e2d2814c6 100644 --- a/pkg/query-service/app/metrics/v4/query_builder_test.go +++ b/pkg/query-service/app/metrics/v4/query_builder_test.go @@ -3,10 +3,10 @@ package v4 import ( "testing" + metricsV3 "github.com/SigNoz/signoz/pkg/query-service/app/metrics/v3" + "github.com/SigNoz/signoz/pkg/query-service/app/metrics/v4/helpers" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" "github.com/stretchr/testify/assert" - metricsV3 "go.signoz.io/signoz/pkg/query-service/app/metrics/v3" - "go.signoz.io/signoz/pkg/query-service/app/metrics/v4/helpers" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" ) func TestPrepareTimeseriesFilterQuery(t *testing.T) { diff --git a/pkg/query-service/app/metricsexplorer/parser.go b/pkg/query-service/app/metricsexplorer/parser.go index 17c84f527a2f..0f332100d00b 100644 --- a/pkg/query-service/app/metricsexplorer/parser.go +++ b/pkg/query-service/app/metricsexplorer/parser.go @@ -7,12 +7,12 @@ import ( "net/http" "strconv" - "go.signoz.io/signoz/pkg/query-service/constants" + "github.com/SigNoz/signoz/pkg/query-service/constants" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" - "go.signoz.io/signoz/pkg/query-service/model" - "go.signoz.io/signoz/pkg/query-service/model/metrics_explorer" + "github.com/SigNoz/signoz/pkg/query-service/model" + "github.com/SigNoz/signoz/pkg/query-service/model/metrics_explorer" ) func ParseFilterKeySuggestions(r *http.Request) (*metrics_explorer.FilterKeyRequest, *model.ApiError) { diff --git a/pkg/query-service/app/metricsexplorer/summary.go b/pkg/query-service/app/metricsexplorer/summary.go index 49cd77700aa6..bb4cf58adf79 100644 --- a/pkg/query-service/app/metricsexplorer/summary.go +++ b/pkg/query-service/app/metricsexplorer/summary.go @@ -10,13 +10,13 @@ import ( "go.uber.org/zap" - "go.signoz.io/signoz/pkg/query-service/app/dashboards" - "go.signoz.io/signoz/pkg/query-service/interfaces" - "go.signoz.io/signoz/pkg/query-service/model" - "go.signoz.io/signoz/pkg/query-service/model/metrics_explorer" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" - "go.signoz.io/signoz/pkg/query-service/rules" - "go.signoz.io/signoz/pkg/types/authtypes" + "github.com/SigNoz/signoz/pkg/query-service/app/dashboards" + "github.com/SigNoz/signoz/pkg/query-service/interfaces" + "github.com/SigNoz/signoz/pkg/query-service/model" + "github.com/SigNoz/signoz/pkg/query-service/model/metrics_explorer" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" + "github.com/SigNoz/signoz/pkg/query-service/rules" + "github.com/SigNoz/signoz/pkg/types/authtypes" "golang.org/x/sync/errgroup" ) diff --git a/pkg/query-service/app/opamp/config_provider.go b/pkg/query-service/app/opamp/config_provider.go index 0978890cb142..b73d94a2c5df 100644 --- a/pkg/query-service/app/opamp/config_provider.go +++ b/pkg/query-service/app/opamp/config_provider.go @@ -1,6 +1,6 @@ package opamp -import "go.signoz.io/signoz/pkg/query-service/app/opamp/model" +import "github.com/SigNoz/signoz/pkg/query-service/app/opamp/model" // Interface for a source of otel collector config recommendations. type AgentConfigProvider interface { diff --git a/pkg/query-service/app/opamp/config_provider_test.go b/pkg/query-service/app/opamp/config_provider_test.go index 99b7b1c96574..175fb102c48d 100644 --- a/pkg/query-service/app/opamp/config_provider_test.go +++ b/pkg/query-service/app/opamp/config_provider_test.go @@ -4,6 +4,8 @@ import ( "fmt" "testing" + "github.com/SigNoz/signoz/pkg/query-service/app/opamp/model" + "github.com/SigNoz/signoz/pkg/query-service/utils" "github.com/knadh/koanf" "github.com/knadh/koanf/parsers/yaml" "github.com/knadh/koanf/providers/rawbytes" @@ -11,8 +13,6 @@ import ( "github.com/open-telemetry/opamp-go/protobufs" "github.com/pkg/errors" "github.com/stretchr/testify/require" - "go.signoz.io/signoz/pkg/query-service/app/opamp/model" - "go.signoz.io/signoz/pkg/query-service/utils" "golang.org/x/exp/maps" ) diff --git a/pkg/query-service/app/opamp/configure_ingestionRules.go b/pkg/query-service/app/opamp/configure_ingestionRules.go index ec9c9e5b8817..35b81e4a3fd0 100644 --- a/pkg/query-service/app/opamp/configure_ingestionRules.go +++ b/pkg/query-service/app/opamp/configure_ingestionRules.go @@ -5,12 +5,12 @@ import ( "crypto/sha256" "fmt" + model "github.com/SigNoz/signoz/pkg/query-service/app/opamp/model" + "github.com/SigNoz/signoz/pkg/query-service/app/opamp/otelconfig" + coreModel "github.com/SigNoz/signoz/pkg/query-service/model" "github.com/knadh/koanf/parsers/yaml" "github.com/open-telemetry/opamp-go/protobufs" "go.opentelemetry.io/collector/confmap" - model "go.signoz.io/signoz/pkg/query-service/app/opamp/model" - "go.signoz.io/signoz/pkg/query-service/app/opamp/otelconfig" - coreModel "go.signoz.io/signoz/pkg/query-service/model" "go.uber.org/zap" ) diff --git a/pkg/query-service/app/opamp/opamp_server.go b/pkg/query-service/app/opamp/opamp_server.go index 45c70e0bff34..835e5b811e1f 100644 --- a/pkg/query-service/app/opamp/opamp_server.go +++ b/pkg/query-service/app/opamp/opamp_server.go @@ -3,10 +3,10 @@ package opamp import ( "context" + model "github.com/SigNoz/signoz/pkg/query-service/app/opamp/model" "github.com/open-telemetry/opamp-go/protobufs" "github.com/open-telemetry/opamp-go/server" "github.com/open-telemetry/opamp-go/server/types" - model "go.signoz.io/signoz/pkg/query-service/app/opamp/model" "go.uber.org/zap" ) diff --git a/pkg/query-service/app/parser.go b/pkg/query-service/app/parser.go index 5b8d847e5928..2a5c963092d1 100644 --- a/pkg/query-service/app/parser.go +++ b/pkg/query-service/app/parser.go @@ -13,27 +13,27 @@ import ( "text/template" "time" - "go.signoz.io/signoz/pkg/query-service/app/integrations/messagingQueues/kafka" - queues2 "go.signoz.io/signoz/pkg/query-service/app/integrations/messagingQueues/queues" - "go.signoz.io/signoz/pkg/query-service/app/integrations/thirdPartyApi" + "github.com/SigNoz/signoz/pkg/query-service/app/integrations/messagingQueues/kafka" + queues2 "github.com/SigNoz/signoz/pkg/query-service/app/integrations/messagingQueues/queues" + "github.com/SigNoz/signoz/pkg/query-service/app/integrations/thirdPartyApi" "github.com/SigNoz/govaluate" "github.com/gorilla/mux" promModel "github.com/prometheus/common/model" "go.uber.org/multierr" - "go.signoz.io/signoz/pkg/query-service/app/metrics" - "go.signoz.io/signoz/pkg/query-service/app/queryBuilder" - "go.signoz.io/signoz/pkg/query-service/auth" - "go.signoz.io/signoz/pkg/query-service/common" - "go.signoz.io/signoz/pkg/query-service/constants" - baseconstants "go.signoz.io/signoz/pkg/query-service/constants" - "go.signoz.io/signoz/pkg/query-service/model" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" - "go.signoz.io/signoz/pkg/query-service/postprocess" - "go.signoz.io/signoz/pkg/query-service/utils" - querytemplate "go.signoz.io/signoz/pkg/query-service/utils/queryTemplate" - "go.signoz.io/signoz/pkg/types" + "github.com/SigNoz/signoz/pkg/query-service/app/metrics" + "github.com/SigNoz/signoz/pkg/query-service/app/queryBuilder" + "github.com/SigNoz/signoz/pkg/query-service/auth" + "github.com/SigNoz/signoz/pkg/query-service/common" + "github.com/SigNoz/signoz/pkg/query-service/constants" + baseconstants "github.com/SigNoz/signoz/pkg/query-service/constants" + "github.com/SigNoz/signoz/pkg/query-service/model" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" + "github.com/SigNoz/signoz/pkg/query-service/postprocess" + "github.com/SigNoz/signoz/pkg/query-service/utils" + querytemplate "github.com/SigNoz/signoz/pkg/query-service/utils/queryTemplate" + "github.com/SigNoz/signoz/pkg/types" ) var allowedFunctions = []string{"count", "ratePerSec", "sum", "avg", "min", "max", "p50", "p90", "p95", "p99"} diff --git a/pkg/query-service/app/parser_test.go b/pkg/query-service/app/parser_test.go index ed290d135585..84975840fcd4 100644 --- a/pkg/query-service/app/parser_test.go +++ b/pkg/query-service/app/parser_test.go @@ -9,10 +9,10 @@ import ( "testing" "time" + "github.com/SigNoz/signoz/pkg/query-service/common" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.signoz.io/signoz/pkg/query-service/common" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" ) func TestParseAggregateAttrReques(t *testing.T) { diff --git a/pkg/query-service/app/preferences/model.go b/pkg/query-service/app/preferences/model.go index efec8cad3f3b..043652591df9 100644 --- a/pkg/query-service/app/preferences/model.go +++ b/pkg/query-service/app/preferences/model.go @@ -6,8 +6,8 @@ import ( "fmt" "strings" + "github.com/SigNoz/signoz/pkg/query-service/model" "github.com/jmoiron/sqlx" - "go.signoz.io/signoz/pkg/query-service/model" ) type Range struct { diff --git a/pkg/query-service/app/querier/helper.go b/pkg/query-service/app/querier/helper.go index 18cee86b1f34..72ee8051d144 100644 --- a/pkg/query-service/app/querier/helper.go +++ b/pkg/query-service/app/querier/helper.go @@ -6,16 +6,16 @@ import ( "strings" "sync" - logsV3 "go.signoz.io/signoz/pkg/query-service/app/logs/v3" - logsV4 "go.signoz.io/signoz/pkg/query-service/app/logs/v4" - metricsV3 "go.signoz.io/signoz/pkg/query-service/app/metrics/v3" - tracesV3 "go.signoz.io/signoz/pkg/query-service/app/traces/v3" - tracesV4 "go.signoz.io/signoz/pkg/query-service/app/traces/v4" - "go.signoz.io/signoz/pkg/query-service/common" - "go.signoz.io/signoz/pkg/query-service/constants" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" - "go.signoz.io/signoz/pkg/query-service/postprocess" - "go.signoz.io/signoz/pkg/query-service/querycache" + logsV3 "github.com/SigNoz/signoz/pkg/query-service/app/logs/v3" + logsV4 "github.com/SigNoz/signoz/pkg/query-service/app/logs/v4" + metricsV3 "github.com/SigNoz/signoz/pkg/query-service/app/metrics/v3" + tracesV3 "github.com/SigNoz/signoz/pkg/query-service/app/traces/v3" + tracesV4 "github.com/SigNoz/signoz/pkg/query-service/app/traces/v4" + "github.com/SigNoz/signoz/pkg/query-service/common" + "github.com/SigNoz/signoz/pkg/query-service/constants" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" + "github.com/SigNoz/signoz/pkg/query-service/postprocess" + "github.com/SigNoz/signoz/pkg/query-service/querycache" "go.uber.org/zap" ) diff --git a/pkg/query-service/app/querier/querier.go b/pkg/query-service/app/querier/querier.go index d7c1e8b48d7b..a759e668f645 100644 --- a/pkg/query-service/app/querier/querier.go +++ b/pkg/query-service/app/querier/querier.go @@ -6,22 +6,22 @@ import ( "sync" "time" - logsV3 "go.signoz.io/signoz/pkg/query-service/app/logs/v3" - logsV4 "go.signoz.io/signoz/pkg/query-service/app/logs/v4" - metricsV3 "go.signoz.io/signoz/pkg/query-service/app/metrics/v3" - "go.signoz.io/signoz/pkg/query-service/app/queryBuilder" - tracesV3 "go.signoz.io/signoz/pkg/query-service/app/traces/v3" - tracesV4 "go.signoz.io/signoz/pkg/query-service/app/traces/v4" - "go.signoz.io/signoz/pkg/query-service/common" - "go.signoz.io/signoz/pkg/query-service/constants" - chErrors "go.signoz.io/signoz/pkg/query-service/errors" - "go.signoz.io/signoz/pkg/query-service/querycache" - "go.signoz.io/signoz/pkg/query-service/utils" + logsV3 "github.com/SigNoz/signoz/pkg/query-service/app/logs/v3" + logsV4 "github.com/SigNoz/signoz/pkg/query-service/app/logs/v4" + metricsV3 "github.com/SigNoz/signoz/pkg/query-service/app/metrics/v3" + "github.com/SigNoz/signoz/pkg/query-service/app/queryBuilder" + tracesV3 "github.com/SigNoz/signoz/pkg/query-service/app/traces/v3" + tracesV4 "github.com/SigNoz/signoz/pkg/query-service/app/traces/v4" + "github.com/SigNoz/signoz/pkg/query-service/common" + "github.com/SigNoz/signoz/pkg/query-service/constants" + chErrors "github.com/SigNoz/signoz/pkg/query-service/errors" + "github.com/SigNoz/signoz/pkg/query-service/querycache" + "github.com/SigNoz/signoz/pkg/query-service/utils" - "go.signoz.io/signoz/pkg/query-service/cache" - "go.signoz.io/signoz/pkg/query-service/interfaces" - "go.signoz.io/signoz/pkg/query-service/model" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" + "github.com/SigNoz/signoz/pkg/query-service/cache" + "github.com/SigNoz/signoz/pkg/query-service/interfaces" + "github.com/SigNoz/signoz/pkg/query-service/model" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" "go.uber.org/multierr" "go.uber.org/zap" ) diff --git a/pkg/query-service/app/querier/querier_test.go b/pkg/query-service/app/querier/querier_test.go index 2a491362fcbe..fc766ab47572 100644 --- a/pkg/query-service/app/querier/querier_test.go +++ b/pkg/query-service/app/querier/querier_test.go @@ -10,16 +10,16 @@ import ( "testing" "time" + "github.com/SigNoz/signoz/pkg/query-service/app/clickhouseReader" + "github.com/SigNoz/signoz/pkg/query-service/app/queryBuilder" + tracesV3 "github.com/SigNoz/signoz/pkg/query-service/app/traces/v3" + "github.com/SigNoz/signoz/pkg/query-service/cache/inmemory" + "github.com/SigNoz/signoz/pkg/query-service/featureManager" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" + "github.com/SigNoz/signoz/pkg/query-service/querycache" + "github.com/SigNoz/signoz/pkg/query-service/utils" cmock "github.com/srikanthccv/ClickHouse-go-mock" "github.com/stretchr/testify/require" - "go.signoz.io/signoz/pkg/query-service/app/clickhouseReader" - "go.signoz.io/signoz/pkg/query-service/app/queryBuilder" - tracesV3 "go.signoz.io/signoz/pkg/query-service/app/traces/v3" - "go.signoz.io/signoz/pkg/query-service/cache/inmemory" - "go.signoz.io/signoz/pkg/query-service/featureManager" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" - "go.signoz.io/signoz/pkg/query-service/querycache" - "go.signoz.io/signoz/pkg/query-service/utils" ) func minTimestamp(series []*v3.Series) int64 { diff --git a/pkg/query-service/app/querier/v2/helper.go b/pkg/query-service/app/querier/v2/helper.go index d0bc32f990d5..9c9e6545e6be 100644 --- a/pkg/query-service/app/querier/v2/helper.go +++ b/pkg/query-service/app/querier/v2/helper.go @@ -6,16 +6,16 @@ import ( "strings" "sync" - logsV3 "go.signoz.io/signoz/pkg/query-service/app/logs/v3" - logsV4 "go.signoz.io/signoz/pkg/query-service/app/logs/v4" - metricsV3 "go.signoz.io/signoz/pkg/query-service/app/metrics/v3" - metricsV4 "go.signoz.io/signoz/pkg/query-service/app/metrics/v4" - tracesV3 "go.signoz.io/signoz/pkg/query-service/app/traces/v3" - tracesV4 "go.signoz.io/signoz/pkg/query-service/app/traces/v4" - "go.signoz.io/signoz/pkg/query-service/common" - "go.signoz.io/signoz/pkg/query-service/constants" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" - "go.signoz.io/signoz/pkg/query-service/querycache" + logsV3 "github.com/SigNoz/signoz/pkg/query-service/app/logs/v3" + logsV4 "github.com/SigNoz/signoz/pkg/query-service/app/logs/v4" + metricsV3 "github.com/SigNoz/signoz/pkg/query-service/app/metrics/v3" + metricsV4 "github.com/SigNoz/signoz/pkg/query-service/app/metrics/v4" + tracesV3 "github.com/SigNoz/signoz/pkg/query-service/app/traces/v3" + tracesV4 "github.com/SigNoz/signoz/pkg/query-service/app/traces/v4" + "github.com/SigNoz/signoz/pkg/query-service/common" + "github.com/SigNoz/signoz/pkg/query-service/constants" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" + "github.com/SigNoz/signoz/pkg/query-service/querycache" "go.uber.org/zap" ) diff --git a/pkg/query-service/app/querier/v2/querier.go b/pkg/query-service/app/querier/v2/querier.go index dcfe62c1ed99..c68923cdb4ff 100644 --- a/pkg/query-service/app/querier/v2/querier.go +++ b/pkg/query-service/app/querier/v2/querier.go @@ -6,22 +6,22 @@ import ( "sync" "time" - logsV3 "go.signoz.io/signoz/pkg/query-service/app/logs/v3" - logsV4 "go.signoz.io/signoz/pkg/query-service/app/logs/v4" - metricsV4 "go.signoz.io/signoz/pkg/query-service/app/metrics/v4" - "go.signoz.io/signoz/pkg/query-service/app/queryBuilder" - tracesV3 "go.signoz.io/signoz/pkg/query-service/app/traces/v3" - tracesV4 "go.signoz.io/signoz/pkg/query-service/app/traces/v4" - "go.signoz.io/signoz/pkg/query-service/common" - "go.signoz.io/signoz/pkg/query-service/constants" - chErrors "go.signoz.io/signoz/pkg/query-service/errors" - "go.signoz.io/signoz/pkg/query-service/querycache" - "go.signoz.io/signoz/pkg/query-service/utils" + logsV3 "github.com/SigNoz/signoz/pkg/query-service/app/logs/v3" + logsV4 "github.com/SigNoz/signoz/pkg/query-service/app/logs/v4" + metricsV4 "github.com/SigNoz/signoz/pkg/query-service/app/metrics/v4" + "github.com/SigNoz/signoz/pkg/query-service/app/queryBuilder" + tracesV3 "github.com/SigNoz/signoz/pkg/query-service/app/traces/v3" + tracesV4 "github.com/SigNoz/signoz/pkg/query-service/app/traces/v4" + "github.com/SigNoz/signoz/pkg/query-service/common" + "github.com/SigNoz/signoz/pkg/query-service/constants" + chErrors "github.com/SigNoz/signoz/pkg/query-service/errors" + "github.com/SigNoz/signoz/pkg/query-service/querycache" + "github.com/SigNoz/signoz/pkg/query-service/utils" - "go.signoz.io/signoz/pkg/query-service/cache" - "go.signoz.io/signoz/pkg/query-service/interfaces" - "go.signoz.io/signoz/pkg/query-service/model" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" + "github.com/SigNoz/signoz/pkg/query-service/cache" + "github.com/SigNoz/signoz/pkg/query-service/interfaces" + "github.com/SigNoz/signoz/pkg/query-service/model" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" "go.uber.org/multierr" "go.uber.org/zap" ) diff --git a/pkg/query-service/app/querier/v2/querier_test.go b/pkg/query-service/app/querier/v2/querier_test.go index 15a7ca713aab..6072ab9cb32c 100644 --- a/pkg/query-service/app/querier/v2/querier_test.go +++ b/pkg/query-service/app/querier/v2/querier_test.go @@ -10,16 +10,16 @@ import ( "testing" "time" + "github.com/SigNoz/signoz/pkg/query-service/app/clickhouseReader" + "github.com/SigNoz/signoz/pkg/query-service/app/queryBuilder" + tracesV3 "github.com/SigNoz/signoz/pkg/query-service/app/traces/v3" + "github.com/SigNoz/signoz/pkg/query-service/cache/inmemory" + "github.com/SigNoz/signoz/pkg/query-service/featureManager" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" + "github.com/SigNoz/signoz/pkg/query-service/querycache" + "github.com/SigNoz/signoz/pkg/query-service/utils" cmock "github.com/srikanthccv/ClickHouse-go-mock" "github.com/stretchr/testify/require" - "go.signoz.io/signoz/pkg/query-service/app/clickhouseReader" - "go.signoz.io/signoz/pkg/query-service/app/queryBuilder" - tracesV3 "go.signoz.io/signoz/pkg/query-service/app/traces/v3" - "go.signoz.io/signoz/pkg/query-service/cache/inmemory" - "go.signoz.io/signoz/pkg/query-service/featureManager" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" - "go.signoz.io/signoz/pkg/query-service/querycache" - "go.signoz.io/signoz/pkg/query-service/utils" ) func minTimestamp(series []*v3.Series) int64 { diff --git a/pkg/query-service/app/queryBuilder/functions.go b/pkg/query-service/app/queryBuilder/functions.go index 39f3cb6ecbcf..6a236f921da3 100644 --- a/pkg/query-service/app/queryBuilder/functions.go +++ b/pkg/query-service/app/queryBuilder/functions.go @@ -4,7 +4,7 @@ import ( "math" "sort" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" ) // funcCutOffMin cuts off values below the threshold and replaces them with NaN diff --git a/pkg/query-service/app/queryBuilder/functions_test.go b/pkg/query-service/app/queryBuilder/functions_test.go index d86ec10d9b40..8a02960b0b7c 100644 --- a/pkg/query-service/app/queryBuilder/functions_test.go +++ b/pkg/query-service/app/queryBuilder/functions_test.go @@ -4,7 +4,7 @@ import ( "math" "testing" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" ) func TestFuncCutOffMin(t *testing.T) { diff --git a/pkg/query-service/app/queryBuilder/query_builder.go b/pkg/query-service/app/queryBuilder/query_builder.go index cfb86a994469..e6e51e7ec2bc 100644 --- a/pkg/query-service/app/queryBuilder/query_builder.go +++ b/pkg/query-service/app/queryBuilder/query_builder.go @@ -5,11 +5,11 @@ import ( "strings" "github.com/SigNoz/govaluate" - metricsV3 "go.signoz.io/signoz/pkg/query-service/app/metrics/v3" - "go.signoz.io/signoz/pkg/query-service/cache" - "go.signoz.io/signoz/pkg/query-service/constants" - "go.signoz.io/signoz/pkg/query-service/interfaces" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" + metricsV3 "github.com/SigNoz/signoz/pkg/query-service/app/metrics/v3" + "github.com/SigNoz/signoz/pkg/query-service/cache" + "github.com/SigNoz/signoz/pkg/query-service/constants" + "github.com/SigNoz/signoz/pkg/query-service/interfaces" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" "go.uber.org/zap" ) diff --git a/pkg/query-service/app/queryBuilder/query_builder_test.go b/pkg/query-service/app/queryBuilder/query_builder_test.go index df0acc250209..72befcf4a295 100644 --- a/pkg/query-service/app/queryBuilder/query_builder_test.go +++ b/pkg/query-service/app/queryBuilder/query_builder_test.go @@ -4,13 +4,13 @@ import ( "strings" "testing" + logsV3 "github.com/SigNoz/signoz/pkg/query-service/app/logs/v3" + logsV4 "github.com/SigNoz/signoz/pkg/query-service/app/logs/v4" + metricsv3 "github.com/SigNoz/signoz/pkg/query-service/app/metrics/v3" + "github.com/SigNoz/signoz/pkg/query-service/constants" + "github.com/SigNoz/signoz/pkg/query-service/featureManager" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" "github.com/stretchr/testify/require" - logsV3 "go.signoz.io/signoz/pkg/query-service/app/logs/v3" - logsV4 "go.signoz.io/signoz/pkg/query-service/app/logs/v4" - metricsv3 "go.signoz.io/signoz/pkg/query-service/app/metrics/v3" - "go.signoz.io/signoz/pkg/query-service/constants" - "go.signoz.io/signoz/pkg/query-service/featureManager" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" ) func TestBuildQueryWithMultipleQueriesAndFormula(t *testing.T) { diff --git a/pkg/query-service/app/resource/resource_query_builder.go b/pkg/query-service/app/resource/resource_query_builder.go index c03807b130a7..99f6864198a4 100644 --- a/pkg/query-service/app/resource/resource_query_builder.go +++ b/pkg/query-service/app/resource/resource_query_builder.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" - "go.signoz.io/signoz/pkg/query-service/utils" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" + "github.com/SigNoz/signoz/pkg/query-service/utils" ) var resourceLogOperators = map[v3.FilterOperator]string{ diff --git a/pkg/query-service/app/resource/resource_query_builder_test.go b/pkg/query-service/app/resource/resource_query_builder_test.go index ff9c25188298..4afee8a92e30 100644 --- a/pkg/query-service/app/resource/resource_query_builder_test.go +++ b/pkg/query-service/app/resource/resource_query_builder_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" ) func Test_buildResourceFilter(t *testing.T) { diff --git a/pkg/query-service/app/server.go b/pkg/query-service/app/server.go index 8641bd034c59..f6d5bd2d7a79 100644 --- a/pkg/query-service/app/server.go +++ b/pkg/query-service/app/server.go @@ -12,38 +12,38 @@ import ( "github.com/gorilla/handlers" "github.com/jmoiron/sqlx" + "github.com/SigNoz/signoz/pkg/alertmanager" + "github.com/SigNoz/signoz/pkg/http/middleware" + "github.com/SigNoz/signoz/pkg/query-service/agentConf" + "github.com/SigNoz/signoz/pkg/query-service/app/clickhouseReader" + "github.com/SigNoz/signoz/pkg/query-service/app/cloudintegrations" + "github.com/SigNoz/signoz/pkg/query-service/app/dashboards" + "github.com/SigNoz/signoz/pkg/query-service/app/integrations" + "github.com/SigNoz/signoz/pkg/query-service/app/logparsingpipeline" + "github.com/SigNoz/signoz/pkg/query-service/app/opamp" + opAmpModel "github.com/SigNoz/signoz/pkg/query-service/app/opamp/model" + "github.com/SigNoz/signoz/pkg/query-service/app/preferences" + "github.com/SigNoz/signoz/pkg/signoz" + "github.com/SigNoz/signoz/pkg/sqlstore" + "github.com/SigNoz/signoz/pkg/types" + "github.com/SigNoz/signoz/pkg/types/authtypes" + "github.com/SigNoz/signoz/pkg/web" "github.com/rs/cors" "github.com/soheilhy/cmux" - "go.signoz.io/signoz/pkg/alertmanager" - "go.signoz.io/signoz/pkg/http/middleware" - "go.signoz.io/signoz/pkg/query-service/agentConf" - "go.signoz.io/signoz/pkg/query-service/app/clickhouseReader" - "go.signoz.io/signoz/pkg/query-service/app/cloudintegrations" - "go.signoz.io/signoz/pkg/query-service/app/dashboards" - "go.signoz.io/signoz/pkg/query-service/app/integrations" - "go.signoz.io/signoz/pkg/query-service/app/logparsingpipeline" - "go.signoz.io/signoz/pkg/query-service/app/opamp" - opAmpModel "go.signoz.io/signoz/pkg/query-service/app/opamp/model" - "go.signoz.io/signoz/pkg/query-service/app/preferences" - "go.signoz.io/signoz/pkg/signoz" - "go.signoz.io/signoz/pkg/sqlstore" - "go.signoz.io/signoz/pkg/types" - "go.signoz.io/signoz/pkg/types/authtypes" - "go.signoz.io/signoz/pkg/web" - "go.signoz.io/signoz/pkg/query-service/app/explorer" - "go.signoz.io/signoz/pkg/query-service/auth" - "go.signoz.io/signoz/pkg/query-service/cache" - "go.signoz.io/signoz/pkg/query-service/constants" - "go.signoz.io/signoz/pkg/query-service/dao" - "go.signoz.io/signoz/pkg/query-service/featureManager" - "go.signoz.io/signoz/pkg/query-service/healthcheck" - "go.signoz.io/signoz/pkg/query-service/interfaces" - "go.signoz.io/signoz/pkg/query-service/model" - pqle "go.signoz.io/signoz/pkg/query-service/pqlEngine" - "go.signoz.io/signoz/pkg/query-service/rules" - "go.signoz.io/signoz/pkg/query-service/telemetry" - "go.signoz.io/signoz/pkg/query-service/utils" + "github.com/SigNoz/signoz/pkg/query-service/app/explorer" + "github.com/SigNoz/signoz/pkg/query-service/auth" + "github.com/SigNoz/signoz/pkg/query-service/cache" + "github.com/SigNoz/signoz/pkg/query-service/constants" + "github.com/SigNoz/signoz/pkg/query-service/dao" + "github.com/SigNoz/signoz/pkg/query-service/featureManager" + "github.com/SigNoz/signoz/pkg/query-service/healthcheck" + "github.com/SigNoz/signoz/pkg/query-service/interfaces" + "github.com/SigNoz/signoz/pkg/query-service/model" + pqle "github.com/SigNoz/signoz/pkg/query-service/pqlEngine" + "github.com/SigNoz/signoz/pkg/query-service/rules" + "github.com/SigNoz/signoz/pkg/query-service/telemetry" + "github.com/SigNoz/signoz/pkg/query-service/utils" "go.uber.org/zap" ) diff --git a/pkg/query-service/app/services/map.go b/pkg/query-service/app/services/map.go index ff0a7c2b3ce9..fb1edf7e49cf 100644 --- a/pkg/query-service/app/services/map.go +++ b/pkg/query-service/app/services/map.go @@ -5,7 +5,7 @@ import ( "strings" "github.com/ClickHouse/clickhouse-go/v2" - "go.signoz.io/signoz/pkg/query-service/model" + "github.com/SigNoz/signoz/pkg/query-service/model" ) var ( diff --git a/pkg/query-service/app/summary.go b/pkg/query-service/app/summary.go index d66d52985612..1ff114b85454 100644 --- a/pkg/query-service/app/summary.go +++ b/pkg/query-service/app/summary.go @@ -5,10 +5,10 @@ import ( "io" "net/http" + "github.com/SigNoz/signoz/pkg/query-service/model" "github.com/gorilla/mux" - "go.signoz.io/signoz/pkg/query-service/model" - explorer "go.signoz.io/signoz/pkg/query-service/app/metricsexplorer" + explorer "github.com/SigNoz/signoz/pkg/query-service/app/metricsexplorer" "go.uber.org/zap" ) diff --git a/pkg/query-service/app/traces/tracedetail/flamegraph.go b/pkg/query-service/app/traces/tracedetail/flamegraph.go index 5cfd7c34e8ee..02bfa91913a7 100644 --- a/pkg/query-service/app/traces/tracedetail/flamegraph.go +++ b/pkg/query-service/app/traces/tracedetail/flamegraph.go @@ -3,7 +3,7 @@ package tracedetail import ( "sort" - "go.signoz.io/signoz/pkg/query-service/model" + "github.com/SigNoz/signoz/pkg/query-service/model" ) var ( diff --git a/pkg/query-service/app/traces/tracedetail/waterfall.go b/pkg/query-service/app/traces/tracedetail/waterfall.go index dace19ea7e43..0697322d4790 100644 --- a/pkg/query-service/app/traces/tracedetail/waterfall.go +++ b/pkg/query-service/app/traces/tracedetail/waterfall.go @@ -4,7 +4,7 @@ import ( "slices" "sort" - "go.signoz.io/signoz/pkg/query-service/model" + "github.com/SigNoz/signoz/pkg/query-service/model" ) var ( diff --git a/pkg/query-service/app/traces/v3/query_builder.go b/pkg/query-service/app/traces/v3/query_builder.go index 1e1461c7dd2e..7bb051239f5b 100644 --- a/pkg/query-service/app/traces/v3/query_builder.go +++ b/pkg/query-service/app/traces/v3/query_builder.go @@ -5,9 +5,9 @@ import ( "math" "strings" - "go.signoz.io/signoz/pkg/query-service/constants" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" - "go.signoz.io/signoz/pkg/query-service/utils" + "github.com/SigNoz/signoz/pkg/query-service/constants" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" + "github.com/SigNoz/signoz/pkg/query-service/utils" ) var AggregateOperatorToPercentile = map[v3.AggregateOperator]float64{ diff --git a/pkg/query-service/app/traces/v3/query_builder_test.go b/pkg/query-service/app/traces/v3/query_builder_test.go index 4678d64ece01..272420616926 100644 --- a/pkg/query-service/app/traces/v3/query_builder_test.go +++ b/pkg/query-service/app/traces/v3/query_builder_test.go @@ -3,9 +3,9 @@ package v3 import ( "testing" + "github.com/SigNoz/signoz/pkg/query-service/constants" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" . "github.com/smartystreets/goconvey/convey" - "go.signoz.io/signoz/pkg/query-service/constants" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" ) var buildFilterQueryData = []struct { diff --git a/pkg/query-service/app/traces/v3/utils.go b/pkg/query-service/app/traces/v3/utils.go index 7d4edd5223b8..4787299216ca 100644 --- a/pkg/query-service/app/traces/v3/utils.go +++ b/pkg/query-service/app/traces/v3/utils.go @@ -3,8 +3,8 @@ package v3 import ( "strconv" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" - "go.signoz.io/signoz/pkg/query-service/utils" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" + "github.com/SigNoz/signoz/pkg/query-service/utils" "go.uber.org/zap" ) diff --git a/pkg/query-service/app/traces/v4/enrich.go b/pkg/query-service/app/traces/v4/enrich.go index c0974ea0b022..40017a693b40 100644 --- a/pkg/query-service/app/traces/v4/enrich.go +++ b/pkg/query-service/app/traces/v4/enrich.go @@ -1,9 +1,9 @@ package v4 import ( - "go.signoz.io/signoz/pkg/query-service/constants" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" - "go.signoz.io/signoz/pkg/query-service/utils" + "github.com/SigNoz/signoz/pkg/query-service/constants" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" + "github.com/SigNoz/signoz/pkg/query-service/utils" ) // if the field is timestamp/id/value we don't need to enrich diff --git a/pkg/query-service/app/traces/v4/enrich_test.go b/pkg/query-service/app/traces/v4/enrich_test.go index 840b251fbf0c..384c550bc0a4 100644 --- a/pkg/query-service/app/traces/v4/enrich_test.go +++ b/pkg/query-service/app/traces/v4/enrich_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" ) func TestEnrichTracesQuery(t *testing.T) { diff --git a/pkg/query-service/app/traces/v4/query_builder.go b/pkg/query-service/app/traces/v4/query_builder.go index b2bb62f0eb6e..251596f96f1c 100644 --- a/pkg/query-service/app/traces/v4/query_builder.go +++ b/pkg/query-service/app/traces/v4/query_builder.go @@ -4,11 +4,11 @@ import ( "fmt" "strings" - "go.signoz.io/signoz/pkg/query-service/app/resource" - tracesV3 "go.signoz.io/signoz/pkg/query-service/app/traces/v3" - "go.signoz.io/signoz/pkg/query-service/constants" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" - "go.signoz.io/signoz/pkg/query-service/utils" + "github.com/SigNoz/signoz/pkg/query-service/app/resource" + tracesV3 "github.com/SigNoz/signoz/pkg/query-service/app/traces/v3" + "github.com/SigNoz/signoz/pkg/query-service/constants" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" + "github.com/SigNoz/signoz/pkg/query-service/utils" ) const NANOSECOND = 1000000000 diff --git a/pkg/query-service/app/traces/v4/query_builder_test.go b/pkg/query-service/app/traces/v4/query_builder_test.go index 1a3ca9e5e725..18c7c180d744 100644 --- a/pkg/query-service/app/traces/v4/query_builder_test.go +++ b/pkg/query-service/app/traces/v4/query_builder_test.go @@ -3,8 +3,8 @@ package v4 import ( "testing" - "go.signoz.io/signoz/pkg/query-service/constants" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" + "github.com/SigNoz/signoz/pkg/query-service/constants" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" ) func Test_getClickHouseTracesColumnType(t *testing.T) { diff --git a/pkg/query-service/auth/auth.go b/pkg/query-service/auth/auth.go index 9913e527b3dd..032299432ce7 100644 --- a/pkg/query-service/auth/auth.go +++ b/pkg/query-service/auth/auth.go @@ -11,15 +11,15 @@ import ( "github.com/google/uuid" "github.com/pkg/errors" - "go.signoz.io/signoz/pkg/alertmanager" - "go.signoz.io/signoz/pkg/query-service/constants" - "go.signoz.io/signoz/pkg/query-service/dao" - "go.signoz.io/signoz/pkg/query-service/model" - "go.signoz.io/signoz/pkg/query-service/telemetry" - "go.signoz.io/signoz/pkg/query-service/utils" - smtpservice "go.signoz.io/signoz/pkg/query-service/utils/smtpService" - "go.signoz.io/signoz/pkg/types" - "go.signoz.io/signoz/pkg/types/authtypes" + "github.com/SigNoz/signoz/pkg/alertmanager" + "github.com/SigNoz/signoz/pkg/query-service/constants" + "github.com/SigNoz/signoz/pkg/query-service/dao" + "github.com/SigNoz/signoz/pkg/query-service/model" + "github.com/SigNoz/signoz/pkg/query-service/telemetry" + "github.com/SigNoz/signoz/pkg/query-service/utils" + smtpservice "github.com/SigNoz/signoz/pkg/query-service/utils/smtpService" + "github.com/SigNoz/signoz/pkg/types" + "github.com/SigNoz/signoz/pkg/types/authtypes" "go.uber.org/zap" "golang.org/x/crypto/bcrypt" ) diff --git a/pkg/query-service/auth/rbac.go b/pkg/query-service/auth/rbac.go index 64d26681708f..caaf3ce41ed4 100644 --- a/pkg/query-service/auth/rbac.go +++ b/pkg/query-service/auth/rbac.go @@ -3,11 +3,11 @@ package auth import ( "context" + "github.com/SigNoz/signoz/pkg/query-service/constants" + "github.com/SigNoz/signoz/pkg/query-service/dao" + "github.com/SigNoz/signoz/pkg/types" + "github.com/SigNoz/signoz/pkg/types/authtypes" "github.com/pkg/errors" - "go.signoz.io/signoz/pkg/query-service/constants" - "go.signoz.io/signoz/pkg/query-service/dao" - "go.signoz.io/signoz/pkg/types" - "go.signoz.io/signoz/pkg/types/authtypes" ) type Group struct { diff --git a/pkg/query-service/auth/utils.go b/pkg/query-service/auth/utils.go index 8157bf3f07e3..5d0aaa3a3e56 100644 --- a/pkg/query-service/auth/utils.go +++ b/pkg/query-service/auth/utils.go @@ -1,9 +1,9 @@ package auth import ( + "github.com/SigNoz/signoz/pkg/query-service/constants" + "github.com/SigNoz/signoz/pkg/query-service/model" "github.com/pkg/errors" - "go.signoz.io/signoz/pkg/query-service/constants" - "go.signoz.io/signoz/pkg/query-service/model" ) var ( diff --git a/pkg/query-service/cache/cache.go b/pkg/query-service/cache/cache.go index f62fe115a522..931265673223 100644 --- a/pkg/query-service/cache/cache.go +++ b/pkg/query-service/cache/cache.go @@ -4,10 +4,10 @@ import ( "os" "time" - inmemory "go.signoz.io/signoz/pkg/query-service/cache/inmemory" - redis "go.signoz.io/signoz/pkg/query-service/cache/redis" - "go.signoz.io/signoz/pkg/query-service/cache/status" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" + inmemory "github.com/SigNoz/signoz/pkg/query-service/cache/inmemory" + redis "github.com/SigNoz/signoz/pkg/query-service/cache/redis" + "github.com/SigNoz/signoz/pkg/query-service/cache/status" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" "gopkg.in/yaml.v2" ) diff --git a/pkg/query-service/cache/inmemory/cache.go b/pkg/query-service/cache/inmemory/cache.go index 6e24c1e53dab..694db0c4d658 100644 --- a/pkg/query-service/cache/inmemory/cache.go +++ b/pkg/query-service/cache/inmemory/cache.go @@ -3,8 +3,8 @@ package inmemory import ( "time" + "github.com/SigNoz/signoz/pkg/query-service/cache/status" go_cache "github.com/patrickmn/go-cache" - "go.signoz.io/signoz/pkg/query-service/cache/status" ) // cache implements the Cache interface diff --git a/pkg/query-service/cache/inmemory/cache_test.go b/pkg/query-service/cache/inmemory/cache_test.go index cfd350fe9c3c..bf22fbc72b98 100644 --- a/pkg/query-service/cache/inmemory/cache_test.go +++ b/pkg/query-service/cache/inmemory/cache_test.go @@ -4,8 +4,8 @@ import ( "testing" "time" + "github.com/SigNoz/signoz/pkg/query-service/cache/status" "github.com/stretchr/testify/assert" - "go.signoz.io/signoz/pkg/query-service/cache/status" ) // TestNew tests the New function diff --git a/pkg/query-service/cache/redis/redis.go b/pkg/query-service/cache/redis/redis.go index 737fa66d06c6..c9f3be4e057d 100644 --- a/pkg/query-service/cache/redis/redis.go +++ b/pkg/query-service/cache/redis/redis.go @@ -6,8 +6,8 @@ import ( "fmt" "time" + "github.com/SigNoz/signoz/pkg/query-service/cache/status" "github.com/go-redis/redis/v8" - "go.signoz.io/signoz/pkg/query-service/cache/status" "go.uber.org/zap" ) diff --git a/pkg/query-service/cache/redis/redis_test.go b/pkg/query-service/cache/redis/redis_test.go index 7dfddc638082..63dcdb3248a4 100644 --- a/pkg/query-service/cache/redis/redis_test.go +++ b/pkg/query-service/cache/redis/redis_test.go @@ -4,8 +4,8 @@ import ( "testing" "time" + "github.com/SigNoz/signoz/pkg/query-service/cache/status" "github.com/go-redis/redismock/v8" - "go.signoz.io/signoz/pkg/query-service/cache/status" ) func TestStore(t *testing.T) { diff --git a/pkg/query-service/common/query_range.go b/pkg/query-service/common/query_range.go index 29f8277be7ee..841132b85dfa 100644 --- a/pkg/query-service/common/query_range.go +++ b/pkg/query-service/common/query_range.go @@ -7,10 +7,10 @@ import ( "time" "unicode" - "go.signoz.io/signoz/pkg/query-service/constants" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" - "go.signoz.io/signoz/pkg/query-service/querycache" - "go.signoz.io/signoz/pkg/query-service/utils/labels" + "github.com/SigNoz/signoz/pkg/query-service/constants" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" + "github.com/SigNoz/signoz/pkg/query-service/querycache" + "github.com/SigNoz/signoz/pkg/query-service/utils/labels" ) func AdjustedMetricTimeRange(start, end, step int64, mq v3.BuilderQuery) (int64, int64) { diff --git a/pkg/query-service/common/query_range_test.go b/pkg/query-service/common/query_range_test.go index 03779996fe9c..c911fc6fe336 100644 --- a/pkg/query-service/common/query_range_test.go +++ b/pkg/query-service/common/query_range_test.go @@ -3,8 +3,8 @@ package common import ( "testing" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" - "go.signoz.io/signoz/pkg/query-service/querycache" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" + "github.com/SigNoz/signoz/pkg/query-service/querycache" ) func TestFilterSeriesPoints(t *testing.T) { diff --git a/pkg/query-service/constants/constants.go b/pkg/query-service/constants/constants.go index 96afef086ae6..deb54d9c2a05 100644 --- a/pkg/query-service/constants/constants.go +++ b/pkg/query-service/constants/constants.go @@ -7,8 +7,8 @@ import ( "testing" "time" - "go.signoz.io/signoz/pkg/query-service/model" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" + "github.com/SigNoz/signoz/pkg/query-service/model" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" ) const ( diff --git a/pkg/query-service/contextlinks/links.go b/pkg/query-service/contextlinks/links.go index 3bb50e3a6b9c..7023554958d7 100644 --- a/pkg/query-service/contextlinks/links.go +++ b/pkg/query-service/contextlinks/links.go @@ -6,9 +6,9 @@ import ( "net/url" "time" - tracesV3 "go.signoz.io/signoz/pkg/query-service/app/traces/v3" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" - "go.signoz.io/signoz/pkg/query-service/utils" + tracesV3 "github.com/SigNoz/signoz/pkg/query-service/app/traces/v3" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" + "github.com/SigNoz/signoz/pkg/query-service/utils" ) func PrepareLinksToTraces(start, end time.Time, filterItems []v3.FilterItem) string { diff --git a/pkg/query-service/dao/factory.go b/pkg/query-service/dao/factory.go index c403c4f1ea6b..c134d4acef14 100644 --- a/pkg/query-service/dao/factory.go +++ b/pkg/query-service/dao/factory.go @@ -1,8 +1,8 @@ package dao import ( - "go.signoz.io/signoz/pkg/query-service/dao/sqlite" - "go.signoz.io/signoz/pkg/sqlstore" + "github.com/SigNoz/signoz/pkg/query-service/dao/sqlite" + "github.com/SigNoz/signoz/pkg/sqlstore" ) var db ModelDao diff --git a/pkg/query-service/dao/interface.go b/pkg/query-service/dao/interface.go index e96241fa43d0..21dc8e93de43 100644 --- a/pkg/query-service/dao/interface.go +++ b/pkg/query-service/dao/interface.go @@ -3,8 +3,8 @@ package dao import ( "context" - "go.signoz.io/signoz/pkg/query-service/model" - "go.signoz.io/signoz/pkg/types" + "github.com/SigNoz/signoz/pkg/query-service/model" + "github.com/SigNoz/signoz/pkg/types" ) type ModelDao interface { diff --git a/pkg/query-service/dao/sqlite/apdex.go b/pkg/query-service/dao/sqlite/apdex.go index 610133ae343d..79c1697739c3 100644 --- a/pkg/query-service/dao/sqlite/apdex.go +++ b/pkg/query-service/dao/sqlite/apdex.go @@ -3,9 +3,9 @@ package sqlite import ( "context" + "github.com/SigNoz/signoz/pkg/query-service/model" + "github.com/SigNoz/signoz/pkg/types" "github.com/uptrace/bun" - "go.signoz.io/signoz/pkg/query-service/model" - "go.signoz.io/signoz/pkg/types" ) const defaultApdexThreshold = 0.5 diff --git a/pkg/query-service/dao/sqlite/connection.go b/pkg/query-service/dao/sqlite/connection.go index e7a9feb2aed8..739444e249b4 100644 --- a/pkg/query-service/dao/sqlite/connection.go +++ b/pkg/query-service/dao/sqlite/connection.go @@ -3,12 +3,12 @@ package sqlite import ( "context" + "github.com/SigNoz/signoz/pkg/query-service/constants" + "github.com/SigNoz/signoz/pkg/query-service/telemetry" + "github.com/SigNoz/signoz/pkg/sqlstore" + "github.com/SigNoz/signoz/pkg/types" "github.com/pkg/errors" "github.com/uptrace/bun" - "go.signoz.io/signoz/pkg/query-service/constants" - "go.signoz.io/signoz/pkg/query-service/telemetry" - "go.signoz.io/signoz/pkg/sqlstore" - "go.signoz.io/signoz/pkg/types" "go.uber.org/zap" ) diff --git a/pkg/query-service/dao/sqlite/rbac.go b/pkg/query-service/dao/sqlite/rbac.go index 1718aadad3c9..01762320b593 100644 --- a/pkg/query-service/dao/sqlite/rbac.go +++ b/pkg/query-service/dao/sqlite/rbac.go @@ -5,11 +5,11 @@ import ( "fmt" "time" + "github.com/SigNoz/signoz/pkg/query-service/model" + "github.com/SigNoz/signoz/pkg/query-service/telemetry" + "github.com/SigNoz/signoz/pkg/types" "github.com/google/uuid" "github.com/pkg/errors" - "go.signoz.io/signoz/pkg/query-service/model" - "go.signoz.io/signoz/pkg/query-service/telemetry" - "go.signoz.io/signoz/pkg/types" ) func (mds *ModelDaoSqlite) CreateInviteEntry(ctx context.Context, req *types.Invite) *model.ApiError { diff --git a/pkg/query-service/featureManager/manager.go b/pkg/query-service/featureManager/manager.go index 439b8b7bd2cf..7ea559bd3523 100644 --- a/pkg/query-service/featureManager/manager.go +++ b/pkg/query-service/featureManager/manager.go @@ -1,8 +1,8 @@ package featureManager import ( - "go.signoz.io/signoz/pkg/query-service/constants" - "go.signoz.io/signoz/pkg/query-service/model" + "github.com/SigNoz/signoz/pkg/query-service/constants" + "github.com/SigNoz/signoz/pkg/query-service/model" "go.uber.org/zap" ) diff --git a/pkg/query-service/formatter/data.go b/pkg/query-service/formatter/data.go index b4d905cc9b71..e75dd0e68381 100644 --- a/pkg/query-service/formatter/data.go +++ b/pkg/query-service/formatter/data.go @@ -3,8 +3,8 @@ package formatter import ( "fmt" + "github.com/SigNoz/signoz/pkg/query-service/converter" "github.com/dustin/go-humanize" - "go.signoz.io/signoz/pkg/query-service/converter" ) type dataFormatter struct { diff --git a/pkg/query-service/formatter/data_rate.go b/pkg/query-service/formatter/data_rate.go index 4027bf3b84a5..011c4339a204 100644 --- a/pkg/query-service/formatter/data_rate.go +++ b/pkg/query-service/formatter/data_rate.go @@ -3,8 +3,8 @@ package formatter import ( "fmt" + "github.com/SigNoz/signoz/pkg/query-service/converter" "github.com/dustin/go-humanize" - "go.signoz.io/signoz/pkg/query-service/converter" ) type dataRateFormatter struct { diff --git a/pkg/query-service/interfaces/featureLookup.go b/pkg/query-service/interfaces/featureLookup.go index 32c7041cf0a3..e2ecbcc3bbbb 100644 --- a/pkg/query-service/interfaces/featureLookup.go +++ b/pkg/query-service/interfaces/featureLookup.go @@ -1,7 +1,7 @@ package interfaces import ( - "go.signoz.io/signoz/pkg/query-service/model" + "github.com/SigNoz/signoz/pkg/query-service/model" ) type FeatureLookup interface { diff --git a/pkg/query-service/interfaces/interface.go b/pkg/query-service/interfaces/interface.go index b3a4d5a9d57f..39c2e2d2b51d 100644 --- a/pkg/query-service/interfaces/interface.go +++ b/pkg/query-service/interfaces/interface.go @@ -4,13 +4,13 @@ import ( "context" "time" + "github.com/SigNoz/signoz/pkg/query-service/model" + "github.com/SigNoz/signoz/pkg/query-service/model/metrics_explorer" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" + "github.com/SigNoz/signoz/pkg/query-service/querycache" "github.com/prometheus/prometheus/promql" "github.com/prometheus/prometheus/storage" "github.com/prometheus/prometheus/util/stats" - "go.signoz.io/signoz/pkg/query-service/model" - "go.signoz.io/signoz/pkg/query-service/model/metrics_explorer" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" - "go.signoz.io/signoz/pkg/query-service/querycache" ) type Reader interface { diff --git a/pkg/query-service/main.go b/pkg/query-service/main.go index 2e38c37343f1..a04ea9ba1cd8 100644 --- a/pkg/query-service/main.go +++ b/pkg/query-service/main.go @@ -6,16 +6,16 @@ import ( "os" "time" + "github.com/SigNoz/signoz/pkg/config" + "github.com/SigNoz/signoz/pkg/config/envprovider" + "github.com/SigNoz/signoz/pkg/config/fileprovider" + "github.com/SigNoz/signoz/pkg/query-service/app" + "github.com/SigNoz/signoz/pkg/query-service/auth" + "github.com/SigNoz/signoz/pkg/query-service/constants" + "github.com/SigNoz/signoz/pkg/query-service/version" + "github.com/SigNoz/signoz/pkg/signoz" + "github.com/SigNoz/signoz/pkg/types/authtypes" prommodel "github.com/prometheus/common/model" - "go.signoz.io/signoz/pkg/config" - "go.signoz.io/signoz/pkg/config/envprovider" - "go.signoz.io/signoz/pkg/config/fileprovider" - "go.signoz.io/signoz/pkg/query-service/app" - "go.signoz.io/signoz/pkg/query-service/auth" - "go.signoz.io/signoz/pkg/query-service/constants" - "go.signoz.io/signoz/pkg/query-service/version" - "go.signoz.io/signoz/pkg/signoz" - "go.signoz.io/signoz/pkg/types/authtypes" "go.uber.org/zap" "go.uber.org/zap/zapcore" diff --git a/pkg/query-service/model/alerting.go b/pkg/query-service/model/alerting.go index 944efecc12d9..969cdac7d33d 100644 --- a/pkg/query-service/model/alerting.go +++ b/pkg/query-service/model/alerting.go @@ -5,8 +5,8 @@ import ( "encoding/json" "fmt" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" "github.com/pkg/errors" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" ) // AlertState denotes the state of an active alert. diff --git a/pkg/query-service/model/infra.go b/pkg/query-service/model/infra.go index 3aab227401d3..5b5e0dfeb421 100644 --- a/pkg/query-service/model/infra.go +++ b/pkg/query-service/model/infra.go @@ -3,7 +3,7 @@ package model import ( "sort" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" ) type ( diff --git a/pkg/query-service/model/logs.go b/pkg/query-service/model/logs.go index c6a92760081c..ae4206674312 100644 --- a/pkg/query-service/model/logs.go +++ b/pkg/query-service/model/logs.go @@ -4,7 +4,7 @@ import ( "context" "strings" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" ) type LogsLiveTailClientV2 struct { diff --git a/pkg/query-service/model/metrics_explorer/summary.go b/pkg/query-service/model/metrics_explorer/summary.go index cf3d1b9d4caf..b279a909733f 100644 --- a/pkg/query-service/model/metrics_explorer/summary.go +++ b/pkg/query-service/model/metrics_explorer/summary.go @@ -1,7 +1,7 @@ package metrics_explorer import ( - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" ) type SummaryListMetricsRequest struct { diff --git a/pkg/query-service/model/updatedMetricsMetadata.go b/pkg/query-service/model/updatedMetricsMetadata.go index 2700a42181c8..01890eaf68a5 100644 --- a/pkg/query-service/model/updatedMetricsMetadata.go +++ b/pkg/query-service/model/updatedMetricsMetadata.go @@ -2,7 +2,7 @@ package model import ( "encoding/json" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" "time" ) diff --git a/pkg/query-service/postprocess/formula.go b/pkg/query-service/postprocess/formula.go index 4d928a6a48f9..6d09a4d7b12d 100644 --- a/pkg/query-service/postprocess/formula.go +++ b/pkg/query-service/postprocess/formula.go @@ -7,7 +7,7 @@ import ( "time" "github.com/SigNoz/govaluate" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" ) // Define the ExpressionEvalFunc type diff --git a/pkg/query-service/postprocess/formula_test.go b/pkg/query-service/postprocess/formula_test.go index 22fc9f61db6a..2dfab2184d8e 100644 --- a/pkg/query-service/postprocess/formula_test.go +++ b/pkg/query-service/postprocess/formula_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/SigNoz/govaluate" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" ) func TestFindUniqueLabelSets(t *testing.T) { diff --git a/pkg/query-service/postprocess/gaps.go b/pkg/query-service/postprocess/gaps.go index 0970fecb9f05..ff748cf05b2d 100644 --- a/pkg/query-service/postprocess/gaps.go +++ b/pkg/query-service/postprocess/gaps.go @@ -2,8 +2,8 @@ package postprocess import ( "github.com/SigNoz/govaluate" - "go.signoz.io/signoz/pkg/query-service/common" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" + "github.com/SigNoz/signoz/pkg/query-service/common" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" ) func StepIntervalForFunction(params *v3.QueryRangeParamsV3, query string) int64 { diff --git a/pkg/query-service/postprocess/gaps_test.go b/pkg/query-service/postprocess/gaps_test.go index 9e42fa240b70..d89b2cbef6c8 100644 --- a/pkg/query-service/postprocess/gaps_test.go +++ b/pkg/query-service/postprocess/gaps_test.go @@ -3,7 +3,7 @@ package postprocess import ( "testing" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" ) func TestFillGaps(t *testing.T) { diff --git a/pkg/query-service/postprocess/having.go b/pkg/query-service/postprocess/having.go index 5c2be7ce8bed..ffe425ada33e 100644 --- a/pkg/query-service/postprocess/having.go +++ b/pkg/query-service/postprocess/having.go @@ -3,7 +3,7 @@ package postprocess import ( "strings" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" ) // ApplyHavingClause applies the having clause to the result diff --git a/pkg/query-service/postprocess/having_test.go b/pkg/query-service/postprocess/having_test.go index 90986d14a935..9fa03a3427c2 100644 --- a/pkg/query-service/postprocess/having_test.go +++ b/pkg/query-service/postprocess/having_test.go @@ -3,7 +3,7 @@ package postprocess import ( "testing" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" ) func TestApplyHavingCaluse(t *testing.T) { diff --git a/pkg/query-service/postprocess/limit.go b/pkg/query-service/postprocess/limit.go index 49cd5d04b9df..0812d05109c7 100644 --- a/pkg/query-service/postprocess/limit.go +++ b/pkg/query-service/postprocess/limit.go @@ -5,8 +5,8 @@ import ( "sort" "strings" - "go.signoz.io/signoz/pkg/query-service/constants" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" + "github.com/SigNoz/signoz/pkg/query-service/constants" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" ) // ApplyMetricLimit applies limit to the metrics query results diff --git a/pkg/query-service/postprocess/limit_test.go b/pkg/query-service/postprocess/limit_test.go index 3f5ffaf15e35..c21669efea40 100644 --- a/pkg/query-service/postprocess/limit_test.go +++ b/pkg/query-service/postprocess/limit_test.go @@ -3,8 +3,8 @@ package postprocess import ( "testing" - "go.signoz.io/signoz/pkg/query-service/constants" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" + "github.com/SigNoz/signoz/pkg/query-service/constants" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" ) func TestApplyLimitOnMetricResult(t *testing.T) { diff --git a/pkg/query-service/postprocess/process.go b/pkg/query-service/postprocess/process.go index 5523bb1176fb..6c215cbfb333 100644 --- a/pkg/query-service/postprocess/process.go +++ b/pkg/query-service/postprocess/process.go @@ -2,8 +2,8 @@ package postprocess import ( "github.com/SigNoz/govaluate" - "go.signoz.io/signoz/pkg/query-service/app/queryBuilder" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" + "github.com/SigNoz/signoz/pkg/query-service/app/queryBuilder" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" "go.uber.org/zap" ) diff --git a/pkg/query-service/postprocess/process_test.go b/pkg/query-service/postprocess/process_test.go index 5f599f7be00d..d71c6de88f05 100644 --- a/pkg/query-service/postprocess/process_test.go +++ b/pkg/query-service/postprocess/process_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" ) func TestPostProcessResult(t *testing.T) { diff --git a/pkg/query-service/postprocess/reduce_to.go b/pkg/query-service/postprocess/reduce_to.go index 2e9275eea801..fe78c8326578 100644 --- a/pkg/query-service/postprocess/reduce_to.go +++ b/pkg/query-service/postprocess/reduce_to.go @@ -1,7 +1,7 @@ package postprocess import ( - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" ) // applyReduceTo applies the reduceTo operator to each series diff --git a/pkg/query-service/postprocess/reduce_to_test.go b/pkg/query-service/postprocess/reduce_to_test.go index 870976685050..8a937557602f 100644 --- a/pkg/query-service/postprocess/reduce_to_test.go +++ b/pkg/query-service/postprocess/reduce_to_test.go @@ -3,7 +3,7 @@ package postprocess import ( "testing" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" ) func TestApplyReduceTo(t *testing.T) { diff --git a/pkg/query-service/postprocess/table.go b/pkg/query-service/postprocess/table.go index 01be79c15318..0cdcf5f70703 100644 --- a/pkg/query-service/postprocess/table.go +++ b/pkg/query-service/postprocess/table.go @@ -6,8 +6,8 @@ import ( "sort" "strings" - "go.signoz.io/signoz/pkg/query-service/constants" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" + "github.com/SigNoz/signoz/pkg/query-service/constants" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" ) func roundToTwoDecimal(number float64) float64 { diff --git a/pkg/query-service/postprocess/table_test.go b/pkg/query-service/postprocess/table_test.go index 317626766b2e..4f265761a522 100644 --- a/pkg/query-service/postprocess/table_test.go +++ b/pkg/query-service/postprocess/table_test.go @@ -6,8 +6,8 @@ import ( "reflect" "testing" - "go.signoz.io/signoz/pkg/query-service/constants" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" + "github.com/SigNoz/signoz/pkg/query-service/constants" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" ) func TestSortRows(t *testing.T) { diff --git a/pkg/query-service/pqlEngine/engine.go b/pkg/query-service/pqlEngine/engine.go index 15fb901646c5..117d4dc7d1c4 100644 --- a/pkg/query-service/pqlEngine/engine.go +++ b/pkg/query-service/pqlEngine/engine.go @@ -5,6 +5,7 @@ import ( "fmt" "time" + "github.com/SigNoz/signoz/pkg/query-service/interfaces" "github.com/go-kit/log" pmodel "github.com/prometheus/common/model" "github.com/prometheus/common/promlog" @@ -12,7 +13,6 @@ import ( pql "github.com/prometheus/prometheus/promql" pstorage "github.com/prometheus/prometheus/storage" premote "github.com/prometheus/prometheus/storage/remote" - "go.signoz.io/signoz/pkg/query-service/interfaces" ) type PqlEngine struct { diff --git a/pkg/query-service/queryBuilderToExpr/queryBuilderToExpr.go b/pkg/query-service/queryBuilderToExpr/queryBuilderToExpr.go index bda8c446b1d0..692a450cc577 100644 --- a/pkg/query-service/queryBuilderToExpr/queryBuilderToExpr.go +++ b/pkg/query-service/queryBuilderToExpr/queryBuilderToExpr.go @@ -5,8 +5,8 @@ import ( "reflect" "strings" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" expr "github.com/antonmedv/expr" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" "go.uber.org/zap" ) diff --git a/pkg/query-service/queryBuilderToExpr/queryBuilderToExpr_test.go b/pkg/query-service/queryBuilderToExpr/queryBuilderToExpr_test.go index e2b17bb0a3b0..7ac1aff58cb2 100644 --- a/pkg/query-service/queryBuilderToExpr/queryBuilderToExpr_test.go +++ b/pkg/query-service/queryBuilderToExpr/queryBuilderToExpr_test.go @@ -3,8 +3,8 @@ package queryBuilderToExpr import ( "testing" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" . "github.com/smartystreets/goconvey/convey" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" ) var testCases = []struct { diff --git a/pkg/query-service/querycache/query_range_cache.go b/pkg/query-service/querycache/query_range_cache.go index 4394b1936d2c..03430c333ea2 100644 --- a/pkg/query-service/querycache/query_range_cache.go +++ b/pkg/query-service/querycache/query_range_cache.go @@ -6,9 +6,9 @@ import ( "sort" "time" - "go.signoz.io/signoz/pkg/query-service/cache" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" - "go.signoz.io/signoz/pkg/query-service/utils/labels" + "github.com/SigNoz/signoz/pkg/query-service/cache" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" + "github.com/SigNoz/signoz/pkg/query-service/utils/labels" "go.uber.org/zap" ) diff --git a/pkg/query-service/querycache/query_range_cache_test.go b/pkg/query-service/querycache/query_range_cache_test.go index 7f8bf75256c6..9d8948cd9118 100644 --- a/pkg/query-service/querycache/query_range_cache_test.go +++ b/pkg/query-service/querycache/query_range_cache_test.go @@ -5,10 +5,10 @@ import ( "testing" "time" + "github.com/SigNoz/signoz/pkg/query-service/cache/inmemory" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" + "github.com/SigNoz/signoz/pkg/query-service/querycache" "github.com/stretchr/testify/assert" - "go.signoz.io/signoz/pkg/query-service/cache/inmemory" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" - "go.signoz.io/signoz/pkg/query-service/querycache" ) func TestFindMissingTimeRanges(t *testing.T) { diff --git a/pkg/query-service/rules/alerting.go b/pkg/query-service/rules/alerting.go index 660b1896f3e7..11557a43bc01 100644 --- a/pkg/query-service/rules/alerting.go +++ b/pkg/query-service/rules/alerting.go @@ -8,10 +8,10 @@ import ( "strings" "time" + "github.com/SigNoz/signoz/pkg/query-service/model" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" + "github.com/SigNoz/signoz/pkg/query-service/utils/labels" "github.com/pkg/errors" - "go.signoz.io/signoz/pkg/query-service/model" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" - "go.signoz.io/signoz/pkg/query-service/utils/labels" ) // this file contains common structs and methods used by diff --git a/pkg/query-service/rules/api_params.go b/pkg/query-service/rules/api_params.go index fcc8a37742bc..1449cb9c72db 100644 --- a/pkg/query-service/rules/api_params.go +++ b/pkg/query-service/rules/api_params.go @@ -7,13 +7,13 @@ import ( "time" "unicode/utf8" + "github.com/SigNoz/signoz/pkg/query-service/model" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" "github.com/pkg/errors" - "go.signoz.io/signoz/pkg/query-service/model" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" "go.uber.org/multierr" - "go.signoz.io/signoz/pkg/query-service/utils/times" - "go.signoz.io/signoz/pkg/query-service/utils/timestamp" + "github.com/SigNoz/signoz/pkg/query-service/utils/times" + "github.com/SigNoz/signoz/pkg/query-service/utils/timestamp" yaml "gopkg.in/yaml.v2" ) diff --git a/pkg/query-service/rules/api_params_test.go b/pkg/query-service/rules/api_params_test.go index 9c3092ff906a..c3a72ca691dc 100644 --- a/pkg/query-service/rules/api_params_test.go +++ b/pkg/query-service/rules/api_params_test.go @@ -3,7 +3,7 @@ package rules import ( "testing" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" ) func TestIsAllQueriesDisabled(t *testing.T) { diff --git a/pkg/query-service/rules/base_rule.go b/pkg/query-service/rules/base_rule.go index 00c4f0819a3c..1c3eb42c57eb 100644 --- a/pkg/query-service/rules/base_rule.go +++ b/pkg/query-service/rules/base_rule.go @@ -8,12 +8,12 @@ import ( "sync" "time" - "go.signoz.io/signoz/pkg/query-service/converter" - "go.signoz.io/signoz/pkg/query-service/interfaces" - "go.signoz.io/signoz/pkg/query-service/model" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" - qslabels "go.signoz.io/signoz/pkg/query-service/utils/labels" - "go.signoz.io/signoz/pkg/sqlstore" + "github.com/SigNoz/signoz/pkg/query-service/converter" + "github.com/SigNoz/signoz/pkg/query-service/interfaces" + "github.com/SigNoz/signoz/pkg/query-service/model" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" + qslabels "github.com/SigNoz/signoz/pkg/query-service/utils/labels" + "github.com/SigNoz/signoz/pkg/sqlstore" "go.uber.org/zap" ) diff --git a/pkg/query-service/rules/base_rule_test.go b/pkg/query-service/rules/base_rule_test.go index a73fa9ebeafb..77ed81cf4691 100644 --- a/pkg/query-service/rules/base_rule_test.go +++ b/pkg/query-service/rules/base_rule_test.go @@ -3,7 +3,7 @@ package rules import ( "testing" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" ) func TestBaseRule_RequireMinPoints(t *testing.T) { diff --git a/pkg/query-service/rules/db.go b/pkg/query-service/rules/db.go index c420e45b92c9..e591f0804362 100644 --- a/pkg/query-service/rules/db.go +++ b/pkg/query-service/rules/db.go @@ -9,13 +9,13 @@ import ( "strings" "time" + "github.com/SigNoz/signoz/pkg/query-service/model" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" + "github.com/SigNoz/signoz/pkg/sqlstore" + "github.com/SigNoz/signoz/pkg/types/authtypes" "github.com/jmoiron/sqlx" "github.com/pkg/errors" "github.com/uptrace/bun" - "go.signoz.io/signoz/pkg/query-service/model" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" - "go.signoz.io/signoz/pkg/sqlstore" - "go.signoz.io/signoz/pkg/types/authtypes" "go.uber.org/zap" ) diff --git a/pkg/query-service/rules/manager.go b/pkg/query-service/rules/manager.go index 3935424efc21..ce5e6d5fbf7b 100644 --- a/pkg/query-service/rules/manager.go +++ b/pkg/query-service/rules/manager.go @@ -17,15 +17,15 @@ import ( "github.com/go-openapi/strfmt" "github.com/jmoiron/sqlx" - "go.signoz.io/signoz/pkg/alertmanager" - "go.signoz.io/signoz/pkg/query-service/cache" - "go.signoz.io/signoz/pkg/query-service/interfaces" - "go.signoz.io/signoz/pkg/query-service/model" - pqle "go.signoz.io/signoz/pkg/query-service/pqlEngine" - "go.signoz.io/signoz/pkg/query-service/telemetry" - "go.signoz.io/signoz/pkg/sqlstore" - "go.signoz.io/signoz/pkg/types/alertmanagertypes" - "go.signoz.io/signoz/pkg/types/authtypes" + "github.com/SigNoz/signoz/pkg/alertmanager" + "github.com/SigNoz/signoz/pkg/query-service/cache" + "github.com/SigNoz/signoz/pkg/query-service/interfaces" + "github.com/SigNoz/signoz/pkg/query-service/model" + pqle "github.com/SigNoz/signoz/pkg/query-service/pqlEngine" + "github.com/SigNoz/signoz/pkg/query-service/telemetry" + "github.com/SigNoz/signoz/pkg/sqlstore" + "github.com/SigNoz/signoz/pkg/types/alertmanagertypes" + "github.com/SigNoz/signoz/pkg/types/authtypes" ) type PrepareTaskOptions struct { diff --git a/pkg/query-service/rules/prom_rule.go b/pkg/query-service/rules/prom_rule.go index c11525d79666..147c2218f59c 100644 --- a/pkg/query-service/rules/prom_rule.go +++ b/pkg/query-service/rules/prom_rule.go @@ -8,15 +8,15 @@ import ( "go.uber.org/zap" + "github.com/SigNoz/signoz/pkg/query-service/formatter" + "github.com/SigNoz/signoz/pkg/query-service/interfaces" + "github.com/SigNoz/signoz/pkg/query-service/model" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" + pqle "github.com/SigNoz/signoz/pkg/query-service/pqlEngine" + qslabels "github.com/SigNoz/signoz/pkg/query-service/utils/labels" + "github.com/SigNoz/signoz/pkg/query-service/utils/times" + "github.com/SigNoz/signoz/pkg/query-service/utils/timestamp" "github.com/prometheus/prometheus/promql" - "go.signoz.io/signoz/pkg/query-service/formatter" - "go.signoz.io/signoz/pkg/query-service/interfaces" - "go.signoz.io/signoz/pkg/query-service/model" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" - pqle "go.signoz.io/signoz/pkg/query-service/pqlEngine" - qslabels "go.signoz.io/signoz/pkg/query-service/utils/labels" - "go.signoz.io/signoz/pkg/query-service/utils/times" - "go.signoz.io/signoz/pkg/query-service/utils/timestamp" yaml "gopkg.in/yaml.v2" ) diff --git a/pkg/query-service/rules/prom_rule_task.go b/pkg/query-service/rules/prom_rule_task.go index c96b09e74f17..8c7aafb2898e 100644 --- a/pkg/query-service/rules/prom_rule_task.go +++ b/pkg/query-service/rules/prom_rule_task.go @@ -7,9 +7,9 @@ import ( "sync" "time" + "github.com/SigNoz/signoz/pkg/query-service/common" opentracing "github.com/opentracing/opentracing-go" plabels "github.com/prometheus/prometheus/model/labels" - "go.signoz.io/signoz/pkg/query-service/common" "go.uber.org/zap" ) diff --git a/pkg/query-service/rules/promrule_test.go b/pkg/query-service/rules/promrule_test.go index 3bc268ed65d4..03fc0c92dfdb 100644 --- a/pkg/query-service/rules/promrule_test.go +++ b/pkg/query-service/rules/promrule_test.go @@ -4,9 +4,9 @@ import ( "testing" "time" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" pql "github.com/prometheus/prometheus/promql" "github.com/stretchr/testify/assert" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" "go.uber.org/zap" ) diff --git a/pkg/query-service/rules/result_types.go b/pkg/query-service/rules/result_types.go index 1f6304c6d50c..a00f818f3d9c 100644 --- a/pkg/query-service/rules/result_types.go +++ b/pkg/query-service/rules/result_types.go @@ -5,7 +5,7 @@ import ( "fmt" "strconv" - "go.signoz.io/signoz/pkg/query-service/utils/labels" + "github.com/SigNoz/signoz/pkg/query-service/utils/labels" ) // common result format of query diff --git a/pkg/query-service/rules/rule.go b/pkg/query-service/rules/rule.go index a8d25f89b699..2b333c3f29c0 100644 --- a/pkg/query-service/rules/rule.go +++ b/pkg/query-service/rules/rule.go @@ -4,8 +4,8 @@ import ( "context" "time" - "go.signoz.io/signoz/pkg/query-service/model" - "go.signoz.io/signoz/pkg/query-service/utils/labels" + "github.com/SigNoz/signoz/pkg/query-service/model" + "github.com/SigNoz/signoz/pkg/query-service/utils/labels" ) // A Rule encapsulates a vector expression which is evaluated at a specified diff --git a/pkg/query-service/rules/rule_task.go b/pkg/query-service/rules/rule_task.go index fc7bde05af9a..aa8ad60b7767 100644 --- a/pkg/query-service/rules/rule_task.go +++ b/pkg/query-service/rules/rule_task.go @@ -7,9 +7,9 @@ import ( "sync" "time" + "github.com/SigNoz/signoz/pkg/query-service/common" + "github.com/SigNoz/signoz/pkg/query-service/utils/labels" opentracing "github.com/opentracing/opentracing-go" - "go.signoz.io/signoz/pkg/query-service/common" - "go.signoz.io/signoz/pkg/query-service/utils/labels" "go.uber.org/zap" ) diff --git a/pkg/query-service/rules/templates.go b/pkg/query-service/rules/templates.go index 49db785cee72..563e6c706151 100644 --- a/pkg/query-service/rules/templates.go +++ b/pkg/query-service/rules/templates.go @@ -16,8 +16,8 @@ import ( "golang.org/x/text/cases" - "go.signoz.io/signoz/pkg/query-service/common" - "go.signoz.io/signoz/pkg/query-service/utils/times" + "github.com/SigNoz/signoz/pkg/query-service/common" + "github.com/SigNoz/signoz/pkg/query-service/utils/times" ) // this file contains all the methods and structs diff --git a/pkg/query-service/rules/templates_test.go b/pkg/query-service/rules/templates_test.go index 0fc0bd779a4e..e45227d950bd 100644 --- a/pkg/query-service/rules/templates_test.go +++ b/pkg/query-service/rules/templates_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" + "github.com/SigNoz/signoz/pkg/query-service/utils/times" "github.com/stretchr/testify/require" - "go.signoz.io/signoz/pkg/query-service/utils/times" ) func TestTemplateExpander(t *testing.T) { diff --git a/pkg/query-service/rules/test_notification.go b/pkg/query-service/rules/test_notification.go index cda893e3f1ff..b184c923d6f2 100644 --- a/pkg/query-service/rules/test_notification.go +++ b/pkg/query-service/rules/test_notification.go @@ -5,9 +5,9 @@ import ( "fmt" "time" + "github.com/SigNoz/signoz/pkg/query-service/model" + "github.com/SigNoz/signoz/pkg/query-service/utils/labels" "github.com/google/uuid" - "go.signoz.io/signoz/pkg/query-service/model" - "go.signoz.io/signoz/pkg/query-service/utils/labels" "go.uber.org/zap" ) diff --git a/pkg/query-service/rules/threshold_rule.go b/pkg/query-service/rules/threshold_rule.go index 5b5f02a52c68..5370f4933a4f 100644 --- a/pkg/query-service/rules/threshold_rule.go +++ b/pkg/query-service/rules/threshold_rule.go @@ -11,26 +11,26 @@ import ( "go.uber.org/zap" - "go.signoz.io/signoz/pkg/query-service/common" - "go.signoz.io/signoz/pkg/query-service/contextlinks" - "go.signoz.io/signoz/pkg/query-service/model" - "go.signoz.io/signoz/pkg/query-service/postprocess" + "github.com/SigNoz/signoz/pkg/query-service/common" + "github.com/SigNoz/signoz/pkg/query-service/contextlinks" + "github.com/SigNoz/signoz/pkg/query-service/model" + "github.com/SigNoz/signoz/pkg/query-service/postprocess" - "go.signoz.io/signoz/pkg/query-service/app/querier" - querierV2 "go.signoz.io/signoz/pkg/query-service/app/querier/v2" - "go.signoz.io/signoz/pkg/query-service/app/queryBuilder" - "go.signoz.io/signoz/pkg/query-service/constants" - "go.signoz.io/signoz/pkg/query-service/interfaces" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" - "go.signoz.io/signoz/pkg/query-service/utils/labels" - querytemplate "go.signoz.io/signoz/pkg/query-service/utils/queryTemplate" - "go.signoz.io/signoz/pkg/query-service/utils/times" - "go.signoz.io/signoz/pkg/query-service/utils/timestamp" + "github.com/SigNoz/signoz/pkg/query-service/app/querier" + querierV2 "github.com/SigNoz/signoz/pkg/query-service/app/querier/v2" + "github.com/SigNoz/signoz/pkg/query-service/app/queryBuilder" + "github.com/SigNoz/signoz/pkg/query-service/constants" + "github.com/SigNoz/signoz/pkg/query-service/interfaces" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" + "github.com/SigNoz/signoz/pkg/query-service/utils/labels" + querytemplate "github.com/SigNoz/signoz/pkg/query-service/utils/queryTemplate" + "github.com/SigNoz/signoz/pkg/query-service/utils/times" + "github.com/SigNoz/signoz/pkg/query-service/utils/timestamp" - logsv3 "go.signoz.io/signoz/pkg/query-service/app/logs/v3" - tracesV3 "go.signoz.io/signoz/pkg/query-service/app/traces/v3" - tracesV4 "go.signoz.io/signoz/pkg/query-service/app/traces/v4" - "go.signoz.io/signoz/pkg/query-service/formatter" + logsv3 "github.com/SigNoz/signoz/pkg/query-service/app/logs/v3" + tracesV3 "github.com/SigNoz/signoz/pkg/query-service/app/traces/v3" + tracesV4 "github.com/SigNoz/signoz/pkg/query-service/app/traces/v4" + "github.com/SigNoz/signoz/pkg/query-service/formatter" yaml "gopkg.in/yaml.v2" ) diff --git a/pkg/query-service/rules/threshold_rule_test.go b/pkg/query-service/rules/threshold_rule_test.go index 7534810d0a9d..ffbfbc32f3f2 100644 --- a/pkg/query-service/rules/threshold_rule_test.go +++ b/pkg/query-service/rules/threshold_rule_test.go @@ -3,19 +3,19 @@ package rules import ( "context" "fmt" - "go.signoz.io/signoz/pkg/cache" - "go.signoz.io/signoz/pkg/cache/memorycache" - "go.signoz.io/signoz/pkg/factory/factorytest" + "github.com/SigNoz/signoz/pkg/cache" + "github.com/SigNoz/signoz/pkg/cache/memorycache" + "github.com/SigNoz/signoz/pkg/factory/factorytest" "strings" "testing" "time" + "github.com/SigNoz/signoz/pkg/query-service/app/clickhouseReader" + "github.com/SigNoz/signoz/pkg/query-service/common" + "github.com/SigNoz/signoz/pkg/query-service/featureManager" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" + "github.com/SigNoz/signoz/pkg/query-service/utils/labels" "github.com/stretchr/testify/assert" - "go.signoz.io/signoz/pkg/query-service/app/clickhouseReader" - "go.signoz.io/signoz/pkg/query-service/common" - "go.signoz.io/signoz/pkg/query-service/featureManager" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" - "go.signoz.io/signoz/pkg/query-service/utils/labels" cmock "github.com/srikanthccv/ClickHouse-go-mock" ) diff --git a/pkg/query-service/telemetry/telemetry.go b/pkg/query-service/telemetry/telemetry.go index e5681ccd831d..679301ed7fec 100644 --- a/pkg/query-service/telemetry/telemetry.go +++ b/pkg/query-service/telemetry/telemetry.go @@ -15,12 +15,12 @@ import ( "go.uber.org/zap" "gopkg.in/segmentio/analytics-go.v3" - "go.signoz.io/signoz/pkg/query-service/constants" - "go.signoz.io/signoz/pkg/query-service/interfaces" - "go.signoz.io/signoz/pkg/query-service/model" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" - "go.signoz.io/signoz/pkg/query-service/version" - "go.signoz.io/signoz/pkg/types" + "github.com/SigNoz/signoz/pkg/query-service/constants" + "github.com/SigNoz/signoz/pkg/query-service/interfaces" + "github.com/SigNoz/signoz/pkg/query-service/model" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" + "github.com/SigNoz/signoz/pkg/query-service/version" + "github.com/SigNoz/signoz/pkg/types" ) const ( diff --git a/pkg/query-service/tests/integration/filter_suggestions_test.go b/pkg/query-service/tests/integration/filter_suggestions_test.go index 24780698c4b1..ba1178ff6e7a 100644 --- a/pkg/query-service/tests/integration/filter_suggestions_test.go +++ b/pkg/query-service/tests/integration/filter_suggestions_test.go @@ -9,17 +9,17 @@ import ( "strings" "testing" + "github.com/SigNoz/signoz/pkg/http/middleware" + "github.com/SigNoz/signoz/pkg/query-service/app" + "github.com/SigNoz/signoz/pkg/query-service/auth" + "github.com/SigNoz/signoz/pkg/query-service/constants" + "github.com/SigNoz/signoz/pkg/query-service/dao" + "github.com/SigNoz/signoz/pkg/query-service/featureManager" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" + "github.com/SigNoz/signoz/pkg/query-service/utils" + "github.com/SigNoz/signoz/pkg/types" mockhouse "github.com/srikanthccv/ClickHouse-go-mock" "github.com/stretchr/testify/require" - "go.signoz.io/signoz/pkg/http/middleware" - "go.signoz.io/signoz/pkg/query-service/app" - "go.signoz.io/signoz/pkg/query-service/auth" - "go.signoz.io/signoz/pkg/query-service/constants" - "go.signoz.io/signoz/pkg/query-service/dao" - "go.signoz.io/signoz/pkg/query-service/featureManager" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" - "go.signoz.io/signoz/pkg/query-service/utils" - "go.signoz.io/signoz/pkg/types" "go.uber.org/zap" ) diff --git a/pkg/query-service/tests/integration/logparsingpipeline_test.go b/pkg/query-service/tests/integration/logparsingpipeline_test.go index a4cd1fad1ebb..0cac4e472c98 100644 --- a/pkg/query-service/tests/integration/logparsingpipeline_test.go +++ b/pkg/query-service/tests/integration/logparsingpipeline_test.go @@ -9,25 +9,25 @@ import ( "strings" "testing" + "github.com/SigNoz/signoz/pkg/query-service/agentConf" + "github.com/SigNoz/signoz/pkg/query-service/app" + "github.com/SigNoz/signoz/pkg/query-service/app/integrations" + "github.com/SigNoz/signoz/pkg/query-service/app/logparsingpipeline" + "github.com/SigNoz/signoz/pkg/query-service/app/opamp" + opampModel "github.com/SigNoz/signoz/pkg/query-service/app/opamp/model" + "github.com/SigNoz/signoz/pkg/query-service/constants" + "github.com/SigNoz/signoz/pkg/query-service/dao" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" + "github.com/SigNoz/signoz/pkg/query-service/queryBuilderToExpr" + "github.com/SigNoz/signoz/pkg/query-service/utils" + "github.com/SigNoz/signoz/pkg/sqlstore" + "github.com/SigNoz/signoz/pkg/types" "github.com/google/uuid" "github.com/gorilla/mux" "github.com/knadh/koanf/parsers/yaml" "github.com/open-telemetry/opamp-go/protobufs" "github.com/pkg/errors" "github.com/stretchr/testify/require" - "go.signoz.io/signoz/pkg/query-service/agentConf" - "go.signoz.io/signoz/pkg/query-service/app" - "go.signoz.io/signoz/pkg/query-service/app/integrations" - "go.signoz.io/signoz/pkg/query-service/app/logparsingpipeline" - "go.signoz.io/signoz/pkg/query-service/app/opamp" - opampModel "go.signoz.io/signoz/pkg/query-service/app/opamp/model" - "go.signoz.io/signoz/pkg/query-service/constants" - "go.signoz.io/signoz/pkg/query-service/dao" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" - "go.signoz.io/signoz/pkg/query-service/queryBuilderToExpr" - "go.signoz.io/signoz/pkg/query-service/utils" - "go.signoz.io/signoz/pkg/sqlstore" - "go.signoz.io/signoz/pkg/types" "golang.org/x/exp/maps" "golang.org/x/exp/slices" ) diff --git a/pkg/query-service/tests/integration/signoz_cloud_integrations_test.go b/pkg/query-service/tests/integration/signoz_cloud_integrations_test.go index 37f29c06245d..ee0dcbf66847 100644 --- a/pkg/query-service/tests/integration/signoz_cloud_integrations_test.go +++ b/pkg/query-service/tests/integration/signoz_cloud_integrations_test.go @@ -8,18 +8,18 @@ import ( "testing" "time" + "github.com/SigNoz/signoz/pkg/http/middleware" + "github.com/SigNoz/signoz/pkg/query-service/app" + "github.com/SigNoz/signoz/pkg/query-service/app/cloudintegrations" + "github.com/SigNoz/signoz/pkg/query-service/auth" + "github.com/SigNoz/signoz/pkg/query-service/dao" + "github.com/SigNoz/signoz/pkg/query-service/featureManager" + "github.com/SigNoz/signoz/pkg/query-service/utils" + "github.com/SigNoz/signoz/pkg/sqlstore" + "github.com/SigNoz/signoz/pkg/types" "github.com/google/uuid" mockhouse "github.com/srikanthccv/ClickHouse-go-mock" "github.com/stretchr/testify/require" - "go.signoz.io/signoz/pkg/http/middleware" - "go.signoz.io/signoz/pkg/query-service/app" - "go.signoz.io/signoz/pkg/query-service/app/cloudintegrations" - "go.signoz.io/signoz/pkg/query-service/auth" - "go.signoz.io/signoz/pkg/query-service/dao" - "go.signoz.io/signoz/pkg/query-service/featureManager" - "go.signoz.io/signoz/pkg/query-service/utils" - "go.signoz.io/signoz/pkg/sqlstore" - "go.signoz.io/signoz/pkg/types" "go.uber.org/zap" ) diff --git a/pkg/query-service/tests/integration/signoz_integrations_test.go b/pkg/query-service/tests/integration/signoz_integrations_test.go index 46c7632606be..1e1915e99193 100644 --- a/pkg/query-service/tests/integration/signoz_integrations_test.go +++ b/pkg/query-service/tests/integration/signoz_integrations_test.go @@ -8,21 +8,21 @@ import ( "testing" "time" + "github.com/SigNoz/signoz/pkg/http/middleware" + "github.com/SigNoz/signoz/pkg/query-service/app" + "github.com/SigNoz/signoz/pkg/query-service/app/cloudintegrations" + "github.com/SigNoz/signoz/pkg/query-service/app/integrations" + "github.com/SigNoz/signoz/pkg/query-service/app/logparsingpipeline" + "github.com/SigNoz/signoz/pkg/query-service/auth" + "github.com/SigNoz/signoz/pkg/query-service/dao" + "github.com/SigNoz/signoz/pkg/query-service/featureManager" + "github.com/SigNoz/signoz/pkg/query-service/model" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" + "github.com/SigNoz/signoz/pkg/query-service/utils" + "github.com/SigNoz/signoz/pkg/sqlstore" + "github.com/SigNoz/signoz/pkg/types" mockhouse "github.com/srikanthccv/ClickHouse-go-mock" "github.com/stretchr/testify/require" - "go.signoz.io/signoz/pkg/http/middleware" - "go.signoz.io/signoz/pkg/query-service/app" - "go.signoz.io/signoz/pkg/query-service/app/cloudintegrations" - "go.signoz.io/signoz/pkg/query-service/app/integrations" - "go.signoz.io/signoz/pkg/query-service/app/logparsingpipeline" - "go.signoz.io/signoz/pkg/query-service/auth" - "go.signoz.io/signoz/pkg/query-service/dao" - "go.signoz.io/signoz/pkg/query-service/featureManager" - "go.signoz.io/signoz/pkg/query-service/model" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" - "go.signoz.io/signoz/pkg/query-service/utils" - "go.signoz.io/signoz/pkg/sqlstore" - "go.signoz.io/signoz/pkg/types" "go.uber.org/zap" ) diff --git a/pkg/query-service/tests/integration/test_utils.go b/pkg/query-service/tests/integration/test_utils.go index cbead9e2df25..6c336b64bc49 100644 --- a/pkg/query-service/tests/integration/test_utils.go +++ b/pkg/query-service/tests/integration/test_utils.go @@ -13,20 +13,20 @@ import ( "time" "github.com/DATA-DOG/go-sqlmock" + "github.com/SigNoz/signoz/pkg/query-service/app" + "github.com/SigNoz/signoz/pkg/query-service/app/clickhouseReader" + "github.com/SigNoz/signoz/pkg/query-service/auth" + "github.com/SigNoz/signoz/pkg/query-service/constants" + "github.com/SigNoz/signoz/pkg/query-service/dao" + "github.com/SigNoz/signoz/pkg/query-service/interfaces" + "github.com/SigNoz/signoz/pkg/query-service/model" + "github.com/SigNoz/signoz/pkg/types" + "github.com/SigNoz/signoz/pkg/types/authtypes" "github.com/google/uuid" "github.com/jmoiron/sqlx" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/entry" mockhouse "github.com/srikanthccv/ClickHouse-go-mock" "github.com/stretchr/testify/require" - "go.signoz.io/signoz/pkg/query-service/app" - "go.signoz.io/signoz/pkg/query-service/app/clickhouseReader" - "go.signoz.io/signoz/pkg/query-service/auth" - "go.signoz.io/signoz/pkg/query-service/constants" - "go.signoz.io/signoz/pkg/query-service/dao" - "go.signoz.io/signoz/pkg/query-service/interfaces" - "go.signoz.io/signoz/pkg/query-service/model" - "go.signoz.io/signoz/pkg/types" - "go.signoz.io/signoz/pkg/types/authtypes" "golang.org/x/exp/maps" ) diff --git a/pkg/query-service/utils/filter_conditions.go b/pkg/query-service/utils/filter_conditions.go index d9b1390838f6..5fca15a9111d 100644 --- a/pkg/query-service/utils/filter_conditions.go +++ b/pkg/query-service/utils/filter_conditions.go @@ -5,9 +5,9 @@ import ( "strings" "time" - "go.signoz.io/signoz/pkg/query-service/constants" - "go.signoz.io/signoz/pkg/query-service/model/metrics_explorer" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" + "github.com/SigNoz/signoz/pkg/query-service/constants" + "github.com/SigNoz/signoz/pkg/query-service/model/metrics_explorer" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" ) // skipKey is an optional parameter to skip processing of a specific key diff --git a/pkg/query-service/utils/format.go b/pkg/query-service/utils/format.go index 5a9d690e837a..743109e86bb6 100644 --- a/pkg/query-service/utils/format.go +++ b/pkg/query-service/utils/format.go @@ -7,9 +7,9 @@ import ( "strconv" "strings" - "go.signoz.io/signoz/pkg/query-service/constants" - "go.signoz.io/signoz/pkg/query-service/metrics" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" + "github.com/SigNoz/signoz/pkg/query-service/constants" + "github.com/SigNoz/signoz/pkg/query-service/metrics" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" "go.uber.org/zap" ) diff --git a/pkg/query-service/utils/format_test.go b/pkg/query-service/utils/format_test.go index e51d510a55e4..8d07dc608c04 100644 --- a/pkg/query-service/utils/format_test.go +++ b/pkg/query-service/utils/format_test.go @@ -4,8 +4,8 @@ import ( "reflect" "testing" - "go.signoz.io/signoz/pkg/query-service/constants" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" + "github.com/SigNoz/signoz/pkg/query-service/constants" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" ) type args struct { diff --git a/pkg/query-service/utils/logs.go b/pkg/query-service/utils/logs.go index 5d26df6fb0df..c54d450aefb9 100644 --- a/pkg/query-service/utils/logs.go +++ b/pkg/query-service/utils/logs.go @@ -1,6 +1,6 @@ package utils -import v3 "go.signoz.io/signoz/pkg/query-service/model/v3" +import v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" const HOUR_NANO = int64(3600000000000) diff --git a/pkg/query-service/utils/logs_test.go b/pkg/query-service/utils/logs_test.go index 1e95f98fcab3..3b741ea3d892 100644 --- a/pkg/query-service/utils/logs_test.go +++ b/pkg/query-service/utils/logs_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" ) func TestListTsRange(t *testing.T) { diff --git a/pkg/query-service/utils/queryTemplate/vars.go b/pkg/query-service/utils/queryTemplate/vars.go index c9d814e00441..da101bb78017 100644 --- a/pkg/query-service/utils/queryTemplate/vars.go +++ b/pkg/query-service/utils/queryTemplate/vars.go @@ -3,7 +3,7 @@ package querytemplate import ( "fmt" - v3 "go.signoz.io/signoz/pkg/query-service/model/v3" + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" ) // AssignReservedVars assigns values for go template vars. assumes that diff --git a/pkg/query-service/utils/testutils.go b/pkg/query-service/utils/testutils.go index 5b5c063616db..2a753ae4aa06 100644 --- a/pkg/query-service/utils/testutils.go +++ b/pkg/query-service/utils/testutils.go @@ -5,15 +5,15 @@ import ( "os" "testing" + "github.com/SigNoz/signoz/pkg/factory" + "github.com/SigNoz/signoz/pkg/factory/factorytest" + "github.com/SigNoz/signoz/pkg/query-service/app/dashboards" + "github.com/SigNoz/signoz/pkg/query-service/dao" + "github.com/SigNoz/signoz/pkg/sqlmigration" + "github.com/SigNoz/signoz/pkg/sqlmigrator" + "github.com/SigNoz/signoz/pkg/sqlstore" + "github.com/SigNoz/signoz/pkg/sqlstore/sqlitesqlstore" _ "github.com/mattn/go-sqlite3" - "go.signoz.io/signoz/pkg/factory" - "go.signoz.io/signoz/pkg/factory/factorytest" - "go.signoz.io/signoz/pkg/query-service/app/dashboards" - "go.signoz.io/signoz/pkg/query-service/dao" - "go.signoz.io/signoz/pkg/sqlmigration" - "go.signoz.io/signoz/pkg/sqlmigrator" - "go.signoz.io/signoz/pkg/sqlstore" - "go.signoz.io/signoz/pkg/sqlstore/sqlitesqlstore" ) func NewTestSqliteDB(t *testing.T) (sqlStore sqlstore.SQLStore, testDBFilePath string) { diff --git a/pkg/signoz/config.go b/pkg/signoz/config.go index 0a51ab5e87f8..d7645a71803f 100644 --- a/pkg/signoz/config.go +++ b/pkg/signoz/config.go @@ -8,17 +8,17 @@ import ( "reflect" "time" - "go.signoz.io/signoz/pkg/alertmanager" - "go.signoz.io/signoz/pkg/apiserver" - "go.signoz.io/signoz/pkg/cache" - "go.signoz.io/signoz/pkg/config" - "go.signoz.io/signoz/pkg/factory" - "go.signoz.io/signoz/pkg/instrumentation" - "go.signoz.io/signoz/pkg/sqlmigration" - "go.signoz.io/signoz/pkg/sqlmigrator" - "go.signoz.io/signoz/pkg/sqlstore" - "go.signoz.io/signoz/pkg/telemetrystore" - "go.signoz.io/signoz/pkg/web" + "github.com/SigNoz/signoz/pkg/alertmanager" + "github.com/SigNoz/signoz/pkg/apiserver" + "github.com/SigNoz/signoz/pkg/cache" + "github.com/SigNoz/signoz/pkg/config" + "github.com/SigNoz/signoz/pkg/factory" + "github.com/SigNoz/signoz/pkg/instrumentation" + "github.com/SigNoz/signoz/pkg/sqlmigration" + "github.com/SigNoz/signoz/pkg/sqlmigrator" + "github.com/SigNoz/signoz/pkg/sqlstore" + "github.com/SigNoz/signoz/pkg/telemetrystore" + "github.com/SigNoz/signoz/pkg/web" ) // Config defines the entire input configuration of signoz. diff --git a/pkg/signoz/config_test.go b/pkg/signoz/config_test.go index c85d4d7a73e6..07aa01ae2405 100644 --- a/pkg/signoz/config_test.go +++ b/pkg/signoz/config_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" + "github.com/SigNoz/signoz/pkg/config/configtest" "github.com/stretchr/testify/assert" - "go.signoz.io/signoz/pkg/config/configtest" ) // This is a test to ensure that all fields of config implement the factory.Config interface and are valid with diff --git a/pkg/signoz/provider.go b/pkg/signoz/provider.go index 6409aa06e550..eece33388985 100644 --- a/pkg/signoz/provider.go +++ b/pkg/signoz/provider.go @@ -1,24 +1,24 @@ package signoz import ( - "go.signoz.io/signoz/pkg/alertmanager" - "go.signoz.io/signoz/pkg/alertmanager/legacyalertmanager" - "go.signoz.io/signoz/pkg/alertmanager/signozalertmanager" - "go.signoz.io/signoz/pkg/cache" - "go.signoz.io/signoz/pkg/cache/memorycache" - "go.signoz.io/signoz/pkg/cache/rediscache" - "go.signoz.io/signoz/pkg/factory" - "go.signoz.io/signoz/pkg/sqlmigration" - "go.signoz.io/signoz/pkg/sqlstore" - "go.signoz.io/signoz/pkg/sqlstore/postgressqlstore" - "go.signoz.io/signoz/pkg/sqlstore/sqlitesqlstore" - "go.signoz.io/signoz/pkg/sqlstore/sqlstorehook" - "go.signoz.io/signoz/pkg/telemetrystore" - "go.signoz.io/signoz/pkg/telemetrystore/clickhousetelemetrystore" - "go.signoz.io/signoz/pkg/telemetrystore/telemetrystorehook" - "go.signoz.io/signoz/pkg/web" - "go.signoz.io/signoz/pkg/web/noopweb" - "go.signoz.io/signoz/pkg/web/routerweb" + "github.com/SigNoz/signoz/pkg/alertmanager" + "github.com/SigNoz/signoz/pkg/alertmanager/legacyalertmanager" + "github.com/SigNoz/signoz/pkg/alertmanager/signozalertmanager" + "github.com/SigNoz/signoz/pkg/cache" + "github.com/SigNoz/signoz/pkg/cache/memorycache" + "github.com/SigNoz/signoz/pkg/cache/rediscache" + "github.com/SigNoz/signoz/pkg/factory" + "github.com/SigNoz/signoz/pkg/sqlmigration" + "github.com/SigNoz/signoz/pkg/sqlstore" + "github.com/SigNoz/signoz/pkg/sqlstore/postgressqlstore" + "github.com/SigNoz/signoz/pkg/sqlstore/sqlitesqlstore" + "github.com/SigNoz/signoz/pkg/sqlstore/sqlstorehook" + "github.com/SigNoz/signoz/pkg/telemetrystore" + "github.com/SigNoz/signoz/pkg/telemetrystore/clickhousetelemetrystore" + "github.com/SigNoz/signoz/pkg/telemetrystore/telemetrystorehook" + "github.com/SigNoz/signoz/pkg/web" + "github.com/SigNoz/signoz/pkg/web/noopweb" + "github.com/SigNoz/signoz/pkg/web/routerweb" ) func NewCacheProviderFactories() factory.NamedMap[factory.ProviderFactory[cache.Cache, cache.Config]] { diff --git a/pkg/signoz/provider_test.go b/pkg/signoz/provider_test.go index 867a7ef13e0a..10abacc15425 100644 --- a/pkg/signoz/provider_test.go +++ b/pkg/signoz/provider_test.go @@ -4,9 +4,9 @@ import ( "testing" "github.com/DATA-DOG/go-sqlmock" + "github.com/SigNoz/signoz/pkg/sqlstore" + "github.com/SigNoz/signoz/pkg/sqlstore/sqlstoretest" "github.com/stretchr/testify/assert" - "go.signoz.io/signoz/pkg/sqlstore" - "go.signoz.io/signoz/pkg/sqlstore/sqlstoretest" ) // This is a test to ensure that provider factories can be created without panicking since diff --git a/pkg/signoz/signoz.go b/pkg/signoz/signoz.go index 54c76671aa1c..2dc3ee04588c 100644 --- a/pkg/signoz/signoz.go +++ b/pkg/signoz/signoz.go @@ -3,17 +3,17 @@ package signoz import ( "context" - "go.signoz.io/signoz/pkg/alertmanager" - "go.signoz.io/signoz/pkg/cache" - "go.signoz.io/signoz/pkg/factory" - "go.signoz.io/signoz/pkg/instrumentation" - "go.signoz.io/signoz/pkg/sqlmigration" - "go.signoz.io/signoz/pkg/sqlmigrator" - "go.signoz.io/signoz/pkg/sqlstore" - "go.signoz.io/signoz/pkg/telemetrystore" - "go.signoz.io/signoz/pkg/version" + "github.com/SigNoz/signoz/pkg/alertmanager" + "github.com/SigNoz/signoz/pkg/cache" + "github.com/SigNoz/signoz/pkg/factory" + "github.com/SigNoz/signoz/pkg/instrumentation" + "github.com/SigNoz/signoz/pkg/sqlmigration" + "github.com/SigNoz/signoz/pkg/sqlmigrator" + "github.com/SigNoz/signoz/pkg/sqlstore" + "github.com/SigNoz/signoz/pkg/telemetrystore" + "github.com/SigNoz/signoz/pkg/version" - "go.signoz.io/signoz/pkg/web" + "github.com/SigNoz/signoz/pkg/web" ) type SigNoz struct { diff --git a/pkg/sqlmigration/000_add_data_migrations.go b/pkg/sqlmigration/000_add_data_migrations.go index a42495695d95..9cbfe9e6cfc1 100644 --- a/pkg/sqlmigration/000_add_data_migrations.go +++ b/pkg/sqlmigration/000_add_data_migrations.go @@ -4,9 +4,9 @@ import ( "context" "time" + "github.com/SigNoz/signoz/pkg/factory" "github.com/uptrace/bun" "github.com/uptrace/bun/migrate" - "go.signoz.io/signoz/pkg/factory" ) type addDataMigrations struct{} diff --git a/pkg/sqlmigration/001_add_organization.go b/pkg/sqlmigration/001_add_organization.go index 37d1447c1ce9..496b033f9383 100644 --- a/pkg/sqlmigration/001_add_organization.go +++ b/pkg/sqlmigration/001_add_organization.go @@ -4,9 +4,9 @@ import ( "context" "time" + "github.com/SigNoz/signoz/pkg/factory" "github.com/uptrace/bun" "github.com/uptrace/bun/migrate" - "go.signoz.io/signoz/pkg/factory" ) type addOrganization struct{} diff --git a/pkg/sqlmigration/002_add_preferences.go b/pkg/sqlmigration/002_add_preferences.go index e1e646f1eda1..0cd8a1763cfa 100644 --- a/pkg/sqlmigration/002_add_preferences.go +++ b/pkg/sqlmigration/002_add_preferences.go @@ -3,9 +3,9 @@ package sqlmigration import ( "context" + "github.com/SigNoz/signoz/pkg/factory" "github.com/uptrace/bun" "github.com/uptrace/bun/migrate" - "go.signoz.io/signoz/pkg/factory" ) type addPreferences struct{} diff --git a/pkg/sqlmigration/003_add_dashboards.go b/pkg/sqlmigration/003_add_dashboards.go index 6e71f72f1fbe..bbdc89a1b1a0 100644 --- a/pkg/sqlmigration/003_add_dashboards.go +++ b/pkg/sqlmigration/003_add_dashboards.go @@ -4,9 +4,9 @@ import ( "context" "time" + "github.com/SigNoz/signoz/pkg/factory" "github.com/uptrace/bun" "github.com/uptrace/bun/migrate" - "go.signoz.io/signoz/pkg/factory" ) type addDashboards struct{} diff --git a/pkg/sqlmigration/004_add_saved_views.go b/pkg/sqlmigration/004_add_saved_views.go index fb9d9b0041af..1f5ad27748b9 100644 --- a/pkg/sqlmigration/004_add_saved_views.go +++ b/pkg/sqlmigration/004_add_saved_views.go @@ -4,9 +4,9 @@ import ( "context" "time" + "github.com/SigNoz/signoz/pkg/factory" "github.com/uptrace/bun" "github.com/uptrace/bun/migrate" - "go.signoz.io/signoz/pkg/factory" ) type addSavedViews struct{} diff --git a/pkg/sqlmigration/005_add_agents.go b/pkg/sqlmigration/005_add_agents.go index 64887f187076..e9accba359e2 100644 --- a/pkg/sqlmigration/005_add_agents.go +++ b/pkg/sqlmigration/005_add_agents.go @@ -4,9 +4,9 @@ import ( "context" "time" + "github.com/SigNoz/signoz/pkg/factory" "github.com/uptrace/bun" "github.com/uptrace/bun/migrate" - "go.signoz.io/signoz/pkg/factory" ) type addAgents struct{} diff --git a/pkg/sqlmigration/006_add_pipelines.go b/pkg/sqlmigration/006_add_pipelines.go index 1cb8f5eadcab..8aa3ed62fe87 100644 --- a/pkg/sqlmigration/006_add_pipelines.go +++ b/pkg/sqlmigration/006_add_pipelines.go @@ -4,9 +4,9 @@ import ( "context" "time" + "github.com/SigNoz/signoz/pkg/factory" "github.com/uptrace/bun" "github.com/uptrace/bun/migrate" - "go.signoz.io/signoz/pkg/factory" ) type addPipelines struct{} diff --git a/pkg/sqlmigration/007_add_integrations.go b/pkg/sqlmigration/007_add_integrations.go index 716f3313569b..7cf0c3fc8185 100644 --- a/pkg/sqlmigration/007_add_integrations.go +++ b/pkg/sqlmigration/007_add_integrations.go @@ -4,9 +4,9 @@ import ( "context" "time" + "github.com/SigNoz/signoz/pkg/factory" "github.com/uptrace/bun" "github.com/uptrace/bun/migrate" - "go.signoz.io/signoz/pkg/factory" ) type addIntegrations struct{} diff --git a/pkg/sqlmigration/008_add_licenses.go b/pkg/sqlmigration/008_add_licenses.go index 0a723d946d2b..c4574c945571 100644 --- a/pkg/sqlmigration/008_add_licenses.go +++ b/pkg/sqlmigration/008_add_licenses.go @@ -4,9 +4,9 @@ import ( "context" "time" + "github.com/SigNoz/signoz/pkg/factory" "github.com/uptrace/bun" "github.com/uptrace/bun/migrate" - "go.signoz.io/signoz/pkg/factory" ) type addLicenses struct{} diff --git a/pkg/sqlmigration/009_add_pats.go b/pkg/sqlmigration/009_add_pats.go index 3486fd17eb39..7bbd49913cdd 100644 --- a/pkg/sqlmigration/009_add_pats.go +++ b/pkg/sqlmigration/009_add_pats.go @@ -3,9 +3,9 @@ package sqlmigration import ( "context" + "github.com/SigNoz/signoz/pkg/factory" "github.com/uptrace/bun" "github.com/uptrace/bun/migrate" - "go.signoz.io/signoz/pkg/factory" ) type addPats struct{} diff --git a/pkg/sqlmigration/011_modify_datetime.go b/pkg/sqlmigration/011_modify_datetime.go index 386cbd0740aa..5299c706a80a 100644 --- a/pkg/sqlmigration/011_modify_datetime.go +++ b/pkg/sqlmigration/011_modify_datetime.go @@ -3,9 +3,9 @@ package sqlmigration import ( "context" + "github.com/SigNoz/signoz/pkg/factory" "github.com/uptrace/bun" "github.com/uptrace/bun/migrate" - "go.signoz.io/signoz/pkg/factory" ) type modifyDatetime struct{} diff --git a/pkg/sqlmigration/012_modify_org_domain.go b/pkg/sqlmigration/012_modify_org_domain.go index 45cdfb85b904..70e2820269ab 100644 --- a/pkg/sqlmigration/012_modify_org_domain.go +++ b/pkg/sqlmigration/012_modify_org_domain.go @@ -3,10 +3,10 @@ package sqlmigration import ( "context" + "github.com/SigNoz/signoz/pkg/factory" "github.com/uptrace/bun" "github.com/uptrace/bun/dialect" "github.com/uptrace/bun/migrate" - "go.signoz.io/signoz/pkg/factory" ) type modifyOrgDomain struct{} diff --git a/pkg/sqlmigration/013_update_organization.go b/pkg/sqlmigration/013_update_organization.go index 8f4731be0e1b..6cfd6fcb8eef 100644 --- a/pkg/sqlmigration/013_update_organization.go +++ b/pkg/sqlmigration/013_update_organization.go @@ -5,10 +5,10 @@ import ( "database/sql" "errors" + "github.com/SigNoz/signoz/pkg/factory" + "github.com/SigNoz/signoz/pkg/sqlstore" "github.com/uptrace/bun" "github.com/uptrace/bun/migrate" - "go.signoz.io/signoz/pkg/factory" - "go.signoz.io/signoz/pkg/sqlstore" ) type updateOrganization struct { diff --git a/pkg/sqlmigration/014_add_alertmanager.go b/pkg/sqlmigration/014_add_alertmanager.go index 4ab8ad268910..af50ed078f91 100644 --- a/pkg/sqlmigration/014_add_alertmanager.go +++ b/pkg/sqlmigration/014_add_alertmanager.go @@ -8,14 +8,14 @@ import ( "strings" "time" + "github.com/SigNoz/signoz/pkg/alertmanager/alertmanagerserver" + "github.com/SigNoz/signoz/pkg/factory" + "github.com/SigNoz/signoz/pkg/sqlstore" + "github.com/SigNoz/signoz/pkg/types/alertmanagertypes" "github.com/prometheus/alertmanager/config" "github.com/tidwall/gjson" "github.com/uptrace/bun" "github.com/uptrace/bun/migrate" - "go.signoz.io/signoz/pkg/alertmanager/alertmanagerserver" - "go.signoz.io/signoz/pkg/factory" - "go.signoz.io/signoz/pkg/sqlstore" - "go.signoz.io/signoz/pkg/types/alertmanagertypes" ) type addAlertmanager struct { diff --git a/pkg/sqlmigration/015_update_dashboards_savedviews.go b/pkg/sqlmigration/015_update_dashboards_savedviews.go index 17ed6cd0eb22..e512a8c52a19 100644 --- a/pkg/sqlmigration/015_update_dashboards_savedviews.go +++ b/pkg/sqlmigration/015_update_dashboards_savedviews.go @@ -3,11 +3,11 @@ package sqlmigration import ( "context" + "github.com/SigNoz/signoz/pkg/factory" + "github.com/SigNoz/signoz/pkg/sqlstore" + "github.com/SigNoz/signoz/pkg/types" "github.com/uptrace/bun" "github.com/uptrace/bun/migrate" - "go.signoz.io/signoz/pkg/factory" - "go.signoz.io/signoz/pkg/sqlstore" - "go.signoz.io/signoz/pkg/types" ) type updateDashboardAndSavedViews struct { diff --git a/pkg/sqlmigration/016_pat_org_domains.go b/pkg/sqlmigration/016_pat_org_domains.go index 2be847ea55ea..b169f456f732 100644 --- a/pkg/sqlmigration/016_pat_org_domains.go +++ b/pkg/sqlmigration/016_pat_org_domains.go @@ -3,11 +3,11 @@ package sqlmigration import ( "context" + "github.com/SigNoz/signoz/pkg/factory" + "github.com/SigNoz/signoz/pkg/sqlstore" + "github.com/SigNoz/signoz/pkg/types" "github.com/uptrace/bun" "github.com/uptrace/bun/migrate" - "go.signoz.io/signoz/pkg/factory" - "go.signoz.io/signoz/pkg/sqlstore" - "go.signoz.io/signoz/pkg/types" ) type updatePatAndOrgDomains struct { diff --git a/pkg/sqlmigration/config.go b/pkg/sqlmigration/config.go index aa1e9da69bfb..5046cf5313e3 100644 --- a/pkg/sqlmigration/config.go +++ b/pkg/sqlmigration/config.go @@ -1,7 +1,7 @@ package sqlmigration import ( - "go.signoz.io/signoz/pkg/factory" + "github.com/SigNoz/signoz/pkg/factory" ) type Config struct{} diff --git a/pkg/sqlmigration/sqlmigration.go b/pkg/sqlmigration/sqlmigration.go index e10c5d050fee..faf6834cf926 100644 --- a/pkg/sqlmigration/sqlmigration.go +++ b/pkg/sqlmigration/sqlmigration.go @@ -4,10 +4,10 @@ import ( "context" "errors" + "github.com/SigNoz/signoz/pkg/factory" "github.com/uptrace/bun" "github.com/uptrace/bun/dialect" "github.com/uptrace/bun/migrate" - "go.signoz.io/signoz/pkg/factory" ) // SQLMigration is the interface for a single migration. diff --git a/pkg/sqlmigration/sqlmigrationtest/000_noop.go b/pkg/sqlmigration/sqlmigrationtest/000_noop.go index ac0b246c9366..84854efc88cf 100644 --- a/pkg/sqlmigration/sqlmigrationtest/000_noop.go +++ b/pkg/sqlmigration/sqlmigrationtest/000_noop.go @@ -3,10 +3,10 @@ package sqlmigrationtest import ( "context" + "github.com/SigNoz/signoz/pkg/factory" + "github.com/SigNoz/signoz/pkg/sqlmigration" "github.com/uptrace/bun" "github.com/uptrace/bun/migrate" - "go.signoz.io/signoz/pkg/factory" - "go.signoz.io/signoz/pkg/sqlmigration" ) type noopMigration struct{} diff --git a/pkg/sqlmigrator/config.go b/pkg/sqlmigrator/config.go index 48a1188549ed..1ea77ce573b2 100644 --- a/pkg/sqlmigrator/config.go +++ b/pkg/sqlmigrator/config.go @@ -4,7 +4,7 @@ import ( "errors" "time" - "go.signoz.io/signoz/pkg/factory" + "github.com/SigNoz/signoz/pkg/factory" ) type Config struct { diff --git a/pkg/sqlmigrator/migrator.go b/pkg/sqlmigrator/migrator.go index 37a3eeb4e163..646b895ae220 100644 --- a/pkg/sqlmigrator/migrator.go +++ b/pkg/sqlmigrator/migrator.go @@ -5,9 +5,9 @@ import ( "errors" "time" + "github.com/SigNoz/signoz/pkg/factory" + "github.com/SigNoz/signoz/pkg/sqlstore" "github.com/uptrace/bun/migrate" - "go.signoz.io/signoz/pkg/factory" - "go.signoz.io/signoz/pkg/sqlstore" ) var ( @@ -33,7 +33,7 @@ func New(ctx context.Context, providerSettings factory.ProviderSettings, sqlstor // and the migration will be retried. migrate.WithMarkAppliedOnSuccess(true), ), - settings: factory.NewScopedProviderSettings(providerSettings, "go.signoz.io/signoz/pkg/sqlmigrator"), + settings: factory.NewScopedProviderSettings(providerSettings, "github.com/SigNoz/signoz/pkg/sqlmigrator"), config: config, dialect: sqlstore.BunDB().Dialect().Name().String(), } diff --git a/pkg/sqlmigrator/migrator_test.go b/pkg/sqlmigrator/migrator_test.go index 67197e3d3c67..123564b5e223 100644 --- a/pkg/sqlmigrator/migrator_test.go +++ b/pkg/sqlmigrator/migrator_test.go @@ -7,13 +7,13 @@ import ( "time" "github.com/DATA-DOG/go-sqlmock" + "github.com/SigNoz/signoz/pkg/factory" + "github.com/SigNoz/signoz/pkg/instrumentation/instrumentationtest" + "github.com/SigNoz/signoz/pkg/sqlmigration" + "github.com/SigNoz/signoz/pkg/sqlmigration/sqlmigrationtest" + "github.com/SigNoz/signoz/pkg/sqlstore" + "github.com/SigNoz/signoz/pkg/sqlstore/sqlstoretest" "github.com/stretchr/testify/require" - "go.signoz.io/signoz/pkg/factory" - "go.signoz.io/signoz/pkg/instrumentation/instrumentationtest" - "go.signoz.io/signoz/pkg/sqlmigration" - "go.signoz.io/signoz/pkg/sqlmigration/sqlmigrationtest" - "go.signoz.io/signoz/pkg/sqlstore" - "go.signoz.io/signoz/pkg/sqlstore/sqlstoretest" ) func TestMigratorWithSqliteAndNoopMigration(t *testing.T) { diff --git a/pkg/sqlstore/bun.go b/pkg/sqlstore/bun.go index ef2a49fb5808..b2df4d8a3503 100644 --- a/pkg/sqlstore/bun.go +++ b/pkg/sqlstore/bun.go @@ -4,10 +4,10 @@ import ( "context" "database/sql" + "github.com/SigNoz/signoz/pkg/errors" + "github.com/SigNoz/signoz/pkg/factory" "github.com/uptrace/bun" "github.com/uptrace/bun/schema" - "go.signoz.io/signoz/pkg/errors" - "go.signoz.io/signoz/pkg/factory" ) type transactorKey struct{} diff --git a/pkg/sqlstore/config.go b/pkg/sqlstore/config.go index bd357f6d2d6a..97e58dc897f9 100644 --- a/pkg/sqlstore/config.go +++ b/pkg/sqlstore/config.go @@ -1,7 +1,7 @@ package sqlstore import ( - "go.signoz.io/signoz/pkg/factory" + "github.com/SigNoz/signoz/pkg/factory" ) type Config struct { diff --git a/pkg/sqlstore/postgressqlstore/provider.go b/pkg/sqlstore/postgressqlstore/provider.go index 7b06d4071674..05ea1d073840 100644 --- a/pkg/sqlstore/postgressqlstore/provider.go +++ b/pkg/sqlstore/postgressqlstore/provider.go @@ -4,13 +4,13 @@ import ( "context" "database/sql" + "github.com/SigNoz/signoz/pkg/factory" + "github.com/SigNoz/signoz/pkg/sqlstore" "github.com/jackc/pgx/v5/pgxpool" "github.com/jackc/pgx/v5/stdlib" "github.com/jmoiron/sqlx" "github.com/uptrace/bun" "github.com/uptrace/bun/dialect/pgdialect" - "go.signoz.io/signoz/pkg/factory" - "go.signoz.io/signoz/pkg/sqlstore" ) type provider struct { @@ -37,7 +37,7 @@ func NewFactory(hookFactories ...factory.ProviderFactory[sqlstore.SQLStoreHook, } func New(ctx context.Context, providerSettings factory.ProviderSettings, config sqlstore.Config, hooks ...sqlstore.SQLStoreHook) (sqlstore.SQLStore, error) { - settings := factory.NewScopedProviderSettings(providerSettings, "go.signoz.io/signoz/pkg/sqlstore/postgressqlstore") + settings := factory.NewScopedProviderSettings(providerSettings, "github.com/SigNoz/signoz/pkg/sqlstore/postgressqlstore") pgConfig, err := pgxpool.ParseConfig(config.Postgres.DSN) if err != nil { diff --git a/pkg/sqlstore/sqlitesqlstore/provider.go b/pkg/sqlstore/sqlitesqlstore/provider.go index af617d40f847..3ce5bc9a3a16 100644 --- a/pkg/sqlstore/sqlitesqlstore/provider.go +++ b/pkg/sqlstore/sqlitesqlstore/provider.go @@ -4,12 +4,12 @@ import ( "context" "database/sql" + "github.com/SigNoz/signoz/pkg/factory" + "github.com/SigNoz/signoz/pkg/sqlstore" "github.com/jmoiron/sqlx" _ "github.com/mattn/go-sqlite3" "github.com/uptrace/bun" "github.com/uptrace/bun/dialect/sqlitedialect" - "go.signoz.io/signoz/pkg/factory" - "go.signoz.io/signoz/pkg/sqlstore" ) type provider struct { @@ -36,7 +36,7 @@ func NewFactory(hookFactories ...factory.ProviderFactory[sqlstore.SQLStoreHook, } func New(ctx context.Context, providerSettings factory.ProviderSettings, config sqlstore.Config, hooks ...sqlstore.SQLStoreHook) (sqlstore.SQLStore, error) { - settings := factory.NewScopedProviderSettings(providerSettings, "go.signoz.io/signoz/pkg/sqlitesqlstore") + settings := factory.NewScopedProviderSettings(providerSettings, "github.com/SigNoz/signoz/pkg/sqlitesqlstore") sqldb, err := sql.Open("sqlite3", "file:"+config.Sqlite.Path+"?_foreign_keys=true") if err != nil { diff --git a/pkg/sqlstore/sqlstorehook/logging.go b/pkg/sqlstore/sqlstorehook/logging.go index 21108410ae17..08342b142af2 100644 --- a/pkg/sqlstore/sqlstorehook/logging.go +++ b/pkg/sqlstore/sqlstorehook/logging.go @@ -5,9 +5,9 @@ import ( "log/slog" "time" + "github.com/SigNoz/signoz/pkg/factory" + "github.com/SigNoz/signoz/pkg/sqlstore" "github.com/uptrace/bun" - "go.signoz.io/signoz/pkg/factory" - "go.signoz.io/signoz/pkg/sqlstore" ) type logging struct { @@ -22,7 +22,7 @@ func NewLoggingFactory() factory.ProviderFactory[sqlstore.SQLStoreHook, sqlstore func NewLogging(ctx context.Context, providerSettings factory.ProviderSettings, config sqlstore.Config) (sqlstore.SQLStoreHook, error) { return &logging{ - logger: factory.NewScopedProviderSettings(providerSettings, "go.signoz.io/signoz/pkg/sqlstore/sqlstorehook").Logger(), + logger: factory.NewScopedProviderSettings(providerSettings, "github.com/SigNoz/signoz/pkg/sqlstore/sqlstorehook").Logger(), level: slog.LevelDebug, }, nil } diff --git a/pkg/sqlstore/sqlstoretest/provider.go b/pkg/sqlstore/sqlstoretest/provider.go index 8ed1c3fdf87c..4927bc9f01dd 100644 --- a/pkg/sqlstore/sqlstoretest/provider.go +++ b/pkg/sqlstore/sqlstoretest/provider.go @@ -6,10 +6,10 @@ import ( "fmt" "github.com/DATA-DOG/go-sqlmock" + "github.com/SigNoz/signoz/pkg/sqlstore" "github.com/jmoiron/sqlx" "github.com/uptrace/bun" "github.com/uptrace/bun/dialect/sqlitedialect" - "go.signoz.io/signoz/pkg/sqlstore" ) var _ sqlstore.SQLStore = (*Provider)(nil) diff --git a/pkg/telemetrystore/clickhousetelemetrystore/provider.go b/pkg/telemetrystore/clickhousetelemetrystore/provider.go index b126e7bd2d54..d3498f2154f0 100644 --- a/pkg/telemetrystore/clickhousetelemetrystore/provider.go +++ b/pkg/telemetrystore/clickhousetelemetrystore/provider.go @@ -5,8 +5,8 @@ import ( "github.com/ClickHouse/clickhouse-go/v2" "github.com/ClickHouse/clickhouse-go/v2/lib/driver" - "go.signoz.io/signoz/pkg/factory" - "go.signoz.io/signoz/pkg/telemetrystore" + "github.com/SigNoz/signoz/pkg/factory" + "github.com/SigNoz/signoz/pkg/telemetrystore" ) type provider struct { @@ -31,7 +31,7 @@ func NewFactory(hookFactories ...factory.ProviderFactory[telemetrystore.Telemetr } func New(ctx context.Context, providerSettings factory.ProviderSettings, config telemetrystore.Config, hooks ...telemetrystore.TelemetryStoreHook) (telemetrystore.TelemetryStore, error) { - settings := factory.NewScopedProviderSettings(providerSettings, "go.signoz.io/signoz/pkg/telemetrystore/clickhousetelemetrystore") + settings := factory.NewScopedProviderSettings(providerSettings, "github.com/SigNoz/signoz/pkg/telemetrystore/clickhousetelemetrystore") options, err := clickhouse.ParseDSN(config.ClickHouse.DSN) if err != nil { diff --git a/pkg/telemetrystore/config.go b/pkg/telemetrystore/config.go index 686175c21786..d862b8bac46c 100644 --- a/pkg/telemetrystore/config.go +++ b/pkg/telemetrystore/config.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "go.signoz.io/signoz/pkg/factory" + "github.com/SigNoz/signoz/pkg/factory" ) type Config struct { diff --git a/pkg/telemetrystore/config_test.go b/pkg/telemetrystore/config_test.go index 68eec0ff99b6..7880adbf0ebe 100644 --- a/pkg/telemetrystore/config_test.go +++ b/pkg/telemetrystore/config_test.go @@ -5,11 +5,11 @@ import ( "testing" "time" + "github.com/SigNoz/signoz/pkg/config" + "github.com/SigNoz/signoz/pkg/config/envprovider" + "github.com/SigNoz/signoz/pkg/factory" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.signoz.io/signoz/pkg/config" - "go.signoz.io/signoz/pkg/config/envprovider" - "go.signoz.io/signoz/pkg/factory" ) func TestNewWithEnvProvider(t *testing.T) { diff --git a/pkg/telemetrystore/telemetrystorehook/settings.go b/pkg/telemetrystore/telemetrystorehook/settings.go index c97ac81d4b89..8e27afa924c8 100644 --- a/pkg/telemetrystore/telemetrystorehook/settings.go +++ b/pkg/telemetrystore/telemetrystorehook/settings.go @@ -6,9 +6,9 @@ import ( "github.com/ClickHouse/clickhouse-go/v2" "github.com/ClickHouse/clickhouse-go/v2/lib/driver" - "go.signoz.io/signoz/pkg/factory" - "go.signoz.io/signoz/pkg/query-service/common" - "go.signoz.io/signoz/pkg/telemetrystore" + "github.com/SigNoz/signoz/pkg/factory" + "github.com/SigNoz/signoz/pkg/query-service/common" + "github.com/SigNoz/signoz/pkg/telemetrystore" ) type provider struct { @@ -64,7 +64,9 @@ func (h *provider) clickHouseSettings(ctx context.Context, query string, args .. } if ctx.Value("clickhouse_max_threads") != nil { - if maxThreads, ok := ctx.Value("clickhouse_max_threads").(int); ok { settings["max_threads"] = maxThreads } + if maxThreads, ok := ctx.Value("clickhouse_max_threads").(int); ok { + settings["max_threads"] = maxThreads + } } ctx = clickhouse.Context(ctx, clickhouse.WithSettings(settings)) diff --git a/pkg/telemetrystore/telemetrystoretest/provider.go b/pkg/telemetrystore/telemetrystoretest/provider.go index b491d470c833..b0c165a10e12 100644 --- a/pkg/telemetrystore/telemetrystoretest/provider.go +++ b/pkg/telemetrystore/telemetrystoretest/provider.go @@ -2,8 +2,8 @@ package telemetrystoretest import ( "github.com/ClickHouse/clickhouse-go/v2" + "github.com/SigNoz/signoz/pkg/telemetrystore" cmock "github.com/srikanthccv/ClickHouse-go-mock" - "go.signoz.io/signoz/pkg/telemetrystore" ) var _ telemetrystore.TelemetryStore = (*Provider)(nil) diff --git a/pkg/types/alertmanagertypes/alert.go b/pkg/types/alertmanagertypes/alert.go index 4066106026d4..78a0e59f95eb 100644 --- a/pkg/types/alertmanagertypes/alert.go +++ b/pkg/types/alertmanagertypes/alert.go @@ -7,6 +7,7 @@ import ( "sort" "time" + "github.com/SigNoz/signoz/pkg/errors" "github.com/go-openapi/runtime/middleware" "github.com/go-openapi/strfmt" v2 "github.com/prometheus/alertmanager/api/v2" @@ -18,7 +19,6 @@ import ( "github.com/prometheus/alertmanager/provider" "github.com/prometheus/alertmanager/types" "github.com/prometheus/common/model" - "go.signoz.io/signoz/pkg/errors" ) type ( diff --git a/pkg/types/alertmanagertypes/alertmanagertypestest/state.go b/pkg/types/alertmanagertypes/alertmanagertypestest/state.go index b6cef1e5821a..a98a148ee818 100644 --- a/pkg/types/alertmanagertypes/alertmanagertypestest/state.go +++ b/pkg/types/alertmanagertypes/alertmanagertypestest/state.go @@ -4,8 +4,8 @@ import ( "context" "sync" - "go.signoz.io/signoz/pkg/errors" - "go.signoz.io/signoz/pkg/types/alertmanagertypes" + "github.com/SigNoz/signoz/pkg/errors" + "github.com/SigNoz/signoz/pkg/types/alertmanagertypes" ) var _ alertmanagertypes.StateStore = (*StateStore)(nil) diff --git a/pkg/types/alertmanagertypes/channel.go b/pkg/types/alertmanagertypes/channel.go index 9e7fa52d485e..304bee7c6f64 100644 --- a/pkg/types/alertmanagertypes/channel.go +++ b/pkg/types/alertmanagertypes/channel.go @@ -6,9 +6,9 @@ import ( "regexp" "time" + "github.com/SigNoz/signoz/pkg/errors" "github.com/prometheus/alertmanager/config" "github.com/uptrace/bun" - "go.signoz.io/signoz/pkg/errors" ) var ( diff --git a/pkg/types/alertmanagertypes/config.go b/pkg/types/alertmanagertypes/config.go index 167b0520abdb..916bd21e8c89 100644 --- a/pkg/types/alertmanagertypes/config.go +++ b/pkg/types/alertmanagertypes/config.go @@ -9,11 +9,11 @@ import ( "time" "dario.cat/mergo" + "github.com/SigNoz/signoz/pkg/errors" "github.com/prometheus/alertmanager/config" commoncfg "github.com/prometheus/common/config" "github.com/prometheus/common/model" "github.com/uptrace/bun" - "go.signoz.io/signoz/pkg/errors" ) const ( diff --git a/pkg/types/alertmanagertypes/receiver.go b/pkg/types/alertmanagertypes/receiver.go index 55fbc48a5777..bbdfaf28d7a8 100644 --- a/pkg/types/alertmanagertypes/receiver.go +++ b/pkg/types/alertmanagertypes/receiver.go @@ -7,9 +7,9 @@ import ( "log/slog" "time" + "github.com/SigNoz/signoz/pkg/errors" "github.com/prometheus/alertmanager/notify" "github.com/prometheus/alertmanager/template" - "go.signoz.io/signoz/pkg/errors" "gopkg.in/yaml.v2" "github.com/prometheus/alertmanager/config" diff --git a/pkg/types/alertmanagertypes/state.go b/pkg/types/alertmanagertypes/state.go index 25ac871e10c0..29565d8642ff 100644 --- a/pkg/types/alertmanagertypes/state.go +++ b/pkg/types/alertmanagertypes/state.go @@ -5,9 +5,9 @@ import ( "encoding/base64" "time" + "github.com/SigNoz/signoz/pkg/errors" "github.com/prometheus/alertmanager/cluster" "github.com/uptrace/bun" - "go.signoz.io/signoz/pkg/errors" ) // State is the type alias for the State type from the alertmanager package. diff --git a/pkg/web/config.go b/pkg/web/config.go index 1baa320992b9..4feb54835c5e 100644 --- a/pkg/web/config.go +++ b/pkg/web/config.go @@ -1,7 +1,7 @@ package web import ( - "go.signoz.io/signoz/pkg/factory" + "github.com/SigNoz/signoz/pkg/factory" ) // Config holds the configuration for web. diff --git a/pkg/web/config_test.go b/pkg/web/config_test.go index 793135fad854..9d002ea8c08e 100644 --- a/pkg/web/config_test.go +++ b/pkg/web/config_test.go @@ -4,11 +4,11 @@ import ( "context" "testing" + "github.com/SigNoz/signoz/pkg/config" + "github.com/SigNoz/signoz/pkg/config/envprovider" + "github.com/SigNoz/signoz/pkg/factory" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.signoz.io/signoz/pkg/config" - "go.signoz.io/signoz/pkg/config/envprovider" - "go.signoz.io/signoz/pkg/factory" ) func TestNewWithEnvProvider(t *testing.T) { diff --git a/pkg/web/noopweb/provider.go b/pkg/web/noopweb/provider.go index 9603872eaefe..3797f5643e68 100644 --- a/pkg/web/noopweb/provider.go +++ b/pkg/web/noopweb/provider.go @@ -4,9 +4,9 @@ import ( "context" "net/http" + "github.com/SigNoz/signoz/pkg/factory" + "github.com/SigNoz/signoz/pkg/web" "github.com/gorilla/mux" - "go.signoz.io/signoz/pkg/factory" - "go.signoz.io/signoz/pkg/web" ) type provider struct{} diff --git a/pkg/web/routerweb/provider.go b/pkg/web/routerweb/provider.go index ea8a30588901..ccc632652f69 100644 --- a/pkg/web/routerweb/provider.go +++ b/pkg/web/routerweb/provider.go @@ -7,10 +7,10 @@ import ( "os" "path/filepath" + "github.com/SigNoz/signoz/pkg/factory" + "github.com/SigNoz/signoz/pkg/http/middleware" + "github.com/SigNoz/signoz/pkg/web" "github.com/gorilla/mux" - "go.signoz.io/signoz/pkg/factory" - "go.signoz.io/signoz/pkg/http/middleware" - "go.signoz.io/signoz/pkg/web" ) const ( diff --git a/pkg/web/routerweb/provider_test.go b/pkg/web/routerweb/provider_test.go index 52be2ec970b6..22c82f9b7a3c 100644 --- a/pkg/web/routerweb/provider_test.go +++ b/pkg/web/routerweb/provider_test.go @@ -9,11 +9,11 @@ import ( "path/filepath" "testing" + "github.com/SigNoz/signoz/pkg/factory/factorytest" + "github.com/SigNoz/signoz/pkg/web" "github.com/gorilla/mux" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.signoz.io/signoz/pkg/factory/factorytest" - "go.signoz.io/signoz/pkg/web" ) func TestServeHttpWithoutPrefix(t *testing.T) {