Merge pull request #70 from getlantern/fix-build-3

fix build

Author: AGMETEOR

.github/workflows/push.yaml

@@ -55,6 +55,5 @@ jobs:
           build-args: |
             VERSION=${{ github.ref_name }}
             COMMIT=${{ github.sha }}
-            BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')
           tags: |
             us-docker.pkg.dev/lantern-cloud/containers/sing-box:latest

.github/workflows/push_branch.yaml

@@ -43,6 +43,5 @@ jobs:
           build-args: |
             VERSION=${{ github.ref_name }}
             COMMIT=${{ github.sha }}
-            BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')
           tags: |
             us-docker.pkg.dev/lantern-cloud/containers/sing-box:${{ github.ref_name }}

Dockerfile

@@ -3,7 +3,6 @@ ARG TARGETOS TARGETARCH
 ARG GOPROXY=""
 ARG VERSION=""
 ARG COMMIT=""
-ARG BUILD_DATE=""
 
 RUN set -ex \
     && apt-get update \
@@ -29,7 +28,7 @@ RUN set -ex \
        fi && \
        echo "Building for $GOOS/$GOARCH using CC=$CC CXX=$CXX" && \
        go build -v -tags "with_gvisor,with_quic,with_dhcp,with_wireguard,with_utls,with_acme,with_clash_api" \
-       -ldflags="-X main.version=${VERSION} -X main.commit=${COMMIT} -X main.buildDate=${BUILD_DATE}" \
+       -ldflags="-X main.version=${VERSION} -X main.commit=${COMMIT}" \
        -o /usr/local/bin/lantern-box ./cmd
 
 FROM debian:bullseye-slim

cmd/cmd_run.go

@@ -113,7 +113,7 @@ func closeMonitor(ctx context.Context) {
 }
 
 func run(configPath string) error {
-	log.Info("build info: version=%s, commit=%s, buildDate=%s", version, commit, buildDate)
+	log.Info("build info: version=%s, commit=%s", version, commit)
 	osSignals := make(chan os.Signal, 1)
 	signal.Notify(osSignals, os.Interrupt, syscall.SIGTERM, syscall.SIGHUP)
 	defer signal.Stop(osSignals)

cmd/main.go

@@ -24,9 +24,8 @@ type ProxyInfo struct {
 
 var globalCtx context.Context
 var (
-	version   string
-	commit    string
-	buildDate string
+	version string
+	commit  string
 )
 
 var rootCmd = &cobra.Command{

otel/otel.go

@@ -6,7 +6,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/getlantern/golog"
+	"github.com/sagernet/sing-box/log"
 	sdkotel "go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp"
@@ -16,10 +16,6 @@ import (
 	semconv "go.opentelemetry.io/otel/semconv/v1.26.0"
 )
 
-var (
-	log = golog.LoggerFor("otel")
-)
-
 type Opts struct {
 	Endpoint         string
 	Headers          map[string]string
@@ -62,7 +58,7 @@ func InitGlobalMeterProvider(opts *Opts) (func(), error) {
 
 	// If endpoint doesn't use port 443, assume insecure (HTTP not HTTPS)
 	if !strings.Contains(opts.Endpoint, ":443") {
-		log.Debugf("Using insecure connection for OTEL metrics endpoint %v", opts.Endpoint)
+		log.Debug("Using insecure connection for OTEL metrics endpoint %v", opts.Endpoint)
 		metricOpts = append(metricOpts, otlpmetrichttp.WithInsecure())
 	}
 
@@ -85,7 +81,7 @@ func InitGlobalMeterProvider(opts *Opts) (func(), error) {
 		defer cancel()
 		err := mp.Shutdown(ctx)
 		if err != nil {
-			log.Errorf("error shutting down meter provider: %v", err)
+			log.Error("error shutting down meter provider: %v", err)
 		}
 	}, nil
 }
@@ -101,19 +97,19 @@ func (opts *Opts) buildResource() *resource.Resource {
 		attributes = append(attributes, attribute.String("track", opts.Track))
 	}
 	if opts.ProxyName != "" {
-		log.Debugf("Will report with proxy.name %v", opts.ProxyName)
+		log.Debug("Will report with proxy.name %v", opts.ProxyName)
 		attributes = append(attributes, attribute.String("proxy.name", opts.ProxyName))
 	}
 	if opts.Provider != "" {
-		log.Debugf("Will report with provider %v", opts.Provider)
+		log.Debug("Will report with provider %v", opts.Provider)
 		attributes = append(attributes, attribute.String("provider", opts.Provider))
 	}
 	if opts.DC != "" {
-		log.Debugf("Will report with dc %v", opts.DC)
+		log.Debug("Will report with dc %v", opts.DC)
 		attributes = append(attributes, attribute.String("dc", opts.DC))
 	}
 	if opts.FrontendProvider != "" {
-		log.Debugf("Will report frontend provider %v in dc %v", opts.FrontendProvider, opts.FrontendDC)
+		log.Debug("Will report frontend provider %v in dc %v", opts.FrontendProvider, opts.FrontendDC)
 		attributes = append(attributes, attribute.String("frontend.provider", opts.FrontendProvider))
 		attributes = append(attributes, attribute.String("frontend.dc", opts.FrontendDC))
 	}