Merge pull request '#347 add Sort Labels' (#47 ) from kgorbunov/micro-tracer-opentracing:#347-v3 into v3

Reviewed-on: #47
#347 add Sort Labels
2024-09-16 15:01:07 +03:00 · 2024-09-16 14:55:01 +03:00 · 2024-07-22 23:39:22 +03:00 · 2024-07-17 17:51:51 +03:00 · 2024-07-17 17:38:14 +03:00 · 2024-07-17 17:37:06 +03:00
7 changed files with 383 additions and 245 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -34,7 +34,7 @@ jobs:
      - name: checkout
        uses: actions/checkout@v3
      - name: lint
-        uses: golangci/golangci-lint-action@v3.3.1
+        uses: golangci/golangci-lint-action@v3.4.0
        continue-on-error: true
        with:
          # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
--- a/.github/workflows/dependabot-automerge.yml
+++ b/.github/workflows/dependabot-automerge.yml
@ -15,7 +15,7 @@ jobs:
    steps:
      - name: metadata
        id: metadata
-        uses: dependabot/fetch-metadata@v1.3.5
+        uses: dependabot/fetch-metadata@v1.3.6
        with:
          github-token: "${{ secrets.TOKEN }}"
      - name: merge
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@ -34,7 +34,7 @@ jobs:
      - name: checkout
        uses: actions/checkout@v3
      - name: lint
-        uses: golangci/golangci-lint-action@v3.3.1
+        uses: golangci/golangci-lint-action@v3.4.0
        continue-on-error: true
        with:
          # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
--- a/go.mod
+++ b/go.mod
@ -1,9 +1,11 @@
 module go.unistack.org/micro-tracer-opentracing/v3

-go 1.16
+go 1.21
+
+toolchain go1.22.2

 require (
 	github.com/opentracing/opentracing-go v1.2.0
-	go.unistack.org/micro/v3 v3.10.4
-	gopkg.in/yaml.v2 v2.4.0 // indirect
+	go.opentelemetry.io/otel v1.28.0
+	go.unistack.org/micro/v3 v3.10.81
 )
--- a/go.sum
+++ b/go.sum
@ -1,156 +1,19 @@
-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.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
-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/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 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/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/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/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=
-github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
-github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
-github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
-github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y=
-go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
-go.unistack.org/micro-proto/v3 v3.3.1/go.mod h1:cwRyv8uInM2I7EbU7O8Fx2Ls3N90Uw9UCCcq4olOdfE=
-go.unistack.org/micro/v3 v3.10.4 h1:8HneC2t7oteTwwkFLmSg5bs62h/OqEzevx/IbXG1vRo=
-go.unistack.org/micro/v3 v3.10.4/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=
+github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
+github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo=
+go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4=
+go.unistack.org/micro/v3 v3.10.81 h1:zHttMUEwL/f9GtrNAQOk8bK0NrEwAuKeUW8DEoywgJI=
+go.unistack.org/micro/v3 v3.10.81/go.mod h1:erMgt3Bl7vQQ0e9UpQyR5NlLiZ9pKeEJ9+1tfYFaqUg=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
--- a/opentracing.go
+++ b/opentracing.go
@ -3,31 +3,38 @@ package opentracing
 import (
 	"context"
 	"errors"
+	"strings"

-	"github.com/opentracing/opentracing-go"
-	"github.com/opentracing/opentracing-go/log"
+	ot "github.com/opentracing/opentracing-go"
+	otlog "github.com/opentracing/opentracing-go/log"
+	"go.opentelemetry.io/otel/attribute"
 	"go.unistack.org/micro/v3/metadata"
 	"go.unistack.org/micro/v3/tracer"
+	"go.unistack.org/micro/v3/util/sort"
 )

 var _ tracer.Tracer = &otTracer{}

 type otTracer struct {
 	opts   tracer.Options
-	tracer opentracing.Tracer
+	tracer ot.Tracer
 }

-func (ot *otTracer) Name() string {
-	return ot.opts.Name
+func (t *otTracer) Name() string {
+	return t.opts.Name
 }

-func (ot *otTracer) Init(opts ...tracer.Option) error {
+func (t *otTracer) Flush(ctx context.Context) error {
+	return nil
+}
+
+func (t *otTracer) Init(opts ...tracer.Option) error {
 	for _, o := range opts {
-		o(&ot.opts)
+		o(&t.opts)
 	}

-	if tr, ok := ot.opts.Context.Value(tracerKey{}).(opentracing.Tracer); ok {
-		ot.tracer = tr
+	if tr, ok := t.opts.Context.Value(tracerKey{}).(ot.Tracer); ok {
+		t.tracer = tr
 	} else {
 		return errors.New("Tracer option missing")
 	}
@ -35,32 +42,113 @@ func (ot *otTracer) Init(opts ...tracer.Option) error {
 	return nil
 }

-func (ot *otTracer) Start(ctx context.Context, name string, opts ...tracer.SpanOption) (context.Context, tracer.Span) {
+type otSpanContext interface {
+	TraceID() idStringer
+	SpanID() idStringer
+}
+
+type jSpanContext interface {
+	TraceID() idStringer
+	SpanID() idStringer
+}
+
+func (t *otTracer) Start(ctx context.Context, name string, opts ...tracer.SpanOption) (context.Context, tracer.Span) {
 	options := tracer.NewSpanOptions(opts...)
-	var span opentracing.Span
-	switch options.Kind {
-	case tracer.SpanKindInternal, tracer.SpanKindUnspecified:
-		ctx, span = ot.startSpanFromContext(ctx, name)
-	case tracer.SpanKindClient, tracer.SpanKindProducer:
-		ctx, span = ot.startSpanFromOutgoingContext(ctx, name)
-	case tracer.SpanKindServer, tracer.SpanKindConsumer:
-		ctx, span = ot.startSpanFromIncomingContext(ctx, ot.tracer, name)
+
+	if len(options.Labels)%2 != 0 {
+		options.Labels = options.Labels[:len(options.Labels)-1]
 	}
-	return ctx, &otSpan{span: span, opts: options}
+
+	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      opentracing.Span
+	span      ot.Span
+	spanID    string
+	traceID   string
+	parentID  string
 	opts      tracer.SpanOptions
 	status    tracer.SpanStatus
 	statusMsg string
+	labels    []interface{}
+	finished  bool
+}
+
+func (os *otSpan) TraceID() string {
+	return os.traceID
+}
+
+func (os *otSpan) SpanID() string {
+	return os.spanID
+}
+
+func (os *otSpan) ParentID() string {
+	return os.parentID
 }

 func (os *otSpan) SetStatus(st tracer.SpanStatus, msg string) {
-	switch st {
-	case tracer.SpanStatusError:
-		os.span.SetTag("error", true)
-	}
 	os.status = st
 	os.statusMsg = msg
 }
@ -74,18 +162,64 @@ func (os *otSpan) Tracer() tracer.Tracer {
 }

 func (os *otSpan) Finish(opts ...tracer.SpanOption) {
-	if len(os.opts.Labels) > 0 {
-		os.span.LogKV(os.opts.Labels...)
+	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.finished = true
 }

 func (os *otSpan) AddEvent(name string, opts ...tracer.EventOption) {
-	os.span.LogFields(log.Event(name))
+	os.span.LogFields(otlog.Event(name))
+}
+
+func (os *otSpan) AddLogs(kv ...interface{}) {
+	os.span.LogKV(kv...)
 }

 func (os *otSpan) Context() context.Context {
-	return opentracing.ContextWithSpan(context.Background(), os.span)
+	return ot.ContextWithSpan(context.Background(), os.span)
 }

 func (os *otSpan) SetName(name string) {
@ -101,7 +235,7 @@ func (os *otSpan) Kind() tracer.SpanKind {
 }

 func (os *otSpan) AddLabels(labels ...interface{}) {
-	os.opts.Labels = append(os.opts.Labels, labels...)
+	os.labels = append(os.labels, labels...)
 }

 func NewTracer(opts ...tracer.Option) *otTracer {
@ -109,75 +243,145 @@ func NewTracer(opts ...tracer.Option) *otTracer {
 	return &otTracer{opts: options}
 }

-func spanFromContext(ctx context.Context) opentracing.Span {
-	return opentracing.SpanFromContext(ctx)
+func (t *otTracer) startSpanFromAny(ctx context.Context, name string, opts ...ot.StartSpanOption) (context.Context, ot.Span) {
+	if tracerSpan, ok := tracer.SpanFromContext(ctx); ok && tracerSpan != nil {
+		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 (ot *otTracer) startSpanFromContext(ctx context.Context, name string, opts ...opentracing.StartSpanOption) (context.Context, opentracing.Span) {
-	if parentSpan := opentracing.SpanFromContext(ctx); parentSpan != nil {
-		opts = append(opts, opentracing.ChildOf(parentSpan.Context()))
+func (t *otTracer) startSpanFromContext(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
+		}
+	}
+
+	if parentSpan != nil {
+		opts = append(opts, ot.ChildOf(parentSpan.Context()))
 	}

 	md := metadata.New(1)

-	sp := ot.tracer.StartSpan(name, opts...)
-	if err := sp.Tracer().Inject(sp.Context(), opentracing.TextMap, opentracing.TextMapCarrier(md)); err != nil {
+	sp := t.tracer.StartSpan(name, opts...)
+	if err := sp.Tracer().Inject(sp.Context(), ot.TextMap, ot.TextMapCarrier(md)); err != nil {
 		return nil, nil
 	}

-	ctx = opentracing.ContextWithSpan(ctx, sp)
+	ctx = ot.ContextWithSpan(ctx, sp)

 	return ctx, sp
 }

-func (ot *otTracer) startSpanFromOutgoingContext(ctx context.Context, name string, opts ...opentracing.StartSpanOption) (context.Context, opentracing.Span) {
-	var parentCtx opentracing.SpanContext
+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 := ot.tracer.Extract(opentracing.TextMap, opentracing.TextMapCarrier(md)); err == nil && ok {
+			if spanCtx, err := t.tracer.Extract(ot.TextMap, ot.TextMapCarrier(md)); err == nil && ok {
 				parentCtx = spanCtx
 			}
 		}

 		if parentCtx != nil {
-		opts = append(opts, opentracing.ChildOf(parentCtx))
+			opts = append(opts, ot.ChildOf(parentCtx))
+		}
 	}

 	nmd := metadata.Copy(md)
+	smd := metadata.New(1)

-	sp := ot.tracer.StartSpan(name, opts...)
-	if err := sp.Tracer().Inject(sp.Context(), opentracing.TextMap, opentracing.TextMapCarrier(nmd)); err != nil {
+	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(opentracing.ContextWithSpan(ctx, sp), nmd)
+	ctx = metadata.NewOutgoingContext(ot.ContextWithSpan(ctx, sp), nmd)

 	return ctx, sp
 }

-func (ot *otTracer) startSpanFromIncomingContext(ctx context.Context, tracer opentracing.Tracer, name string, opts ...opentracing.StartSpanOption) (context.Context, opentracing.Span) {
-	var parentCtx opentracing.SpanContext
+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)
+
+	if parentSpan != nil {
+		opts = append(opts, ot.ChildOf(parentSpan.Context()))
+	} else {
+		var parentCtx ot.SpanContext
+
 		if ok && md != nil {
-		if spanCtx, err := tracer.Extract(opentracing.TextMap, opentracing.TextMapCarrier(md)); err == nil {
+			if spanCtx, err := t.tracer.Extract(ot.TextMap, ot.TextMapCarrier(md)); err == nil {
 				parentCtx = spanCtx
 			}
 		}

 		if parentCtx != nil {
-		opts = append(opts, opentracing.ChildOf(parentCtx))
+			opts = append(opts, ot.ChildOf(parentCtx))
+		}
 	}

 	nmd := metadata.Copy(md)
+	smd := metadata.New(1)

-	sp := tracer.StartSpan(name, opts...)
-	if err := sp.Tracer().Inject(sp.Context(), opentracing.TextMap, opentracing.TextMapCarrier(nmd)); err != nil {
+	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.NewIncomingContext(opentracing.ContextWithSpan(ctx, sp), nmd)
+	ctx = metadata.NewIncomingContext(ot.ContextWithSpan(ctx, sp), nmd)

 	return ctx, sp
 }
--- a/opentracing_test.go
+++ b/opentracing_test.go
@ -2,47 +2,116 @@ package opentracing

 import (
 	"context"
-	"sync"
+	"fmt"
 	"testing"

-	opentracing "github.com/opentracing/opentracing-go"
+	"github.com/opentracing/opentracing-go/mocktracer"
+	// 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/tracer"
 )

-func TestStartSpanFromIncomingContext(t *testing.T) {
-	md := metadata.New(2)
-	md.Set("key", "val")
-
-	var g sync.WaitGroup
-
+func TestNoopTraceID(t *testing.T) {
+	md := metadata.New(1)
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	ctx = metadata.NewIncomingContext(ctx, md)

-	tracer := opentracing.GlobalTracer()
-	ot := &otTracer{tracer: tracer}
-
-	g.Add(8000)
-	cherr := make(chan error)
-	for i := 0; i < 8000; i++ {
-		go func() {
-			defer g.Done()
-			_, sp := ot.startSpanFromIncomingContext(ctx, tracer, "test")
-			sp.Finish()
-		}()
+	tr := NewTracer(Tracer(mocktracer.New()))
+	if err := tr.Init(); err != nil {
+		t.Fatal(err)
 	}

-	for {
-		select {
-		default:
-			g.Wait()
-			close(cherr)
-		case err, ok := <-cherr:
+	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 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 {
 		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)
 	}
 }
Author	SHA1	Message	Date
Василий Толстов	31350e8c21	Merge pull request '#347 add Sort Labels' (#47 ) from kgorbunov/micro-tracer-opentracing:#347-v3 into v3 Some checks failed build / test (push) Failing after 1s Details build / lint (push) Failing after 1s Details codeql / analyze (go) (push) Failing after 1s Details Reviewed-on: #47	2024-09-16 15:01:07 +03:00
Gorbunov Kirill Andreevich	d3d5925747	#347 add Sort Labels Some checks failed autoapprove / autoapprove (pull_request) Failing after 1s Details automerge / automerge (pull_request) Has been skipped Details dependabot-automerge / automerge (pull_request) Has been skipped Details codeql / analyze (go) (pull_request) Has been cancelled Details prbuild / test (pull_request) Has been cancelled Details prbuild / lint (pull_request) Has been cancelled Details	2024-09-16 14:55:01 +03:00
Vasiliy Tolstov	89f75e0431	improve tracing Some checks failed build / test (push) Failing after 26s Details build / lint (push) Successful in 25s Details codeql / analyze (go) (push) Failing after 49s Details Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2024-07-22 23:39:22 +03:00
Vasiliy Tolstov	9f6620676a	get trace info from context Some checks failed build / test (push) Failing after 23s Details build / lint (push) Successful in 22s Details codeql / analyze (go) (push) Failing after 1m0s Details Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2024-07-17 17:51:51 +03:00
Vasiliy Tolstov	e1f85545d9	get trace info from context Some checks failed build / test (push) Waiting to run Details build / lint (push) Successful in 41s Details codeql / analyze (go) (push) Failing after 2m5s Details Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2024-07-17 17:38:14 +03:00
Vasiliy Tolstov	e887edb475	get trace info from context Some checks failed build / test (push) Has been cancelled Details build / lint (push) Has been cancelled Details codeql / analyze (go) (push) Has been cancelled Details Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2024-07-17 17:37:06 +03:00
Vasiliy Tolstov	2149a713d5	support never micro context attrs funcs Some checks failed build / lint (push) Successful in 24s Details build / test (push) Failing after 1m30s Details codeql / analyze (go) (push) Failing after 1m55s Details Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2024-07-06 00:19:38 +03:00
Vasiliy Tolstov	9b553cfa62	add ability to pass span options on finish Some checks failed build / test (push) Failing after 1m38s Details codeql / analyze (go) (push) Failing after 1m54s Details build / lint (push) Successful in 9m17s Details Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2024-05-09 19:30:32 +03:00
Vasiliy Tolstov	65ac3aff56	fixup add labels Some checks failed build / test (push) Failing after 1m43s Details codeql / analyze (go) (push) Failing after 1m43s Details build / lint (push) Successful in 9m13s Details Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2024-05-06 01:09:41 +03:00
Vasiliy Tolstov	e9933df477	add abilit to skip span recording Some checks failed build / test (push) Failing after 1m32s Details codeql / analyze (go) (push) Failing after 1m42s Details build / lint (push) Successful in 9m16s Details Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2024-05-04 19:24:10 +03:00
Vasiliy Tolstov	905910e8ce	avoid duplicate tags Some checks failed build / test (push) Failing after 1m17s Details codeql / analyze (go) (push) Failing after 2m45s Details build / lint (push) Successful in 9m30s Details Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2024-03-17 23:07:06 +03:00
Vasiliy Tolstov	7948652293	fixup labels Some checks failed build / test (push) Failing after 1m13s Details codeql / analyze (go) (push) Failing after 1m46s Details build / lint (push) Successful in 9m14s Details Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2024-03-17 00:51:29 +03:00
Vasiliy Tolstov	54d9857bb9	fixup labels Some checks failed build / test (push) Failing after 1m11s Details codeql / analyze (go) (push) Failing after 1m48s Details build / lint (push) Successful in 9m20s Details Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2024-03-17 00:35:37 +03:00
Vasiliy Tolstov	1e9abb9905	fixup tracing Some checks failed build / test (push) Failing after 1m11s Details codeql / analyze (go) (push) Failing after 1m47s Details build / lint (push) Successful in 9m19s Details Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2024-03-16 23:59:36 +03:00
Vasiliy Tolstov	6b9edf3593	fixup finish Some checks failed build / test (push) Failing after 1m21s Details codeql / analyze (go) (push) Failing after 1m51s Details build / lint (push) Successful in 9m15s Details Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2024-03-15 11:34:31 +03:00
Vasiliy Tolstov	742b86f128	support semconv Some checks failed build / test (push) Failing after 1m9s Details codeql / analyze (go) (push) Failing after 1m48s Details build / lint (push) Successful in 9m16s Details Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2024-03-14 23:35:38 +03:00
Vasiliy Tolstov	474fc506dd	fixup logs Some checks failed build / test (push) Failing after 1m7s Details codeql / analyze (go) (push) Failing after 3m10s Details build / lint (push) Successful in 9m15s Details Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2024-03-12 23:33:59 +03:00
Vasiliy Tolstov	c94af432a0	fixup span tags and logs Some checks failed build / test (push) Failing after 1m49s Details build / lint (push) Successful in 9m49s Details codeql / analyze (go) (push) Failing after 12m46s Details Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2024-03-12 12:38:40 +03:00
Vasiliy Tolstov	3f9704aef8	add new micro tracer methods Some checks failed build / test (push) Failing after 1m13s Details codeql / analyze (go) (push) Failing after 2m31s Details build / lint (push) Successful in 9m26s Details Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2024-03-06 12:36:29 +03:00
Vasiliy Tolstov	5224363bfc	update micro Some checks failed build / test (push) Failing after 58s Details build / lint (push) Successful in 15s Details codeql / analyze (go) (push) Failing after 1m52s Details Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2023-10-12 01:27:42 +03:00
Vasiliy Tolstov	52ec3cf264	add missing tag case messaging.operation Some checks failed build / test (push) Failing after 1m28s Details build / lint (push) Failing after 2m35s Details codeql / analyze (go) (push) Failing after 3m7s Details Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2023-09-01 16:10:08 +03:00
Vasiliy Tolstov	d2b9201423	Merge pull request 'tracer improve' (#44 ) from improve into v3 Some checks failed build / test (push) Failing after 1m28s Details build / lint (push) Failing after 2m40s Details codeql / analyze (go) (push) Failing after 3m10s Details Reviewed-on: #44	2023-09-01 15:41:22 +03:00
Vasiliy Tolstov	6543196faf	tracer improve Some checks failed prbuild / test (pull_request) Failing after 1m29s Details prbuild / lint (pull_request) Failing after 2m42s Details autoapprove / autoapprove (pull_request) Failing after 1m26s Details automerge / automerge (pull_request) Failing after 4s Details codeql / analyze (go) (pull_request) Failing after 3m20s Details dependabot-automerge / automerge (pull_request) Has been skipped Details Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2023-09-01 15:39:30 +03:00
Vasiliy Tolstov	f9dad57eb2	Merge pull request 'fixup span and tags' (#43 ) from fixup into v3 Some checks failed codeql / analyze (go) (push) Failing after 3m3s Details build / test (push) Failing after 1m28s Details build / lint (push) Failing after 2m33s Details Reviewed-on: #43	2023-09-01 08:09:14 +03:00
Vasiliy Tolstov	59283b64c9	fixup span and tags Some checks failed codeql / analyze (go) (pull_request) Failing after 3m7s Details dependabot-automerge / automerge (pull_request) Has been skipped Details prbuild / test (pull_request) Failing after 1m29s Details prbuild / lint (pull_request) Failing after 2m33s Details autoapprove / autoapprove (pull_request) Failing after 1m24s Details automerge / automerge (pull_request) Failing after 3s Details Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2023-09-01 08:08:34 +03:00
Vasiliy Tolstov	4805482921	Merge pull request 'update for latest micro' (#42 ) from micro into v3 Some checks failed build / test (push) Failing after 1m28s Details build / lint (push) Failing after 2m27s Details codeql / analyze (go) (push) Failing after 3m9s Details Reviewed-on: #42	2023-08-02 09:55:13 +03:00
Vasiliy Tolstov	c2225cb92a	update for latest micro Some checks failed autoapprove / autoapprove (pull_request) Failing after 1m25s Details automerge / automerge (pull_request) Failing after 4s Details codeql / analyze (go) (pull_request) Failing after 3m4s Details dependabot-automerge / automerge (pull_request) Has been skipped Details prbuild / test (pull_request) Failing after 1m29s Details prbuild / lint (pull_request) Failing after 2m39s Details Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2023-08-02 09:50:36 +03:00
Vasiliy Tolstov	d0ff8fe540	Merge pull request #44 from unistack-org/dependabot/go_modules/go.unistack.org/micro/v3-3.10.19 Some checks failed build / test (push) Failing after 1m28s Details build / lint (push) Failing after 2m39s Details codeql / analyze (go) (push) Failing after 3m8s Details Bump go.unistack.org/micro/v3 from 3.10.18 to 3.10.19	2023-04-03 06:01:58 +03:00
dependabot[bot]	ef99c90bd5	Bump go.unistack.org/micro/v3 from 3.10.18 to 3.10.19 Bumps go.unistack.org/micro/v3 from 3.10.18 to 3.10.19. --- updated-dependencies: - dependency-name: go.unistack.org/micro/v3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2023-04-03 03:00:38 +00:00
Vasiliy Tolstov	3ec4c658a4	Merge pull request #43 from unistack-org/dependabot/go_modules/go.unistack.org/micro/v3-3.10.18 Bump go.unistack.org/micro/v3 from 3.10.17 to 3.10.18	2023-03-17 06:01:49 +03:00
dependabot[bot]	2ed758091d	Bump go.unistack.org/micro/v3 from 3.10.17 to 3.10.18 Bumps go.unistack.org/micro/v3 from 3.10.17 to 3.10.18. --- updated-dependencies: - dependency-name: go.unistack.org/micro/v3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2023-03-17 03:00:14 +00:00
Vasiliy Tolstov	a8093dc3e4	Merge pull request #41 from unistack-org/dependabot/go_modules/go.unistack.org/micro/v3-3.10.17 Bump go.unistack.org/micro/v3 from 3.10.16 to 3.10.17	2023-03-16 06:00:42 +03:00
dependabot[bot]	ec1cad87ce	Bump go.unistack.org/micro/v3 from 3.10.16 to 3.10.17 Bumps go.unistack.org/micro/v3 from 3.10.16 to 3.10.17. --- updated-dependencies: - dependency-name: go.unistack.org/micro/v3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2023-03-16 02:59:32 +00:00
Vasiliy Tolstov	be1af0ef92	Merge pull request #40 from unistack-org/dependabot/go_modules/go.unistack.org/micro/v3-3.10.16 Bump go.unistack.org/micro/v3 from 3.10.14 to 3.10.16	2023-03-15 06:01:07 +03:00
dependabot[bot]	ae9cb3c9b3	Bump go.unistack.org/micro/v3 from 3.10.14 to 3.10.16 Bumps go.unistack.org/micro/v3 from 3.10.14 to 3.10.16. --- updated-dependencies: - dependency-name: go.unistack.org/micro/v3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2023-03-15 02:59:27 +00:00
Vasiliy Tolstov	3a23fdebe3	Merge pull request #39 from unistack-org/dependabot/go_modules/go.unistack.org/micro/v3-3.10.14 Bump go.unistack.org/micro/v3 from 3.10.13 to 3.10.14	2023-02-27 06:24:29 +03:00
dependabot[bot]	1f5f2a6a6e	Bump go.unistack.org/micro/v3 from 3.10.13 to 3.10.14 Bumps [go.unistack.org/micro/v3](https://github.com/unistack-org/micro) from 3.10.13 to 3.10.14. - [Release notes](https://github.com/unistack-org/micro/releases) - [Commits](https://github.com/unistack-org/micro/compare/v3.10.13...v3.10.14) --- updated-dependencies: - dependency-name: go.unistack.org/micro/v3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2023-02-27 03:23:11 +00:00
Vasiliy Tolstov	4f619068c2	Merge pull request #38 from unistack-org/dependabot/go_modules/go.unistack.org/micro/v3-3.10.13 Bump go.unistack.org/micro/v3 from 3.10.11 to 3.10.13	2023-02-22 05:26:53 +03:00
dependabot[bot]	4eb2fc6175	Bump go.unistack.org/micro/v3 from 3.10.11 to 3.10.13 Bumps [go.unistack.org/micro/v3](https://github.com/unistack-org/micro) from 3.10.11 to 3.10.13. - [Release notes](https://github.com/unistack-org/micro/releases) - [Commits](https://github.com/unistack-org/micro/compare/v3.10.11...v3.10.13) --- updated-dependencies: - dependency-name: go.unistack.org/micro/v3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2023-02-22 02:25:25 +00:00
Vasiliy Tolstov	27fdf8012d	Merge pull request #37 from unistack-org/dependabot/go_modules/go.unistack.org/micro/v3-3.10.11 Bump go.unistack.org/micro/v3 from 3.10.9 to 3.10.11	2023-02-14 06:01:02 +03:00
dependabot[bot]	4ba6e22797	Bump go.unistack.org/micro/v3 from 3.10.9 to 3.10.11 Bumps [go.unistack.org/micro/v3](https://github.com/unistack-org/micro) from 3.10.9 to 3.10.11. - [Release notes](https://github.com/unistack-org/micro/releases) - [Commits](https://github.com/unistack-org/micro/compare/v3.10.9...v3.10.11) --- updated-dependencies: - dependency-name: go.unistack.org/micro/v3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2023-02-14 02:59:33 +00:00
Vasiliy Tolstov	fcfcf428d6	Merge pull request #36 from unistack-org/dependabot/go_modules/go.unistack.org/micro/v3-3.10.9 Bump go.unistack.org/micro/v3 from 3.10.8 to 3.10.9	2023-02-09 05:05:01 +03:00
dependabot[bot]	92e14b7114	Bump go.unistack.org/micro/v3 from 3.10.8 to 3.10.9 Bumps [go.unistack.org/micro/v3](https://github.com/unistack-org/micro) from 3.10.8 to 3.10.9. - [Release notes](https://github.com/unistack-org/micro/releases) - [Commits](https://github.com/unistack-org/micro/compare/v3.10.8...v3.10.9) --- updated-dependencies: - dependency-name: go.unistack.org/micro/v3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2023-02-09 02:03:47 +00:00
Vasiliy Tolstov	adf191f873	Merge pull request #35 from unistack-org/dependabot/go_modules/go.unistack.org/micro/v3-3.10.8 Bump go.unistack.org/micro/v3 from 3.10.7 to 3.10.8	2023-02-08 05:06:00 +03:00
dependabot[bot]	e47c8c8547	Bump go.unistack.org/micro/v3 from 3.10.7 to 3.10.8 Bumps [go.unistack.org/micro/v3](https://github.com/unistack-org/micro) from 3.10.7 to 3.10.8. - [Release notes](https://github.com/unistack-org/micro/releases) - [Commits](https://github.com/unistack-org/micro/compare/v3.10.7...v3.10.8) --- updated-dependencies: - dependency-name: go.unistack.org/micro/v3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2023-02-08 02:04:30 +00:00
Vasiliy Tolstov	55acf760e4	Merge pull request #34 from unistack-org/dependabot/go_modules/go.unistack.org/micro/v3-3.10.7 Bump go.unistack.org/micro/v3 from 3.10.5 to 3.10.7	2023-02-07 05:04:57 +03:00
dependabot[bot]	72bfa251ce	Bump go.unistack.org/micro/v3 from 3.10.5 to 3.10.7 Bumps [go.unistack.org/micro/v3](https://github.com/unistack-org/micro) from 3.10.5 to 3.10.7. - [Release notes](https://github.com/unistack-org/micro/releases) - [Commits](https://github.com/unistack-org/micro/compare/v3.10.5...v3.10.7) --- updated-dependencies: - dependency-name: go.unistack.org/micro/v3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2023-02-07 02:03:47 +00:00
Vasiliy Tolstov	de7b903e21	Merge pull request #33 from unistack-org/dependabot/go_modules/go.unistack.org/micro/v3-3.10.5 Bump go.unistack.org/micro/v3 from 3.10.4 to 3.10.5	2023-01-30 05:22:46 +03:00
dependabot[bot]	173e7cc781	Bump go.unistack.org/micro/v3 from 3.10.4 to 3.10.5 Bumps [go.unistack.org/micro/v3](https://github.com/unistack-org/micro) from 3.10.4 to 3.10.5. - [Release notes](https://github.com/unistack-org/micro/releases) - [Commits](https://github.com/unistack-org/micro/compare/v3.10.4...v3.10.5) --- updated-dependencies: - dependency-name: go.unistack.org/micro/v3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2023-01-30 02:21:23 +00:00
dependabot[bot]	e06115aa5c	Bump dependabot/fetch-metadata from 1.3.5 to 1.3.6 (#31 ) Bumps [dependabot/fetch-metadata](https://github.com/dependabot/fetch-metadata) from 1.3.5 to 1.3.6. - [Release notes](https://github.com/dependabot/fetch-metadata/releases) - [Commits](https://github.com/dependabot/fetch-metadata/compare/v1.3.5...v1.3.6) --- updated-dependencies: - dependency-name: dependabot/fetch-metadata dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2023-01-24 10:07:28 +03:00
dependabot[bot]	9eadf06e67	Bump golangci/golangci-lint-action from 3.3.1 to 3.4.0 (#32 ) Bumps [golangci/golangci-lint-action](https://github.com/golangci/golangci-lint-action) from 3.3.1 to 3.4.0. - [Release notes](https://github.com/golangci/golangci-lint-action/releases) - [Commits](https://github.com/golangci/golangci-lint-action/compare/v3.3.1...v3.4.0) --- updated-dependencies: - dependency-name: golangci/golangci-lint-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2023-01-24 09:54:16 +03:00