Merge pull request #54 from foomo/feature/without-cancel-client-middleware

feat: add without cancel client middleware

.github/workflows/test.yml

@@ -26,7 +26,7 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
 
-      - uses: golangci/golangci-lint-action@v6
+      - uses: golangci/golangci-lint-action@v7
         with:
           version: latest
           args: --timeout=5m

.golangci.yml

@@ -1,106 +1,14 @@
-# yaml-language-server: $schema=https://golangci-lint.run/jsonschema/golangci.jsonschema.json
-# https://golangci-lint.run/usage/configuration/
-
+version: "2"
 run:
   go: 1.24.1
-  build-tags: [safe]
+  build-tags:
+    - safe
   modules-download-mode: readonly
-
-issues:
-  exclude-dirs:
-    - 'tmp'
-  exclude-rules:
-    - path: _test\.go
-      linters:
-        - forbidigo
-        - forcetypeassert
-
-linters-settings:
-  # https://golangci-lint.run/usage/linters/#misspell
-  misspell:
-    mode: restricted
-  # https://golangci-lint.run/usage/linters/#asasalint
-  asasalint:
-    ignore-test: true
-  # https://golangci-lint.run/usage/linters/#exhaustive
-  exhaustive:
-    default-signifies-exhaustive: true
-  # https://golangci-lint.run/usage/linters/#predeclared
-  predeclared:
-    ignore: "new,error"
-  # https://golangci-lint.run/usage/linters/#gocritic
-  gocritic:
-    disabled-checks:
-      - ifElseChain
-      - commentFormatting
-  # https://golangci-lint.run/usage/linters/#testifylint
-  testifylint:
-    disable:
-      - float-compare
-  # https://golangci-lint.run/usage/linters/#gosec
-  gosec:
-    confidence: medium
-  # https://golangci-lint.run/usage/linters/#importas
-  importas:
-    no-unaliased: true
-  # https://golangci-lint.run/usage/linters/#gomoddirectives
-  gomoddirectives:
-    replace-local: true
-  # https://golangci-lint.run/usage/linters/#revive
-  revive:
-    ignore-generated-header: true
-    enable-all-rules: true
-    rules:
-      - name: line-length-limit
-        disabled: true
-      - name: cognitive-complexity
-        disabled: true
-      - name: unused-parameter
-        disabled: true
-      - name: add-constant
-        disabled: true
-      - name: cyclomatic
-        disabled: true
-      - name: function-length
-        disabled: true
-      - name: function-result-limit
-        disabled: true
-      - name: flag-parameter
-        disabled: true
-      - name: unused-receiver
-        disabled: true
-      - name: argument-limit
-        disabled: true
-      - name: max-control-nesting
-        disabled: true
-      - name: comment-spacings
-        disabled: true
-      - name: max-public-structs
-        disabled: true
-      - name: struct-tag
-        arguments:
-          - "json,inline"
-      - name: unhandled-error
-        arguments:
-          - "fmt.Println"
-          - "io.Writer.Write"
-          - "strings.Builder.WriteString"
-      # TODO remove
-      - name: deep-exit
-        disabled: true
-      - name: if-return
-        disabled: true
-      - name: empty-block
-        disabled: true
-      - name: indent-error-flow
-        disabled: true
-
 linters:
-  disable-all: true
+  default: none
   enable:
     ## Default linters
     - errcheck # errcheck is a program for checking for unchecked errors in Go code. These unchecked errors can be critical bugs in some cases [fast: false, auto-fix: false]
-    - gosimple # (megacheck) Linter for Go source code that specializes in simplifying code [fast: false, auto-fix: false]
     - govet # (vet, vetshadow) Vet examines Go source code and reports suspicious constructs. It is roughly the same as 'go vet' and uses its passes. [fast: false, auto-fix: false]
     - ineffassign # Detects when assignments to existing variables are not used [fast: true, auto-fix: false]
     - staticcheck # (megacheck) It's a set of rules from staticcheck. It's not the same thing as the staticcheck binary. The author of staticcheck doesn't support or approve the use of staticcheck as a library inside golangci-lint. [fast: false, auto-fix: false]
@@ -129,9 +37,7 @@ linters:
     - gochecksumtype # Run exhaustiveness checks on Go "sum types" [fast: false, auto-fix: false]
     - goconst # Finds repeated strings that could be replaced by a constant [fast: true, auto-fix: false]
     - gocritic # Provides diagnostics that check for bugs, performance and style issues. [fast: false, auto-fix: true]
-    - gofmt # Gofmt checks whether code was gofmt-ed. By default this tool runs with -s option to check for code simplification [fast: true, auto-fix: true]
     - goheader # Checks is file header matches to pattern [fast: true, auto-fix: true]
