Skip to content

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

Merged
yurishkuro merged 1 commit intojaegertracing:mainfrom
clement2026:issue-4292
Mar 11, 2023
Merged

[chore]: Replace pkg/multierror with standard errors.Join#4293
yurishkuro merged 1 commit intojaegertracing:mainfrom
clement2026:issue-4292

Conversation

@clement2026
Copy link
Copy Markdown
Contributor

@clement2026 clement2026 commented Mar 11, 2023

Which problem is this PR solving?

Resolves #4292

@clement2026
Replace pkg/multierror with standard errors.Join
715bf7f 
Signed-off-by: Clement <ClementBarnes@mail.uk>
@clement2026 clement2026 requested a review from a team as a code owner March 11, 2023 09:53
@clement2026 clement2026 requested a review from yurishkuro March 11, 2023 09:53
@clement2026 clement2026 changed the title Replace pkg/multierror with standard errors.Join [chore]: Replace pkg/multierror with standard errors.Join Mar 11, 2023
albertteoh
albertteoh approved these changes Mar 11, 2023
View reviewed changes
Copy link
Copy Markdown
Contributor

@albertteoh albertteoh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

yurishkuro
yurishkuro approved these changes Mar 11, 2023
View reviewed changes
Copy link
Copy Markdown
Member

@yurishkuro yurishkuro left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!!!

@yurishkuro yurishkuro enabled auto-merge (squash) March 11, 2023 18:43
@codecov
Copy link
Copy Markdown

codecov bot commented Mar 11, 2023

Codecov Report

Patch coverage: 100.00% and project coverage change: -0.03 ⚠️

Comparison is base (a172bcc) 97.10% compared to head (715bf7f) 97.07%.

Additional details and impacted files 
@@            Coverage Diff             @@
##             main    #4293      +/-   ##
==========================================
- Coverage   97.10%   97.07%   -0.03%     
==========================================
  Files         301      300       -1     
  Lines       17675    17659      -16     
