Compare commits
No commits in common. "v3" and "v3.10.0" have entirely different histories.
2
.github/workflows/build.yml
vendored
2
.github/workflows/build.yml
vendored
@ -34,7 +34,7 @@ jobs:
|
|||||||
- name: checkout
|
- name: checkout
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v3
|
||||||
- name: lint
|
- name: lint
|
||||||
uses: golangci/golangci-lint-action@v3.4.0
|
uses: golangci/golangci-lint-action@v3.3.1
|
||||||
continue-on-error: true
|
continue-on-error: true
|
||||||
with:
|
with:
|
||||||
# Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
|
# Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
|
||||||
|
|||||||
2
.github/workflows/dependabot-automerge.yml
vendored
2
.github/workflows/dependabot-automerge.yml
vendored
@ -15,7 +15,7 @@ jobs:
|
|||||||
steps:
|
steps:
|
||||||
- name: metadata
|
- name: metadata
|
||||||
id: metadata
|
id: metadata
|
||||||
uses: dependabot/fetch-metadata@v1.3.6
|
uses: dependabot/fetch-metadata@v1.3.5
|
||||||
with:
|
with:
|
||||||
github-token: "${{ secrets.TOKEN }}"
|
github-token: "${{ secrets.TOKEN }}"
|
||||||
- name: merge
|
- name: merge
|
||||||
|
|||||||
2
.github/workflows/pr.yml
vendored
2
.github/workflows/pr.yml
vendored
@ -34,7 +34,7 @@ jobs:
|
|||||||
- name: checkout
|
- name: checkout
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v3
|
||||||
- name: lint
|
- name: lint
|
||||||
uses: golangci/golangci-lint-action@v3.4.0
|
uses: golangci/golangci-lint-action@v3.3.1
|
||||||
continue-on-error: true
|
continue-on-error: true
|
||||||
with:
|
with:
|
||||||
# Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
|
# Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
|
||||||
|
|||||||
8
go.mod
8
go.mod
@ -1,11 +1,9 @@
|
|||||||
module go.unistack.org/micro-tracer-opentracing/v3
|
module go.unistack.org/micro-tracer-opentracing/v3
|
||||||
|
|
||||||
go 1.21
|
go 1.16
|
||||||
|
|
||||||
toolchain go1.22.2
|
|
||||||
|
|
||||||
require (
|
require (
|
||||||
github.com/opentracing/opentracing-go v1.2.0
|
github.com/opentracing/opentracing-go v1.2.0
|
||||||
go.opentelemetry.io/otel v1.28.0
|
go.unistack.org/micro/v3 v3.10.1
|
||||||
go.unistack.org/micro/v3 v3.10.81
|
gopkg.in/yaml.v2 v2.4.0 // indirect
|
||||||
)
|
)
|
||||||
|
|||||||
157
go.sum
157
go.sum
@ -1,19 +1,156 @@
|
|||||||
|
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
|
||||||
|
cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
|
||||||
|
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
|
||||||
|
github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
|
||||||
|
github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
|
||||||
|
github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0=
|
||||||
|
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
|
||||||
|
github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
|
||||||
|
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
|
||||||
|
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
|
||||||
|
github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
|
||||||
|
github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
|
||||||
|
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
|
||||||
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||||
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
||||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||||
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
|
github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
|
||||||
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
|
github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
|
||||||
|
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
|
||||||
|
github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
|
||||||
|
github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
|
||||||
|
github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ=
|
||||||
|
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
|
||||||
|
github.com/flowstack/go-jsonschema v0.1.1/go.mod h1:yL7fNggx1o8rm9RlgXv7hTBWxdBM0rVwpMwimd3F3N0=
|
||||||
|
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
|
||||||
|
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
|
||||||
|
github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
|
||||||
|
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
|
||||||
|
github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
|
||||||
|
github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
|
||||||
|
github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
|
||||||
|
github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
|
||||||
|
github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
|
||||||
|
github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
|
||||||
|
github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
|
||||||
|
github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
|
||||||
|
github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
|
||||||
|
github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
|
||||||
|
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
|
||||||
|
github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
|
||||||
|
github.com/google/gnostic v0.6.9/go.mod h1:Nm8234We1lq6iB9OmlgNv3nH91XLLVZHCDayfA3xq+E=
|
||||||
|
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
|
||||||
|
github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
|
||||||
|
github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
|
||||||
|
github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
|
||||||
|
github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
|
||||||
|
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
|
||||||
|
github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
|
||||||
|
github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
||||||
|
github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
|
||||||
|
github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg=
|
||||||
|
github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
|
||||||
|
github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
|
||||||
|
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/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
|
||||||
github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs=
|
github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs=
|
||||||
github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc=
|
github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc=
|
||||||
|
github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
|
||||||
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
||||||
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||||
|
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
|
||||||
|
github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
|
||||||
|
github.com/silas/dag v0.0.0-20211117232152-9d50aa809f35/go.mod h1:7RTUFBdIRC9nZ7/3RyRNH1bdqIShrDejd1YbLwgPS+I=
|
||||||
|
github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
|
||||||
|
github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8=
|
||||||
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
||||||
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
|
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
|
||||||
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
|
github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=
|
||||||
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
|
github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
|
||||||
go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo=
|
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
|
||||||
go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4=
|
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
|
||||||
go.unistack.org/micro/v3 v3.10.81 h1:zHttMUEwL/f9GtrNAQOk8bK0NrEwAuKeUW8DEoywgJI=
|
github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y=
|
||||||
go.unistack.org/micro/v3 v3.10.81/go.mod h1:erMgt3Bl7vQQ0e9UpQyR5NlLiZ9pKeEJ9+1tfYFaqUg=
|
go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
|
||||||
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
go.unistack.org/micro-proto/v3 v3.3.1/go.mod h1:cwRyv8uInM2I7EbU7O8Fx2Ls3N90Uw9UCCcq4olOdfE=
|
||||||
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
go.unistack.org/micro/v3 v3.10.1 h1:MbtPj7ueTw4x6lL2Ok2ez70ORyGXBWhxizO5fQsnAA4=
|
||||||
|
go.unistack.org/micro/v3 v3.10.1/go.mod h1:gI4RkJKHLPW7KV6h4+ZBOZD997MRvFRXMPQIHpozikI=
|
||||||
|
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
|
||||||
|
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
|
||||||
|
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
|
||||||
|
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
|
||||||
|
golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
|
||||||
|
golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
|
||||||
|
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
||||||
|
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
||||||
|
golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
||||||
|
golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
||||||
|
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
|
||||||
|
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
|
||||||
|
golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
|
||||||
|
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
|
||||||
|
golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
|
||||||
|
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
|
||||||
|
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
|
||||||
|
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
|
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
|
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
|
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
|
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||||
|
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||||
|
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
|
golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
|
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
|
golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
|
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
|
golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
|
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
|
||||||
|
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||||
|
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
||||||
|
golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
||||||
|
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
||||||
|
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
||||||
|
golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
||||||
|
golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
|
||||||
|
golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
|
||||||
|
golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
|
||||||
|
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||||
|
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||||
|
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
|
||||||
|
google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
|
||||||
|
google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
|
||||||
|
google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
|
||||||
|
google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
|
||||||
|
google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
|
||||||
|
google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
|
||||||
|
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
|
||||||
|
google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
|
||||||
|
google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
|
||||||
|
google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
|
||||||
|
google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
|
||||||
|
google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
|
||||||
|
google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
|
||||||
|
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
|
||||||
|
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
|
||||||
|
google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
|
||||||
|
google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
|
||||||
|
google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
|
||||||
|
google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
|
||||||
|
google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
|
||||||
|
google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
|
||||||
|
google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
|
||||||
|
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
|
||||||
|
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
|
||||||
|
google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
|
||||||
|
google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
|
||||||
|
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||||
|
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||||
|
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
||||||
|
gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
||||||
|
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
|
||||||
|
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
|
||||||
|
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||||
|
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||||
|
gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||||
|
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
|
||||||
|
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
|
||||||
|
|||||||
404
opentracing.go
404
opentracing.go
@ -3,38 +3,31 @@ package opentracing
|
|||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"errors"
|
"errors"
|
||||||
"strings"
|
|
||||||
|
|
||||||
ot "github.com/opentracing/opentracing-go"
|
"github.com/opentracing/opentracing-go"
|
||||||
otlog "github.com/opentracing/opentracing-go/log"
|
"github.com/opentracing/opentracing-go/log"
|
||||||
"go.opentelemetry.io/otel/attribute"
|
|
||||||
"go.unistack.org/micro/v3/metadata"
|
"go.unistack.org/micro/v3/metadata"
|
||||||
"go.unistack.org/micro/v3/tracer"
|
"go.unistack.org/micro/v3/tracer"
|
||||||
"go.unistack.org/micro/v3/util/sort"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
var _ tracer.Tracer = &otTracer{}
|
var _ tracer.Tracer = &opentracingTracer{}
|
||||||
|
|
||||||
type otTracer struct {
|
type opentracingTracer struct {
|
||||||
opts tracer.Options
|
opts tracer.Options
|
||||||
tracer ot.Tracer
|
tracer opentracing.Tracer
|
||||||
}
|
}
|
||||||
|
|
||||||
func (t *otTracer) Name() string {
|
func (ot *opentracingTracer) Name() string {
|
||||||
return t.opts.Name
|
return ot.opts.Name
|
||||||
}
|
}
|
||||||
|
|
||||||
func (t *otTracer) Flush(ctx context.Context) error {
|
func (ot *opentracingTracer) Init(opts ...tracer.Option) error {
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (t *otTracer) Init(opts ...tracer.Option) error {
|
|
||||||
for _, o := range opts {
|
for _, o := range opts {
|
||||||
o(&t.opts)
|
o(&ot.opts)
|
||||||
}
|
}
|
||||||
|
|
||||||
if tr, ok := t.opts.Context.Value(tracerKey{}).(ot.Tracer); ok {
|
if tr, ok := ot.opts.Context.Value(tracerKey{}).(opentracing.Tracer); ok {
|
||||||
t.tracer = tr
|
ot.tracer = tr
|
||||||
} else {
|
} else {
|
||||||
return errors.New("Tracer option missing")
|
return errors.New("Tracer option missing")
|
||||||
}
|
}
|
||||||
@ -42,346 +35,123 @@ func (t *otTracer) Init(opts ...tracer.Option) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
type otSpanContext interface {
|
func (ot *opentracingTracer) Start(ctx context.Context, name string, opts ...tracer.SpanOption) (context.Context, tracer.Span) {
|
||||||
TraceID() idStringer
|
ctx, span, _ := startSpanFromIncomingContext(ctx, ot.tracer, name)
|
||||||
SpanID() idStringer
|
return ctx, &opentracingSpan{span: span}
|
||||||
}
|
}
|
||||||
|
|
||||||
type jSpanContext interface {
|
type opentracingSpan struct {
|
||||||
TraceID() idStringer
|
span opentracing.Span
|
||||||
SpanID() idStringer
|
|
||||||
}
|
|
||||||
|
|
||||||
func (t *otTracer) Start(ctx context.Context, name string, opts ...tracer.SpanOption) (context.Context, tracer.Span) {
|
|
||||||
options := tracer.NewSpanOptions(opts...)
|
|
||||||
|
|
||||||
if len(options.Labels)%2 != 0 {
|
|
||||||
options.Labels = options.Labels[:len(options.Labels)-1]
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, fn := range t.opts.ContextAttrFuncs {
|
|
||||||
options.Labels = append(options.Labels, fn(ctx)...)
|
|
||||||
}
|
|
||||||
|
|
||||||
var span ot.Span
|
|
||||||
switch options.Kind {
|
|
||||||
case tracer.SpanKindUnspecified:
|
|
||||||
ctx, span = t.startSpanFromAny(ctx, name)
|
|
||||||
case tracer.SpanKindInternal:
|
|
||||||
ctx, span = t.startSpanFromContext(ctx, name)
|
|
||||||
case tracer.SpanKindClient, tracer.SpanKindProducer:
|
|
||||||
ctx, span = t.startSpanFromOutgoingContext(ctx, name)
|
|
||||||
case tracer.SpanKindServer, tracer.SpanKindConsumer:
|
|
||||||
ctx, span = t.startSpanFromIncomingContext(ctx, name)
|
|
||||||
}
|
|
||||||
|
|
||||||
sp := &otSpan{span: span, opts: options}
|
|
||||||
|
|
||||||
spctx := span.Context()
|
|
||||||
|
|
||||||
var traceID, spanID, parentID string
|
|
||||||
|
|
||||||
if v, ok := spctx.(otSpanContext); ok {
|
|
||||||
traceID = v.TraceID().String()
|
|
||||||
spanID = v.SpanID().String()
|
|
||||||
} else {
|
|
||||||
carrier := make(map[string]string, 1)
|
|
||||||
_ = span.Tracer().Inject(spctx, ot.TextMap, ot.TextMapCarrier(carrier))
|
|
||||||
for k, v := range carrier {
|
|
||||||
switch k {
|
|
||||||
case "mockpfx-ids-sampled":
|
|
||||||
continue
|
|
||||||
case "mockpfx-ids-spanid":
|
|
||||||
spanID = v
|
|
||||||
case "mockpfx-ids-traceid":
|
|
||||||
traceID = v
|
|
||||||
default: // reasonable default
|
|
||||||
p := strings.Split(v, ":")
|
|
||||||
traceID = p[0]
|
|
||||||
spanID = p[1]
|
|
||||||
parentID = p[2]
|
|
||||||
case "uber-trace-id": // jaeger trace span
|
|
||||||
p := strings.Split(v, ":")
|
|
||||||
traceID = p[0]
|
|
||||||
spanID = p[1]
|
|
||||||
parentID = p[2]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
sp.traceID = traceID
|
|
||||||
sp.spanID = spanID
|
|
||||||
sp.parentID = parentID
|
|
||||||
|
|
||||||
return tracer.NewSpanContext(ctx, sp), sp
|
|
||||||
}
|
|
||||||
|
|
||||||
type idStringer struct {
|
|
||||||
s string
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s idStringer) String() string {
|
|
||||||
return s.s
|
|
||||||
}
|
|
||||||
|
|
||||||
type otSpan struct {
|
|
||||||
span ot.Span
|
|
||||||
spanID string
|
|
||||||
traceID string
|
|
||||||
parentID string
|
|
||||||
opts tracer.SpanOptions
|
|
||||||
status tracer.SpanStatus
|
|
||||||
statusMsg string
|
|
||||||
labels []interface{}
|
labels []interface{}
|
||||||
finished bool
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (os *otSpan) TraceID() string {
|
func (os *opentracingSpan) Tracer() tracer.Tracer {
|
||||||
return os.traceID
|
return &opentracingTracer{tracer: os.span.Tracer()}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (os *otSpan) SpanID() string {
|
func (os *opentracingSpan) Finish(opts ...tracer.SpanOption) {
|
||||||
return os.spanID
|
if len(os.labels) > 0 {
|
||||||
}
|
os.span.LogKV(os.labels...)
|
||||||
|
|
||||||
func (os *otSpan) ParentID() string {
|
|
||||||
return os.parentID
|
|
||||||
}
|
|
||||||
|
|
||||||
func (os *otSpan) SetStatus(st tracer.SpanStatus, msg string) {
|
|
||||||
os.status = st
|
|
||||||
os.statusMsg = msg
|
|
||||||
}
|
|
||||||
|
|
||||||
func (os *otSpan) Status() (tracer.SpanStatus, string) {
|
|
||||||
return os.status, os.statusMsg
|
|
||||||
}
|
|
||||||
|
|
||||||
func (os *otSpan) Tracer() tracer.Tracer {
|
|
||||||
return &otTracer{tracer: os.span.Tracer()}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (os *otSpan) Finish(opts ...tracer.SpanOption) {
|
|
||||||
if os.finished {
|
|
||||||
return
|
|
||||||
}
|
}
|
||||||
|
|
||||||
options := os.opts
|
|
||||||
|
|
||||||
options.Status = os.status
|
|
||||||
options.StatusMsg = os.statusMsg
|
|
||||||
options.Labels = append(options.Labels, os.labels...)
|
|
||||||
|
|
||||||
for _, o := range opts {
|
|
||||||
o(&options)
|
|
||||||
}
|
|
||||||
|
|
||||||
if !options.Record {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
if len(options.Labels)%2 != 0 {
|
|
||||||
options.Labels = options.Labels[:len(options.Labels)-1]
|
|
||||||
}
|
|
||||||
|
|
||||||
os.opts.Labels = sort.Uniq(os.opts.Labels)
|
|
||||||
|
|
||||||
l := len(options.Labels)
|
|
||||||
for idx := 0; idx < l; idx++ {
|
|
||||||
switch lt := options.Labels[idx].(type) {
|
|
||||||
case attribute.KeyValue:
|
|
||||||
os.span.SetTag(string(lt.Key), lt.Value.AsInterface())
|
|
||||||
case string:
|
|
||||||
if l > idx+1 {
|
|
||||||
os.span.SetTag(lt, options.Labels[idx+1])
|
|
||||||
idx++
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if options.Status == tracer.SpanStatusError {
|
|
||||||
os.span.SetTag("error", true)
|
|
||||||
os.span.LogKV("error", options.StatusMsg)
|
|
||||||
}
|
|
||||||
|
|
||||||
os.span.SetTag("span.kind", options.Kind)
|
|
||||||
os.span.Finish()
|
os.span.Finish()
|
||||||
|
|
||||||
os.finished = true
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (os *otSpan) AddEvent(name string, opts ...tracer.EventOption) {
|
func (os *opentracingSpan) AddEvent(name string, opts ...tracer.EventOption) {
|
||||||
os.span.LogFields(otlog.Event(name))
|
os.span.LogFields(log.Event(name))
|
||||||
}
|
}
|
||||||
|
|
||||||
func (os *otSpan) AddLogs(kv ...interface{}) {
|
func (os *opentracingSpan) Context() context.Context {
|
||||||
os.span.LogKV(kv...)
|
return tracer.NewSpanContext(context.Background(), os)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (os *otSpan) Context() context.Context {
|
func (os *opentracingSpan) SetName(name string) {
|
||||||
return ot.ContextWithSpan(context.Background(), os.span)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (os *otSpan) SetName(name string) {
|
|
||||||
os.span = os.span.SetOperationName(name)
|
os.span = os.span.SetOperationName(name)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (os *otSpan) SetLabels(labels ...interface{}) {
|
func (os *opentracingSpan) SetLabels(labels ...interface{}) {
|
||||||
os.opts.Labels = labels
|
os.labels = labels
|
||||||
}
|
}
|
||||||
|
|
||||||
func (os *otSpan) Kind() tracer.SpanKind {
|
func (os *opentracingSpan) AddLabels(labels ...interface{}) {
|
||||||
return os.opts.Kind
|
|
||||||
}
|
|
||||||
|
|
||||||
func (os *otSpan) AddLabels(labels ...interface{}) {
|
|
||||||
os.labels = append(os.labels, labels...)
|
os.labels = append(os.labels, labels...)
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewTracer(opts ...tracer.Option) *otTracer {
|
func NewTracer(opts ...tracer.Option) *opentracingTracer {
|
||||||
options := tracer.NewOptions(opts...)
|
options := tracer.NewOptions(opts...)
|
||||||
return &otTracer{opts: options}
|
return &opentracingTracer{opts: options}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (t *otTracer) startSpanFromAny(ctx context.Context, name string, opts ...ot.StartSpanOption) (context.Context, ot.Span) {
|
func spanFromContext(ctx context.Context) opentracing.Span {
|
||||||
if tracerSpan, ok := tracer.SpanFromContext(ctx); ok && tracerSpan != nil {
|
return opentracing.SpanFromContext(ctx)
|
||||||
return t.startSpanFromContext(ctx, name, opts...)
|
|
||||||
}
|
|
||||||
|
|
||||||
if otSpan := ot.SpanFromContext(ctx); otSpan != nil {
|
|
||||||
return t.startSpanFromContext(ctx, name, opts...)
|
|
||||||
}
|
|
||||||
|
|
||||||
if md, ok := metadata.FromIncomingContext(ctx); ok && md != nil {
|
|
||||||
return t.startSpanFromIncomingContext(ctx, name, opts...)
|
|
||||||
}
|
|
||||||
|
|
||||||
if md, ok := metadata.FromOutgoingContext(ctx); ok && md != nil {
|
|
||||||
return t.startSpanFromOutgoingContext(ctx, name, opts...)
|
|
||||||
}
|
|
||||||
|
|
||||||
return t.startSpanFromContext(ctx, name, opts...)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (t *otTracer) startSpanFromContext(ctx context.Context, name string, opts ...ot.StartSpanOption) (context.Context, ot.Span) {
|
// startSpanFromOutgoingContext returns a new span with the given operation name and options. If a span
|
||||||
var parentSpan ot.Span
|
// is found in the context, it will be used as the parent of the resulting span.
|
||||||
if tracerSpan, ok := tracer.SpanFromContext(ctx); ok && tracerSpan != nil {
|
func startSpanFromOutgoingContext(ctx context.Context, tracer opentracing.Tracer, name string, opts ...opentracing.StartSpanOption) (context.Context, opentracing.Span, error) {
|
||||||
if sp, ok := tracerSpan.(*otSpan); ok {
|
var parentCtx opentracing.SpanContext
|
||||||
parentSpan = sp.span
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if parentSpan == nil {
|
|
||||||
if otSpan := ot.SpanFromContext(ctx); otSpan != nil {
|
|
||||||
parentSpan = otSpan
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if parentSpan != nil {
|
|
||||||
opts = append(opts, ot.ChildOf(parentSpan.Context()))
|
|
||||||
}
|
|
||||||
|
|
||||||
md := metadata.New(1)
|
|
||||||
|
|
||||||
sp := t.tracer.StartSpan(name, opts...)
|
|
||||||
if err := sp.Tracer().Inject(sp.Context(), ot.TextMap, ot.TextMapCarrier(md)); err != nil {
|
|
||||||
return nil, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
ctx = ot.ContextWithSpan(ctx, sp)
|
|
||||||
|
|
||||||
return ctx, sp
|
|
||||||
}
|
|
||||||
|
|
||||||
func (t *otTracer) startSpanFromOutgoingContext(ctx context.Context, name string, opts ...ot.StartSpanOption) (context.Context, ot.Span) {
|
|
||||||
var parentSpan ot.Span
|
|
||||||
if tracerSpan, ok := tracer.SpanFromContext(ctx); ok && tracerSpan != nil {
|
|
||||||
if sp, ok := tracerSpan.(*otSpan); ok {
|
|
||||||
parentSpan = sp.span
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if parentSpan == nil {
|
|
||||||
if otSpan := ot.SpanFromContext(ctx); otSpan != nil {
|
|
||||||
parentSpan = otSpan
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
md, ok := metadata.FromOutgoingContext(ctx)
|
|
||||||
|
|
||||||
if parentSpan != nil {
|
|
||||||
opts = append(opts, ot.ChildOf(parentSpan.Context()))
|
|
||||||
} else {
|
|
||||||
var parentCtx ot.SpanContext
|
|
||||||
|
|
||||||
if ok && md != nil {
|
|
||||||
if spanCtx, err := t.tracer.Extract(ot.TextMap, ot.TextMapCarrier(md)); err == nil && ok {
|
|
||||||
parentCtx = spanCtx
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if parentCtx != nil {
|
|
||||||
opts = append(opts, ot.ChildOf(parentCtx))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
nmd := metadata.Copy(md)
|
|
||||||
smd := metadata.New(1)
|
|
||||||
|
|
||||||
sp := t.tracer.StartSpan(name, opts...)
|
|
||||||
if err := sp.Tracer().Inject(sp.Context(), ot.TextMap, ot.TextMapCarrier(smd)); err != nil {
|
|
||||||
return nil, nil
|
|
||||||
}
|
|
||||||
for k, v := range smd {
|
|
||||||
nmd.Set(k, v)
|
|
||||||
}
|
|
||||||
|
|
||||||
ctx = metadata.NewOutgoingContext(ot.ContextWithSpan(ctx, sp), nmd)
|
|
||||||
|
|
||||||
return ctx, sp
|
|
||||||
}
|
|
||||||
|
|
||||||
func (t *otTracer) startSpanFromIncomingContext(ctx context.Context, name string, opts ...ot.StartSpanOption) (context.Context, ot.Span) {
|
|
||||||
var parentSpan ot.Span
|
|
||||||
if tracerSpan, ok := tracer.SpanFromContext(ctx); ok && tracerSpan != nil {
|
|
||||||
if sp, ok := tracerSpan.(*otSpan); ok {
|
|
||||||
parentSpan = sp.span
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if parentSpan == nil {
|
|
||||||
if otSpan := ot.SpanFromContext(ctx); otSpan != nil {
|
|
||||||
parentSpan = otSpan
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
md, ok := metadata.FromIncomingContext(ctx)
|
md, ok := metadata.FromIncomingContext(ctx)
|
||||||
|
// Find parent span.
|
||||||
if parentSpan != nil {
|
if parentSpan := opentracing.SpanFromContext(ctx); parentSpan != nil {
|
||||||
opts = append(opts, ot.ChildOf(parentSpan.Context()))
|
// First try to get span within current service boundary.
|
||||||
} else {
|
parentCtx = parentSpan.Context()
|
||||||
var parentCtx ot.SpanContext
|
} else if spanCtx, err := tracer.Extract(opentracing.TextMap, opentracing.TextMapCarrier(md)); err == nil && ok {
|
||||||
|
// If there doesn't exist, try to get it from metadata(which is cross boundary)
|
||||||
if ok && md != nil {
|
|
||||||
if spanCtx, err := t.tracer.Extract(ot.TextMap, ot.TextMapCarrier(md)); err == nil {
|
|
||||||
parentCtx = spanCtx
|
parentCtx = spanCtx
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
if parentCtx != nil {
|
if parentCtx != nil {
|
||||||
opts = append(opts, ot.ChildOf(parentCtx))
|
opts = append(opts, opentracing.ChildOf(parentCtx))
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
nmd := metadata.Copy(md)
|
nmd := metadata.Copy(md)
|
||||||
smd := metadata.New(1)
|
|
||||||
|
|
||||||
sp := t.tracer.StartSpan(name, opts...)
|
sp := tracer.StartSpan(name, opts...)
|
||||||
if err := sp.Tracer().Inject(sp.Context(), ot.TextMap, ot.TextMapCarrier(smd)); err != nil {
|
if err := sp.Tracer().Inject(sp.Context(), opentracing.TextMap, opentracing.TextMapCarrier(nmd)); err != nil {
|
||||||
return nil, nil
|
return nil, nil, err
|
||||||
}
|
}
|
||||||
for k, v := range smd {
|
|
||||||
|
ctx = metadata.NewOutgoingContext(opentracing.ContextWithSpan(ctx, sp), nmd)
|
||||||
|
|
||||||
|
return ctx, sp, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// startSpanFromIncomingContext returns a new span with the given operation name and options. If a span
|
||||||
|
// is found in the context, it will be used as the parent of the resulting span.
|
||||||
|
func startSpanFromIncomingContext(ctx context.Context, tracer opentracing.Tracer, name string, opts ...opentracing.StartSpanOption) (context.Context, opentracing.Span, error) {
|
||||||
|
var parentCtx opentracing.SpanContext
|
||||||
|
|
||||||
|
// Find parent span.
|
||||||
|
md, ok := metadata.FromIncomingContext(ctx)
|
||||||
|
if parentSpan := opentracing.SpanFromContext(ctx); parentSpan != nil {
|
||||||
|
// First try to get span within current service boundary.
|
||||||
|
parentCtx = parentSpan.Context()
|
||||||
|
} else if spanCtx, err := tracer.Extract(opentracing.TextMap, opentracing.TextMapCarrier(md)); err == nil && ok {
|
||||||
|
// If there doesn't exist, try to get it from metadata(which is cross boundary)
|
||||||
|
parentCtx = spanCtx
|
||||||
|
}
|
||||||
|
|
||||||
|
if parentCtx != nil {
|
||||||
|
opts = append(opts, opentracing.ChildOf(parentCtx))
|
||||||
|
}
|
||||||
|
|
||||||
|
var nmd metadata.Metadata
|
||||||
|
if ok {
|
||||||
|
nmd = metadata.New(len(md))
|
||||||
|
} else {
|
||||||
|
nmd = metadata.New(0)
|
||||||
|
}
|
||||||
|
|
||||||
|
sp := tracer.StartSpan(name, opts...)
|
||||||
|
if err := sp.Tracer().Inject(sp.Context(), opentracing.TextMap, opentracing.TextMapCarrier(nmd)); err != nil {
|
||||||
|
return nil, nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
for k, v := range md {
|
||||||
nmd.Set(k, v)
|
nmd.Set(k, v)
|
||||||
}
|
}
|
||||||
|
|
||||||
ctx = metadata.NewIncomingContext(ot.ContextWithSpan(ctx, sp), nmd)
|
ctx = metadata.NewIncomingContext(opentracing.ContextWithSpan(ctx, sp), nmd)
|
||||||
|
|
||||||
return ctx, sp
|
return ctx, sp, nil
|
||||||
}
|
}
|
||||||
|
|||||||
@ -2,116 +2,49 @@ package opentracing
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"fmt"
|
"sync"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"github.com/opentracing/opentracing-go/mocktracer"
|
opentracing "github.com/opentracing/opentracing-go"
|
||||||
// jconfig "github.com/uber/jaeger-client-go/config"
|
|
||||||
"go.unistack.org/micro/v3/logger/slog"
|
|
||||||
"go.unistack.org/micro/v3/metadata"
|
"go.unistack.org/micro/v3/metadata"
|
||||||
"go.unistack.org/micro/v3/tracer"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestNoopTraceID(t *testing.T) {
|
func TestStartSpanFromIncomingContext(t *testing.T) {
|
||||||
md := metadata.New(1)
|
md := metadata.New(2)
|
||||||
|
md.Set("key", "val")
|
||||||
|
|
||||||
|
var g sync.WaitGroup
|
||||||
|
|
||||||
ctx, cancel := context.WithCancel(context.Background())
|
ctx, cancel := context.WithCancel(context.Background())
|
||||||
defer cancel()
|
defer cancel()
|
||||||
ctx = metadata.NewIncomingContext(ctx, md)
|
ctx = metadata.NewIncomingContext(ctx, md)
|
||||||
|
|
||||||
tr := NewTracer(Tracer(mocktracer.New()))
|
tracer := opentracing.GlobalTracer()
|
||||||
if err := tr.Init(); err != nil {
|
|
||||||
t.Fatal(err)
|
g.Add(8000)
|
||||||
|
cherr := make(chan error)
|
||||||
|
for i := 0; i < 8000; i++ {
|
||||||
|
go func() {
|
||||||
|
defer g.Done()
|
||||||
|
_, sp, err := startSpanFromIncomingContext(ctx, tracer, "test")
|
||||||
|
if err != nil {
|
||||||
|
cherr <- err
|
||||||
|
}
|
||||||
|
sp.Finish()
|
||||||
|
}()
|
||||||
}
|
}
|
||||||
|
|
||||||
var sp tracer.Span
|
for {
|
||||||
|
select {
|
||||||
ctx, sp = tr.Start(ctx, "test")
|
default:
|
||||||
if v := sp.TraceID(); v != "43" {
|
g.Wait()
|
||||||
t.Fatalf("invalid span trace id %#+v", v)
|
close(cherr)
|
||||||
}
|
case err, ok := <-cherr:
|
||||||
if v := sp.SpanID(); v != "44" {
|
|
||||||
t.Fatalf("invalid span span id %#+v", v)
|
|
||||||
}
|
|
||||||
|
|
||||||
l := slog.NewLogger()
|
|
||||||
if err := l.Init(); err != nil {
|
|
||||||
t.Fatal(err)
|
|
||||||
}
|
|
||||||
l.Info(ctx, "msg")
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
func TestRealTraceID(t *testing.T) {
|
|
||||||
md := metadata.New(1)
|
|
||||||
ctx, cancel := context.WithCancel(context.Background())
|
|
||||||
defer cancel()
|
|
||||||
ctx = metadata.NewIncomingContext(ctx, md)
|
|
||||||
|
|
||||||
jcfg := &jconfig.Configuration{
|
|
||||||
ServiceName: "test",
|
|
||||||
Sampler: &jconfig.SamplerConfig{
|
|
||||||
Type: "const",
|
|
||||||
Param: 1,
|
|
||||||
},
|
|
||||||
Reporter: &jconfig.ReporterConfig{
|
|
||||||
LogSpans: true,
|
|
||||||
QueueSize: 100,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
jtr, closer, err := jcfg.NewTracer()
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
|
} else if !ok {
|
||||||
|
return
|
||||||
}
|
}
|
||||||
defer closer.Close()
|
|
||||||
|
|
||||||
tr := NewTracer(Tracer(jtr))
|
|
||||||
if err := tr.Init(); err != nil {
|
|
||||||
t.Fatal(err)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
var sp tracer.Span
|
|
||||||
|
|
||||||
ctx, sp = tr.Start(ctx, "test")
|
|
||||||
if v := sp.TraceID(); v != "43" {
|
|
||||||
t.Fatalf("invalid span trace id %#+v", v)
|
|
||||||
}
|
|
||||||
if v := sp.SpanID(); v != "44" {
|
|
||||||
t.Fatalf("invalid span span id %#+v", v)
|
|
||||||
}
|
|
||||||
|
|
||||||
l := slog.NewLogger()
|
|
||||||
if err := l.Init(); err != nil {
|
|
||||||
t.Fatal(err)
|
|
||||||
}
|
|
||||||
l.Info(ctx, "msg")
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
|
|
||||||
func TestTraceTags(t *testing.T) {
|
|
||||||
md := metadata.New(1)
|
|
||||||
ctx, cancel := context.WithCancel(context.Background())
|
|
||||||
defer cancel()
|
|
||||||
ctx = metadata.NewIncomingContext(ctx, md)
|
|
||||||
|
|
||||||
mtr := mocktracer.New()
|
|
||||||
tr := NewTracer(Tracer(mtr))
|
|
||||||
if err := tr.Init(); err != nil {
|
|
||||||
t.Fatal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
var sp tracer.Span
|
|
||||||
|
|
||||||
ctx, sp = tr.Start(ctx, "test", tracer.WithSpanLabels("key", "val", "odd"))
|
|
||||||
sp.Finish(tracer.WithSpanLabels("xkey", "xval"))
|
|
||||||
_ = ctx
|
|
||||||
msp := mtr.FinishedSpans()[0]
|
|
||||||
|
|
||||||
if "val" != fmt.Sprintf("%v", msp.Tags()["key"]) {
|
|
||||||
t.Fatal("mock span invalid")
|
|
||||||
}
|
|
||||||
|
|
||||||
if "xval" != fmt.Sprintf("%v", msp.Tags()["xkey"]) {
|
|
||||||
t.Fatalf("mock span invalid %#+v", msp)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user