feat: update some code (#28)

Signed-off-by: yuluo-yx <[email protected]>

Author: yuluo-yx

.editorconfig

@@ -0,0 +1,15 @@
+# http://editorconfig.org
+
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 2
+max_line_length = 80
+trim_trailing_whitespace = true
+
+[Makefile]
+indent_style = tab

.gitattributes

@@ -0,0 +1,11 @@
+# Auto detect text files and perform LF normalization
+* text=auto
+* text eol=lf
+
+# Binary files - treat as binary, no line ending conversion
+*.png binary
+*.jpg binary
+*.jpeg binary
+*.gif binary
+*.ico binary
+*.svg binary

internal/banner/embed.go

@@ -19,6 +19,7 @@ package banner
 
 import (
 	"embed"
+	"fmt"
 	"os"
 	"strconv"
 	"text/template"
@@ -27,6 +28,14 @@ import (
 	bannertypes "hertzbeat.apache.org/hertzbeat-collector-go/internal/collector/common/types/err"
 )
 
+const (
+	// ANSI color codes
+	ColorReset  = "\033[0m"
+	ColorPurple = "\033[35m"
+	ColorGreen  = "\033[32m"
+	ColorYellow = "\033[33m"
+)
+
 //go:embed banner.txt
 var EmbedLogo embed.FS
 
@@ -74,7 +83,11 @@ func (r *Runner) PrintBanner(appName, port string) error {
 		Pid:           strconv.Itoa(os.Getpid()),
 	}
 
+	// Print banner with color
+	fmt.Print(ColorPurple)
 	err = tmpl.Execute(os.Stdout, vars)
+	fmt.Print(ColorReset)
+
 	if err != nil {
 		r.Logger.Error(bannertypes.BannerPrintExecuteError, "template parse error", "error", err)
 		return err

internal/util/logger/logger.go

@@ -18,64 +18,65 @@
 package logger
 
 import (
-	"io"
-	"os"
-
-	"github.com/go-logr/logr"
-	"github.com/go-logr/zapr"
-	"go.uber.org/zap"
-	"go.uber.org/zap/zapcore"
-	"hertzbeat.apache.org/hertzbeat-collector-go/internal/collector/common/types/logger"
+  "io"
+  "os"
+
+  "github.com/go-logr/logr"
+  "github.com/go-logr/zapr"
+  "go.uber.org/zap"
+  "go.uber.org/zap/zapcore"
+
+  "hertzbeat.apache.org/hertzbeat-collector-go/internal/collector/common/types/logger"
 )
 
 type Logger struct {
-	logr.Logger
-	out           io.Writer
-	logging       *logger.HertzBeatLogging
-	sugaredLogger *zap.SugaredLogger
+  logr.Logger
+  out           io.Writer
+  logging       *logger.HertzBeatLogging
+  sugaredLogger *zap.SugaredLogger
 }
 
 func NewLogger(w io.Writer, logging *logger.HertzBeatLogging) Logger {
 
-	logger := initZapLogger(w, logging, logging.Level[logger.LogComponentHertzbeatDefault])
+  logger := initZapLogger(w, logging, logging.Level[logger.LogComponentHertzbeatDefault])
 
-	return Logger{
-		Logger:        zapr.NewLogger(logger),
-		out:           w,
-		logging:       logging,
-		sugaredLogger: logger.Sugar(),
-	}
+  return Logger{
+    Logger:        zapr.NewLogger(logger),
+    out:           w,
+    logging:       logging,
+    sugaredLogger: logger.Sugar(),
+  }
 }
 
 func FileLogger(file, name string, level logger.LogLevel) Logger {
 
-	writer, err := os.OpenFile(file, os.O_WRONLY, 0o666)
-	if err != nil {
-		panic(err)
-	}
+  writer, err := os.OpenFile(file, os.O_WRONLY, 0o666)
+  if err != nil {
+    panic(err)
+  }
 
-	logging := logger.DefaultHertzbeatLogging()
-	logger := initZapLogger(writer, logging, level)
+  logging := logger.DefaultHertzbeatLogging()
+  logger := initZapLogger(writer, logging, level)
 
-	return Logger{
-		Logger:        zapr.NewLogger(logger).WithName(name),
-		logging:       logging,
-		out:           writer,
-		sugaredLogger: logger.Sugar(),
-	}
+  return Logger{
+    Logger:        zapr.NewLogger(logger).WithName(name),
+    logging:       logging,
+    out:           writer,
+    sugaredLogger: logger.Sugar(),
+  }
 }
 
 func DefaultLogger(out io.Writer, level logger.LogLevel) Logger {
 
-	logging := logger.DefaultHertzbeatLogging()
-	logger := initZapLogger(out, logging, level)
+  logging := logger.DefaultHertzbeatLogging()
+  logger := initZapLogger(out, logging, level)
 
-	return Logger{
-		Logger:        zapr.NewLogger(logger),
-		out:           out,
-		logging:       logging,
-		sugaredLogger: logger.Sugar(),
-	}
+  return Logger{
+    Logger:        zapr.NewLogger(logger),
+    out:           out,
+    logging:       logging,
+    sugaredLogger: logger.Sugar(),
+  }
 }
 
 // WithName returns a new Logger instance with the specified name element added
@@ -85,23 +86,23 @@ func DefaultLogger(out io.Writer, level logger.LogLevel) Logger {
 // more information).
 func (l Logger) WithName(name string) Logger {
 
-	logLevel := l.logging.Level[logger.HertzbeatLogComponent(name)]
-	logger := initZapLogger(l.out, l.logging, logLevel)
+  logLevel := l.logging.Level[logger.HertzbeatLogComponent(name)]
+  logger := initZapLogger(l.out, l.logging, logLevel)
 
-	return Logger{
-		Logger:        zapr.NewLogger(logger).WithName(name),
-		logging:       l.logging,
-		out:           l.out,
-		sugaredLogger: logger.Sugar().Named(name),
-	}
+  return Logger{
+    Logger:        zapr.NewLogger(logger).WithName(name),
+    logging:       l.logging,
+    out:           l.out,
+    sugaredLogger: logger.Sugar().Named(name),
+  }
 }
 
 // WithValues returns a new Logger instance with additional key/value pairs.
 // See Info for documentation on how key/value pairs work.
 func (l Logger) WithValues(keysAndValues ...interface{}) Logger {
 
-	l.Logger = l.Logger.WithValues(keysAndValues...)
-	return l
+  l.Logger = l.Logger.WithValues(keysAndValues...)
+  return l
 }
 
 // A Sugar wraps the base Logger functionality in a slower, but less
@@ -124,13 +125,13 @@ func (l Logger) WithValues(keysAndValues ...interface{}) Logger {
 //	Infoln(...any)         Println-style logger
 func (l Logger) Sugar() *zap.SugaredLogger {
 
-	return l.sugaredLogger
+  return l.sugaredLogger
 }
 
 func initZapLogger(w io.Writer, logging *logger.HertzBeatLogging, level logger.LogLevel) *zap.Logger {
 
-	parseLevel, _ := zapcore.ParseLevel(string(logging.DefaultHertzBeatLoggingLevel(level)))
-	core := zapcore.NewCore(zapcore.NewConsoleEncoder(zap.NewDevelopmentEncoderConfig()), zapcore.AddSync(w), zap.NewAtomicLevelAt(parseLevel))
+  parseLevel, _ := zapcore.ParseLevel(string(logging.DefaultHertzBeatLoggingLevel(level)))
+  core := zapcore.NewCore(zapcore.NewConsoleEncoder(zap.NewDevelopmentEncoderConfig()), zapcore.AddSync(w), zap.NewAtomicLevelAt(parseLevel))
 
-	return zap.New(core, zap.AddCaller())
+  return zap.New(core, zap.AddCaller())
 }

tools/linter/license/.licenserc.yaml

@@ -59,6 +59,7 @@ header:
     - 'tools/linter/yamllint/.yamllint'
     - '.go-version'
     - 'VERSION'
+    - '.editorconfig'
 
   comment: on-failure
 

tools/linter/markdownlint/markdown_lint_config.yaml

@@ -44,3 +44,5 @@ MD051: false
 MD056: false
 # MD055/table-pipe-style
 MD055: false
+# MD060/table
+MD060: false

tools/make/linter.mk

@@ -19,7 +19,7 @@
 
 .PHONY: lint
 lint: ## Check files
-lint: markdown-lint-check yaml-lint codespell newline-check
+lint: markdown-lint-check yaml-lint codespell
 
 .PHONY: codespell
 codespell: CODESPELL_SKIP := $(shell cat tools/linter/codespell/.codespell.skip | tr \\n ',')
@@ -64,16 +64,6 @@ markdown-lint-fix: ## Fix the markdown files style.
 	markdownlint --version
 	markdownlint --config ./tools/linter/markdownlint/markdown_lint_config.yaml --fix .
 
-.PHONY: newline-check
-newline-check: ## Check the newline
-	@$(LOG_TARGET)
-	python3 tools/scripts/new-line-check.py check
-
-.PHONY: newline-fix
-newline-fix: ## Fix the newline
-	@$(LOG_TARGET)
-	python3 tools/scripts/new-line-check.py fix
-
 .PHONY: secrets-check
 secrets-check: ## Check the secrets
 	@$(LOG_TARGET)