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

[bug] Use correct argument as jaeger-version #5716

Merged
merged 8 commits into from
Jul 8, 2024

Conversation

yurishkuro
Copy link
Member

@yurishkuro yurishkuro commented Jul 7, 2024

Which problem is this PR solving?

  • There is a typo in the test script that means v2 test was never executed:
    local es_version=$2
    local j_version=$2
  • Even with the typo fixed the way the configs are parsed in the e2e tests (in order to add a storage cleaner extension) did not match the recent config changes (which would've caught the issue if not for the typo above).

Description of the changes

  • Fix typo. Expand usage printout to illustrate expected argument values
  • Fix config parsing to reflect the new structure.

How was this change tested?

T23:12:04 make jaeger-v2-storage-integration-test
...
=== RUN   TestESStorage
    e2e_integration.go:50: Starting Jaeger-v2 in the background with config file /tmp/TestESStorage88065053/001/storageCleaner_config.yaml
    e2e_integration.go:58: Writing the Jaeger-v2 output logs into /tmp/TestESStorage88065053/002/jaeger_output_logs.txt
    e2e_integration.go:66: Writing the Jaeger-v2 error logs into /tmp/TestESStorage88065053/003/jaeger_error_logs.txt
    e2e_integration.go:81: Checking if Jaeger-v2 is available on http://localhost:16686/
    e2e_integration.go:94: Jaeger-v2 is ready
    logger.go:146: 2024-07-07T23:15:00.796Z	INFO	integration/span_writer.go:36	Creating the span writer	{"port": 4317}
    logger.go:146: 2024-07-07T23:15:00.797Z	INFO	integration/span_reader.go:38	Creating the span reader	{"port": 16685}

@yurishkuro yurishkuro added the changelog:test Change that's adding missing tests or correcting existing tests label Jul 7, 2024
Signed-off-by: Yuri Shkuro <[email protected]>
Signed-off-by: Yuri Shkuro <[email protected]>
Signed-off-by: Yuri Shkuro <[email protected]>
Copy link

codecov bot commented Jul 7, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 96.87%. Comparing base (7b7e5cc) to head (657f4b8).

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #5716   +/-   ##
=======================================
  Coverage   96.87%   96.87%           
=======================================
  Files         334      334           
  Lines       16146    16146           
=======================================
  Hits        15642    15642           
  Misses        334      334           
  Partials      170      170           
Flag Coverage Δ
badger_v1 8.06% <ø> (ø)
badger_v2 1.90% <ø> (ø)
cassandra-3.x-v1 16.62% <ø> (ø)
cassandra-3.x-v2 1.82% <ø> (ø)
cassandra-4.x-v1 16.62% <ø> (ø)
cassandra-4.x-v2 1.82% <ø> (ø)
elasticsearch-6.x-v1 18.79% <ø> (-0.02%) ⬇️
elasticsearch-7.x-v1 18.86% <ø> (ø)
elasticsearch-8.x-v1 19.04% <ø> (-0.02%) ⬇️
elasticsearch-8.x-v2 1.90% <ø> (-17.16%) ⬇️
grpc_v1 9.45% <ø> (-0.02%) ⬇️
grpc_v2 7.41% <ø> (ø)
kafka 9.75% <ø> (ø)
opensearch-1.x-v1 18.91% <ø> (+0.01%) ⬆️
opensearch-2.x-v1 18.91% <ø> (+0.01%) ⬆️
opensearch-2.x-v2 1.90% <ø> (-17.00%) ⬇️
unittests 95.26% <ø> (ø)

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 <[email protected]>
@yurishkuro yurishkuro changed the title [bug] Use corret argument as jaeger-version [bug] Use correct argument as jaeger-version Jul 7, 2024
Signed-off-by: Yuri Shkuro <[email protected]>
Signed-off-by: Yuri Shkuro <[email protected]>
Signed-off-by: Yuri Shkuro <[email protected]>
@yurishkuro yurishkuro marked this pull request as ready for review July 7, 2024 23:19
@yurishkuro yurishkuro requested a review from a team as a code owner July 7, 2024 23:19
@dosubot dosubot bot added changelog:ci Change related to continuous integration / testing storage/elasticsearch labels Jul 7, 2024
@yurishkuro yurishkuro merged commit 13c715b into jaegertracing:main Jul 8, 2024
45 checks passed
@yurishkuro yurishkuro deleted the fix-test branch July 8, 2024 02:07
@yurishkuro yurishkuro removed the changelog:test Change that's adding missing tests or correcting existing tests label Jul 10, 2024
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 storage/elasticsearch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants