Update dependencies (#366)

dpattmann · May 10, 2024 · c49b3f6 · c49b3f6
1 parent 74786e5
commit c49b3f6
Show file tree

Hide file tree

Showing 7 changed files with 58 additions and 1,704 deletions.
diff --git a/.github/workflows/defaults.yaml b/.github/workflows/defaults.yaml
@@ -7,9 +7,9 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Setup go env
-        uses: actions/setup-go@v5.0.1
+        uses: actions/setup-go@v5
         with:
-          go-version: '1.16'
+          go-version: '1.21'
       - name: Run tests
         run: go test -v ./... -bench=.
 
@@ -23,9 +23,9 @@ jobs:
         with:
           fetch-depth: 0
       - name: Setup go env
-        uses: actions/setup-go@v5.0.1
+        uses: actions/setup-go@v5
         with:
-          go-version: '1.16'
+          go-version: '1.21'
       - name: Release new package on tag
         uses: goreleaser/goreleaser-action@v5
         with:

diff --git a/.github/workflows/dependabot-automerge.yml b/.github/workflows/dependabot-automerge.yml
@@ -12,7 +12,7 @@ jobs:
     steps:
       - name: Dependabot metadata
         id: metadata
-        uses: dependabot/fetch-metadata@v1.6.0
+        uses: dependabot/fetch-metadata@v2
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
       - name: Enable auto-merge for Dependabot PRs

diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -7,8 +7,8 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Setup go env
-        uses: actions/setup-go@v5.0.1
+        uses: actions/setup-go@v5
         with:
-          go-version: '1.16'
+          go-version: '1.21'
       - name: Run tests
         run: go test -v ./...
diff --git a/go.mod b/go.mod
@@ -1,6 +1,8 @@
 module github.com/dpattmann/prometheus-timestream-adapter
 
-go 1.16
+go 1.21
+
+toolchain go1.21.6
 
 require (
 	github.com/aws/aws-sdk-go v1.52.2
@@ -9,8 +11,20 @@ require (
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_golang v1.19.0
 	github.com/prometheus/common v0.53.0
-	github.com/prometheus/prometheus v2.5.0+incompatible
+	github.com/prometheus/prometheus v0.52.0
 	github.com/spf13/pflag v1.0.5
 	go.uber.org/zap v1.27.0
 	golang.org/x/net v0.25.0
 )
+
+require (
+	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/cespare/xxhash/v2 v2.3.0 // indirect
+	github.com/jmespath/go-jmespath v0.4.0 // indirect
+	github.com/prometheus/client_model v0.6.1 // indirect
+	github.com/prometheus/procfs v0.12.0 // indirect
+	go.uber.org/multierr v1.11.0 // indirect
+	golang.org/x/sys v0.20.0 // indirect
+	golang.org/x/text v0.15.0 // indirect
+	google.golang.org/protobuf v1.33.0 // indirect
+)
diff --git a/go.sum b/go.sum
diff --git a/timestream.go b/timestream.go
@@ -326,7 +326,7 @@ func (t TimeStreamAdapter) readDimension(measureName string) (dimensions []strin
 	return
 }
 
-func (t TimeStreamAdapter) readLabels(labels []*prompb.Label) (task writeTask) {
+func (t TimeStreamAdapter) readLabels(labels []prompb.Label) (task writeTask) {
 	for _, s := range labels {
 		if s.Name == model.MetricNameLabel {
 			task.measureName = s.Value
@@ -345,14 +345,14 @@ func (t TimeStreamAdapter) handleQueryResult(qo *timestreamquery.QueryOutput, ti
 	for _, row := range qo.Rows {
 		var ts prompb.TimeSeries
 
-		ts.Labels = append(ts.Labels, &prompb.Label{
+		ts.Labels = append(ts.Labels, prompb.Label{
 			Name:  model.MetricNameLabel,
 			Value: measureName,
 		})
 
 		for i, d := range row.Data {
 			if d.ScalarValue != nil {
-				ts.Labels = append(ts.Labels, &prompb.Label{
+				ts.Labels = append(ts.Labels, prompb.Label{
 					Name:  *qo.ColumnInfo[i].Name,
 					Value: *d.ScalarValue,
 				})

diff --git a/timestream_test.go b/timestream_test.go
@@ -209,7 +209,7 @@ func (t TimeStreamQueryMock) QueryPages(input *timestreamquery.QueryInput, handl
 
 func TestTimeSteamAdapter_readLabels(t *testing.T) {
 	type args struct {
-		labels []*prompb.Label
+		labels []prompb.Label
 	}
 	tests := []struct {
 		name     string
@@ -219,7 +219,7 @@ func TestTimeSteamAdapter_readLabels(t *testing.T) {
 		{
 			name: "Prom data request",
 			args: args{
-				labels: []*prompb.Label{
+				labels: []prompb.Label{
 					{
 						Name:  "__name__",
 						Value: "sample_metric",
@@ -263,9 +263,9 @@ func TestTimeSteamAdapter_toRecords(t *testing.T) {
 			name: "Prom data request",
 			args: args{
 				req: &prompb.WriteRequest{
-					Timeseries: []*prompb.TimeSeries{
+					Timeseries: []prompb.TimeSeries{
 						{
-							Labels: []*prompb.Label{
+							Labels: []prompb.Label{
 								{
 									Name:  "__name__",
 									Value: "sample_metric",
@@ -305,9 +305,9 @@ func TestTimeSteamAdapter_toRecords(t *testing.T) {
 			name: "Prom with NaN value",
 			args: args{
 				req: &prompb.WriteRequest{
-					Timeseries: []*prompb.TimeSeries{
+					Timeseries: []prompb.TimeSeries{
 						{
-							Labels: []*prompb.Label{
+							Labels: []prompb.Label{
 								{
 									Name:  "__name__",
 									Value: "sample_metric",
@@ -333,9 +333,9 @@ func TestTimeSteamAdapter_toRecords(t *testing.T) {
 			name: "Prom with positive inf number",
 			args: args{
 				req: &prompb.WriteRequest{
-					Timeseries: []*prompb.TimeSeries{
+					Timeseries: []prompb.TimeSeries{
 						{
-							Labels: []*prompb.Label{
+							Labels: []prompb.Label{
 								{
 									Name:  "__name__",
 									Value: "sample_metric",
@@ -361,9 +361,9 @@ func TestTimeSteamAdapter_toRecords(t *testing.T) {
 			name: "Prom with negative inf number",
 			args: args{
 				req: &prompb.WriteRequest{
-					Timeseries: []*prompb.TimeSeries{
+					Timeseries: []prompb.TimeSeries{
 						{
-							Labels: []*prompb.Label{
+							Labels: []prompb.Label{
 								{
 									Name:  "__name__",
 									Value: "sample_metric",
@@ -389,9 +389,9 @@ func TestTimeSteamAdapter_toRecords(t *testing.T) {
 			name: "Prom with long metric name",
 			args: args{
 				req: &prompb.WriteRequest{
-					Timeseries: []*prompb.TimeSeries{
+					Timeseries: []prompb.TimeSeries{
 						{
-							Labels: []*prompb.Label{
+							Labels: []prompb.Label{
 								{
 									Name:  "__name__",
 									Value: "sample_metric_measure_name_exceeds_the_maximum_supported_length",
@@ -436,9 +436,9 @@ func TestTimeSteamAdapter_Write(t *testing.T) {
 			name: "Write Timestream Request",
 			args: args{
 				req: &prompb.WriteRequest{
-					Timeseries: []*prompb.TimeSeries{
+					Timeseries: []prompb.TimeSeries{
 						{
-							Labels: []*prompb.Label{
+							Labels: []prompb.Label{
 								{
 									Name:  "__name__",
 									Value: "sample_name",
@@ -460,9 +460,9 @@ func TestTimeSteamAdapter_Write(t *testing.T) {
 			name: "Write Timestream Request With Error",
 			args: args{
 				req: &prompb.WriteRequest{
-					Timeseries: []*prompb.TimeSeries{
+					Timeseries: []prompb.TimeSeries{
 						{
-							Labels: []*prompb.Label{
+							Labels: []prompb.Label{
 								{
 									Name:  "__name__",
 									Value: "sample_name_error",
@@ -527,7 +527,7 @@ func TestTimeSteamAdapter_Read(t *testing.T) {
 					{
 						Timeseries: []*prompb.TimeSeries{
 							{
-								Labels: []*prompb.Label{
+								Labels: []prompb.Label{
 									{
 										Name:  "__name__",
 										Value: "mock",
@@ -549,7 +549,7 @@ func TestTimeSteamAdapter_Read(t *testing.T) {
 								},
 							},
 							{
-								Labels: []*prompb.Label{
+								Labels: []prompb.Label{
 									{
 										Name:  "__name__",
 										Value: "mock",