==========================================
- Hits        17163    17143      -20     
- Misses        412      415       +3     
- Partials      100      101       +1
Flag Coverage Δ
unittests 97.07% <100.00%> (-0.03%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
cmd/agent/app/reporter/reporter.go 100.00% <100.00%> (ø)
cmd/query/app/http_handler.go 100.00% <100.00%> (ø)
cmd/query/app/querysvc/query_service.go 100.00% <100.00%> (ø)
model/adjuster/adjuster.go 100.00% <100.00%> (ø)
model/converter/thrift/zipkin/to_domain.go 100.00% <100.00%> (ø)
plugin/storage/factory.go 98.39% <100.00%> (ø)
storage/spanstore/composite.go 100.00% <100.00%> (ø)

... and 2 files with indirect coverage changes

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

@yurishkuro yurishkuro merged commit 18843de into jaegertracing:main Mar 11, 2023
axfor pushed a commit to axfor/jaeger that referenced this pull request 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 <ClementBarnes@mail.uk>
Signed-off-by: axfor <aixiaoxiang2009@hotmail.com>
@clement2026 clement2026 deleted the issue-4292 branch March 15, 2023 11:58
mx-psi added a commit to mx-psi/jaeger that referenced this pull request Mar 22, 2023
@mx-psi
Revert "[chore]: Replace pkg/multierror with standard errors.Join (ja…
e2fa30f 
…egertracing#4293)"

This reverts commit 18843de.

Signed-off-by: Pablo Baeyens <pablo.baeyens@datadoghq.com>
@mx-psi mx-psi mentioned this pull request Mar 22, 2023
Closed
mx-psi added a commit to mx-psi/jaeger that referenced this pull request Mar 22, 2023
@mx-psi
Revert "[chore]: Replace pkg/multierror with standard errors.Join (ja…
a47dacf 
…egertracing#4293)"

This reverts commit 18843de.

Signed-off-by: Pablo Baeyens <pablo.baeyens@datadoghq.com>
axfor added a commit to axfor/jaeger that referenced this pull request Jun 23, 2023
@axfor
Squashed commit of the following:
5c34f4d 
commit cfef09c
Merge: a5cbf94 f8d219a
Author: axfor <aixiaoxiang2009@hotmail.com>
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 <aixiaoxiang2009@hotmail.com>
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 <aixiaoxiang2009@hotmail.com>
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 <aixiaoxiang2009@hotmail.com>
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 <aixiaoxiang2009@hotmail.com>
Date:   Thu Mar 23 18:39:50 2023 +0800

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

commit c90f070
Author: axfor <aixiaoxiang2009@hotmail.com>
Date:   Thu Mar 23 01:10:54 2023 +0800

    fix unnecessary assignment to the blank identifier (gosimple)

    Signed-off-by: axfor <aixiaoxiang2009@hotmail.com>

commit 90d74dd
Author: axfor <aixiaoxiang2009@hotmail.com>
Date:   Thu Mar 23 00:16:07 2023 +0800

    fix some tips

    Signed-off-by: axfor <aixiaoxiang2009@hotmail.com>

commit f0a2d53
Author: axfor <aixiaoxiang2009@hotmail.com>
Date:   Wed Mar 22 23:55:29 2023 +0800

    add some comments

    Signed-off-by: axfor <aixiaoxiang2009@hotmail.com>

commit 170f77d
Author: axfor <aixiaoxiang2009@hotmail.com>
Date:   Wed Mar 22 23:27:55 2023 +0800

    Fixed the issue of repeatedly closing ready

    Signed-off-by: axfor <aixiaoxiang2009@hotmail.com>

commit e74b66b
Author: axfor <aixiaoxiang2009@hotmail.com>
Date:   Wed Mar 22 22:07:34 2023 +0800

    The consumer interface is changed to a minimum subset

    Signed-off-by: axfor <aixiaoxiang2009@hotmail.com>

commit f8863b5
Merge: 2703cb9 6ab3f01
Author: axfor <aixiaoxiang2009@hotmail.com>
Date:   Wed Mar 22 21:38:09 2023 +0800

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

    Signed-off-by: axfor <aixiaoxiang2009@hotmail.com>

commit 2703cb9
Merge: 810629b 66e6610
Author: axfor <aixiaoxiang2009@hotmail.com>
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 <aixiaoxiang2009@hotmail.com>
Date:   Wed Mar 22 21:29:40 2023 +0800

    add func ready of consumer and remove commitInterval config

    Signed-off-by: axfor <aixiaoxiang2009@hotmail.com>

commit 66e6610
Merge: ec4e958 06c59e7
Author: axx <aixiaoxiang2009@hotmail.com>
Date:   Sun Mar 19 16:29:14 2023 +0800

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

commit ec4e958
Author: axfor <aixiaoxiang2009@hotmail.com>
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 <aixiaoxiang2009@hotmail.com>

commit 1556879
Author: axfor <aixiaoxiang2009@hotmail.com>
Date:   Sun Mar 19 02:07:00 2023 +0800

    fixed some typoe

    Signed-off-by: axfor <aixiaoxiang2009@hotmail.com>

commit 28dc496
Merge: 7294b58 c46d6ca
Author: axfor <aixiaoxiang2009@hotmail.com>
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 <aixiaoxiang2009@hotmail.com>
Date:   Sun Mar 19 01:56:53 2023 +0800

    fixed some err of integration test

    Signed-off-by: axfor <aixiaoxiang2009@hotmail.com>

commit c46d6ca
Merge: 90ddffc 43c29a0
Author: axx <aixiaoxiang2009@hotmail.com>
Date:   Sat Mar 18 22:15:21 2023 +0800

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

commit 90ddffc
Author: axfor <aixiaoxiang2009@hotmail.com>
Date:   Sat Mar 18 22:11:12 2023 +0800

    Improved log printing when a new ConsumerGroup object fails

    Signed-off-by: axfor <aixiaoxiang2009@hotmail.com>

commit 655a6dd
Merge: 3a82b7c 18843de
Author: axfor <aixiaoxiang2009@hotmail.com>
Date:   Sun Mar 12 17:13:54 2023 +0800

    Merge branch 'main' code

    Signed-off-by: axfor <aixiaoxiang2009@hotmail.com>

commit 3a82b7c
Author: axfor <aixiaoxiang2009@hotmail.com>
Date:   Sun Mar 12 17:09:42 2023 +0800

    update some comment

    Signed-off-by: axfor <aixiaoxiang2009@hotmail.com>

commit e077b09
Author: axfor <aixiaoxiang2009@hotmail.com>
Date:   Sun Mar 12 16:43:57 2023 +0800

    improve some of the tests

    Signed-off-by: axfor <aixiaoxiang2009@hotmail.com>

commit 574810a
Author: Clement <ClementBarnes@mail.uk>
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 <ClementBarnes@mail.uk>
    Signed-off-by: axfor <aixiaoxiang2009@hotmail.com>

commit b7ab7fd
Author: axfor <aixiaoxiang2009@hotmail.com>
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 <aixiaoxiang2009@hotmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@yurishkuro yurishkuro yurishkuro approved these changes

@albertteoh albertteoh albertteoh approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

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

3 participants

@clement2026 @yurishkuro @albertteoh