Compare commits

...

1 Commits

Author SHA1 Message Date
Srikanth Chekuri
85f163e828 chore: preare verbose query service 2022-12-07 21:17:47 +05:30
4 changed files with 13 additions and 4 deletions

3
go.mod
View File

@@ -33,6 +33,7 @@ require (
)
require (
github.com/DmitriyVTitov/size v1.5.0 // indirect
github.com/beevik/etree v1.1.0 // indirect
github.com/form3tech-oss/jwt-go v3.2.2+incompatible // indirect
github.com/google/go-cmp v0.5.8 // indirect
@@ -149,4 +150,4 @@ require (
k8s.io/client-go v8.0.0+incompatible // indirect
)
replace github.com/prometheus/prometheus => github.com/SigNoz/prometheus v1.9.76
replace github.com/prometheus/prometheus => github.com/SigNoz/prometheus v1.9.76-0.1

6
go.sum
View File

@@ -52,13 +52,15 @@ github.com/ClickHouse/clickhouse-go v1.5.3 h1:Vok8zUb/wlqc9u8oEqQzBMBRDoFd8NxPRq
github.com/ClickHouse/clickhouse-go v1.5.3/go.mod h1:EaI/sW7Azgz9UATzd5ZdZHRUhHgv5+JMS9NSr2smCJI=
github.com/ClickHouse/clickhouse-go/v2 v2.0.12 h1:Nbl/NZwoM6LGJm7smNBgvtdr/rxjlIssSW3eG/Nmb9E=
github.com/ClickHouse/clickhouse-go/v2 v2.0.12/go.mod h1:u4RoNQLLM2W6hNSPYrIESLJqaWSInZVmfM+MlaAhXcg=
github.com/DmitriyVTitov/size v1.5.0 h1:/PzqxYrOyOUX1BXj6J9OuVRVGe+66VL4D9FlUaW515g=
github.com/DmitriyVTitov/size v1.5.0/go.mod h1:le6rNI4CoLQV1b9gzp1+3d7hMAD/uu2QcJ+aYbNgiU0=
github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
github.com/OneOfOne/xxhash v1.2.8 h1:31czK/TI9sNkxIKfaUfGlU47BAxQ0ztGgd9vPyqimf8=
github.com/OneOfOne/xxhash v1.2.8/go.mod h1:eZbhyaAYD41SGSSsnmcpxVoRiQ/MPUTjUdIIOT9Um7Q=
github.com/SigNoz/govaluate v0.0.0-20220522085550-d19c08c206cb h1:bneLSKPf9YUSFmafKx32bynV6QrzViL/s+ZDvQxH1E4=
github.com/SigNoz/govaluate v0.0.0-20220522085550-d19c08c206cb/go.mod h1:JznGDNg9x1cujDKa22RaQOimOvvEfy3nxzDGd8XDgmA=
github.com/SigNoz/prometheus v1.9.76 h1:YQOHezj4Yyu6PHV7/bVR297FQgUMQAAJtCVZ+NslwYk=
github.com/SigNoz/prometheus v1.9.76/go.mod h1:Y4J9tGDmacMC+EcOTp+EIAn2C1sN+9kE+idyVKadiVM=
github.com/SigNoz/prometheus v1.9.76-0.1 h1:G0rbn7O7mVYUMQ2Bf5doJ2ZPVMy4sG3P2GaVL6SoUGY=
github.com/SigNoz/prometheus v1.9.76-0.1/go.mod h1:hc8ITdHA55Ab2bvG7BYUOEk5cR3/ujnYGAx8G6eB9QM=
github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg=
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=

View File

@@ -589,11 +589,14 @@ func (aH *APIHandler) QueryRangeMetricsV2(w http.ResponseWriter, r *http.Request
Step: time.Duration(metricsQueryRangeParams.Step * int64(time.Second)),
Query: query.Query,
}
queryStart := time.Now()
promResult, _, err := aH.reader.GetQueryRangeResult(r.Context(), &queryModel)
zap.L().Info("prometheus query GetQueryRangeResult took", zap.String("query", query.Query), zap.Duration("duration", time.Since(queryStart)))
if err != nil {
ch <- channelResult{Err: fmt.Errorf("error in query-%s: %v", name, err), Name: name, Query: query.Query}
return
}
prepareStart := time.Now()
matrix, _ := promResult.Matrix()
for _, v := range matrix {
var s model.Series
@@ -604,6 +607,7 @@ func (aH *APIHandler) QueryRangeMetricsV2(w http.ResponseWriter, r *http.Request
}
seriesList = append(seriesList, &s)
}
zap.L().Info("prometheus query prepare took", zap.String("query", query.Query), zap.Duration("duration", time.Since(prepareStart)))
ch <- channelResult{Series: seriesList}
}(name, query)
}
@@ -667,7 +671,9 @@ func (aH *APIHandler) QueryRangeMetricsV2(w http.ResponseWriter, r *http.Request
}
seriesList, err, errQuriesByName = execClickHouseQueries(queries)
case model.PROM:
start := time.Now()
seriesList, err, errQuriesByName = execPromQueries(metricsQueryRangeParams)
zap.L().Info("execPromQueries", zap.Duration("time", time.Since(start)))
default:
err = fmt.Errorf("invalid query type")
RespondError(w, &model.ApiError{Typ: model.ErrorBadData, Err: err}, errQuriesByName)

View File

@@ -22,4 +22,4 @@ rule_files:
scrape_configs: []
remote_read:
- url: tcp://stagingapp.signoz.io:9000/?database=signoz_metrics
- url: tcp://localhost:9000/?database=signoz_metrics