From efd4e30edf79f40ea34b90552eb5c5fdaa48f116 Mon Sep 17 00:00:00 2001 From: Shivanshu Raj Shrivastava Date: Thu, 20 Mar 2025 21:01:41 +0530 Subject: [PATCH] fix: publish signoz as package (#7378) Signed-off-by: Shivanshu Raj Shrivastava --- Makefile | 2 +- ee/http/middleware/pat.go | 4 +- ee/query-service/.goreleaser.yaml | 12 +-- ee/query-service/anomaly/daily.go | 4 +- ee/query-service/anomaly/hourly.go | 4 +- ee/query-service/anomaly/params.go | 4 +- ee/query-service/anomaly/seasonal.go | 10 +- ee/query-service/anomaly/weekly.go | 4 +- ee/query-service/app/api/api.go | 34 +++---- ee/query-service/app/api/auth.go | 8 +- ee/query-service/app/api/cloudIntegrations.go | 14 +-- ee/query-service/app/api/dashboard.go | 10 +- ee/query-service/app/api/domains.go | 4 +- ee/query-service/app/api/featureFlags.go | 4 +- ee/query-service/app/api/featureFlags_test.go | 2 +- ee/query-service/app/api/gateway.go | 2 +- ee/query-service/app/api/license.go | 8 +- ee/query-service/app/api/pat.go | 10 +- ee/query-service/app/api/queryrange.go | 10 +- ee/query-service/app/api/response.go | 4 +- ee/query-service/app/api/traces.go | 8 +- ee/query-service/app/db/reader.go | 6 +- ee/query-service/app/db/trace.go | 4 +- ee/query-service/app/server.go | 74 +++++++-------- ee/query-service/dao/factory.go | 4 +- ee/query-service/dao/interface.go | 14 +-- ee/query-service/dao/sqlite/auth.go | 16 ++-- ee/query-service/dao/sqlite/domain.go | 8 +- ee/query-service/dao/sqlite/modelDao.go | 8 +- ee/query-service/dao/sqlite/pat.go | 6 +- .../integrations/signozio/signozio.go | 4 +- ee/query-service/interfaces/connector.go | 2 +- ee/query-service/license/db.go | 6 +- ee/query-service/license/manager.go | 14 +-- ee/query-service/main.go | 18 ++-- ee/query-service/model/auth.go | 2 +- ee/query-service/model/errors.go | 2 +- ee/query-service/model/license.go | 2 +- ee/query-service/model/license_test.go | 2 +- ee/query-service/model/pat.go | 2 +- ee/query-service/model/plans.go | 4 +- ee/query-service/rules/anomaly.go | 26 +++--- ee/query-service/rules/manager.go | 6 +- ee/query-service/sso/saml/request.go | 2 +- ee/query-service/usage/manager.go | 10 +- ee/types/domain.go | 6 +- ee/types/sso.go | 2 +- go.mod | 2 +- pkg/alertmanager/alertmanager.go | 6 +- .../alertmanagerbatcher/batcher.go | 2 +- .../alertmanagerbatcher/batcher_test.go | 2 +- pkg/alertmanager/alertmanagerserver/config.go | 2 +- pkg/alertmanager/alertmanagerserver/server.go | 4 +- .../alertmanagerserver/server_test.go | 4 +- .../sqlalertmanagerstore/config.go | 6 +- .../sqlalertmanagerstore/state.go | 6 +- pkg/alertmanager/api.go | 8 +- pkg/alertmanager/config.go | 4 +- pkg/alertmanager/config_test.go | 6 +- .../legacyalertmanager/provider.go | 14 +-- pkg/alertmanager/service.go | 8 +- .../signozalertmanager/provider.go | 14 +-- pkg/apiserver/config.go | 2 +- pkg/apiserver/config_test.go | 6 +- pkg/cache/config.go | 2 +- pkg/cache/memorycache/provider.go | 4 +- pkg/cache/memorycache/provider_test.go | 4 +- pkg/cache/rediscache/provider.go | 4 +- pkg/cache/rediscache/provider_test.go | 2 +- pkg/config/config.go | 2 +- pkg/config/configtest/config.go | 4 +- pkg/config/envprovider/provider.go | 2 +- pkg/config/envprovider/provider_test.go | 2 +- pkg/config/fileprovider/provider.go | 2 +- pkg/config/fileprovider/provider_test.go | 2 +- pkg/factory/factorytest/settings.go | 4 +- pkg/http/middleware/analytics.go | 6 +- pkg/http/middleware/auth.go | 2 +- pkg/http/middleware/logging.go | 4 +- pkg/http/render/render.go | 2 +- pkg/http/render/render_test.go | 2 +- pkg/http/server/server.go | 2 +- pkg/instrumentation/config.go | 2 +- pkg/instrumentation/config_test.go | 6 +- pkg/instrumentation/instrumentation.go | 2 +- .../instrumentationtest/instrumentation.go | 4 +- pkg/instrumentation/logger.go | 2 +- pkg/instrumentation/sdk.go | 4 +- pkg/query-service/.goreleaser.yaml | 8 +- pkg/query-service/agentConf/agent_features.go | 2 +- pkg/query-service/agentConf/db.go | 2 +- pkg/query-service/agentConf/manager.go | 8 +- pkg/query-service/app/apdex.go | 6 +- pkg/query-service/app/auth.go | 8 +- .../clickhouseReader/filter_suggestions.go | 4 +- .../query_progress/inmemory_tracker.go | 2 +- .../query_progress/tracker.go | 2 +- .../query_progress/tracker_test.go | 2 +- .../app/clickhouseReader/reader.go | 38 ++++---- .../app/cloudintegrations/accountsRepo.go | 2 +- .../cloudintegrations/availableServices.go | 4 +- .../availableServices_test.go | 2 +- .../app/cloudintegrations/controller.go | 6 +- .../app/cloudintegrations/controller_test.go | 4 +- .../app/cloudintegrations/model.go | 2 +- .../cloudintegrations/serviceConfigRepo.go | 2 +- pkg/query-service/app/dashboards/model.go | 8 +- pkg/query-service/app/explorer/db.go | 10 +- pkg/query-service/app/http_handler.go | 92 +++++++++---------- pkg/query-service/app/http_handler_test.go | 2 +- pkg/query-service/app/infra.go | 2 +- .../app/inframetrics/clusters.go | 12 +-- pkg/query-service/app/inframetrics/common.go | 4 +- .../app/inframetrics/daemonsets.go | 12 +-- .../app/inframetrics/deployments.go | 12 +-- pkg/query-service/app/inframetrics/hosts.go | 14 +-- .../app/inframetrics/hosts_query.go | 2 +- pkg/query-service/app/inframetrics/jobs.go | 12 +-- .../app/inframetrics/namespaces.go | 12 +-- pkg/query-service/app/inframetrics/nodes.go | 14 +-- .../app/inframetrics/nodes_query.go | 2 +- pkg/query-service/app/inframetrics/pods.go | 14 +-- .../app/inframetrics/pods_query.go | 2 +- .../app/inframetrics/process_query.go | 2 +- .../app/inframetrics/processes.go | 12 +-- pkg/query-service/app/inframetrics/pvcs.go | 12 +-- .../app/inframetrics/pvcs_query.go | 2 +- .../app/inframetrics/statefulsets.go | 12 +-- .../app/inframetrics/workload_query.go | 2 +- pkg/query-service/app/integrations/builtin.go | 2 +- .../app/integrations/controller.go | 10 +- pkg/query-service/app/integrations/manager.go | 10 +- .../messagingQueues/kafka/translator.go | 6 +- .../messagingQueues/queues/model.go | 2 +- .../messagingQueues/queues/queueOverview.go | 2 +- .../messagingQueues/queues/sql.go | 4 +- .../app/integrations/pipeline_utils.go | 4 +- pkg/query-service/app/integrations/repo.go | 2 +- .../app/integrations/sqlite_repo.go | 2 +- .../app/integrations/test_utils.go | 12 +-- .../app/integrations/thirdPartyApi/model.go | 2 +- .../integrations/thirdPartyApi/translator.go | 2 +- .../thirdPartyApi/translator_test.go | 2 +- .../app/logparsingpipeline/agent_feature.go | 2 +- .../logparsingpipeline/collector_config.go | 4 +- .../collector_config_test.go | 6 +- .../app/logparsingpipeline/controller.go | 10 +- .../app/logparsingpipeline/db.go | 4 +- .../app/logparsingpipeline/model.go | 2 +- .../app/logparsingpipeline/pipelineBuilder.go | 4 +- .../pipelineBuilder_test.go | 6 +- .../logparsingpipeline/postablePipeline.go | 4 +- .../postablePipeline_test.go | 2 +- .../app/logparsingpipeline/preview.go | 2 +- .../app/logparsingpipeline/preview_test.go | 4 +- .../app/logparsingpipeline/processors_test.go | 6 +- .../severity_parser_test.go | 4 +- .../logparsingpipeline/time_parser_test.go | 4 +- pkg/query-service/app/logs/parser.go | 6 +- pkg/query-service/app/logs/parser_test.go | 2 +- pkg/query-service/app/logs/v3/enrich_query.go | 6 +- .../app/logs/v3/enrich_query_test.go | 2 +- pkg/query-service/app/logs/v3/json_filter.go | 4 +- .../app/logs/v3/json_filter_test.go | 2 +- .../app/logs/v3/query_builder.go | 6 +- .../app/logs/v3/query_builder_test.go | 4 +- pkg/query-service/app/logs/v4/json_filter.go | 6 +- .../app/logs/v4/json_filter_test.go | 4 +- .../app/logs/v4/query_builder.go | 10 +- .../app/logs/v4/query_builder_test.go | 4 +- pkg/query-service/app/logs/validator.go | 6 +- .../app/metrics/query_builder.go | 2 +- .../app/metrics/v3/cumulative_table.go | 8 +- .../app/metrics/v3/cumulative_table_test.go | 2 +- pkg/query-service/app/metrics/v3/delta.go | 8 +- .../app/metrics/v3/delta_table.go | 8 +- .../app/metrics/v3/delta_table_test.go | 2 +- .../app/metrics/v3/query_builder.go | 14 +-- .../app/metrics/v3/query_builder_test.go | 2 +- .../app/metrics/v4/cumulative/table.go | 4 +- .../app/metrics/v4/cumulative/table_test.go | 2 +- .../app/metrics/v4/cumulative/timeseries.go | 8 +- .../metrics/v4/cumulative/timeseries_test.go | 2 +- .../app/metrics/v4/delta/table.go | 4 +- .../app/metrics/v4/delta/table_test.go | 2 +- .../app/metrics/v4/delta/time_series_test.go | 2 +- .../app/metrics/v4/delta/timeseries.go | 8 +- .../app/metrics/v4/helpers/clauses.go | 4 +- .../metrics/v4/helpers/series_agg_helper.go | 2 +- .../app/metrics/v4/helpers/sub_query.go | 6 +- .../app/metrics/v4/query_builder.go | 16 ++-- .../metrics/v4/query_builder_pre_agg_test.go | 4 +- .../app/metrics/v4/query_builder_test.go | 6 +- .../app/metricsexplorer/parser.go | 8 +- .../app/metricsexplorer/summary.go | 14 +-- .../app/opamp/config_provider.go | 2 +- .../app/opamp/config_provider_test.go | 4 +- .../app/opamp/configure_ingestionRules.go | 6 +- pkg/query-service/app/opamp/opamp_server.go | 2 +- pkg/query-service/app/parser.go | 30 +++--- pkg/query-service/app/parser_test.go | 4 +- pkg/query-service/app/preferences/model.go | 2 +- pkg/query-service/app/querier/helper.go | 20 ++-- pkg/query-service/app/querier/querier.go | 30 +++--- pkg/query-service/app/querier/querier_test.go | 16 ++-- pkg/query-service/app/querier/v2/helper.go | 20 ++-- pkg/query-service/app/querier/v2/querier.go | 30 +++--- .../app/querier/v2/querier_test.go | 16 ++-- .../app/queryBuilder/functions.go | 2 +- .../app/queryBuilder/functions_test.go | 2 +- .../app/queryBuilder/query_builder.go | 10 +- .../app/queryBuilder/query_builder_test.go | 12 +-- .../app/resource/resource_query_builder.go | 4 +- .../resource/resource_query_builder_test.go | 2 +- pkg/query-service/app/server.go | 58 ++++++------ pkg/query-service/app/services/map.go | 2 +- pkg/query-service/app/summary.go | 4 +- .../app/traces/tracedetail/flamegraph.go | 2 +- .../app/traces/tracedetail/waterfall.go | 2 +- .../app/traces/v3/query_builder.go | 6 +- .../app/traces/v3/query_builder_test.go | 4 +- pkg/query-service/app/traces/v3/utils.go | 4 +- pkg/query-service/app/traces/v4/enrich.go | 6 +- .../app/traces/v4/enrich_test.go | 2 +- .../app/traces/v4/query_builder.go | 10 +- .../app/traces/v4/query_builder_test.go | 4 +- pkg/query-service/auth/auth.go | 18 ++-- pkg/query-service/auth/rbac.go | 8 +- pkg/query-service/auth/utils.go | 4 +- pkg/query-service/cache/cache.go | 8 +- pkg/query-service/cache/inmemory/cache.go | 2 +- .../cache/inmemory/cache_test.go | 2 +- pkg/query-service/cache/redis/redis.go | 2 +- pkg/query-service/cache/redis/redis_test.go | 2 +- pkg/query-service/common/query_range.go | 8 +- pkg/query-service/common/query_range_test.go | 4 +- pkg/query-service/constants/constants.go | 4 +- pkg/query-service/contextlinks/links.go | 6 +- pkg/query-service/dao/factory.go | 4 +- pkg/query-service/dao/interface.go | 4 +- pkg/query-service/dao/sqlite/apdex.go | 4 +- pkg/query-service/dao/sqlite/connection.go | 8 +- pkg/query-service/dao/sqlite/rbac.go | 6 +- pkg/query-service/featureManager/manager.go | 4 +- pkg/query-service/formatter/data.go | 2 +- pkg/query-service/formatter/data_rate.go | 2 +- pkg/query-service/interfaces/featureLookup.go | 2 +- pkg/query-service/interfaces/interface.go | 8 +- pkg/query-service/main.go | 18 ++-- pkg/query-service/model/alerting.go | 2 +- pkg/query-service/model/infra.go | 2 +- pkg/query-service/model/logs.go | 2 +- .../model/metrics_explorer/summary.go | 2 +- .../model/updatedMetricsMetadata.go | 2 +- pkg/query-service/postprocess/formula.go | 2 +- pkg/query-service/postprocess/formula_test.go | 2 +- pkg/query-service/postprocess/gaps.go | 4 +- pkg/query-service/postprocess/gaps_test.go | 2 +- pkg/query-service/postprocess/having.go | 2 +- pkg/query-service/postprocess/having_test.go | 2 +- pkg/query-service/postprocess/limit.go | 4 +- pkg/query-service/postprocess/limit_test.go | 4 +- pkg/query-service/postprocess/process.go | 4 +- pkg/query-service/postprocess/process_test.go | 2 +- pkg/query-service/postprocess/reduce_to.go | 2 +- .../postprocess/reduce_to_test.go | 2 +- pkg/query-service/postprocess/table.go | 4 +- pkg/query-service/postprocess/table_test.go | 4 +- pkg/query-service/pqlEngine/engine.go | 2 +- .../queryBuilderToExpr/queryBuilderToExpr.go | 2 +- .../queryBuilderToExpr_test.go | 2 +- .../querycache/query_range_cache.go | 6 +- .../querycache/query_range_cache_test.go | 6 +- pkg/query-service/rules/alerting.go | 6 +- pkg/query-service/rules/api_params.go | 8 +- pkg/query-service/rules/api_params_test.go | 2 +- pkg/query-service/rules/base_rule.go | 12 +-- pkg/query-service/rules/base_rule_test.go | 2 +- pkg/query-service/rules/db.go | 8 +- pkg/query-service/rules/manager.go | 18 ++-- pkg/query-service/rules/prom_rule.go | 16 ++-- pkg/query-service/rules/prom_rule_task.go | 2 +- pkg/query-service/rules/promrule_test.go | 2 +- pkg/query-service/rules/result_types.go | 2 +- pkg/query-service/rules/rule.go | 4 +- pkg/query-service/rules/rule_task.go | 4 +- pkg/query-service/rules/templates.go | 4 +- pkg/query-service/rules/templates_test.go | 2 +- pkg/query-service/rules/test_notification.go | 4 +- pkg/query-service/rules/threshold_rule.go | 36 ++++---- .../rules/threshold_rule_test.go | 16 ++-- pkg/query-service/telemetry/telemetry.go | 12 +-- .../integration/filter_suggestions_test.go | 18 ++-- .../integration/logparsingpipeline_test.go | 26 +++--- .../signoz_cloud_integrations_test.go | 18 ++-- .../integration/signoz_integrations_test.go | 26 +++--- .../tests/integration/test_utils.go | 18 ++-- pkg/query-service/utils/filter_conditions.go | 6 +- pkg/query-service/utils/format.go | 6 +- pkg/query-service/utils/format_test.go | 4 +- pkg/query-service/utils/logs.go | 2 +- pkg/query-service/utils/logs_test.go | 2 +- pkg/query-service/utils/queryTemplate/vars.go | 2 +- pkg/query-service/utils/testutils.go | 16 ++-- pkg/signoz/config.go | 22 ++--- pkg/signoz/config_test.go | 2 +- pkg/signoz/provider.go | 36 ++++---- pkg/signoz/provider_test.go | 4 +- pkg/signoz/signoz.go | 20 ++-- pkg/sqlmigration/000_add_data_migrations.go | 2 +- pkg/sqlmigration/001_add_organization.go | 2 +- pkg/sqlmigration/002_add_preferences.go | 2 +- pkg/sqlmigration/003_add_dashboards.go | 2 +- pkg/sqlmigration/004_add_saved_views.go | 2 +- pkg/sqlmigration/005_add_agents.go | 2 +- pkg/sqlmigration/006_add_pipelines.go | 2 +- pkg/sqlmigration/007_add_integrations.go | 2 +- pkg/sqlmigration/008_add_licenses.go | 2 +- pkg/sqlmigration/009_add_pats.go | 2 +- pkg/sqlmigration/011_modify_datetime.go | 2 +- pkg/sqlmigration/012_modify_org_domain.go | 2 +- pkg/sqlmigration/013_update_organization.go | 4 +- pkg/sqlmigration/014_add_alertmanager.go | 8 +- .../015_update_dashboards_savedviews.go | 6 +- pkg/sqlmigration/016_pat_org_domains.go | 6 +- pkg/sqlmigration/config.go | 2 +- pkg/sqlmigration/sqlmigration.go | 2 +- pkg/sqlmigration/sqlmigrationtest/000_noop.go | 4 +- pkg/sqlmigrator/config.go | 2 +- pkg/sqlmigrator/migrator.go | 6 +- pkg/sqlmigrator/migrator_test.go | 12 +-- pkg/sqlstore/bun.go | 4 +- pkg/sqlstore/config.go | 2 +- pkg/sqlstore/postgressqlstore/provider.go | 6 +- pkg/sqlstore/sqlitesqlstore/provider.go | 6 +- pkg/sqlstore/sqlstorehook/logging.go | 6 +- pkg/sqlstore/sqlstoretest/provider.go | 2 +- .../clickhousetelemetrystore/provider.go | 6 +- pkg/telemetrystore/config.go | 2 +- pkg/telemetrystore/config_test.go | 6 +- .../telemetrystorehook/settings.go | 10 +- .../telemetrystoretest/provider.go | 2 +- pkg/types/alertmanagertypes/alert.go | 2 +- .../alertmanagertypestest/state.go | 4 +- pkg/types/alertmanagertypes/channel.go | 2 +- pkg/types/alertmanagertypes/config.go | 2 +- pkg/types/alertmanagertypes/receiver.go | 2 +- pkg/types/alertmanagertypes/state.go | 2 +- pkg/web/config.go | 2 +- pkg/web/config_test.go | 6 +- pkg/web/noopweb/provider.go | 4 +- pkg/web/routerweb/provider.go | 6 +- pkg/web/routerweb/provider_test.go | 4 +- 353 files changed, 1174 insertions(+), 1172 deletions(-) diff --git a/Makefile b/Makefile index 02a86cf850..73baeb2183 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 a9ec1ff06d..292d209dd9 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 83a6a8101e..66ba7182d1 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 bbafe1618e..035c406244 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 1ee08655f0..ac0739adac 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 b0107493d7..9cfa5a6414 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 c77acc0a8e..900145f4a7 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 407e7e6440..35551e4caf 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 6b57928c85..8620621473 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 6ae3241975..03e3c7030a 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 38643fb96c..13ac372f65 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 61c78dfe4d..7a9a75bcc6 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 f825bc59de..6e99183ffe 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 d5af0ab626..1feca4b764 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 99a7be1521..e64e2ea135 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 1154911a26..54fc1759ed 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 33b7950112..a3d0f65077 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 0b318c499d..3b50fd0031 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 6047eeeb10..6a9c49ba4d 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 fef5f89798..7537d26228 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 3864fc672e..965c8128c6 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 121d89d5b3..d7652acdc2 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 497f56e059..3a3420c306 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 3aa7a80aad..b13b24a5d0 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 3da11bad0c..eb146c3688 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 2d5cbc476d..bb2bc764d5 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 d1f2ab3c90..c0c8290b6c 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 a3a8192b06..1fe63c995e 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 dbacfa646b..f50c5b16bb 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 ef04c2bd4f..7cc5b96380 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 d57132e04b..ff4f307441 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 5428e421fa..71435e1616 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 021dc2b676..0f30ec78db 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 7ad62e0068..900a5dd75e 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 79284d439f..06c5695bca 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 9ad83cb398..fd7ecad9d0 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 efc780be95..cbbb0e4cc3 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 d7c8cb49dc..4b5a63174e 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 24c74eee09..5ba585c4b6 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 3128702c3c..53003aa891 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 6dbfa8ba56..8c390beef3 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 ceec23747e..7478c65321 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 e28afbdb2e..bccdc08adf 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 c9788d0ff3..73851ef828 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 2ed475b4dd..bcd154b21d 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 2d98cff63a..5cba222302 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 1e36f97ba2..9ad640cd75 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 f5f4ec34b4..3d456796f7 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 79c6a76ce7..c0605a58d2 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 34e68d2806..977321b014 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 517c16a1ea..5f01215f63 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 c7e06297d5..47549473e2 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 9bcca2a506..f53be783db 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 142e49884f..f5cc5fe670 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 0a0e21c385..c2c4a05348 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 008db2cda3..5c4e6acefa 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 b71cbb2034..d0f5bd94df 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 03deab8fdd..2b47c7bc8f 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 62038f5406..30b35aac3d 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 09a8d894a8..05d9ae5c54 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 3ddafb5e36..10d7fb2446 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 122a292a97..1920733a1f 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 e505c312c2..e87d809243 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 373deaae28..4c1320fb7d 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 ad80b6275a..aec67ced02 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 ccc2bfd5be..9dc4ce085d 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 abc816c050..1d89f486b2 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 171f08cf64..a9bc249abf 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 6de4b5e465..7fa70ef331 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 1261816ba3..1d12d1213b 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 87f34c3426..7fa15a47a2 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 3f6a591a50..7a4bd1947c 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 43a095e7dc..6cebb92bc5 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 fb184f9c52..b8b8728d18 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 647672c8ea..a8db05bebb 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 ee1a61ff21..34074dbec4 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 fcdc25d6b2..dd0104459c 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 5ee3ba7de4..a9626c4fa3 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 9376f4805f..a9c666418d 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 97206a6eb8..fc2cf44d7b 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 6017c2e711..5b6b28149c 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 50d268f24c..449eff28f8 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 bc1149ec88..6a7223441c 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 b04b3cd249..52ac5acdef 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 8bacc9dfa2..c9ec2dbda6 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 c0bd563387..cd6625dd46 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 dd08f4bedc..808e1e6557 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 c31cf5796d..7665995639 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 e47c62eb86..d4f5ffa04a 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 f10d4fbf66..c0e615a88d 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 848de75780..9f02672598 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 61fd70ab90..8a9da7741f 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 df6f03ccde..a3e99e1744 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 30ac833ee5..196cf65609 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 eeda450050..248d085536 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 fcefe4cd7c..b99c2070af 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 c783dfbd5b..8c4fa3695a 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 9a51cd0fe6..169151bfa7 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 e253a3c44f..afbfaf63ce 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 3e6882c9cb..905254abf0 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 bf2262e7f8..5edd2e3f83 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 cdc222463a..96e915f158 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 c26af1d79d..d91a47bb0e 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 8bf4e73680..05c6dac287 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 63c33a274f..8dc83f2e9f 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 c746c8eaa4..e3d4ac634a 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 60798cea49..c90eb0690e 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 7320e799e7..c397034059 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 d4a2f6935d..ab746c3ccb 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 6993d37168..ee25a56fc6 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 eb32af3e08..2a19f5ae8c 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 af1e098856..9c6479188d 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 d2012ef2a5..8f7a6bab4b 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 c4db9b2084..1d4f2893c3 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 346a186f46..88fe62bcde 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 39a5ea2830..7a080cfd3b 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 dff7963127..1fbb186341 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 dc36954e54..4fc3ede132 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 9772bdd6ab..1e595f8d42 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 3515e662fd..6d9c5ea040 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 2dbb9df27b..5bbf4b49a6 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 ef6636e5a9..a87beee574 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 900a934e80..27ccbbdd6c 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 88a329cba5..cbda7f9edd 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 2f98efdcfc..925b606679 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 4b1a57b84a..e56b637904 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 1e4ddd4510..16895d155c 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 e4562e17b4..7ec540e333 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 8481c20756..435b23725b 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 5314412c9f..6ea1c41f3f 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 d2113148b0..d2c987d6da 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 7e0c361308..26a1ab6c1c 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 f5a669755f..bf5c37099c 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 eca7bf870c..ce33caa28b 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 cbfe0ad0d1..12689016c5 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 450c9d0773..a5d4698aea 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 49ab5dd82a..f9e78f3a53 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 9ed46cd247..690bb8c0cb 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 aebe7bf4ea..6e2390023c 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 2f1b474afc..187551e881 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 7ea5fc86d8..5dd274b397 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 f0e66552fe..290fb2e914 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 188af606bc..171139b935 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 3f8cc7df1a..15da5dea46 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 516ddf5bac..de4c3a17e3 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 1ddf092e9f..79f3a4a367 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 645d21741f..dfd0c8ffb5 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 3a622c4cae..bc09f32e22 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 e37bf85546..d3e27e23d4 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 07a0ea6346..56268115e9 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 82bb2ab2bf..d21b37a014 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 535f47d989..4c8a200019 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 371799ebab..89da545e02 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 af713b75a2..abecd733ee 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 0dd421dad4..b20ce28bf1 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 110f9fbb05..2a440318b9 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 12a273d1b0..ee32651b15 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 26a696091f..6e9aa998ed 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 be524d00da..177320805b 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 f894fcaecd..860980c5c8 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 f6f7c1165e..f4bfd8ba95 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 de5e81cb7e..bea0c8b29f 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 d883b61797..7123cd45b9 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 060ba63707..6e7bc304c1 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 8f14fea99d..94cbbfcafc 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 958a3fa93f..d92aa80c68 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 cde88e748a..f7351cda72 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 bdca6df8df..2456aa4c45 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 a808a3b57d..aed8919d17 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 4ce3721e18..0f9a9b2f88 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 03432922dd..62eacb6653 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 3b4e432af8..69d5cfb75a 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 84973a1850..c4aae6b3ef 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 426d6a5980..26b0e3c3ee 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 1fe401e3dd..e922c448b8 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 f30f6c2337..b693cba2e9 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 02cfdb9b7d..9da2437bcf 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 77910b1f38..0fe6645d15 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 0aa37f4316..2174db175b 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 8ce7dbe0bb..a0b30e1ec7 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 d256448b52..cf81758cee 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 2c8e861b4b..aaf182c723 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 0ba41ab8fd..59487e4127 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 1629760795..7cdf5fa395 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 350ac4c57d..512cfeeeba 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 033cd09511..a34c92ee44 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 1a8dc9743f..a23042ebbb 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 3787b40a33..2bc3c24ef4 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 a4bfcb1be2..bc7be103d0 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 60a48180d0..a5a7eaa17b 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 6f4d96b270..0826199549 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 4c1e0b3f2c..6c7550a6c4 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 0fe422b45b..032e2d2814 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 17c84f527a..0f332100d0 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 49cd77700a..bb4cf58adf 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 0978890cb1..b73d94a2c5 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 99b7b1c965..175fb102c4 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 ec9c9e5b88..35b81e4a3f 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 45c70e0bff..835e5b811e 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 5b8d847e59..2a5c963092 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 ed290d1355..84975840fc 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 efec8cad3f..043652591d 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 18cee86b1f..72ee8051d1 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 d7c1e8b48d..a759e668f6 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 2a491362fc..fc766ab475 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 d0bc32f990..9c9e6545e6 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 dcfe62c1ed..c68923cdb4 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 15a7ca713a..6072ab9cb3 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 39f3cb6ecb..6a236f921d 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 d86ec10d9b..8a02960b0b 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 cfb86a9944..e6e51e7ec2 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 df0acc2502..72befcf4a2 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 c03807b130..99f6864198 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 ff9c251882..4afee8a92e 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 8641bd034c..f6d5bd2d7a 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 ff0a7c2b3c..fb1edf7e49 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 d66d529856..1ff114b854 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 5cfd7c34e8..02bfa91913 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 dace19ea7e..0697322d47 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 1e1461c7dd..7bb051239f 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 4678d64ece..2724206169 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 7d4edd5223..4787299216 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 c0974ea0b0..40017a693b 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 840b251fbf..384c550bc0 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 b2bb62f0eb..251596f96f 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 1a3ca9e5e7..18c7c180d7 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 9913e527b3..032299432c 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 64d2668170..caaf3ce41e 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 8157bf3f07..5d0aaa3a3e 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 f62fe115a5..9312656732 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 6e24c1e53d..694db0c4d6 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 cfd350fe9c..bf22fbc72b 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 737fa66d06..c9f3be4e05 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 7dfddc6380..63dcdb3248 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 29f8277be7..841132b85d 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 03779996fe..c911fc6fe3 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 96afef086a..deb54d9c2a 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 3bb50e3a6b..7023554958 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 c403c4f1ea..c134d4acef 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 e96241fa43..21dc8e93de 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 610133ae34..79c1697739 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 e7a9feb2ae..739444e249 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 1718aadad3..01762320b5 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 439b8b7bd2..7ea559bd35 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 b4d905cc9b..e75dd0e683 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 4027bf3b84..011c4339a2 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 32c7041cf0..e2ecbcc3bb 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 b3a4d5a9d5..39c2e2d2b5 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 2e38c37343..a04ea9ba1c 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 944efecc12..969cdac7d3 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 3aab227401..5b5e0dfeb4 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 c6a9276008..ae42066743 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 cf3d1b9d4c..b279a90973 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 2700a42181..01890eaf68 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 4d928a6a48..6d09a4d7b1 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 22fc9f61db..2dfab2184d 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 0970fecb9f..ff748cf05b 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 9e42fa240b..d89b2cbef6 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 5c2be7ce8b..ffe425ada3 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 90986d14a9..9fa03a3427 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 49cd5d04b9..0812d05109 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 3f5ffaf15e..c21669efea 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 5523bb1176..6c215cbfb3 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 5f599f7be0..d71c6de88f 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 2e9275eea8..fe78c83265 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 8709766850..8a93755760 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 01be79c153..0cdcf5f707 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 317626766b..4f265761a5 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 15fb901646..117d4dc7d1 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 bda8c446b1..692a450cc5 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 e2b17bb0a3..7ac1aff58c 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 4394b1936d..03430c333e 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 7f8bf75256..9d8948cd91 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 660b1896f3..11557a43bc 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 fcc8a37742..1449cb9c72 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 9c3092ff90..c3a72ca691 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 00c4f0819a..1c3eb42c57 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 a73fa9ebea..77ed81cf46 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 c420e45b92..e591f08043 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 3935424efc..ce5e6d5fbf 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 c11525d796..147c2218f5 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 c96b09e74f..8c7aafb289 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 3bc268ed65..03fc0c92df 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 1f6304c6d5..a00f818f3d 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 a8d25f89b6..2b333c3f29 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 fc7bde05af..aa8ad60b77 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 49db785cee..563e6c7061 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 0fc0bd779a..e45227d950 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 cda893e3f1..b184c923d6 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 5b5f02a52c..5370f4933a 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 7534810d0a..ffbfbc32f3 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 e5681ccd83..679301ed7f 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 24780698c4..ba1178ff6e 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 a4cd1fad1e..0cac4e472c 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 37f29c0624..ee0dcbf668 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 46c7632606..1e1915e991 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 cbead9e2df..6c336b64bc 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 d9b1390838..5fca15a911 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 5a9d690e83..743109e86b 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 e51d510a55..8d07dc608c 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 5d26df6fb0..c54d450aef 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 1e95f98fca..3b741ea3d8 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 c9d814e004..da101bb780 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 5b5c063616..2a753ae4aa 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 0a51ab5e87..d7645a7180 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 c85d4d7a73..07aa01ae24 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 6409aa06e5..eece333889 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 867a7ef13e..10abacc154 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 54c76671aa..2dc3ee0458 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 a42495695d..9cbfe9e6cf 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 37d1447c1c..496b033f93 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 e1e646f1ed..0cd8a1763c 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 6e71f72f1f..bbdc89a1b1 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 fb9d9b0041..1f5ad27748 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 64887f1870..e9accba359 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 1cb8f5eadc..8aa3ed62fe 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 716f331356..7cf0c3fc81 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 0a723d946d..c4574c9455 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 3486fd17eb..7bbd49913c 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 386cbd0740..5299c706a8 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 45cdfb85b9..70e2820269 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 8f4731be0e..6cfd6fcb8e 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 4ab8ad2689..af50ed078f 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 17ed6cd0eb..e512a8c52a 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 2be847ea55..b169f456f7 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 aa1e9da69b..5046cf5313 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 e10c5d050f..faf6834cf9 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 ac0b246c93..84854efc88 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 48a1188549..1ea77ce573 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 37a3eeb4e1..646b895ae2 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 67197e3d3c..123564b5e2 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 ef2a49fb58..b2df4d8a35 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 bd357f6d2d..97e58dc897 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 7b06d40716..05ea1d0738 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 af617d40f8..3ce5bc9a3a 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 21108410ae..08342b142a 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 8ed1c3fdf8..4927bc9f01 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 b126e7bd2d..d3498f2154 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 686175c217..d862b8bac4 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 68eec0ff99..7880adbf0e 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 c97ac81d4b..8e27afa924 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 b491d470c8..b0c165a10e 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 4066106026..78a0e59f95 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 b6cef1e582..a98a148ee8 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 9e7fa52d48..304bee7c6f 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 167b0520ab..916bd21e8c 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 55fbc48a57..bbdfaf28d7 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 25ac871e10..29565d8642 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 1baa320992..4feb54835c 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 793135fad8..9d002ea8c0 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 9603872eae..3797f5643e 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 ea8a305889..ccc632652f 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 52be2ec970..22c82f9b7a 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) {