Skip to content

Commit 46cdd8d

Browse files
authored
fix: fixed issue with filtering not functioning for start_time (#23)
1 parent d4277f9 commit 46cdd8d

File tree

9 files changed

+386
-135
lines changed

9 files changed

+386
-135
lines changed

go.mod

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,40 +14,82 @@ require (
1414
)
1515

1616
require (
17+
dario.cat/mergo v1.0.0 // indirect
18+
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
19+
github.com/Microsoft/go-winio v0.6.1 // indirect
20+
github.com/Microsoft/hcsshim v0.11.4 // indirect
1721
github.com/beorn7/perks v1.0.1 // indirect
22+
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
1823
github.com/cespare/xxhash/v2 v2.2.0 // indirect
24+
github.com/containerd/containerd v1.7.12 // indirect
25+
github.com/containerd/log v0.1.0 // indirect
26+
github.com/cpuguy83/dockercfg v0.3.1 // indirect
1927
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
28+
github.com/distribution/reference v0.5.0 // indirect
29+
github.com/docker/docker v25.0.3+incompatible // indirect
30+
github.com/docker/go-connections v0.5.0 // indirect
31+
github.com/docker/go-units v0.5.0 // indirect
2032
github.com/fatih/color v1.14.1 // indirect
33+
github.com/felixge/httpsnoop v1.0.4 // indirect
34+
github.com/go-logr/logr v1.4.1 // indirect
35+
github.com/go-logr/stdr v1.2.2 // indirect
36+
github.com/go-ole/go-ole v1.2.6 // indirect
2137
github.com/gogo/protobuf v1.3.2 // indirect
2238
github.com/golang/protobuf v1.5.3 // indirect
39+
github.com/google/uuid v1.6.0 // indirect
2340
github.com/hashicorp/go-hclog v1.6.2 // indirect
2441
github.com/hashicorp/go-plugin v1.6.0 // indirect
2542
github.com/hashicorp/yamux v0.1.1 // indirect
2643
github.com/jackc/pgpassfile v1.0.0 // indirect
2744
github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
2845
github.com/jackc/puddle/v2 v2.2.1 // indirect
46+
github.com/klauspost/compress v1.17.6 // indirect
2947
github.com/kr/pretty v0.3.1 // indirect
3048
github.com/kr/text v0.2.0 // indirect
49+
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
50+
github.com/magiconair/properties v1.8.7 // indirect
3151
github.com/mattn/go-colorable v0.1.13 // indirect
3252
github.com/mattn/go-isatty v0.0.20 // indirect
3353
github.com/mfridman/interpolate v0.0.2 // indirect
3454
github.com/mitchellh/go-testing-interface v1.0.0 // indirect
55+
github.com/moby/patternmatcher v0.6.0 // indirect
56+
github.com/moby/sys/sequential v0.5.0 // indirect
57+
github.com/moby/sys/user v0.1.0 // indirect
58+
github.com/moby/term v0.5.0 // indirect
59+
github.com/morikuni/aec v1.0.0 // indirect
3560
github.com/oklog/run v1.1.0 // indirect
61+
github.com/opencontainers/go-digest v1.0.0 // indirect
62+
github.com/opencontainers/image-spec v1.1.0 // indirect
63+
github.com/pkg/errors v0.9.1 // indirect
3664
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
65+
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
3766
github.com/prometheus/client_model v0.6.0 // indirect
3867
github.com/prometheus/common v0.49.0 // indirect
3968
github.com/prometheus/procfs v0.12.0 // indirect
4069
github.com/rogpeppe/go-internal v1.11.0 // indirect
4170
github.com/sethvargo/go-retry v0.2.4 // indirect
71+
github.com/shirou/gopsutil/v3 v3.24.1 // indirect
72+
github.com/shoenig/go-m1cpu v0.1.6 // indirect
73+
github.com/sirupsen/logrus v1.9.3 // indirect
74+
github.com/testcontainers/testcontainers-go v0.29.1 // indirect
75+
github.com/testcontainers/testcontainers-go/modules/postgres v0.29.1 // indirect
76+
github.com/tklauser/go-sysconf v0.3.12 // indirect
77+
github.com/tklauser/numcpus v0.6.1 // indirect
78+
github.com/yusufpapurcu/wmi v1.2.3 // indirect
79+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
4280
go.opentelemetry.io/otel v1.24.0 // indirect
81+
go.opentelemetry.io/otel/metric v1.24.0 // indirect
4382
go.uber.org/dig v1.17.1 // indirect
4483
go.uber.org/multierr v1.11.0 // indirect
4584
go.uber.org/zap v1.27.0 // indirect
4685
golang.org/x/crypto v0.19.0 // indirect
86+
golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc // indirect
87+
golang.org/x/mod v0.16.0 // indirect
4788
golang.org/x/net v0.21.0 // indirect
4889
golang.org/x/sync v0.6.0 // indirect
4990
golang.org/x/sys v0.17.0 // indirect
5091
golang.org/x/text v0.14.0 // indirect
92+
golang.org/x/tools v0.17.0 // indirect
5193
google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect
5294
google.golang.org/protobuf v1.33.0 // indirect
5395
gopkg.in/yaml.v3 v3.0.1 // indirect

go.sum

Lines changed: 68 additions & 0 deletions
Large diffs are not rendered by default.

internal/sql/manual.go

Lines changed: 0 additions & 78 deletions
This file was deleted.

internal/sql/query.sql

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,3 +127,22 @@ WHERE spans.start_time < sqlc.arg(prune_before)::TIMESTAMP;
127127
-- name: GetSpansDiskSize :one
128128

129129
SELECT pg_total_relation_size('spans');
130+
131+
-- name: GetSpansCount :one
132+
133+
SELECT COUNT(*) FROM spans;
134+
135+
-- name: FindTraceIDs :many
136+
137+
SELECT DISTINCT spans.trace_id as trace_id
138+
FROM spans
139+
INNER JOIN operations ON (operations.id = spans.operation_id)
140+
INNER JOIN services ON (services.id = spans.service_id)
141+
WHERE
142+
(services.name = sqlc.arg(service_name)::VARCHAR OR sqlc.arg(service_name_enable_filter)::BOOLEAN = FALSE) AND
143+
(operations.name = sqlc.arg(operation_name)::VARCHAR OR sqlc.arg(operation_name_enable_filter)::BOOLEAN = FALSE) AND
144+
(start_time >= sqlc.arg(start_time_minimum)::TIMESTAMP OR sqlc.arg(start_time_minimum_enable_filter)::BOOLEAN = FALSE) AND
145+
(start_time <= sqlc.arg(start_time_maximum)::TIMESTAMP OR sqlc.arg(start_time_maximum_enable_filter)::BOOLEAN = FALSE) AND
146+
(duration >= sqlc.arg(duration_minimum)::INTERVAL OR sqlc.arg(duration_minimum_enable_filter)::BOOLEAN = FALSE) AND
147+
(duration <= sqlc.arg(duration_maximum)::INTERVAL OR sqlc.arg(duration_maximum_enable_filter)::BOOLEAN = FALSE)
148+
LIMIT sqlc.arg(num_traces);

internal/sql/query.sql.go

Lines changed: 78 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)