fix: docker-compose.yaml

.env.docker.compose

@@ -44,7 +44,7 @@ REDIS_MASTER=
 # Config state, if use `disable` the sampler will be closed. use `enable` to enable
 TRACING_STATE=enable
 # Config tracing sampler, suggest 0.01
-TRACING_SAMPLER=0.1
+TRACING_SAMPLER=0.01
 TRACING_ENDPOINT=jaeger:4318
 # Optional: Config Pyroscope
 # Decide whether to enable the service, support : enable, disable.

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:alpine as builder
+FROM golang:1.21-alpine as builder
 
 WORKDIR /build
 

docker-compose.yaml

@@ -86,7 +86,7 @@ services:
       - '--opentsdbListenAddr=:4242'
       - '--httpListenAddr=:8428'
       - '--influxListenAddr=:8089'
-    restart: always
+    restart: unless-stopped
   grafana:
     container_name: "GuGoTik-Extra-Grafana"
     image: grafana/grafana
@@ -99,7 +99,7 @@ services:
   elasticsearch:
     image: elasticsearch:7.17.12
     container_name: "GuGoTik-Extra-ElasticSearch"
-    restart: always
+    restart: unless-stopped
     environment:
       - bootstrap.memory_lock=true
       - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
@@ -119,7 +119,7 @@ services:
   kibana:
     image: kibana:7.17.12
     container_name: "GuGoTik-Extra-Kibana"
-    restart: always
+    restart: unless-stopped
     environment:
       ELASTICSEARCH_HOSTS: http://elasticsearch:9200
       I18N_LOCALE: zh-CN

src/extra/tracing/otel.go

@@ -34,7 +34,7 @@ func SetTraceProvider(name string) (*trace.TracerProvider, error) {
 	if config.EnvCfg.OtelState == "disable" {
 		sampler = trace.NeverSample()
 	} else {
-		sampler = trace.TraceIDRatioBased(config.EnvCfg.OtelSampler)
+		sampler = GetGuGoTikSampler(config.EnvCfg.OtelSampler)
 	}
 
 	tp := trace.NewTracerProvider(

src/extra/tracing/sampler.go

@@ -0,0 +1,55 @@
+package tracing
+
+import (
+	"encoding/binary"
+	"go.opentelemetry.io/otel/sdk/trace"
+	trace2 "go.opentelemetry.io/otel/trace"
+)
+
+type GuGoTikSampler struct {
+	traceIDUpperBound uint64
+}
+
+func GetGuGoTikSampler(fraction float64) trace.Sampler {
+	if fraction >= 1 {
+		return trace.AlwaysSample()
+	}
+
+	if fraction <= 0 {
+		fraction = 0
+	}
+
+	return &GuGoTikSampler{
+		traceIDUpperBound: uint64(fraction * (1 << 63)),
+	}
+}
+
+func (cs *GuGoTikSampler) ShouldSample(p trace.SamplingParameters) trace.SamplingResult {
+	psc := trace2.SpanContextFromContext(p.ParentContext)
+
+	for _, attribute := range p.Attributes {
+		if attribute.Key == "error" {
+			return trace.SamplingResult{
+				Decision:   trace.RecordAndSample,
+				Tracestate: psc.TraceState(),
+			}
+		}
+	}
+
+	x := binary.BigEndian.Uint64(p.TraceID[8:16]) >> 1
+	if x < cs.traceIDUpperBound {
+		return trace.SamplingResult{
+			Decision:   trace.RecordAndSample,
+			Tracestate: psc.TraceState(),
+		}
+	}
+
+	return trace.SamplingResult{
+		Decision:   trace.Drop,
+		Tracestate: psc.TraceState(),
+	}
+}
+
+func (cs *GuGoTikSampler) Description() string {
+	return "GuGoTikSampler"
+}

src/utils/logging/logging.go

@@ -106,11 +106,13 @@ func LogService(name string) *log.Entry {
 func SetSpanError(span trace.Span, err error) {
 	span.RecordError(err)
 	span.SetStatus(codes.Error, "Internal Error")
+	span.SetAttributes(attribute.String("errorMsg", err.Error()))
 }
 
 func SetSpanErrorWithDesc(span trace.Span, err error, desc string) {
 	span.RecordError(err)
 	span.SetStatus(codes.Error, desc)
+	span.SetAttributes(attribute.String("error", err.Error()))
 }
 
 func SetSpanWithHostname(span trace.Span) {