chore: go 1.22

axiomhq · Sep 9, 2024 · 81d159a · 81d159a
1 parent c9c86ca
commit 81d159a
Show file tree

Hide file tree

Showing 22 changed files with 123 additions and 120 deletions.
diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
@@ -21,8 +21,8 @@ jobs:
     strategy:
       matrix:
         go:
-          - "1.21"
           - "1.22"
+          - "1.23"
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
@@ -38,8 +38,8 @@ jobs:
     strategy:
       matrix:
         go:
-          - "1.21"
           - "1.22"
+          - "1.23"
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
@@ -65,8 +65,8 @@ jobs:
       fail-fast: false
       matrix:
         go:
-          - "1.21"
           - "1.22"
+          - "1.23"
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
@@ -98,8 +98,8 @@ jobs:
       fail-fast: true
       matrix:
         go:
-          - "1.21"
           - "1.22"
+          - "1.23"
         environment:
           - development
           - staging

diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml
@@ -18,8 +18,8 @@ jobs:
     strategy:
       matrix:
         go:
-          - "1.21"
           - "1.22"
+          - "1.23"
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
@@ -35,8 +35,8 @@ jobs:
     strategy:
       matrix:
         go:
-          - "1.21"
           - "1.22"
+          - "1.23"
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
@@ -64,8 +64,8 @@ jobs:
       fail-fast: true
       matrix:
         go:
-          - "1.21"
           - "1.22"
+          - "1.23"
         environment:
           - development
           - staging

diff --git a/.github/workflows/server_regression.yaml b/.github/workflows/server_regression.yaml
@@ -24,8 +24,8 @@ jobs:
     strategy:
       matrix:
         go:
-          - "1.21"
           - "1.22"
+          - "1.23"
         environment:
           - development
           - staging

diff --git a/.golangci.yaml b/.golangci.yaml
@@ -1,18 +1,16 @@
 run:
   modules-download-mode: readonly
   timeout: 5m
-  build-tags:
-    - integration
 
 linters:
   disable-all: true
   enable:
     - bodyclose
+    - copyloopvar
     - dogsled
     - dupl
     - errcheck
     - exhaustive
-    - exportloopref
     - goconst
     - gofmt
     - goimports
@@ -50,3 +48,8 @@ issues:
     - .github
     - .vscode
     - dist
+  exclude-rules:
+    - linters:
+        - gosec
+      text: "G115: integer overflow conversion"
+      path: _test\.go
diff --git a/.goreleaser.yaml b/.goreleaser.yaml
@@ -2,6 +2,9 @@ version: 2
 
 project_name: axiom-go
 
+git:
+  prerelease_suffix: "-"
+
 builds:
   - skip: true
 

diff --git a/Makefile b/Makefile
@@ -49,13 +49,13 @@ dep-clean: ## Remove obsolete dependencies
 .PHONY: dep-upgrade
 dep-upgrade: ## Upgrade all direct dependencies to their latest version
 	@echo ">> upgrading dependencies"
-	@$(GO) get -d $(shell $(GO) list -f '{{if not (or .Main .Indirect)}}{{.Path}}{{end}}' -m all)
+	@$(GO) get $(shell $(GO) list -f '{{if not (or .Main .Indirect)}}{{.Path}}{{end}}' -m all)
 	@make dep
 
 .PHONY: dep-upgrade-tools
 dep-upgrade-tools: ## Upgrade all tool dependencies to their latest version
 	@echo ">> upgrading tool dependencies"
-	@$(GO) get -d $(GOTOOLS)
+	@$(GO) get $(GOTOOLS)
 	@make dep
 
 .PHONY: dep

diff --git a/adapters/slog/slog_test.go b/adapters/slog/slog_test.go
@@ -61,13 +61,13 @@ func TestHandler(t *testing.T) {
 		_, _ = w.Write([]byte("{}"))
 	}
 
-	logger, flush := adapters.Setup(t, hf, setup(t))
+	logger, closeHandler := adapters.Setup(t, hf, setup(t))
 
 	logger.
 		With("key", "value").
 		Info("my message")
 
-	flush()
+	closeHandler()
 
 	assert.EqualValues(t, 1, atomic.LoadUint64(&hasRun))
 }

