GitHub-Proxy/signoz
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/SigNoz/signoz synced 2025-08-17 00:45:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into issue-3400-ui-horizontal-scroll-logs-context

Browse Source
This commit is contained in:
Rajat Dabade 2023-08-24 11:48:32 +05:30 committed by GitHub
commit f89f3c0b14
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/query-service/dao/sqlite/apdex.go
View File

@ -4,6 +4,7 @@ import (
"context" "context"
"fmt" "fmt"
"github.com/jmoiron/sqlx"
"go.signoz.io/signoz/pkg/query-service/model" "go.signoz.io/signoz/pkg/query-service/model"
) )
@ -11,19 +12,16 @@ const defaultApdexThreshold = 0.5
func (mds *ModelDaoSqlite) GetApdexSettings(ctx context.Context, services []string) ([]model.ApdexSettings, *model.ApiError) { func (mds *ModelDaoSqlite) GetApdexSettings(ctx context.Context, services []string) ([]model.ApdexSettings, *model.ApiError) {
var apdexSettings []model.ApdexSettings var apdexSettings []model.ApdexSettings
var serviceName string
for i, service := range services { query, args, err := sqlx.In("SELECT * FROM apdex_settings WHERE service_name IN (?)", services)
if i == 0 { if err != nil {
serviceName = fmt.Sprintf("'%s'", service) return nil, &model.ApiError{
} else { Err: err,
serviceName = fmt.Sprintf("%s, '%s'", serviceName, service)
} }
} }
query = mds.db.Rebind(query)
query := fmt.Sprintf("SELECT * FROM apdex_settings WHERE service_name IN (%s)", serviceName) err = mds.db.Select(&apdexSettings, query, args...)
err := mds.db.Select(&apdexSettings, query)
if err != nil { if err != nil {
return nil, &model.ApiError{ return nil, &model.ApiError{
Err: err, Err: err,

2
pkg/query-service/integrations/signozio/dynamic_config.go
View File

@ -6,8 +6,8 @@ import (
"net/http" "net/http"
"time" "time"
"go.signoz.io/signoz/ee/query-service/model"
"go.signoz.io/signoz/pkg/query-service/constants" "go.signoz.io/signoz/pkg/query-service/constants"
"go.signoz.io/signoz/pkg/query-service/model"
) )
var C *Client var C *Client