feat: reusable http client and enhance backoff retry (#64)

Author: hgiasac

.github/workflows/lint.yaml

@@ -8,9 +8,6 @@ on:
       - "go.sum"
       - ".github/workflows/*.yaml"
 
-env:
-  GO_VERSION: 1.23
-
 jobs:
   detect-modules:
     runs-on: ubuntu-latest
@@ -34,13 +31,13 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: ${{ env.GO_VERSION }}
+          go-version-file: ./go.mod
       - name: Format
         run: |
           diff -u <(echo -n) <(gofmt -d -s .)
           cd ndc-http-schema && diff -u <(echo -n) <(gofmt -d -s .)
       - name: golangci-lint ${{ matrix.modules }}
-        uses: golangci/golangci-lint-action@v6
+        uses: golangci/golangci-lint-action@v7
         with:
           args: --timeout=5m
           working-directory: ${{ matrix.modules }}

.github/workflows/release.yaml

@@ -112,7 +112,7 @@ jobs:
         uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.23"
+          go-version-file: ./go.mod
       - name: Build the CLI
         run: |
           VERSION="$GITHUB_REF_NAME" make ci-build-cli

.github/workflows/test.yaml

@@ -8,14 +8,12 @@ jobs:
   test-go:
     name: Run unit tests
     runs-on: ubuntu-latest
-    permissions:
-      pull-requests: write
     steps:
       - name: Checkout
         uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: ${{ env.GO_VERSION }}
+          go-version-file: ./go.mod
       - name: Run integration tests
         run: |
           ./scripts/test.sh

.golangci.yml

@@ -1,43 +1,115 @@
+version: "2"
+
 linters:
-  enable-all: true
+  default: all
   disable:
     - err113
     - lll
-    - gocognit
-    - funlen
     - gomoddirectives
     - depguard
-    - gosec
-    - revive
-    - cyclop
-    - nestif
-    - wsl
     - wrapcheck
     - varnamelen
     - exhaustive
     - exhaustruct
     - ireturn
     - gochecknoglobals
-    - stylecheck
     - nilnil
     - mnd
     - tagliatelle
-    - goconst
-    - noctx
     - recvcheck
+    - funcorder
+    - tagalign
+
+  settings:
+    nestif:
+      # Minimal complexity of if statements to report.
+      # Default: 5
+      min-complexity: 15
+
+    gocritic:
+      disabled-checks:
+        - appendAssign
+    gocyclo:
+      min-complexity: 40
+
+    cyclop:
+      max-complexity: 30
+
+    revive:
+      # Maximum number of open files at the same time.
+      max-open-files: 2048
+      severity: error
+      rules:
+        - name: var-naming
+          disabled: true
+        - name: exported
+          disabled: true
+          
+    gosec:
+      excludes:
+        - G115
+        - G301
+        - G304
+        - G306
+        - G404
+        
+    funlen:
+      lines: 200
+      statements: 90
+
+    gocognit:
+      min-complexity: 60
+
+  # Defines a set of rules to ignore issues.
+  # It does not skip the analysis, and so does not ignore "typecheck" errors.
+  exclusions:
+    # Mode of the generated files analysis.
+    #
+    # - `strict`: sources are excluded by strictly following the Go generated file convention.
+    #    Source files that have lines matching only the following regular expression will be excluded: `^// Code generated .* DO NOT EDIT\.$`
+    #    This line must appear before the first non-comment, non-blank text in the file.
+    #    https://go.dev/s/generatedcode
+    # - `lax`: sources are excluded if they contain lines like `autogenerated file`, `code generated`, `do not edit`, etc.
+    # - `disable`: disable the generated files exclusion.
+    #
+    # Default: lax
+    generated: strict
+    # Log a warning if an exclusion rule is unused.
+    warn-unused: false
+    rules: 
+      - path: ndc-http-schema
+        linters:
+          - noctx
+          - goconst
+
+    # Which file paths to exclude: they will be analyzed, but issues from them won't be reported.
+    # "/" will be replaced by the current OS file path separator to properly work on Windows.
+    paths:
+      - ".*_test\\.go$"
 
-linters-settings:
-  nestif:
-    # Minimal complexity of if statements to report.
-    # Default: 5
-    min-complexity: 10
-
-  gocritic:
-    disabled-checks:
-      - appendAssign
-  gocyclo:
-    min-complexity: 40
-
-issues:
-  exclude-files:
-    - ".*_test\\.go$"
+formatters:
+  # Enable specific formatter.
+  # Default: [] (uses standard Go formatting)
+  enable:
+    - gci
+    - gofmt
+    - gofumpt
+    - goimports
+    - golines
+  # Formatters settings.
+  settings: {}
+  exclusions:
+    # Mode of the generated files analysis.
+    #
+    # - `strict`: sources are excluded by strictly following the Go generated file convention.
+    #    Source files that have lines matching only the following regular expression will be excluded: `^// Code generated .* DO NOT EDIT\.$`
+    #    This line must appear before the first non-comment, non-blank text in the file.
+    #    https://go.dev/s/generatedcode
+    # - `lax`: sources are excluded if they contain lines like `autogenerated file`, `code generated`, `do not edit`, etc.
+    # - `disable`: disable the generated files exclusion.
+    #
+    # Default: lax
+    generated: strict
+    # Which file paths to exclude.
+    # Default: []
+    paths: []

Makefile

@@ -3,8 +3,7 @@ OUTPUT_DIR := _output
 
 .PHONY: format
 format:
-	gofmt -w -s .
-	cd ndc-http-schema && gofmt -w -s .
+	golangci-lint fmt
 
 .PHONY: test
 test:
@@ -15,7 +14,14 @@ test:
 # https://golangci-lint.run/usage/install
 .PHONY: lint
 lint:
+	golangci-lint run
+	cd exhttp && golangci-lint run
+	cd ndc-http-schema && golangci-lint run
+
+.PHONY: lint-fix
+lint-fix:
 	golangci-lint run --fix
+	cd exhttp && golangci-lint run --fix
 	cd ndc-http-schema && golangci-lint run --fix
 
 # clean the output directory

connector/connector.go

@@ -8,10 +8,12 @@ import (
 	"path/filepath"
 
 	"github.com/hasura/ndc-http/connector/internal"
+	"github.com/hasura/ndc-http/exhttp"
 	"github.com/hasura/ndc-http/ndc-http-schema/configuration"
 	rest "github.com/hasura/ndc-http/ndc-http-schema/schema"
 	"github.com/hasura/ndc-sdk-go/connector"
 	"github.com/hasura/ndc-sdk-go/schema"
+	"go.opentelemetry.io/otel/attribute"
 )
 
 // HTTPConnector implements the SDK interface of NDC specification.
@@ -38,7 +40,10 @@ func NewHTTPConnector(opts ...Option) *HTTPConnector {
 
 // ParseConfiguration validates the configuration files provided by the user, returning a validated 'Configuration',
 // or throwing an error to prevents Connector startup.
-func (c *HTTPConnector) ParseConfiguration(ctx context.Context, configurationDir string) (*configuration.Configuration, error) {
+func (c *HTTPConnector) ParseConfiguration(
+	ctx context.Context,
+	configurationDir string,
+) (*configuration.Configuration, error) {
 	restCapabilities := schema.CapabilitiesResponse{
 		Version: "0.1.6",
 		Capabilities: schema.Capabilities{
@@ -52,10 +57,12 @@ func (c *HTTPConnector) ParseConfiguration(ctx context.Context, configurationDir
 			},
 		},
 	}
+
 	rawCapabilities, err := json.Marshal(restCapabilities)
 	if err != nil {
 		return nil, fmt.Errorf("failed to encode capabilities: %w", err)
 	}
+
 	c.capabilities = schema.NewRawCapabilitiesResponseUnsafe(rawCapabilities)
 
 	config, err := configuration.ReadConfigurationFile(configurationDir)
@@ -64,6 +71,7 @@ func (c *HTTPConnector) ParseConfiguration(ctx context.Context, configurationDir
 	}
 
 	logger := connector.GetLogger(ctx)
+
 	schemas, err := configuration.ReadSchemaOutputFile(configurationDir, config.Output, logger)
 	if err != nil {
 		return nil, err
@@ -72,7 +80,12 @@ func (c *HTTPConnector) ParseConfiguration(ctx context.Context, configurationDir
 	var errs map[string][]string
 
 	if schemas == nil {
-		logger.Debug(fmt.Sprintf("output file at %s does not exist. Parsing files...", filepath.Join(configurationDir, config.Output)))
+		logger.Debug(
+			fmt.Sprintf(
+				"output file at %s does not exist. Parsing files...",
+				filepath.Join(configurationDir, config.Output),
+			),
+		)
 
 		schemas, errs = configuration.BuildSchemaFromConfig(config, configurationDir, logger)
 		if len(errs) > 0 {
@@ -82,7 +95,16 @@ func (c *HTTPConnector) ParseConfiguration(ctx context.Context, configurationDir
 		}
 	}
 
+	c.httpClient.Transport = exhttp.NewTelemetryTransport(
+		c.httpClient.Transport,
+		exhttp.TelemetryConfig{
+			Logger:     logger,
+			Attributes: []attribute.KeyValue{attribute.String("db.system", "http")},
+		},
+	)
+
 	c.config = config
+
 	c.upstreams, err = internal.NewUpstreamManager(c.httpClient, config)
 	if err != nil {
 		return nil, err
@@ -102,7 +124,11 @@ func (c *HTTPConnector) ParseConfiguration(ctx context.Context, configurationDir
 //
 // In addition, this function should register any
 // connector-specific metrics with the metrics registry.
-func (c *HTTPConnector) TryInitState(ctx context.Context, configuration *configuration.Configuration, metrics *connector.TelemetryState) (*State, error) {
+func (c *HTTPConnector) TryInitState(
+	ctx context.Context,
+	configuration *configuration.Configuration,
+	metrics *connector.TelemetryState,
+) (*State, error) {
 	return &State{
 		Tracer: metrics.Tracer,
 	}, nil
@@ -114,11 +140,17 @@ func (c *HTTPConnector) TryInitState(ctx context.Context, configuration *configu
 // is able to reach its data source over the network.
 //
 // Should throw if the check fails, else resolve.
-func (c *HTTPConnector) HealthCheck(ctx context.Context, configuration *configuration.Configuration, state *State) error {
+func (c *HTTPConnector) HealthCheck(
+	ctx context.Context,
+	configuration *configuration.Configuration,
+	state *State,
+) error {
 	return nil
 }
 
 // GetCapabilities get the connector's capabilities.
-func (c *HTTPConnector) GetCapabilities(configuration *configuration.Configuration) schema.CapabilitiesResponseMarshaler {
+func (c *HTTPConnector) GetCapabilities(
+	configuration *configuration.Configuration,
+) schema.CapabilitiesResponseMarshaler {
 	return c.capabilities
 }