Skip to content

Commit c49b3f6

Browse files
dpattmanndpattmann
authored
Update dependencies (#366)
1 parent 74786e5 commit c49b3f6

File tree

7 files changed

+58
-1704
lines changed

7 files changed

+58
-1704
lines changed

‎.github/workflows/defaults.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ jobs:
77
- name: Checkout
88
uses: actions/checkout@v4
99
- name: Setup go env
10-
uses: actions/setup-go@v5.0.1
10+
uses: actions/setup-go@v5
1111
with:
12-
go-version: '1.16'
12+
go-version: '1.21'
1313
- name: Run tests
1414
run: go test -v ./... -bench=.
1515

@@ -23,9 +23,9 @@ jobs:
2323
with:
2424
fetch-depth: 0
2525
- name: Setup go env
26-
uses: actions/setup-go@v5.0.1
26+
uses: actions/setup-go@v5
2727
with:
28-
go-version: '1.16'
28+
go-version: '1.21'
2929
- name: Release new package on tag
3030
uses: goreleaser/goreleaser-action@v5
3131
with:

‎.github/workflows/dependabot-automerge.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
steps:
1313
- name: Dependabot metadata
1414
id: metadata
15-
uses: dependabot/fetch-metadata@v1.6.0
15+
uses: dependabot/fetch-metadata@v2
1616
with:
1717
github-token: "${{ secrets.GITHUB_TOKEN }}"
1818
- name: Enable auto-merge for Dependabot PRs

‎.github/workflows/pull-request.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ jobs:
77
- name: Checkout
88
uses: actions/checkout@v4
99
- name: Setup go env
10-
uses: actions/setup-go@v5.0.1
10+
uses: actions/setup-go@v5
1111
with:
12-
go-version: '1.16'
12+
go-version: '1.21'
1313
- name: Run tests
1414
run: go test -v ./...

‎go.mod‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
module github.com/dpattmann/prometheus-timestream-adapter
22

3-
go 1.16
3+
go 1.21
4+
5+
toolchain go1.21.6
46

57
require (
68
github.com/aws/aws-sdk-go v1.52.2
@@ -9,8 +11,20 @@ require (
911
github.com/pkg/errors v0.9.1
1012
github.com/prometheus/client_golang v1.19.0
1113
github.com/prometheus/common v0.53.0
12-
github.com/prometheus/prometheus v2.5.0+incompatible
14+
github.com/prometheus/prometheus v0.52.0
1315
github.com/spf13/pflag v1.0.5
1416
go.uber.org/zap v1.27.0
1517
golang.org/x/net v0.25.0
1618
)
19+
20+
require (
21+
github.com/beorn7/perks v1.0.1 // indirect
22+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
23+
github.com/jmespath/go-jmespath v0.4.0 // indirect
24+
github.com/prometheus/client_model v0.6.1 // indirect
25+
github.com/prometheus/procfs v0.12.0 // indirect
26+
go.uber.org/multierr v1.11.0 // indirect
27+
golang.org/x/sys v0.20.0 // indirect
28+
golang.org/x/text v0.15.0 // indirect
29+
google.golang.org/protobuf v1.33.0 // indirect
30+
)

‎go.sum‎

Lines changed: 14 additions & 1674 deletions
Large diffs are not rendered by default.

‎timestream.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ func (t TimeStreamAdapter) readDimension(measureName string) (dimensions []strin
326326
return
327327
}
328328

329-
func (t TimeStreamAdapter) readLabels(labels []*prompb.Label) (task writeTask) {
329+
func (t TimeStreamAdapter) readLabels(labels []prompb.Label) (task writeTask) {
330330
for _, s := range labels {
331331
if s.Name == model.MetricNameLabel {
332332
task.measureName = s.Value
@@ -345,14 +345,14 @@ func (t TimeStreamAdapter) handleQueryResult(qo *timestreamquery.QueryOutput, ti
345345
for _, row := range qo.Rows {
346346
var ts prompb.TimeSeries
347347

348-
ts.Labels = append(ts.Labels, &prompb.Label{
348+
ts.Labels = append(ts.Labels, prompb.Label{
349349
Name: model.MetricNameLabel,
350350
Value: measureName,
351351
})
352352

353353
for i, d := range row.Data {
354354
if d.ScalarValue != nil {
355-
ts.Labels = append(ts.Labels, &prompb.Label{
355+
ts.Labels = append(ts.Labels, prompb.Label{
356356
Name: *qo.ColumnInfo[i].Name,
357357
Value: *d.ScalarValue,
358358
})

‎timestream_test.go‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ func (t TimeStreamQueryMock) QueryPages(input *timestreamquery.QueryInput, handl
209209

210210
func TestTimeSteamAdapter_readLabels(t *testing.T) {
211211
type args struct {
212-
labels []*prompb.Label
212+
labels []prompb.Label
213213
}
214214
tests := []struct {
215215
name string
@@ -219,7 +219,7 @@ func TestTimeSteamAdapter_readLabels(t *testing.T) {
219219
{
220220
name: "Prom data request",
221221
args: args{
222-
labels: []*prompb.Label{
222+
labels: []prompb.Label{
223223
{
224224
Name: "__name__",
225225
Value: "sample_metric",
@@ -263,9 +263,9 @@ func TestTimeSteamAdapter_toRecords(t *testing.T) {
263263
name: "Prom data request",
264264
args: args{
265265
req: &prompb.WriteRequest{
266-
Timeseries: []*prompb.TimeSeries{
266+
Timeseries: []prompb.TimeSeries{
267267
{
268-
Labels: []*prompb.Label{
268+
Labels: []prompb.Label{
269269
{
270270
Name: "__name__",
271271
Value: "sample_metric",
@@ -305,9 +305,9 @@ func TestTimeSteamAdapter_toRecords(t *testing.T) {
305305
name: "Prom with NaN value",
306306
args: args{
307307
req: &prompb.WriteRequest{
308-
Timeseries: []*prompb.TimeSeries{
308+
Timeseries: []prompb.TimeSeries{
309309
{
310-
Labels: []*prompb.Label{
310+
Labels: []prompb.Label{
311311
{
312312
Name: "__name__",
313313
Value: "sample_metric",
@@ -333,9 +333,9 @@ func TestTimeSteamAdapter_toRecords(t *testing.T) {
333333
name: "Prom with positive inf number",
334334
args: args{
335335
req: &prompb.WriteRequest{
336-
Timeseries: []*prompb.TimeSeries{
336+
Timeseries: []prompb.TimeSeries{
337337
{
338-
Labels: []*prompb.Label{
338+
Labels: []prompb.Label{
339339
{
340340
Name: "__name__",
341341
Value: "sample_metric",
@@ -361,9 +361,9 @@ func TestTimeSteamAdapter_toRecords(t *testing.T) {
361361
name: "Prom with negative inf number",
362362
args: args{
363363
req: &prompb.WriteRequest{
364-
Timeseries: []*prompb.TimeSeries{
364+
Timeseries: []prompb.TimeSeries{
365365
{
366-
Labels: []*prompb.Label{
366+
Labels: []prompb.Label{
367367
{
368368
Name: "__name__",
369369
Value: "sample_metric",
@@ -389,9 +389,9 @@ func TestTimeSteamAdapter_toRecords(t *testing.T) {
389389
name: "Prom with long metric name",
390390
args: args{
391391
req: &prompb.WriteRequest{
392-
Timeseries: []*prompb.TimeSeries{
392+
Timeseries: []prompb.TimeSeries{
393393
{
394-
Labels: []*prompb.Label{
394+
Labels: []prompb.Label{
395395
{
396396
Name: "__name__",
397397
Value: "sample_metric_measure_name_exceeds_the_maximum_supported_length",
@@ -436,9 +436,9 @@ func TestTimeSteamAdapter_Write(t *testing.T) {
436436
name: "Write Timestream Request",
437437
args: args{
438438
req: &prompb.WriteRequest{
439-
Timeseries: []*prompb.TimeSeries{
439+
Timeseries: []prompb.TimeSeries{
440440
{
441-
Labels: []*prompb.Label{
441+
Labels: []prompb.Label{
442442
{
443443
Name: "__name__",
444444
Value: "sample_name",
@@ -460,9 +460,9 @@ func TestTimeSteamAdapter_Write(t *testing.T) {
460460
name: "Write Timestream Request With Error",
461461
args: args{
462462
req: &prompb.WriteRequest{
463-
Timeseries: []*prompb.TimeSeries{
463+
Timeseries: []prompb.TimeSeries{
464464
{
465-
Labels: []*prompb.Label{
465+
Labels: []prompb.Label{
466466
{
467467
Name: "__name__",
468468
Value: "sample_name_error",
@@ -527,7 +527,7 @@ func TestTimeSteamAdapter_Read(t *testing.T) {
527527
{
528528
Timeseries: []*prompb.TimeSeries{
529529
{
530-
Labels: []*prompb.Label{
530+
Labels: []prompb.Label{
531531
{
532532
Name: "__name__",
533533
Value: "mock",
@@ -549,7 +549,7 @@ func TestTimeSteamAdapter_Read(t *testing.T) {
549549
},
550550
},
551551
{
552-
Labels: []*prompb.Label{
552+
Labels: []prompb.Label{
553553
{
554554
Name: "__name__",
555555
Value: "mock",

0 commit comments

Comments
 (0)