External/signoz
1
0
Fork 0
mirror of https://github.com/SigNoz/signoz.git synced 2025-12-22 18:06:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: resolved conflicts

Browse Source
This commit is contained in:
eKuG 2025-08-11 11:46:47 +05:30
parent 9170846111
commit 33f47993d3
2 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/querier/querier.go
View File

@ -32,8 +32,8 @@ type querier struct {
logStmtBuilder qbtypes.StatementBuilder[qbtypes.LogAggregation] logStmtBuilder qbtypes.StatementBuilder[qbtypes.LogAggregation]
metricStmtBuilder qbtypes.StatementBuilder[qbtypes.MetricAggregation] metricStmtBuilder qbtypes.StatementBuilder[qbtypes.MetricAggregation]
meterStmtBuilder qbtypes.StatementBuilder[qbtypes.MetricAggregation] meterStmtBuilder qbtypes.StatementBuilder[qbtypes.MetricAggregation]
traceOperatorStmtBuilder qbtypes.TraceOperatorStatementBuilder
bucketCache BucketCache bucketCache BucketCache
traceOperatorStmtBuilder qbtypes.TraceOperatorStatementBuilder
} }
var _ Querier = (*querier)(nil) var _ Querier = (*querier)(nil)
@ -47,8 +47,8 @@ func New(
logStmtBuilder qbtypes.StatementBuilder[qbtypes.LogAggregation], logStmtBuilder qbtypes.StatementBuilder[qbtypes.LogAggregation],
metricStmtBuilder qbtypes.StatementBuilder[qbtypes.MetricAggregation], metricStmtBuilder qbtypes.StatementBuilder[qbtypes.MetricAggregation],
meterStmtBuilder qbtypes.StatementBuilder[qbtypes.MetricAggregation], meterStmtBuilder qbtypes.StatementBuilder[qbtypes.MetricAggregation],
traceOperatorStmtBuilder qbtypes.TraceOperatorStatementBuilder,
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{
@ -60,8 +60,8 @@ func New(
logStmtBuilder: logStmtBuilder, logStmtBuilder: logStmtBuilder,
metricStmtBuilder: metricStmtBuilder, metricStmtBuilder: metricStmtBuilder,
meterStmtBuilder: meterStmtBuilder, meterStmtBuilder: meterStmtBuilder,
traceOperatorStmtBuilder: traceOperatorStmtBuilder,
bucketCache: bucketCache, bucketCache: bucketCache,
traceOperatorStmtBuilder: traceOperatorStmtBuilder,
} }
} }
@ -606,16 +606,6 @@ 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)
case *traceOperatorQuery:
return &traceOperatorQuery{
telemetryStore: q.telemetryStore,
stmtBuilder: q.traceOperatorStmtBuilder,
spec: qt.spec,
fromMS: uint64(timeRange.From),
toMS: uint64(timeRange.To),
compositeQuery: qt.compositeQuery,
kind: qt.kind,
}
default: default:
return nil return nil
} }

2
pkg/querier/signozquerier/provider.go
View File

@ -150,7 +150,7 @@ func newProvider(
logStmtBuilder, logStmtBuilder,
metricStmtBuilder, metricStmtBuilder,
meterStmtBuilder, meterStmtBuilder,
traceOperatorStmtBuilder,
bucketCache, bucketCache,
traceOperatorStmtBuilder,
), nil ), nil
} }