Merge branch 'initial-dev' of https://github.com/snapp-incubator/nats…

…-blackbox-exporter into initial-metric

.github/workflows/ci.yaml

@@ -7,20 +7,25 @@
      name: lint
      runs-on: ubuntu-latest
      steps:
-       - uses: actions/checkout@v2
-       - name: golangci-lint
-         uses: golangci/golangci-lint-action@v2
-         with:
-           version: latest
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
+        with:
+          go-version: '1.22'
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v6
+        with:
+          version: v1.58
    test:
      name: test
      runs-on: ubuntu-latest
      steps:
-       - uses: actions/checkout@v2
-       - uses: actions/setup-go@v2
+       - uses: actions/checkout@v4
+       - uses: actions/setup-go@v4
          with:
            go-version: 1.22
        - run: go test -v ./... -covermode=atomic -coverprofile=coverage.out
-       - uses: codecov/codecov-action@v1
+       - uses: codecov/codecov-action@v4.0.1
          with:
-           files: coverage.out
+           files: coverage.out
+           token: ${{ secrets.CODECOV_TOKEN }}
+           slug: snapp-incubator/nats-blackbox-exporter

.gitignore

@@ -18,4 +18,6 @@
 .idea/
 
 # config
-config.yaml
+config.yaml
+
+.DS_Store

.golangci.yml

@@ -1,27 +1,8 @@
-# ---
-# linters:
-#   enable-all: true
-#   disable:
-#     - depguard
-#     # we don't use json with camel-case
-#     - tagliatelle
-#     - nolintlint
-#     # it should improve to support more known patterns
-#     - varnamelen
-#     - ireturn
-#     # deprecated linters
-#     - maligned
-#     - scopelint
-#     - golint
-#     - ifshort
-#     - interfacer
-#     - exhaustivestruct
-#     - nosnakecase
-#     - varcheck
-#     - deadcode
-#     - structcheck
-#     - gomnd
-#     - execinquery
-#     # temporarily disabled 
-#     - tagalign
-#     - gochecknoglobals
+---
+linters:
+  enable:
+    - gofmt   
+    - govet  
+    - revive 
+    - staticcheck 
+    - errcheck

internal/cmd/main.go

@@ -5,17 +5,17 @@ import (
 	"os/signal"
 	"syscall"
 
-	"github.com/snapp-incubator/nats-blackbox-exporter/internal/client"
 	"github.com/snapp-incubator/nats-blackbox-exporter/internal/config"
+	"github.com/snapp-incubator/nats-blackbox-exporter/internal/natsclient"
 	"go.uber.org/zap"
 )
 
 func main(cfg config.Config, logger *zap.Logger) {
 	natsConfig := cfg.NATS
 
-	natsClient := client.New(logger, natsConfig)
+	client := natsclient.New(logger, natsConfig)
 
-	natsClient.StartMessaging()
+	client.StartMessaging()
 
 	sig := make(chan os.Signal, 1)
 	signal.Notify(sig, syscall.SIGINT, syscall.SIGTERM)

internal/config/config.go

@@ -10,9 +10,9 @@ import (
 	"github.com/knadh/koanf/providers/file"
 	"github.com/knadh/koanf/providers/structs"
 	"github.com/knadh/koanf/v2"
-	"github.com/snapp-incubator/nats-blackbox-exporter/internal/client"
 	"github.com/snapp-incubator/nats-blackbox-exporter/internal/logger"
 	"github.com/snapp-incubator/nats-blackbox-exporter/internal/metric"
+	"github.com/snapp-incubator/nats-blackbox-exporter/internal/natsclient"
 	"github.com/tidwall/pretty"
 )
 

internal/config/default.go

@@ -3,9 +3,9 @@ package config
 import (
 	"time"
 
-	"github.com/snapp-incubator/nats-blackbox-exporter/internal/client"
 	"github.com/snapp-incubator/nats-blackbox-exporter/internal/logger"
 	"github.com/snapp-incubator/nats-blackbox-exporter/internal/metric"
+	"github.com/snapp-incubator/nats-blackbox-exporter/internal/natsclient"
 )
 
 // Default return default configuration.
@@ -15,7 +15,7 @@ func Default() Config {
 		Logger: logger.Config{
 			Level: "debug",
 		},
-		NATS: client.Config{
+		NATS: natsclient.Config{
 			URL:             "localhost:4222",
 			PublishInterval: 2 * time.Second,
 			RequestTimeout:  50 * time.Millisecond,

internal/client/client.go → internal/natsclient/client.go

@@ -1,4 +1,4 @@
-package client
+package natsclient
 
 import (
 	"time"
@@ -7,7 +7,7 @@ import (
 	"go.uber.org/zap"
 )
 
-type Client struct {
+type NatsClient struct {
 	Conn    *nats.Conn
 	Logger  *zap.Logger
 	Config  Config
@@ -51,12 +51,25 @@ func connect(logger *zap.Logger, cfg Config) *nats.Conn {
 	return nc
 }
 
-func (c *Client) StartMessaging() {
+func (c *NatsClient) StartMessaging() {
 	go c.Subscribe("")
 	go c.Publish("")
 }
 
-func (c *Client) Publish(subject string) {
+func New(nc *nats.Conn, logger *zap.Logger, cfg Config) *NatsClient {
+	return &NatsClient{
+		Conn:   nc,
+		Logger: logger,
+		Config: cfg,
+	}
+}
+
+func (c *NatsClient) StartMessaging() {
+	go c.Subscribe("")
+	go c.Publish("")
+}
+
+func (c *NatsClient) Publish(subject string) {
 	if subject == "" {
 		subject = c.Config.DefaultSubject
 	}
@@ -82,7 +95,7 @@ func (c *Client) Publish(subject string) {
 	}
 }
 
-func (c *Client) Subscribe(subject string) {
+func (c *NatsClient) Subscribe(subject string) {
 	if subject == "" {
 		subject = c.Config.DefaultSubject
 	}

internal/client/config.go → internal/natsclient/config.go

@@ -1,4 +1,4 @@
-package client
+package natsclient
 
 import "time"