Merge pull request 'Update workflows' (#48) from atolstikhin/micro-tracer-opentracing:master into master

Reviewed-on: #48

.gitea/workflows/job_lint.yml

@@ -0,0 +1,29 @@
+name: lint
+
+on:
+  pull_request:
+    types: [opened, reopened, synchronize]
+    branches:
+    - master
+    - v3
+    - v4
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+    - name: checkout code
+      uses: actions/checkout@v4
+      with:
+        filter: 'blob:none'
+    - name: setup go
+      uses: actions/setup-go@v5
+      with:
+        cache-dependency-path: "**/*.sum"
+        go-version: 'stable' 
+    - name: setup deps
+      run: go get -v ./...
+    - name: run lint
+      uses: https://github.com/golangci/golangci-lint-action@v6
+      with:
+        version: 'latest'

.gitea/workflows/job_test.yml

@@ -0,0 +1,34 @@
+name: test
+
+on:
+  pull_request:
+    types: [opened, reopened, synchronize]
+    branches:
+    - master
+    - v3
+    - v4
+  push:
+    branches:
+    - master
+    - v3
+    - v4
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+    - name: checkout code
+      uses: actions/checkout@v4
+      with:
+        filter: 'blob:none'
+    - name: setup go
+      uses: actions/setup-go@v5
+      with:
+        cache-dependency-path: "**/*.sum"
+        go-version: 'stable'
+    - name: setup deps
+      run: go get -v ./...
+    - name: run test
+      env:
+        INTEGRATION_TESTS: yes
+      run: go test -mod readonly -v ./...

.gitea/workflows/job_tests.yml

@@ -0,0 +1,53 @@
+name: test
+
+on:
+  pull_request:
+    types: [opened, reopened, synchronize]
+    branches:
+    - master
+    - v3
+    - v4
+  push:
+    branches:
+    - master
+    - v3
+    - v4
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+    - name: checkout code
+      uses: actions/checkout@v4
+      with:
+        filter: 'blob:none'
+    - name: checkout tests
+      uses: actions/checkout@v4
+      with:
+        ref: master
+        filter: 'blob:none'
+        repository: unistack-org/micro-tests
+        path: micro-tests
+    - name: setup go
+      uses: actions/setup-go@v5
+      with:
+        cache-dependency-path: "**/*.sum"
+        go-version: 'stable'
+    - name: setup go work
+      env:
+        GOWORK: /workspace/${{ github.repository_owner }}/go.work
+      run: |
+        go work init
+        go work use .
+        go work use micro-tests
+    - name: setup deps
+      env:
+        GOWORK: /workspace/${{ github.repository_owner }}/go.work
+      run: go get -v ./...
+    - name: run tests
+      env:
+        INTEGRATION_TESTS: yes
+        GOWORK: /workspace/${{ github.repository_owner }}/go.work
+      run: |
+        cd micro-tests
+        go test -mod readonly -v ./... || true

.github/dependabot.yml

@@ -1,19 +0,0 @@
-# To get started with Dependabot version updates, you'll need to specify which
-# package ecosystems to update and where the package manifests are located.
-# Please see the documentation for all configuration options:
-# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
-
-version: 2
-updates:
-
-  # Maintain dependencies for GitHub Actions
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "daily"
-
-  # Maintain dependencies for Golang
-  - package-ecosystem: "gomod"
-    directory: "/"
-    schedule:
-      interval: "daily"

.github/workflows/autoapprove.yml

@@ -1,20 +0,0 @@
-name: "autoapprove"
-
-on:
-  pull_request_target:
-    types: [assigned, opened, synchronize, reopened]
-
-permissions:
-  pull-requests: write
-  contents: write
-
-jobs:
-  autoapprove:
-    runs-on: ubuntu-latest
-    steps:
-      - name: approve
-        uses: hmarr/auto-approve-action@v3
-        if: github.actor == 'vtolstov' || github.actor == 'dependabot[bot]'
-        id: approve
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/automerge.yml

@@ -1,21 +0,0 @@
-name: "automerge"
-
-on:
-  pull_request_target:
-    types: [assigned, opened, synchronize, reopened]
-
-permissions:
-  pull-requests: write
-  contents: write
-
-jobs:
-  automerge:
-    runs-on: ubuntu-latest
-    if: github.actor == 'vtolstov'
-    steps:
-      - name: merge
-        id: merge
-        run: gh pr merge --auto --merge "$PR_URL"
-        env:
-          PR_URL: ${{github.event.pull_request.html_url}}
-          GITHUB_TOKEN: ${{secrets.TOKEN}}

.github/workflows/build.yml

@@ -1,47 +0,0 @@
-name: build
-on:
- push:
-    branches:
-    - master
-    - v3
-jobs:
-  test:
-    name: test
-    runs-on: ubuntu-latest
-    steps:
-    - name: setup
-      uses: actions/setup-go@v3
-      with:
-        go-version: 1.17
-    - name: checkout
-      uses: actions/checkout@v3
-    - name: cache
-      uses: actions/cache@v3
-      with:
-        path: ~/go/pkg/mod
-        key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-        restore-keys: ${{ runner.os }}-go-
-    - name: deps
-      run: go get -v -t -d ./...
-    - name: test
-      env:
-        INTEGRATION_TESTS: yes
-      run: go test -mod readonly -v ./...
-  lint:
-    name: lint
-    runs-on: ubuntu-latest
-    steps:
-      - name: checkout
-        uses: actions/checkout@v3
-      - name: lint
-        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.
-          version: v1.30
-          # Optional: working directory, useful for monorepos
-          # working-directory: somedir
-          # Optional: golangci-lint command line arguments.
-          # args: --issues-exit-code=0
-          # Optional: show only new issues if it's a pull request. The default value is `false`.
-          # only-new-issues: true

.github/workflows/codeql-analysis.yml

@@ -1,78 +0,0 @@
-# For most projects, this workflow file will not need changing; you simply need
-# to commit it to your repository.
-#
-# You may wish to alter this file to override the set of languages analyzed,
-# or to provide custom queries or build logic.
-#
-# ******** NOTE ********
-# We have attempted to detect the languages in your repository. Please check
-# the `language` matrix defined below to confirm you have the correct set of
-# supported CodeQL languages.
-#
-name: "codeql"
-
-on:
-  workflow_run:
-    workflows: ["prbuild"]
-    types:
-      - completed
-  push:
-    branches: [ master, v3 ]
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [ master, v3 ]
-  schedule:
-    - cron: '34 1 * * 0'
-
-jobs:
-  analyze:
-    name: analyze
-    runs-on: ubuntu-latest
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
-
-    strategy:
-      fail-fast: false
-      matrix:
-        language: [ 'go' ]
-        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
-        # Learn more:
-        # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
-
-    steps:
-    - name: checkout
-      uses: actions/checkout@v3
-    - name: setup
-      uses: actions/setup-go@v3
-      with:
-        go-version: 1.17
-    # Initializes the CodeQL tools for scanning.
-    - name: init
-      uses: github/codeql-action/init@v2
-      with:
-        languages: ${{ matrix.language }}
-        # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file.
-        # Prefix the list here with "+" to use these queries and those in the config file.
-        # queries: ./path/to/local/query, your-org/your-repo/queries@main
-
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-    # If this step fails, then you should remove it and run the build manually (see below)
-    - name: autobuild
-      uses: github/codeql-action/autobuild@v2
-
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 https://git.io/JvXDl
-
-    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-    #    and modify them (or add more) to build your code if your project
-    #    uses a compiled language
-
-    #- run: |
-    #   make bootstrap
-    #   make release
-
-    - name: analyze
-      uses: github/codeql-action/analyze@v2

.github/workflows/dependabot-automerge.yml

@@ -1,27 +0,0 @@
-name: "dependabot-automerge"
-
-on:
-  pull_request_target:
-    types: [assigned, opened, synchronize, reopened]
-
-permissions:
-  pull-requests: write
-  contents: write
-
-jobs:
-  automerge:
-    runs-on: ubuntu-latest
-    if: github.actor == 'dependabot[bot]'
-    steps:
-      - name: metadata
-        id: metadata
-        uses: dependabot/fetch-metadata@v1.3.6
-        with:
-          github-token: "${{ secrets.TOKEN }}"
-      - name: merge
-        id: merge
-        if: ${{contains(steps.metadata.outputs.dependency-names, 'go.unistack.org')}}
-        run: gh pr merge --auto --merge "$PR_URL"
-        env:
-          PR_URL: ${{github.event.pull_request.html_url}}
-          GITHUB_TOKEN: ${{secrets.TOKEN}}

.github/workflows/pr.yml

@@ -1,47 +0,0 @@
-name: prbuild
-on:
-  pull_request:
-    branches:
-    - master
-    - v3
-jobs:
-  test:
-    name: test
-    runs-on: ubuntu-latest
-    steps:
-    - name: setup
-      uses: actions/setup-go@v3
-      with:
-        go-version: 1.17
-    - name: checkout
-      uses: actions/checkout@v3
-    - name: cache
-      uses: actions/cache@v3
-      with:
-        path: ~/go/pkg/mod
-        key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-        restore-keys: ${{ runner.os }}-go-
-    - name: deps
-      run: go get -v -t -d ./...
-    - name: test
-      env:
-        INTEGRATION_TESTS: yes
-      run: go test -mod readonly -v ./...
-  lint:
-    name: lint
-    runs-on: ubuntu-latest
-    steps:
-      - name: checkout
-        uses: actions/checkout@v3
-      - name: lint
-        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.
-          version: v1.30
-          # Optional: working directory, useful for monorepos
-          # working-directory: somedir
-          # Optional: golangci-lint command line arguments.
-          # args: --issues-exit-code=0
-          # Optional: show only new issues if it's a pull request. The default value is `false`.
-          # only-new-issues: true

.golangci.yml

@@ -0,0 +1,5 @@
+run:
+  concurrency: 8
+  deadline: 5m
+  issues-exit-code: 1
+  tests: true

go.mod

@@ -1,11 +1,10 @@
-module go.unistack.org/micro-tracer-opentracing/v3
+module go.unistack.org/micro-tracer-opentracing/v4
 
-go 1.16
+go 1.20
 
 require (
-	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/opentracing/opentracing-go v1.2.0
-	github.com/stretchr/testify v1.5.1 // indirect
+	go.unistack.org/micro/v4 v4.0.13
-	go.unistack.org/micro/v3 v3.10.19
-	gopkg.in/yaml.v2 v2.4.0 // indirect
 )
+
+require github.com/stretchr/testify v1.8.3 // indirect

go.sum

@@ -1,21 +1,13 @@
 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/imdario/mergo v0.3.14/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=
 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/silas/dag v0.0.0-20211117232152-9d50aa809f35/go.mod h1:7RTUFBdIRC9nZ7/3RyRNH1bdqIShrDejd1YbLwgPS+I=
 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.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY=
-github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
+github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
-go.unistack.org/micro/v3 v3.10.19 h1:JtPacglETxHyb+GiuMdfxqGtnWSTYXPQm6PlDQfNIl8=
+go.unistack.org/micro/v4 v4.0.13 h1:wyprk+KNAv/zR6bri6p6ucmXcJ9WyZ/vzru4zjPd8dA=
-go.unistack.org/micro/v3 v3.10.19/go.mod h1:XIArw29f0b3uvF4cq96X/nQt2f0J2OGnjh8J+DBbC0s=
+go.unistack.org/micro/v4 v4.0.13/go.mod h1:ZDgU9931vm2l7X6RN/6UuwRIVp24GRdmQ7dKmegArk4=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
-gopkg.in/yaml.v2 v2.2.2/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.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

opentracing.go

@@ -3,31 +3,40 @@ package opentracing
 import (
 	"context"
 	"errors"
+	"fmt"
 
-	"github.com/opentracing/opentracing-go"
+	ot "github.com/opentracing/opentracing-go"
-	"github.com/opentracing/opentracing-go/log"
+	otlog "github.com/opentracing/opentracing-go/log"
-	"go.unistack.org/micro/v3/metadata"
+	"go.unistack.org/micro/v4/metadata"
-	"go.unistack.org/micro/v3/tracer"
+	"go.unistack.org/micro/v4/options"
+	"go.unistack.org/micro/v4/tracer"
+	rutil "go.unistack.org/micro/v4/util/reflect"
 )
 
 var _ tracer.Tracer = &otTracer{}
 
 type otTracer struct {
 	opts   tracer.Options
-	tracer opentracing.Tracer
+	tracer ot.Tracer
 }
 
-func (ot *otTracer) Name() string {
+func (t *otTracer) Name() string {
-	return ot.opts.Name
+	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 ...options.Option) error {
 	for _, o := range opts {
-		o(&ot.opts)
+		if err := o(&t.opts); err != nil {
+			return err
+		}
 	}
 
-	if tr, ok := ot.opts.Context.Value(tracerKey{}).(opentracing.Tracer); ok {
+	if tr, ok := t.opts.Context.Value(tracerKey{}).(ot.Tracer); ok {
-		ot.tracer = tr
+		t.tracer = tr
 	} else {
 		return errors.New("Tracer option missing")
 	}
@@ -35,32 +44,69 @@ 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 spanContext interface {
+	TraceID() idStringer
+	SpanID() idStringer
+}
+
+func (t *otTracer) Start(ctx context.Context, name string, opts ...options.Option) (context.Context, tracer.Span) {
 	options := tracer.NewSpanOptions(opts...)
-	var span opentracing.Span
+	var span ot.Span
 	switch options.Kind {
-	case tracer.SpanKindInternal, tracer.SpanKindUnspecified:
+	case tracer.SpanKindUnspecified:
-		ctx, span = ot.startSpanFromContext(ctx, name)
+		ctx, span = t.startSpanFromAny(ctx, name)
+	case tracer.SpanKindInternal:
+		ctx, span = t.startSpanFromContext(ctx, name)
 	case tracer.SpanKindClient, tracer.SpanKindProducer:
-		ctx, span = ot.startSpanFromOutgoingContext(ctx, name)
+		ctx, span = t.startSpanFromOutgoingContext(ctx, name)
 	case tracer.SpanKindServer, tracer.SpanKindConsumer:
-		ctx, span = ot.startSpanFromIncomingContext(ctx, ot.tracer, name)
+		ctx, span = t.startSpanFromIncomingContext(ctx, name)
 	}
-	return ctx, &otSpan{span: span, opts: options}
+
+	sp := &otSpan{span: span, opts: options}
+
+	spctx := span.Context()
+	if v, ok := spctx.(spanContext); ok {
+		sp.traceID = v.TraceID().String()
+		sp.spanID = v.SpanID().String()
+	} else {
+		if val, err := rutil.StructFieldByName(spctx, "TraceID"); err == nil {
+			sp.traceID = fmt.Sprintf("%v", val)
+		}
+		if val, err := rutil.StructFieldByName(spctx, "SpanID"); err == nil {
+			sp.spanID = fmt.Sprintf("%v", val)
+		}
+	}
+
+	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
 	opts      tracer.SpanOptions
 	status    tracer.SpanStatus
 	statusMsg string
 }
 
+func (os *otSpan) TraceID() string {
+	return os.traceID
+}
+
+func (os *otSpan) SpanID() string {
+	return os.spanID
+}
+
 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
 }
@@ -73,19 +119,54 @@ func (os *otSpan) Tracer() tracer.Tracer {
 	return &otTracer{tracer: os.span.Tracer()}
 }
 
-func (os *otSpan) Finish(opts ...tracer.SpanOption) {
+func (os *otSpan) AddLogs(kv ...interface{}) {
-	if len(os.opts.Labels) > 0 {
+	os.span.LogKV(kv...)
-		os.span.LogKV(os.opts.Labels...)
+}
+
+func (os *otSpan) Finish(opts ...options.Option) {
+	if len(os.opts.Labels)%2 != 0 {
+		os.opts.Labels = os.opts.Labels[:len(os.opts.Labels)-1]
 	}
+	os.opts.Labels = tracer.UniqLabels(os.opts.Labels)
+	for idx := 0; idx < len(os.opts.Labels); idx += 2 {
+		k, ok := os.opts.Labels[idx].(string)
+		if !ok {
+			continue
+		}
+		v, ok := os.opts.Labels[idx+1].(string)
+		if !ok {
+			v = fmt.Sprintf("%v", os.opts.Labels[idx+1])
+		}
+		switch k {
+		case "err":
+			os.status = tracer.SpanStatusError
+			os.statusMsg = v
+		case "error":
+			continue
+		case "X-Request-Id", "x-request-id":
+			os.span.SetTag("x-request-id", v)
+		case "rpc.call", "rpc.call_type", "rpc.flavor", "rpc.service", "rpc.method",
+			"sdk.database", "db.statement", "db.args", "db.query", "db.method",
+			"messaging.destination.name", "messaging.source.name", "messaging.operation":
+			os.span.SetTag(k, v)
+		default:
+			os.span.LogKV(k, v)
+		}
+	}
+	if os.status == tracer.SpanStatusError {
+		os.span.SetTag("error", true)
+		os.span.LogKV("error", os.statusMsg)
+	}
+	os.span.SetTag("span.kind", os.opts.Kind)
 	os.span.Finish()
 }
 
-func (os *otSpan) AddEvent(name string, opts ...tracer.EventOption) {
+func (os *otSpan) AddEvent(name string, opts ...options.Option) {
-	os.span.LogFields(log.Event(name))
+	os.span.LogFields(otlog.Event(name))
 }
 
 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) {
@@ -104,80 +185,142 @@ func (os *otSpan) AddLabels(labels ...interface{}) {
 	os.opts.Labels = append(os.opts.Labels, labels...)
 }
 
-func NewTracer(opts ...tracer.Option) *otTracer {
+func NewTracer(opts ...options.Option) *otTracer {
 	options := tracer.NewOptions(opts...)
 	return &otTracer{opts: options}
 }
 
-func spanFromContext(ctx context.Context) opentracing.Span {
+func (t *otTracer) startSpanFromAny(ctx context.Context, name string, opts ...ot.StartSpanOption) (context.Context, ot.Span) {
-	return opentracing.SpanFromContext(ctx)
+	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) {
+func (t *otTracer) startSpanFromContext(ctx context.Context, name string, opts ...ot.StartSpanOption) (context.Context, ot.Span) {
-	if parentSpan := opentracing.SpanFromContext(ctx); parentSpan != nil {
+	var parentSpan ot.Span
-		opts = append(opts, opentracing.ChildOf(parentSpan.Context()))
+	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...)
+	sp := t.tracer.StartSpan(name, opts...)
-	if err := sp.Tracer().Inject(sp.Context(), opentracing.TextMap, opentracing.TextMapCarrier(md)); err != nil {
+	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) {
+func (t *otTracer) startSpanFromOutgoingContext(ctx context.Context, name string, opts ...ot.StartSpanOption) (context.Context, ot.Span) {
-	var parentCtx opentracing.SpanContext
+	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 ok && md != nil {
-		if spanCtx, err := ot.tracer.Extract(opentracing.TextMap, opentracing.TextMapCarrier(md)); err == nil && ok {
-			parentCtx = spanCtx
-		}
-	}
 
-	if parentCtx != nil {
+	if parentSpan != nil {
-		opts = append(opts, opentracing.ChildOf(parentCtx))
+		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)
 
-	sp := ot.tracer.StartSpan(name, opts...)
+	sp := t.tracer.StartSpan(name, opts...)
-	if err := sp.Tracer().Inject(sp.Context(), opentracing.TextMap, opentracing.TextMapCarrier(nmd)); err != nil {
+	if err := sp.Tracer().Inject(sp.Context(), ot.TextMap, ot.TextMapCarrier(nmd)); err != nil {
 		return nil, nil
 	}
 
-	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) {
+func (t *otTracer) startSpanFromIncomingContext(ctx context.Context, name string, opts ...ot.StartSpanOption) (context.Context, ot.Span) {
-	var parentCtx opentracing.SpanContext
+	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 ok && md != nil {
-		if spanCtx, err := tracer.Extract(opentracing.TextMap, opentracing.TextMapCarrier(md)); err == nil {
-			parentCtx = spanCtx
-		}
-	}
 
-	if parentCtx != nil {
+	if parentSpan != nil {
-		opts = append(opts, opentracing.ChildOf(parentCtx))
+		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 {
+				parentCtx = spanCtx
+			}
+		}
+
+		if parentCtx != nil {
+			opts = append(opts, ot.ChildOf(parentCtx))
+		}
 	}
 
 	nmd := metadata.Copy(md)
 
-	sp := tracer.StartSpan(name, opts...)
+	sp := t.tracer.StartSpan(name, opts...)
-	if err := sp.Tracer().Inject(sp.Context(), opentracing.TextMap, opentracing.TextMapCarrier(nmd)); err != nil {
+	if err := sp.Tracer().Inject(sp.Context(), ot.TextMap, ot.TextMapCarrier(nmd)); err != nil {
 		return nil, nil
 	}
 
-	ctx = metadata.NewIncomingContext(opentracing.ContextWithSpan(ctx, sp), nmd)
+	ctx = metadata.NewIncomingContext(ot.ContextWithSpan(ctx, sp), nmd)
 
 	return ctx, sp
 }

opentracing_test.go

@@ -2,47 +2,32 @@ package opentracing
 
 import (
 	"context"
-	"sync"
 	"testing"
 
-	opentracing "github.com/opentracing/opentracing-go"
+	"github.com/opentracing/opentracing-go/mocktracer"
-	"go.unistack.org/micro/v3/metadata"
+	"go.unistack.org/micro/v4/metadata"
+	"go.unistack.org/micro/v4/tracer"
 )
 
-func TestStartSpanFromIncomingContext(t *testing.T) {
+func TestTraceID(t *testing.T) {
-	md := metadata.New(2)
+	md := metadata.New(1)
-	md.Set("key", "val")
-
-	var g sync.WaitGroup
-
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	ctx = metadata.NewIncomingContext(ctx, md)
 
-	tracer := opentracing.GlobalTracer()
+	tr := NewTracer(Tracer(mocktracer.New()))
-	ot := &otTracer{tracer: tracer}
+	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 := ot.startSpanFromIncomingContext(ctx, tracer, "test")
-			sp.Finish()
-		}()
 	}
 
-	for {
+	var sp tracer.Span
-		select {
+
-		default:
+	ctx, sp = tr.Start(ctx, "test")
-			g.Wait()
+	if v := sp.TraceID(); v != "43" {
-			close(cherr)
+		t.Fatalf("invalid span trace id %#+v", v)
-		case err, ok := <-cherr:
-			if err != nil {
-				t.Fatal(err)
-			} else if !ok {
-				return
-			}
-		}
 	}
+	if v := sp.SpanID(); v != "44" {
+		t.Fatalf("invalid span span id %#+v", v)
+	}
+	_ = ctx
 }

options.go

@@ -2,11 +2,11 @@ package opentracing
 
 import (
 	"github.com/opentracing/opentracing-go"
-	"go.unistack.org/micro/v3/tracer"
+	"go.unistack.org/micro/v4/options"
 )
 
 type tracerKey struct{}
 
-func Tracer(ot opentracing.Tracer) tracer.Option {
+func Tracer(ot opentracing.Tracer) options.Option {
-	return tracer.SetOption(tracerKey{}, ot)
+	return options.ContextOption(tracerKey{}, ot)
 }