diff --git a/adapters/zerolog/zerolog_test.go b/adapters/zerolog/zerolog_test.go
@@ -93,7 +93,7 @@ func TestHook_FlushFullBatch(t *testing.T) {
 
 	logger, _ := adapters.Setup(t, hf, setup(t))
 
-	for i := 0; i <= 10_000; i++ {
+	for range 10_001 {
 		logger.Info().Str("key", "value").Msg("my message")
 	}
 

diff --git a/axiom/annotations_test.go b/axiom/annotations_test.go
@@ -28,7 +28,7 @@ func TestAnnotationService_Create(t *testing.T) {
 		assert.NoError(t, err)
 	}
 
-	client := setup(t, "/v2/annotations", hf)
+	client := setup(t, "POST /v2/annotations", hf)
 
 	res, err := client.Annotations.Create(context.Background(), exp)
 	require.NoError(t, err)
@@ -55,7 +55,7 @@ func TestAnnotationService_Get(t *testing.T) {
 		assert.NoError(t, err)
 	}
 
-	client := setup(t, "/v2/annotations/ann_test", hf)
+	client := setup(t, "GET /v2/annotations/ann_test", hf)
 
 	res, err := client.Annotations.Get(context.Background(), "ann_test")
 	require.NoError(t, err)
@@ -87,7 +87,7 @@ func TestAnnotationService_List(t *testing.T) {
 		assert.NoError(t, err)
 	}
 
-	client := setup(t, "/v2/annotations", hf)
+	client := setup(t, "GET /v2/annotations", hf)
 
 	res, err := client.Annotations.List(context.Background(), nil)
 	require.NoError(t, err)
@@ -113,7 +113,7 @@ func TestAnnotationService_Update(t *testing.T) {
 		assert.NoError(t, err)
 	}
 
-	client := setup(t, "/v2/annotations/ann_test", hf)
+	client := setup(t, "PUT /v2/annotations/ann_test", hf)
 
 	res, err := client.Annotations.Update(context.Background(), "ann_test", exp)
 	require.NoError(t, err)
@@ -129,7 +129,7 @@ func TestAnnotationService_Delete(t *testing.T) {
 		w.Header().Set("Content-Type", mediaTypeJSON)
 	}
 
-	client := setup(t, "/v2/annotations/ann_test", hf)
+	client := setup(t, "DELETE /v2/annotations/ann_test", hf)
 
 	err := client.Annotations.Delete(context.Background(), "ann_test")
 	require.NoError(t, err)

diff --git a/axiom/client_test.go b/axiom/client_test.go
@@ -356,7 +356,7 @@ func TestClient_do(t *testing.T) {
 		_, _ = fmt.Fprint(w, `{"A":"a"}`)
 	}
 
-	client := setup(t, "/", hf)
+	client := setup(t, "GET /", hf)
 
 	type foo struct {
 		A string
@@ -382,7 +382,7 @@ func TestClient_do_ioWriter(t *testing.T) {
 		_, _ = fmt.Fprint(w, content)
 	}
 
-	client := setup(t, "/", hf)
+	client := setup(t, "GET /", hf)
 
 	req, err := client.NewRequest(context.Background(), http.MethodGet, "/", nil)
 	require.NoError(t, err)
@@ -401,7 +401,7 @@ func TestClient_do_HTTPError(t *testing.T) {
 		_, _ = w.Write([]byte(http.StatusText(http.StatusBadRequest)))
 	}
 
-	client := setup(t, "/", hf)
+	client := setup(t, "GET /", hf)
 
 	req, err := client.NewRequest(context.Background(), http.MethodGet, "/", nil)
 	require.NoError(t, err)
@@ -421,7 +421,7 @@ func TestClient_do_HTTPError_Typed(t *testing.T) {
 		_, _ = w.Write([]byte(http.StatusText(http.StatusForbidden)))
 	}
 
-	client := setup(t, "/", hf)
+	client := setup(t, "GET /", hf)
 
 	req, err := client.NewRequest(context.Background(), http.MethodGet, "/", nil)
 	require.NoError(t, err)
@@ -442,7 +442,7 @@ func TestClient_do_HTTPError_JSON(t *testing.T) {
 		}))
 	}
 
-	client := setup(t, "/", hf)
+	client := setup(t, "GET /", hf)
 
 	req, err := client.NewRequest(context.Background(), http.MethodGet, "/", nil)
 	require.NoError(t, err)
@@ -466,7 +466,7 @@ func TestClient_do_HTTPError_Unauthenticated(t *testing.T) {
 		}))
 	}
 
-	client := setup(t, "/", hf)
+	client := setup(t, "GET /", hf)
 
 	req, err := client.NewRequest(context.Background(), http.MethodGet, "/", nil)
 	require.NoError(t, err)
@@ -511,7 +511,7 @@ func TestClient_do_RateLimit(t *testing.T) {
 		}))
 	}
 
-	client := setup(t, "/", hf)
+	client := setup(t, "GET /", hf)
 
 	req, err := client.NewRequest(context.Background(), http.MethodGet, "/", nil)
 	require.NoError(t, err)
@@ -531,7 +531,7 @@ func TestClient_do_RedirectLoop(t *testing.T) {
 		http.Redirect(w, r, "/", http.StatusFound)
 	}
 
