Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[chore]: Replace pkg/multierror with standard errors.Join #4292

Closed
yurishkuro opened this issue Mar 11, 2023 · 0 comments · Fixed by #4293
Closed

[chore]: Replace pkg/multierror with standard errors.Join #4292

yurishkuro opened this issue Mar 11, 2023 · 0 comments · Fixed by #4293
Labels
good first issue Good for beginners help wanted Features that maintainers are willing to accept but do not have cycles to implement

Comments

@yurishkuro
Copy link
Member

yurishkuro commented Mar 11, 2023 •
edited
Loading

Requirement

Simplify code

Problem

We have an internal package pkg/multierror that is no longer needed since recent versions of Go added errors.Join

Proposal

  • Delete pkg/multierror
  • Replace all usage with errors.Join
  • Make sure make test runs clean
$ grx multierror .
./cmd/agent/app/reporter/reporter.go:21:	"github.com/jaegertracing/jaeger/pkg/multierror"
./cmd/agent/app/reporter/reporter.go:52:	return multierror.Wrap(errors)
./cmd/agent/app/reporter/reporter.go:63:	return multierror.Wrap(errors)
./cmd/query/app/http_handler.go:38:	"github.com/jaegertracing/jaeger/pkg/multierror"
./cmd/query/app/http_handler.go:368:	if err := multierror.Wrap(errors); err != nil {
./cmd/query/app/querysvc/query_service.go:26:	"github.com/jaegertracing/jaeger/pkg/multierror"
./cmd/query/app/querysvc/query_service.go:113:	return multierror.Wrap(writeErrors)
./plugin/storage/factory.go:27:	"github.com/jaegertracing/jaeger/pkg/multierror"
./plugin/storage/factory.go:330:	return multierror.Wrap(errs)
./storage/spanstore/composite.go:22:	"github.com/jaegertracing/jaeger/pkg/multierror"
./storage/spanstore/composite.go:45:	return multierror.Wrap(errors)
./model/converter/thrift/zipkin/to_domain.go:28:	"github.com/jaegertracing/jaeger/pkg/multierror"
./model/converter/thrift/zipkin/to_domain.go:101:	return trace, multierror.Wrap(errors)
./model/adjuster/adjuster.go:20:	"github.com/jaegertracing/jaeger/pkg/multierror"
./model/adjuster/adjuster.go:70:	return trace, multierror.Wrap(errors)

Open questions

No response
@yurishkuro yurishkuro added help wanted Features that maintainers are willing to accept but do not have cycles to implement good first issue Good for beginners labels Mar 11, 2023
@clement2026 clement2026 mentioned this issue Mar 11, 2023
Merged
yurishkuro pushed a commit that referenced this issue Mar 11, 2023
@clement2026
[chore]: Replace pkg/multierror with standard errors.Join (#4293)
18843de 
## Which problem is this PR solving?
Resolves #4292

Signed-off-by: Clement <[email protected]>
axfor pushed a commit to axfor/jaeger that referenced this issue Mar 12, 2023
@clement2026 @axfor
[chore]: Replace pkg/multierror with standard errors.Join (jaegertrac…
574810a 
…ing#4293)

## Which problem is this PR solving?
Resolves jaegertracing#4292

Signed-off-by: Clement <[email protected]>
Signed-off-by: axfor <[email protected]>
axfor added a commit to axfor/jaeger that referenced this issue Jun 23, 2023
@axfor
Squashed commit of the following:
5c34f4d 
commit cfef09c
Merge: a5cbf94 f8d219a
Author: axfor <[email protected]>
Date:   Sun Mar 26 14:24:42 2023 +0800

    Merge branch 'upgrade-sarama-v1.38.1' into upgrade-sarama-v1.38.1

commit a5cbf94
Merge: c90f070 13fa044
Author: axfor <[email protected]>
Date:   Sun Mar 26 14:23:35 2023 +0800

    Merge branch 'main' into  upgrade-sarama-v1.38.1

commit f8d219a
Merge: 46f6368 13fa044
Author: axx <[email protected]>
Date:   Sun Mar 26 14:23:11 2023 +0800

    Merge branch 'main' into upgrade-sarama-v1.38.1

commit 46f6368
Merge: 6d75d03 4f231b6
Author: axx <[email protected]>
Date:   Sat Mar 25 15:29:51 2023 +0800

    Merge branch 'main' into upgrade-sarama-v1.38.1

commit 6d75d03
Merge: c90f070 45d2de2
Author: axx <[email protected]>
Date:   Thu Mar 23 18:39:50 2023 +0800

    Merge branch 'main' into upgrade-sarama-v1.38.1

commit c90f070
Author: axfor <[email protected]>
Date:   Thu Mar 23 01:10:54 2023 +0800

    fix unnecessary assignment to the blank identifier (gosimple)

    Signed-off-by: axfor <[email protected]>

commit 90d74dd
Author: axfor <[email protected]>
Date:   Thu Mar 23 00:16:07 2023 +0800

    fix some tips

    Signed-off-by: axfor <[email protected]>

commit f0a2d53
Author: axfor <[email protected]>
Date:   Wed Mar 22 23:55:29 2023 +0800

    add some comments

    Signed-off-by: axfor <[email protected]>

commit 170f77d
Author: axfor <[email protected]>
Date:   Wed Mar 22 23:27:55 2023 +0800

    Fixed the issue of repeatedly closing ready

    Signed-off-by: axfor <[email protected]>

commit e74b66b
Author: axfor <[email protected]>
Date:   Wed Mar 22 22:07:34 2023 +0800

    The consumer interface is changed to a minimum subset

    Signed-off-by: axfor <[email protected]>

commit f8863b5
Merge: 2703cb9 6ab3f01
Author: axfor <[email protected]>
Date:   Wed Mar 22 21:38:09 2023 +0800

    Merge branch 'main'  into upgrade-sarama-v1.38.1

    Signed-off-by: axfor <[email protected]>

commit 2703cb9
Merge: 810629b 66e6610
Author: axfor <[email protected]>
Date:   Wed Mar 22 21:30:14 2023 +0800

    Merge branch 'upgrade-sarama-v1.38.1'  into upgrade-sarama-v1.38.1

commit 810629b
Author: axfor <[email protected]>
Date:   Wed Mar 22 21:29:40 2023 +0800

    add func ready of consumer and remove commitInterval config

    Signed-off-by: axfor <[email protected]>

commit 66e6610
Merge: ec4e958 06c59e7
Author: axx <[email protected]>
Date:   Sun Mar 19 16:29:14 2023 +0800

    Merge branch 'main' into upgrade-sarama-v1.38.1

commit ec4e958
Author: axfor <[email protected]>
Date:   Sun Mar 19 04:16:35 2023 +0800

    Remove the Consumer's partitionMapLock field and change the partitionsHeld type from int64 to atomic.int64

    Signed-off-by: axfor <[email protected]>

commit 1556879
Author: axfor <[email protected]>
Date:   Sun Mar 19 02:07:00 2023 +0800

    fixed some typoe

    Signed-off-by: axfor <[email protected]>

commit 28dc496
Merge: 7294b58 c46d6ca
Author: axfor <[email protected]>
Date:   Sun Mar 19 01:58:04 2023 +0800

    Merge branch 'upgrade-sarama-v1.38.1'  into upgrade-sarama-v1.38.1

commit 7294b58
Author: axfor <[email protected]>
Date:   Sun Mar 19 01:56:53 2023 +0800

    fixed some err of integration test

    Signed-off-by: axfor <[email protected]>

commit c46d6ca
Merge: 90ddffc 43c29a0
Author: axx <[email protected]>
Date:   Sat Mar 18 22:15:21 2023 +0800

    Merge branch 'main' into upgrade-sarama-v1.38.1

commit 90ddffc
Author: axfor <[email protected]>
Date:   Sat Mar 18 22:11:12 2023 +0800

    Improved log printing when a new ConsumerGroup object fails

    Signed-off-by: axfor <[email protected]>

commit 655a6dd
Merge: 3a82b7c 18843de
Author: axfor <[email protected]>
Date:   Sun Mar 12 17:13:54 2023 +0800

    Merge branch 'main' code

    Signed-off-by: axfor <[email protected]>

commit 3a82b7c
Author: axfor <[email protected]>
Date:   Sun Mar 12 17:09:42 2023 +0800

    update some comment

    Signed-off-by: axfor <[email protected]>

commit e077b09
Author: axfor <[email protected]>
Date:   Sun Mar 12 16:43:57 2023 +0800

    improve some of the tests

    Signed-off-by: axfor <[email protected]>

commit 574810a
Author: Clement <[email protected]>
Date:   Sun Mar 12 03:02:00 2023 +0800

    [chore]: Replace pkg/multierror with standard errors.Join (jaegertracing#4293)
    Resolves jaegertracing#4292

    Signed-off-by: Clement <[email protected]>
    Signed-off-by: axfor <[email protected]>

commit b7ab7fd
Author: axfor <[email protected]>
Date:   Sun Mar 12 00:06:22 2023 +0800

    Bump github.com/Shopify/sarama from v1.33.0 to v1.38.1

    Signed-off-by: axfor <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
good first issue Good for beginners help wanted Features that maintainers are willing to accept but do not have cycles to implement
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

[chore]: Replace pkg/multierror with standard errors.Join clement2026/jaeger
1 participant
@yurishkuro