Skip to content
This repository was archived by the owner on Apr 2, 2024. It is now read-only.

Commit 7451bd1

Browse files
committed
Hook up code to use promQL fork
Change the import paths
1 parent f650f98 commit 7451bd1

File tree

4 files changed

+9
-5
lines changed

4 files changed

+9
-5
lines changed

go.mod

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ require (
77
github.com/OneOfOne/xxhash v1.2.5 // indirect
88
github.com/allegro/bigcache v1.2.1
99
github.com/docker/go-connections v0.4.0
10+
github.com/edsrzf/mmap-go v1.0.0
1011
github.com/go-kit/kit v0.10.0
1112
github.com/gogo/protobuf v1.3.1
1213
github.com/golang-migrate/migrate/v4 v4.9.1
@@ -18,6 +19,7 @@ require (
1819
github.com/jackc/pgtype v1.2.0
1920
github.com/jackc/pgx/v4 v4.4.1
2021
github.com/jamiealquiza/envy v1.1.0
22+
github.com/opentracing/opentracing-go v1.1.0
2123
github.com/pkg/errors v0.9.1
2224
github.com/prometheus/client_golang v1.5.1
2325
github.com/prometheus/client_model v0.2.0
@@ -27,6 +29,7 @@ require (
2729
github.com/testcontainers/testcontainers-go v0.5.1
2830
google.golang.org/genproto v0.0.0-20200420144010-e5e8543f8aeb
2931
google.golang.org/grpc v1.29.0
32+
github.com/uber/jaeger-client-go v2.23.0+incompatible
3033
)
3134

3235
replace github.com/jackc/pgconn => github.com/JLockerman/pgconn v1.5.3-0.20200513205926-64cd2ce264ca

pkg/api/query.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ import (
1212
"github.com/NYTimes/gziphandler"
1313
"github.com/pkg/errors"
1414
"github.com/prometheus/common/model"
15-
"github.com/prometheus/prometheus/promql"
1615
"github.com/prometheus/prometheus/promql/parser"
1716
"github.com/timescale/timescale-prometheus/pkg/log"
17+
"github.com/timescale/timescale-prometheus/pkg/promql"
1818
"github.com/timescale/timescale-prometheus/pkg/query"
1919
)
2020

pkg/api/query_range.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66

77
"github.com/NYTimes/gziphandler"
88
"github.com/pkg/errors"
9-
"github.com/prometheus/prometheus/promql"
109
"github.com/timescale/timescale-prometheus/pkg/log"
10+
"github.com/timescale/timescale-prometheus/pkg/promql"
1111
"github.com/timescale/timescale-prometheus/pkg/query"
1212
)
1313

pkg/query/query_engine.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
package query
22

33
import (
4-
"github.com/go-kit/kit/log"
5-
"github.com/prometheus/client_golang/prometheus"
6-
"github.com/prometheus/prometheus/promql"
74
"math"
85
"time"
6+
7+
"github.com/go-kit/kit/log"
8+
"github.com/prometheus/client_golang/prometheus"
9+
"github.com/timescale/timescale-prometheus/pkg/promql"
910
)
1011

1112
func NewEngine(logger log.Logger, queryTimeout time.Duration) *promql.Engine {

0 commit comments

Comments
 (0)