-	client := setup(t, "/", hf)
+	client := setup(t, "GET /", hf)
 
 	req, err := client.NewRequest(context.Background(), http.MethodGet, "/", nil)
 	require.NoError(t, err)
@@ -593,7 +593,7 @@ func TestClient_do_Backoff(t *testing.T) {
 		w.WriteHeader(header)
 	}
 
-	client := setup(t, "/", hf)
+	client := setup(t, "POST /", hf)
 
 	// Wrap with an io.TeeReader as http.NewRequest checks for some special
 	// readers it can read in full to optimize the request.
@@ -626,7 +626,7 @@ func TestClient_do_Backoff_NoRetryOn400(t *testing.T) {
 		w.WriteHeader(http.StatusBadRequest)
 	}
 
-	client := setup(t, "/", hf)
+	client := setup(t, "GET /", hf)
 
 	req, err := client.NewRequest(context.Background(), http.MethodGet, "/", nil)
 	require.NoError(t, err)

diff --git a/axiom/datasets.go b/axiom/datasets.go
@@ -738,9 +738,9 @@ func setIngestResultOnSpan(span trace.Span, res ingest.Status) {
 
 	span.SetAttributes(
 		attribute.String("axiom.result.trace_id", res.TraceID),
-		attribute.Int64("axiom.events.ingested", int64(res.Ingested)),
-		attribute.Int64("axiom.events.failed", int64(res.Failed)),
-		attribute.Int64("axiom.events.processed_bytes", int64(res.ProcessedBytes)),
+		attribute.Int64("axiom.events.ingested", int64(res.Ingested)),              //nolint:gosec // Fine for this use case.
+		attribute.Int64("axiom.events.failed", int64(res.Failed)),                  //nolint:gosec // Fine for this use case.
+		attribute.Int64("axiom.events.processed_bytes", int64(res.ProcessedBytes)), //nolint:gosec // Fine for this use case.
 	)
 }
 
@@ -753,9 +753,9 @@ func setQueryResultOnSpan(span trace.Span, res query.Result) {
 	span.SetAttributes(
 		attribute.String("axiom.result.trace_id", res.TraceID),
 		attribute.String("axiom.result.status.elapsed_time", res.Status.ElapsedTime.String()),
-		attribute.Int64("axiom.result.status.blocks_examined", int64(res.Status.BlocksExamined)),
-		attribute.Int64("axiom.result.status.rows_examined", int64(res.Status.RowsExamined)),
-		attribute.Int64("axiom.result.status.rows_matched", int64(res.Status.RowsMatched)),
+		attribute.Int64("axiom.result.status.blocks_examined", int64(res.Status.BlocksExamined)), //nolint:gosec // Fine for this use case.
+		attribute.Int64("axiom.result.status.rows_examined", int64(res.Status.RowsExamined)),     //nolint:gosec // Fine for this use case.
+		attribute.Int64("axiom.result.status.rows_matched", int64(res.Status.RowsMatched)),       //nolint:gosec // Fine for this use case.
 		attribute.Int64("axiom.result.status.num_groups", int64(res.Status.NumGroups)),
 		attribute.Bool("axiom.result.status.is_partial", res.Status.IsPartial),
 		attribute.Bool("axiom.result.status.is_estimate", res.Status.IsEstimate),
@@ -775,9 +775,9 @@ func setLegacyQueryResultOnSpan(span trace.Span, res querylegacy.Result) {
 	span.SetAttributes(
 		attribute.String("axiom.result.trace_id", res.TraceID),
 		attribute.String("axiom.result.status.elapsed_time", res.Status.ElapsedTime.String()),
-		attribute.Int64("axiom.result.status.blocks_examined", int64(res.Status.BlocksExamined)),
-		attribute.Int64("axiom.result.status.rows_examined", int64(res.Status.RowsExamined)),
-		attribute.Int64("axiom.result.status.rows_matched", int64(res.Status.RowsMatched)),
+		attribute.Int64("axiom.result.status.blocks_examined", int64(res.Status.BlocksExamined)), //nolint:gosec // Fine for this use case.
+		attribute.Int64("axiom.result.status.rows_examined", int64(res.Status.RowsExamined)),     //nolint:gosec // Fine for this use case.
+		attribute.Int64("axiom.result.status.rows_matched", int64(res.Status.RowsMatched)),       //nolint:gosec // Fine for this use case.
 		attribute.Int64("axiom.result.status.num_groups", int64(res.Status.NumGroups)),
 		attribute.Bool("axiom.result.status.is_partial", res.Status.IsPartial),
 		attribute.Bool("axiom.result.status.is_estimate", res.Status.IsEstimate),