jaeger icon indicating copy to clipboard operation
jaeger copied to clipboard

Upgrade github.com/Shopify/sarama v1.33.0 to github.com/IBM/sarama v1.40.0

Open axfor opened this issue 1 year ago • 10 comments

  • [x] Bump github.com/Shopify/sarama v1.33.0 to github.com/IBM/sarama v1.40.0
  • [x] Remove sarama-cluster dependencies
  • [x] Use the Sarama native consumer group,see: https://github.com/Shopify/sarama/pull/1099

Deprecation notice of sarama-cluster: image


axfor avatar Mar 11 '23 16:03 axfor

This looks a lot more than a version bump, please describe the changes.

yurishkuro avatar Mar 12 '23 07:03 yurishkuro

This looks a lot more than a version bump, please describe the changes.

  • [x] Bump github.com/Shopify/sarama from v1.33.0 to v1.38.1
  • [x] Remove sarama-cluster dependencies
  • [x] Use the Sarama native consumer group,see: https://github.com/Shopify/sarama/pull/1099

Deprecation notice of sarama-cluster: image


axfor avatar Mar 12 '23 14:03 axfor

Note: merging from main invalidates previous CI runs, but unit tests there are failing due to this change. https://github.com/jaegertracing/jaeger/actions/runs/4492589597/jobs/7912198192

yurishkuro avatar Mar 25 '23 17:03 yurishkuro

Note: merging from main invalidates previous CI runs, but unit tests there are failing due to this change. https://github.com/jaegertracing/jaeger/actions/runs/4492589597/jobs/7912198192

Based on the main branch, I used git merge --squash upgrade-sarama-v1.38.1 to merge all the commits of my branch


See https://github.com/axfor/jaeger/pull/8 :

axfor avatar Mar 26 '23 08:03 axfor

Codecov Report

Patch coverage: 100.00% and project coverage change: +0.03 :tada:

Comparison is base (2c1bf07) 97.04% compared to head (77acc07) 97.08%.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #4294      +/-   ##
==========================================
+ Coverage   97.04%   97.08%   +0.03%     
==========================================
  Files         301      301              
  Lines       17857    17944      +87     
==========================================
+ Hits        17330    17421      +91     
+ Misses        422      419       -3     
+ Partials      105      104       -1     
Flag Coverage Δ
unittests 97.08% <100.00%> (+0.03%) :arrow_up:

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

Impacted Files Coverage Δ
cmd/ingester/app/consumer/message.go 100.00% <ø> (ø)
plugin/storage/kafka/factory.go 100.00% <ø> (ø)
plugin/storage/kafka/options.go 89.38% <ø> (ø)
plugin/storage/kafka/writer.go 100.00% <ø> (ø)
cmd/ingester/app/consumer/consumer.go 98.31% <100.00%> (+1.34%) :arrow_up:
cmd/ingester/app/consumer/consumer_metrics.go 100.00% <100.00%> (ø)
cmd/ingester/app/consumer/deadlock_detector.go 100.00% <100.00%> (ø)
cmd/ingester/app/consumer/offset/manager.go 100.00% <100.00%> (ø)
cmd/ingester/app/consumer/processor_factory.go 100.00% <100.00%> (ø)

... and 2 files with indirect coverage changes

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

codecov[bot] avatar Mar 26 '23 18:03 codecov[bot]

Codecov Report

Patch coverage: 2.70% and project coverage change: -0.82 ⚠️

Comparison is base (ea55beb) 97.10% compared to head (39cbfea) 96.29%.

❗ Current head 39cbfea differs from pull request most recent head 555aff3. Consider uploading reports for the commit 555aff3 to get more accurate results

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


I added more unit tests

axfor avatar Apr 02 '23 14:04 axfor

@yurishkuro @albertteoh I added more unit tests and please re-review ! Thank you

axfor avatar Apr 07 '23 18:04 axfor

Codecov Report

Patch coverage: 2.70% and project coverage change: -0.82 ⚠️

Comparison is base (ea55beb) 97.10% compared to head (39cbfea) 96.29%.

❗ Current head 39cbfea differs from pull request most recent head 555aff3. Consider uploading reports for the commit 555aff3 to get more accurate results

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

I added more unit tests

Patch code coverage up to 100%

refer to my repository:

https://app.codecov.io/github/jaegertracing/jaeger/commit/d26207e598c39806a6bff7689bf0e71347c3718a


image

axfor avatar Apr 16 '23 02:04 axfor

Merge main to axfor:upgrade-sarama-v1.38.1 and resolve go.mod conflicts

axfor avatar Apr 18 '23 17:04 axfor

@axfor thanks for the work. Are you interested in completing it per this ticket's scope https://github.com/jaegertracing/jaeger/issues/4591 ?

yurishkuro avatar Jul 26 '23 16:07 yurishkuro

Thanks for contributing, but I am going to close this. It's too risky of a change to apply without significant testing, and we are going to deprecate all of this code anyway once jaeger-v2 goes out.

yurishkuro avatar Aug 04 '24 18:08 yurishkuro