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.

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

Separate all-in-one integration tests for v1 and v2 #4968

Merged
merged 10 commits into from
Nov 27, 2023

Conversation

yurishkuro
Copy link
Member

@yurishkuro yurishkuro commented Nov 26, 2023

Which problem is this PR solving?

  • Turns out integration test for jaeger-v2 was never working correctly because v1 all-in-one was still running and tests were succeeding against that

Description of the changes

  • build-all-in-one workflow
    • Skip into two jobs to avoid cross interference
    • DRY by using PR_ONLY variable
  • all-in-one.go test
    • Replace build tag with a check for env var, to allow the test to compile in the IDE
    • Allow skipping sampling strategy test which is not working yet in v2
  • remove unused cmd/jaeger/internal/all-in-one/ package
  • use our standard Tracer constructor to pass a tracer to query-service in v2 (OTEL-coll doesn't support internal tracer yet)

How was this change tested?

  • CI

Signed-off-by: Yuri Shkuro <github@ysh.us>
@yurishkuro yurishkuro requested a review from a team as a code owner November 26, 2023 17:09
@yurishkuro yurishkuro added the changelog:ci Change related to continuous integration / testing label Nov 26, 2023
yurishkuro and others added 2 commits November 26, 2023 12:15
Signed-off-by: Yuri Shkuro <github@ysh.us>
Copy link

codecov bot commented Nov 26, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (4096fe9) 95.58% compared to head (ff31f6c) 95.60%.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #4968      +/-   ##
==========================================
+ Coverage   95.58%   95.60%   +0.02%     
==========================================
  Files         317      317              
  Lines       18689    18689              
==========================================
+ Hits        17863    17868       +5     
+ Misses        663      659       -4     
+ Partials      163      162       -1     
Flag Coverage Δ
cassandra-3.x 25.64% <ø> (ø)
cassandra-4.x 25.64% <ø> (ø)
elasticsearch-5.x 19.91% <ø> (+0.01%) ⬆️
elasticsearch-6.x 19.91% <ø> (ø)
elasticsearch-7.x 20.03% <ø> (ø)
elasticsearch-8.x 20.14% <ø> (+0.01%) ⬆️
grpc-badger 19.55% <ø> (ø)
kafka 14.07% <ø> (ø)
opensearch-1.x 20.05% <ø> (+0.01%) ⬆️
opensearch-2.x 20.05% <ø> (ø)
unittests 93.35% <ø> (+0.02%) ⬆️

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.

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 Add codecov to all-in-one integration test WIP Add codecov to all-in-one integration test Nov 26, 2023
Signed-off-by: Yuri Shkuro <github@ysh.us>
@yurishkuro yurishkuro changed the title WIP Add codecov to all-in-one integration test Separate all-in-one integration tests for v1 and v2 Nov 26, 2023
t.Run("createTrace", createTrace)
t.Run("getAPITrace", getAPITrace)
t.Run("getSamplingStrategy", getSamplingStrategy)
t.Run("getServicesAPIV3", getServicesAPIV3)
}

func healthCheck(t *testing.T) {
Copy link
Member Author

Choose a reason for hiding this comment

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

moved two methods from below to match the order of calls from the test above

Copy link
Contributor

@jkowall jkowall left a comment

Choose a reason for hiding this comment

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

lgtm! Nice to have these split out for the future. Should speed up the CI as well.

yurishkuro and others added 3 commits November 26, 2023 22:00
Signed-off-by: Yuri Shkuro <github@ysh.us>
Signed-off-by: Yuri Shkuro <github@ysh.us>
@yurishkuro yurishkuro merged commit 076cd87 into jaegertracing:main Nov 27, 2023
37 checks passed
@yurishkuro yurishkuro deleted the aio-coverage branch November 27, 2023 03:45
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