-    - goimports # Check import statements are formatted according to the 'goimport' command. Reformat imports in autofix mode. [fast: true, auto-fix: true]
     - gomoddirectives # Manage the use of 'replace', 'retract', and 'excludes' directives in go.mod. [fast: true, auto-fix: false]
     - gomodguard # Allow and block list linter for direct Go module dependencies. This is different from depguard where there are different block types for example version constraints and module recommendations. [fast: true, auto-fix: false]
     - goprintffuncname # Checks that printf-like functions are named with `f` at the end. [fast: true, auto-fix: false]
@@ -141,7 +47,6 @@ linters:
     - iface # Detect the incorrect use of interfaces, helping developers avoid interface pollution. [fast: false, auto-fix: false]
     - importas # Enforces consistent import aliases [fast: false, auto-fix: false]
     - inamedparam # reports interfaces with unnamed method parameters [fast: true, auto-fix: false]
-    #- intrange # (go >= 1.22) intrange is a linter to find places where for loops could make use of an integer range. [fast: true, auto-fix: false]
     - loggercheck # (logrlint) Checks key value pairs for common logger libraries (kitlog,klog,logr,zap). [fast: false, auto-fix: false]
     - makezero # Finds slice declarations with non-zero initial length [fast: false, auto-fix: false]
     - mirror # reports wrong mirror patterns of bytes/strings usage [fast: false, auto-fix: true]
@@ -164,7 +69,6 @@ linters:
     - rowserrcheck # checks whether Rows.Err of rows is checked successfully [fast: false, auto-fix: false]
     - spancheck # Checks for mistakes with OpenTelemetry/Census spans. [fast: false, auto-fix: false]
     - sqlclosecheck # Checks that sql.Rows, sql.Stmt, sqlx.NamedStmt, pgx.Query are closed. [fast: false, auto-fix: false]
-    - stylecheck # Stylecheck is a replacement for golint [fast: false, auto-fix: false]
     - testableexamples # linter checks if examples are testable (have an expected output) [fast: true, auto-fix: false]
     - testifylint # Checks usage of github.com/stretchr/testify. [fast: false, auto-fix: false]
     - testpackage # linter that makes you use a separate _test package [fast: true, auto-fix: false]
@@ -186,7 +90,6 @@ linters:
     #- err113 # Go linter to check the errors handling expressions [fast: false, auto-fix: false]
     #- exhaustruct # Checks if all structure fields are initialized [fast: false, auto-fix: false]
     #- funlen # Tool for detection of long functions [fast: true, auto-fix: false]
-    #- gci # Gci controls Go package import order and makes it always deterministic. [fast: true, auto-fix: true]
     #- ginkgolinter # enforces standards of using ginkgo and gomega [fast: false, auto-fix: false]
     #- gochecknoglobals # Check that no global variables exist. [fast: false, auto-fix: false]
     #- gochecknoinits # Checks that no init functions are present in Go code [fast: true, auto-fix: false]
@@ -194,7 +97,6 @@ linters:
     #- gocyclo # Computes and checks the cyclomatic complexity of functions [fast: true, auto-fix: false]
     #- godot # Check if comments end in a period [fast: true, auto-fix: true]
     #- godox # Tool for detection of comment keywords [fast: true, auto-fix: false]
-    #- gofumpt # Gofumpt checks whether code was gofumpt-ed. [fast: true, auto-fix: true]
     #- interfacebloat # A linter that checks the number of methods inside an interface. [fast: true, auto-fix: false]
     #- intrange # (go >= 1.22) intrange is a linter to find places where for loops could make use of an integer range. [fast: true, auto-fix: false]
     #- ireturn # Accept Interfaces, Return Concrete Types [fast: false, auto-fix: false]
@@ -214,3 +116,101 @@ linters:
     #- wrapcheck # Checks that errors returned from external packages are wrapped [fast: false, auto-fix: false]
     #- wsl # add or remove empty lines [fast: true, auto-fix: false]
     #- zerologlint # Detects the wrong usage of `zerolog` that a user forgets to dispatch with `Send` or `Msg` [fast: false, auto-fix: false]
