This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch feature-triple
in repository https://gitbox.apache.org/repos/asf/dubbo-go.git
The following commit(s) were added to refs/heads/feature-triple by this push:
new 333be1f84 code format
333be1f84 is described below
commit 333be1f84924dd293582cffccd36bcb1d2bcfe61
Author: chickenlj <[email protected]>
AuthorDate: Wed Oct 11 20:00:21 2023 +0800
code format
---
common/extension/otel_trace.go | 4 ++--
config/otel_config.go | 3 +++
go.mod | 5 ++++-
go.sum | 13 ++++++++++---
imports/imports.go | 3 +--
otel/trace/exporter.go | 4 ++++
otel/trace/jaeger/exporter.go | 9 +++++----
otel/trace/otlp/exporter.go | 11 ++++++-----
otel/trace/stdout/exporter.go | 8 +++++---
otel/trace/zipkin/exporter.go | 9 +++++----
protocol/dubbo3/health/triple_health_v1/health.pb.go | 8 ++++++--
.../dubbo3/health/triple_health_v1/health_triple.pb.go | 15 +++++++++++----
12 files changed, 62 insertions(+), 30 deletions(-)
diff --git a/common/extension/otel_trace.go b/common/extension/otel_trace.go
index f8023d7a0..cee4cea80 100644
--- a/common/extension/otel_trace.go
+++ b/common/extension/otel_trace.go
@@ -22,11 +22,11 @@ import (
)
import (
- "dubbo.apache.org/dubbo-go/v3/otel/trace"
+ "github.com/dubbogo/gost/log/logger"
)
import (
- "github.com/dubbogo/gost/log/logger"
+ "dubbo.apache.org/dubbo-go/v3/otel/trace"
)
var traceExporterMap = make(map[string]func(config *trace.ExporterConfig)
(trace.Exporter, error), 4)
diff --git a/config/otel_config.go b/config/otel_config.go
index 6c819fffd..762a0897f 100644
--- a/config/otel_config.go
+++ b/config/otel_config.go
@@ -19,8 +19,11 @@ package config
import (
"github.com/creasty/defaults"
+
"github.com/dubbogo/gost/log/logger"
+
"github.com/pkg/errors"
+
"go.opentelemetry.io/otel"
)
diff --git a/go.mod b/go.mod
index e64da0801..1c6c70545 100644
--- a/go.mod
+++ b/go.mod
@@ -39,11 +39,13 @@ require (
github.com/influxdata/tdigest v0.0.1
github.com/jinzhu/copier v0.3.5
github.com/knadh/koanf v1.5.0
- github.com/magiconair/properties v1.8.1
+ github.com/kr/pretty v0.3.0 // indirect
+ github.com/magiconair/properties v1.8.5
github.com/mattn/go-colorable v0.1.13
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/mitchellh/mapstructure v1.5.0
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd
+ github.com/nacos-group/nacos-sdk-go v1.0.9 // indirect
github.com/nacos-group/nacos-sdk-go/v2 v2.2.2
github.com/oliveagle/jsonpath v0.0.0-20180606110733-2e52cf6e6852
github.com/opentracing/opentracing-go v1.2.0
@@ -52,6 +54,7 @@ require (
github.com/polarismesh/polaris-go v1.3.0
github.com/prometheus/client_golang v1.13.0
github.com/prometheus/common v0.37.0
+ github.com/rogpeppe/go-internal v1.8.0 // indirect
github.com/sirupsen/logrus v1.8.1
github.com/stretchr/testify v1.8.3
go.etcd.io/etcd/api/v3 v3.5.7
diff --git a/go.sum b/go.sum
index 8a4f0a63b..965544e02 100644
--- a/go.sum
+++ b/go.sum
@@ -927,8 +927,9 @@ github.com/kr/fs v0.1.0/go.mod
h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod
h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
github.com/kr/pretty v0.1.0/go.mod
h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
github.com/kr/pretty v0.2.0/go.mod
h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
-github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
github.com/kr/pretty v0.2.1/go.mod
h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
+github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
+github.com/kr/pretty v0.3.0/go.mod
h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/text v0.1.0/go.mod
h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
@@ -945,8 +946,9 @@ github.com/lufia/plan9stats
v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2
github.com/lyft/protoc-gen-star v0.6.1/go.mod
h1:TGAoBVkt8w7MPG72TrKIu85MIdXwDuzJYeZuUPFPNwA=
github.com/lyft/protoc-gen-star/v2 v2.0.1/go.mod
h1:RcCdONR2ScXaYnQC5tUzxzlpA3WVYF7/opLeUgcQs/o=
github.com/lyft/protoc-gen-validate v0.0.13/go.mod
h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ=
-github.com/magiconair/properties v1.8.1
h1:ZC2Vc7/ZFkGmsVC9KvOjumD+G5lXy2RtTKyzRKO2BQ4=
github.com/magiconair/properties v1.8.1/go.mod
h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
+github.com/magiconair/properties v1.8.5
h1:b6kJs+EmPFMYGkow9GiUyCyOvIwYetYJ3fSaWak/Gls=
+github.com/magiconair/properties v1.8.5/go.mod
h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60=
github.com/mattn/go-colorable v0.0.9/go.mod
h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
github.com/mattn/go-colorable v0.1.4/go.mod
h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
github.com/mattn/go-colorable v0.1.6/go.mod
h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
@@ -1002,8 +1004,9 @@ github.com/mschoch/smat v0.2.0
h1:8imxQsjDm8yFEAVBe7azKmKSgzSkZXDuKkSq9374khM=
github.com/mschoch/smat v0.2.0/go.mod
h1:kc9mz7DoBKqDyiRL7VZN8KvXQMWeTaVnttLRXOlotKw=
github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod
h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod
h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
-github.com/nacos-group/nacos-sdk-go v1.0.8
h1:8pEm05Cdav9sQgJSv5kyvlgfz0SzFUUGI3pWX6SiSnM=
github.com/nacos-group/nacos-sdk-go v1.0.8/go.mod
h1:hlAPn3UdzlxIlSILAyOXKxjFSvDJ9oLzTJ9hLAK1KzA=
+github.com/nacos-group/nacos-sdk-go v1.0.9
h1:sMvrp6tZj4LdhuHRsS4GCqASB81k3pjmT2ykDQQpwt0=
+github.com/nacos-group/nacos-sdk-go v1.0.9/go.mod
h1:hlAPn3UdzlxIlSILAyOXKxjFSvDJ9oLzTJ9hLAK1KzA=
github.com/nacos-group/nacos-sdk-go/v2 v2.1.2/go.mod
h1:ys/1adWeKXXzbNWfRNbaFlX/t6HVLWdpsNDvmoWTw0g=
github.com/nacos-group/nacos-sdk-go/v2 v2.2.2
h1:FI+7vr1fvCA4jbgx36KezmP3zlU/WoP/7wAloaSd1Ew=
github.com/nacos-group/nacos-sdk-go/v2 v2.2.2/go.mod
h1:ys/1adWeKXXzbNWfRNbaFlX/t6HVLWdpsNDvmoWTw0g=
@@ -1062,6 +1065,7 @@ github.com/pierrec/lz4 v2.0.5+incompatible/go.mod
h1:pdkljMzZIN41W+lC3N2tnIh5sFi
github.com/pierrec/lz4 v2.5.2+incompatible/go.mod
h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
github.com/pierrec/lz4 v2.6.1+incompatible
h1:9UY3+iC23yxF0UfGaYrGplQ+79Rg+h/q9FV9ix19jjM=
github.com/pierrec/lz4 v2.6.1+incompatible/go.mod
h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
+github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod
h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
github.com/pkg/errors v0.8.0/go.mod
h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pkg/errors v0.8.1/go.mod
h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
@@ -1133,6 +1137,9 @@ github.com/robfig/cron/v3 v3.0.1/go.mod
h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzG
github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod
h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
github.com/rogpeppe/fastuuid v1.2.0/go.mod
h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
github.com/rogpeppe/go-internal v1.3.0/go.mod
h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
+github.com/rogpeppe/go-internal v1.6.1/go.mod
h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
+github.com/rogpeppe/go-internal v1.8.0
h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUAtL9R8=
+github.com/rogpeppe/go-internal v1.8.0/go.mod
h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE=
github.com/russross/blackfriday/v2 v2.0.1/go.mod
h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
github.com/rwtodd/Go.Sed v0.0.0-20210816025313-55464686f9ef/go.mod
h1:8AEUvGVi2uQ5b24BIhcr0GCcpd/RNAFWaN2CJFrWIIQ=
github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod
h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
diff --git a/imports/imports.go b/imports/imports.go
index 3bc668a4e..595b37c35 100644
--- a/imports/imports.go
+++ b/imports/imports.go
@@ -67,9 +67,8 @@ import (
_ "dubbo.apache.org/dubbo-go/v3/metrics/app_info"
_ "dubbo.apache.org/dubbo-go/v3/metrics/prometheus"
_ "dubbo.apache.org/dubbo-go/v3/otel/trace/jaeger"
- _ "dubbo.apache.org/dubbo-go/v3/otel/trace/zipkin"
- //_ "dubbo.apache.org/dubbo-go/v3/otel/trace/otlp" // FIXME: otlp-grpc
use grpc health check which has the namespace conflict with dubbo3 protocol
_ "dubbo.apache.org/dubbo-go/v3/otel/trace/stdout"
+ _ "dubbo.apache.org/dubbo-go/v3/otel/trace/zipkin"
_ "dubbo.apache.org/dubbo-go/v3/protocol/dubbo"
_ "dubbo.apache.org/dubbo-go/v3/protocol/dubbo3"
_ "dubbo.apache.org/dubbo-go/v3/protocol/dubbo3/health"
diff --git a/otel/trace/exporter.go b/otel/trace/exporter.go
index 454b02a97..74770f7b0 100644
--- a/otel/trace/exporter.go
+++ b/otel/trace/exporter.go
@@ -24,10 +24,14 @@ import (
import (
"github.com/dubbogo/gost/log/logger"
+
"go.opentelemetry.io/contrib/propagators/b3"
+
"go.opentelemetry.io/otel/propagation"
+
"go.opentelemetry.io/otel/sdk/resource"
sdktrace "go.opentelemetry.io/otel/sdk/trace"
+
semconv "go.opentelemetry.io/otel/semconv/v1.7.0"
)
diff --git a/otel/trace/jaeger/exporter.go b/otel/trace/jaeger/exporter.go
index 65a269022..c2969111c 100644
--- a/otel/trace/jaeger/exporter.go
+++ b/otel/trace/jaeger/exporter.go
@@ -22,13 +22,14 @@ import (
)
import (
- "dubbo.apache.org/dubbo-go/v3/common/extension"
- "dubbo.apache.org/dubbo-go/v3/otel/trace"
+ "go.opentelemetry.io/otel/exporters/jaeger"
+
+ sdktrace "go.opentelemetry.io/otel/sdk/trace"
)
import (
- "go.opentelemetry.io/otel/exporters/jaeger"
- sdktrace "go.opentelemetry.io/otel/sdk/trace"
+ "dubbo.apache.org/dubbo-go/v3/common/extension"
+ "dubbo.apache.org/dubbo-go/v3/otel/trace"
)
var (
diff --git a/otel/trace/otlp/exporter.go b/otel/trace/otlp/exporter.go
index 69e2adeb1..3c0c10542 100644
--- a/otel/trace/otlp/exporter.go
+++ b/otel/trace/otlp/exporter.go
@@ -22,18 +22,19 @@ import (
"sync"
)
-import (
- "dubbo.apache.org/dubbo-go/v3/common/extension"
- "dubbo.apache.org/dubbo-go/v3/otel/trace"
-)
-
import (
"go.opentelemetry.io/otel/exporters/otlp/otlptrace"
"go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc"
"go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp"
+
sdktrace "go.opentelemetry.io/otel/sdk/trace"
)
+import (
+ "dubbo.apache.org/dubbo-go/v3/common/extension"
+ "dubbo.apache.org/dubbo-go/v3/otel/trace"
+)
+
var (
initHttpOnce sync.Once
httpInstance *Exporter
diff --git a/otel/trace/stdout/exporter.go b/otel/trace/stdout/exporter.go
index 8024c4d89..7bfdd5c45 100644
--- a/otel/trace/stdout/exporter.go
+++ b/otel/trace/stdout/exporter.go
@@ -22,14 +22,16 @@ import (
)
import (
- "dubbo.apache.org/dubbo-go/v3/common/extension"
- "dubbo.apache.org/dubbo-go/v3/otel/trace"
-
"go.opentelemetry.io/otel/exporters/stdout/stdouttrace"
sdktrace "go.opentelemetry.io/otel/sdk/trace"
)
+import (
+ "dubbo.apache.org/dubbo-go/v3/common/extension"
+ "dubbo.apache.org/dubbo-go/v3/otel/trace"
+)
+
var (
initOnce sync.Once
instance *Exporter
diff --git a/otel/trace/zipkin/exporter.go b/otel/trace/zipkin/exporter.go
index 4068872ce..f70fc67b2 100644
--- a/otel/trace/zipkin/exporter.go
+++ b/otel/trace/zipkin/exporter.go
@@ -22,13 +22,14 @@ import (
)
import (
- "dubbo.apache.org/dubbo-go/v3/common/extension"
- "dubbo.apache.org/dubbo-go/v3/otel/trace"
+ "go.opentelemetry.io/otel/exporters/zipkin"
+
+ sdktrace "go.opentelemetry.io/otel/sdk/trace"
)
import (
- "go.opentelemetry.io/otel/exporters/zipkin"
- sdktrace "go.opentelemetry.io/otel/sdk/trace"
+ "dubbo.apache.org/dubbo-go/v3/common/extension"
+ "dubbo.apache.org/dubbo-go/v3/otel/trace"
)
var (
diff --git a/protocol/dubbo3/health/triple_health_v1/health.pb.go
b/protocol/dubbo3/health/triple_health_v1/health.pb.go
index 499740042..5eaa416d7 100644
--- a/protocol/dubbo3/health/triple_health_v1/health.pb.go
+++ b/protocol/dubbo3/health/triple_health_v1/health.pb.go
@@ -27,12 +27,16 @@
package triple_health_v1
import (
- protoreflect "google.golang.org/protobuf/reflect/protoreflect"
- protoimpl "google.golang.org/protobuf/runtime/protoimpl"
reflect "reflect"
sync "sync"
)
+import (
+ protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+
+ protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+)
+
const (
// Verify that this generated code is sufficiently up-to-date.
_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
diff --git a/protocol/dubbo3/health/triple_health_v1/health_triple.pb.go
b/protocol/dubbo3/health/triple_health_v1/health_triple.pb.go
index 00633ccfa..d177190d8 100644
--- a/protocol/dubbo3/health/triple_health_v1/health_triple.pb.go
+++ b/protocol/dubbo3/health/triple_health_v1/health_triple.pb.go
@@ -25,20 +25,27 @@ package triple_health_v1
import (
context "context"
- constant1 "dubbo.apache.org/dubbo-go/v3/common/constant"
- protocol "dubbo.apache.org/dubbo-go/v3/protocol"
- dubbo3 "dubbo.apache.org/dubbo-go/v3/protocol/dubbo3"
- invocation "dubbo.apache.org/dubbo-go/v3/protocol/invocation"
fmt "fmt"
+)
+
+import (
grpc_go "github.com/dubbogo/grpc-go"
codes "github.com/dubbogo/grpc-go/codes"
metadata "github.com/dubbogo/grpc-go/metadata"
status "github.com/dubbogo/grpc-go/status"
+
common "github.com/dubbogo/triple/pkg/common"
constant "github.com/dubbogo/triple/pkg/common/constant"
triple "github.com/dubbogo/triple/pkg/triple"
)
+import (
+ constant1 "dubbo.apache.org/dubbo-go/v3/common/constant"
+ protocol "dubbo.apache.org/dubbo-go/v3/protocol"
+ dubbo3 "dubbo.apache.org/dubbo-go/v3/protocol/dubbo3"
+ invocation "dubbo.apache.org/dubbo-go/v3/protocol/invocation"
+)
+
// This is a compile-time assertion to ensure that this generated file
// is compatible with the grpc package it is being compiled against.
const _ = grpc_go.SupportPackageIsVersion7
