External/signoz
1
0
Fork 0
mirror of https://github.com/SigNoz/signoz.git synced 2025-12-19 16:36:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: resolved conflicts

Browse Source
This commit is contained in:
eKuG 2025-08-11 11:48:13 +05:30
parent 33f47993d3
commit 90366975d8
1 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/querier/querier.go
View File

@ -33,7 +33,6 @@ type querier struct {
metricStmtBuilder qbtypes.StatementBuilder[qbtypes.MetricAggregation] metricStmtBuilder qbtypes.StatementBuilder[qbtypes.MetricAggregation]
meterStmtBuilder qbtypes.StatementBuilder[qbtypes.MetricAggregation] meterStmtBuilder qbtypes.StatementBuilder[qbtypes.MetricAggregation]
bucketCache BucketCache bucketCache BucketCache
traceOperatorStmtBuilder qbtypes.TraceOperatorStatementBuilder
} }
var _ Querier = (*querier)(nil) var _ Querier = (*querier)(nil)
@ -48,7 +47,6 @@ func New(
metricStmtBuilder qbtypes.StatementBuilder[qbtypes.MetricAggregation], metricStmtBuilder qbtypes.StatementBuilder[qbtypes.MetricAggregation],
meterStmtBuilder qbtypes.StatementBuilder[qbtypes.MetricAggregation], meterStmtBuilder qbtypes.StatementBuilder[qbtypes.MetricAggregation],
bucketCache BucketCache, bucketCache BucketCache,
traceOperatorStmtBuilder qbtypes.TraceOperatorStatementBuilder,
) *querier { ) *querier {
querierSettings := factory.NewScopedProviderSettings(settings, "github.com/SigNoz/signoz/pkg/querier") querierSettings := factory.NewScopedProviderSettings(settings, "github.com/SigNoz/signoz/pkg/querier")
return &querier{ return &querier{
@ -61,7 +59,6 @@ func New(
metricStmtBuilder: metricStmtBuilder, metricStmtBuilder: metricStmtBuilder,
meterStmtBuilder: meterStmtBuilder, meterStmtBuilder: meterStmtBuilder,
bucketCache: bucketCache, bucketCache: bucketCache,
traceOperatorStmtBuilder: traceOperatorStmtBuilder,
} }
} }
@ -606,6 +603,7 @@ func (q *querier) createRangedQuery(originalQuery qbtypes.Query, timeRange qbtyp
return newBuilderQuery(q.telemetryStore, q.meterStmtBuilder, specCopy, adjustedTimeRange, qt.kind, qt.variables) return newBuilderQuery(q.telemetryStore, q.meterStmtBuilder, specCopy, adjustedTimeRange, qt.kind, qt.variables)
} }
return newBuilderQuery(q.telemetryStore, q.metricStmtBuilder, specCopy, adjustedTimeRange, qt.kind, qt.variables) return newBuilderQuery(q.telemetryStore, q.metricStmtBuilder, specCopy, adjustedTimeRange, qt.kind, qt.variables)
default: default:
return nil return nil
} }