+  settings:
+    exhaustive:
+      default-signifies-exhaustive: true
+    gocritic:
+      disabled-checks:
+        - ifElseChain
+        - commentFormatting
+    gomoddirectives:
+      replace-local: true
+    gosec:
+      confidence: medium
+    importas:
+      no-unaliased: true
+    misspell:
+      mode: restricted
+    predeclared:
+      ignore:
+        - new
+        - error
+    revive:
+      enable-all-rules: true
+      rules:
+        - name: line-length-limit
+          disabled: true
+        - name: cognitive-complexity
+          disabled: true
+        - name: unused-parameter
+          disabled: true
+        - name: add-constant
+          disabled: true
+        - name: cyclomatic
+          disabled: true
+        - name: function-length
+          disabled: true
+        - name: function-result-limit
+          disabled: true
+        - name: flag-parameter
+          disabled: true
+        - name: unused-receiver
+          disabled: true
+        - name: argument-limit
+          disabled: true
+        - name: max-control-nesting
+          disabled: true
+        - name: comment-spacings
+          disabled: true
+        - name: max-public-structs
+          disabled: true
+        - name: struct-tag
+          arguments:
+            - json,inline
+        - name: unhandled-error
+          arguments:
+            - fmt.Println
+            - io.Writer.Write
+            - strings.Builder.WriteString
+        - name: deep-exit
+          disabled: true
+        - name: if-return
+          disabled: true
+        - name: empty-block
+          disabled: true
+        - name: indent-error-flow
+          disabled: true
+    testifylint:
+      disable:
+        - float-compare
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    rules:
+      - linters:
+          - forbidigo
+          - forcetypeassert
+        path: _test\.go
+      - linters:
+          - asasalint
+        path: (.+)_test\.go
+    paths:
+      - tmp
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  enable:
+    - gofmt
+    - goimports
+  exclusions:
+    generated: lax
+    paths:
+      - tmp
+      - third_party$
+      - builtin$
+      - examples$

.husky.yaml

@@ -1,6 +1,6 @@
 hooks:
   pre-commit:
-    - golangci-lint run --fast
+    - golangci-lint run --fast-only
     - husky lint-staged
   commit-msg:
     # only execute if not in a merge
@@ -8,7 +8,7 @@ hooks:
 
 lint-staged:
   '*.go':
-    - goimports -l -w
+    - golangci-lint fmt
 
 lint-commit:
   types: '^(feat|fix|build|chore|docs|perf|refactor|revert|style|test|wip)$'

pkg/client/gtagmiddleware.go

@@ -1,6 +1,7 @@
 package client
 
 import (
+	"context"
 	"net/http"
 	"strings"
 
@@ -58,6 +59,12 @@ func GTagMiddlewarClientID(next GTagHandler) GTagHandler {
 	}
 }
 
+func GTagMiddlewarWithoutCancel(next GTagHandler) GTagHandler {
+	return func(r *http.Request, payload *gtag.Payload) error {
+		return next(r.WithContext(context.WithoutCancel(r.Context())), payload)
+	}
+}
+
 func GTagMiddlewarSessionID(measurementID string) GTagMiddleware {
 	measurementID = strings.Split(measurementID, "-")[1]
 	return func(next GTagHandler) GTagHandler {

pkg/client/mpv2middleware.go

@@ -1,6 +1,7 @@
 package client
 
 import (
+	"context"
 	"net/http"
 	"strings"
 
@@ -47,6 +48,12 @@ func MPv2MiddlewarDebugMode(next MPv2Handler) MPv2Handler {
 	}
 }
 
+func MPv2MiddlewarWithoutCancel(next MPv2Handler) MPv2Handler {
+	return func(r *http.Request, payload *mpv2.Payload[any]) error {
+		return next(r.WithContext(context.WithoutCancel(r.Context())), payload)
+	}
+}
+
 func MPv2MiddlewareUserID(cookieName string) MPv2Middleware {
 	return func(next MPv2Handler) MPv2Handler {
 		return func(r *http.Request, payload *mpv2.Payload[any]) error {

pkg/encoding/mpv2encode/gtag_test.go

@@ -41,7 +41,7 @@ func TestSelectItem(t *testing.T) {
 	var outgoing gtag.Payload
 	err = mpv2encode.GTag(*intermediate, &outgoing)
 	require.NoError(t, err)
-	assert.Equal(t, iso4217.EUR, gtag.Get(outgoing.ECommerce.Currency))
+	assert.Equal(t, iso4217.EUR, gtag.Get(outgoing.Currency))
 }
 
 func TestSelectItem_Pointer(t *testing.T) {
@@ -69,5 +69,5 @@ func TestSelectItem_Pointer(t *testing.T) {
 
 	err = mpv2encode.GTag(*intermediate, &incoming)
 	require.NoError(t, err)
-	assert.Equal(t, iso4217.EUR, gtag.Get(incoming.ECommerce.Currency))
+	assert.Equal(t, iso4217.EUR, gtag.Get(incoming.Currency))
 }