Skip to content

Conversation

yurishkuro
Copy link
Member

@yurishkuro yurishkuro commented Apr 18, 2025

Which problem is this PR solving?

  • When we did a recent move of a bunch of packages to internal/ the mocks were moved manually instead of being re-generated via mockery and the paths in the mockery config were not updated. The mockery run would log warnings, but unfortunately not fail.

Description of the changes

  • Fix the paths to eliminate most warnings (the remaining one is deprecation notice)
  • Change Makefile target to first remove all mocks/*.go files to ensure generated code is not stale
  • Regenerate some affected mocks
  • Remove AgentService from crossdock (doesn't exist anymore) and fix the tests
  • We had a mock for crossdock.T stored and never regenerated. Moved it from under mocks/ into t_mock_test.go.

How was this change tested?

  • CI

Signed-off-by: Yuri Shkuro <github@ysh.us>
Signed-off-by: Yuri Shkuro <github@ysh.us>
Signed-off-by: Yuri Shkuro <github@ysh.us>
@yurishkuro yurishkuro added the changelog:ci Change related to continuous integration / testing label Apr 18, 2025
Copy link

codecov bot commented Apr 18, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 95.99%. Comparing base (23cf4c0) to head (9d239da).
Report is 1 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #7045      +/-   ##
==========================================
- Coverage   96.01%   95.99%   -0.03%     
==========================================
  Files         349      349              
  Lines       20677    20677              
==========================================
- Hits        19854    19849       -5     
- Misses        620      624       +4     
- Partials      203      204       +1     
Flag Coverage Δ
badger_v1 9.98% <ø> (ø)
badger_v2 2.07% <ø> (ø)
cassandra-4.x-v1-manual 15.02% <ø> (ø)
cassandra-4.x-v2-auto 2.06% <ø> (ø)
cassandra-4.x-v2-manual 2.06% <ø> (ø)
cassandra-5.x-v1-manual 15.02% <ø> (ø)
cassandra-5.x-v2-auto 2.06% <ø> (ø)
cassandra-5.x-v2-manual 2.06% <ø> (ø)
elasticsearch-6.x-v1 19.88% <ø> (ø)
elasticsearch-7.x-v1 19.96% <ø> (ø)
elasticsearch-8.x-v1 20.13% <ø> (ø)
elasticsearch-8.x-v2 2.07% <ø> (ø)
grpc_v1 11.53% <ø> (ø)
grpc_v2 9.16% <ø> (ø)
kafka-3.x-v1 10.26% <ø> (ø)
kafka-3.x-v2 2.07% <ø> (ø)
memory_v2 2.07% <ø> (ø)
opensearch-1.x-v1 20.01% <ø> (ø)
opensearch-2.x-v1 20.01% <ø> (ø)
opensearch-2.x-v2 2.18% <ø> (+0.11%) ⬆️
tailsampling-processor 0.56% <ø> (ø)
unittests 94.76% <ø> (-0.03%) ⬇️

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

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

yurishkuro and others added 4 commits April 18, 2025 12:36
Signed-off-by: Yuri Shkuro <github@ysh.us>
Signed-off-by: Yuri Shkuro <github@ysh.us>
Signed-off-by: Yuri Shkuro <github@ysh.us>
@yurishkuro yurishkuro changed the title Fix mockery Fix paths in mockery config Apr 18, 2025
@yurishkuro yurishkuro marked this pull request as ready for review April 18, 2025 16:57
@yurishkuro yurishkuro requested a review from a team as a code owner April 18, 2025 16:57
@yurishkuro yurishkuro requested a review from pavolloffay April 18, 2025 16:57
@yurishkuro yurishkuro enabled auto-merge April 18, 2025 17:00
@yurishkuro yurishkuro added this pull request to the merge queue Apr 18, 2025
Merged via the queue into jaegertracing:main with commit e60b2df Apr 18, 2025
59 checks passed
@yurishkuro yurishkuro deleted the fix-mockery branch April 18, 2025 17:10
amilbcahat pushed a commit to amilbcahat/jaeger that referenced this pull request May 4, 2025
## Which problem is this PR solving?
- When we did a recent move of a bunch of packages to internal/ the
mocks were moved manually instead of being re-generated via mockery and
the paths in the mockery config were not updated. The mockery run would
log warnings, but unfortunately not fail.

## Description of the changes
- Fix the paths to eliminate most warnings (the remaining one is
deprecation notice)
- Change Makefile target to first remove all mocks/*.go files to ensure
generated code is not stale
- Regenerate some affected mocks
- Remove AgentService from crossdock (doesn't exist anymore) and fix the
tests
- We had a mock for `crossdock.T` stored and never regenerated. Moved it
from under mocks/ into `t_mock_test.go`.

## How was this change tested?
- CI

---------

Signed-off-by: Yuri Shkuro <github@ysh.us>
amilbcahat pushed a commit to amilbcahat/jaeger that referenced this pull request May 4, 2025
## Which problem is this PR solving?
- When we did a recent move of a bunch of packages to internal/ the
mocks were moved manually instead of being re-generated via mockery and
the paths in the mockery config were not updated. The mockery run would
log warnings, but unfortunately not fail.

## Description of the changes
- Fix the paths to eliminate most warnings (the remaining one is
deprecation notice)
- Change Makefile target to first remove all mocks/*.go files to ensure
generated code is not stale
- Regenerate some affected mocks
- Remove AgentService from crossdock (doesn't exist anymore) and fix the
tests
- We had a mock for `crossdock.T` stored and never regenerated. Moved it
from under mocks/ into `t_mock_test.go`.

## How was this change tested?
- CI

---------

Signed-off-by: Yuri Shkuro <github@ysh.us>
Signed-off-by: amol-verma-allen <amol.verma@allen.in>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
changelog:ci Change related to continuous integration / testing
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants