Skip to content

Conversation

mahadzaryab1
Copy link
Collaborator

Which problem is this PR solving?

Description of the changes

  • The integration tests were previously overwriting the existing environment variables when starting the test binary. This PR fixes that by appending the test-specific environment variables to the current environment, ensuring that existing variables are preserved.

How was this change tested?

  • Manually tested that environment variables are propagated when calling go test

Checklist

Signed-off-by: Mahad Zaryab <mahadzaryab1@gmail.com>
Copy link

codecov bot commented May 10, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 96.09%. Comparing base (0d538cd) to head (ccd331c).
Report is 1 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #7112      +/-   ##
==========================================
- Coverage   96.13%   96.09%   -0.04%     
==========================================
  Files         358      358              
  Lines       21585    21585              
==========================================
- Hits        20750    20742       -8     
- Misses        629      635       +6     
- Partials      206      208       +2     
Flag Coverage Δ
badger_v1 9.91% <ø> (ø)
badger_v2 2.05% <ø> (ø)
cassandra-4.x-v1-manual 14.91% <ø> (ø)
cassandra-4.x-v2-auto 2.04% <ø> (ø)
cassandra-4.x-v2-manual 2.07% <ø> (+0.02%) ⬆️
cassandra-5.x-v1-manual 14.91% <ø> (ø)
cassandra-5.x-v2-auto 2.04% <ø> (ø)
cassandra-5.x-v2-manual 2.04% <ø> (ø)
elasticsearch-6.x-v1 20.17% <ø> (ø)
elasticsearch-7.x-v1 20.25% <ø> (ø)
elasticsearch-8.x-v1 20.43% <ø> (ø)
elasticsearch-8.x-v2 2.05% <ø> (ø)
grpc_v1 11.46% <ø> (ø)
grpc_v2 2.05% <ø> (ø)
kafka-3.x-v1 10.19% <ø> (ø)
kafka-3.x-v2 2.05% <ø> (ø)
memory_v2 2.05% <ø> (ø)
opensearch-1.x-v1 20.30% <ø> (ø)
opensearch-2.x-v1 20.30% <ø> (ø)
opensearch-2.x-v2 2.05% <ø> (ø)
query 2.05% <ø> (ø)
tailsampling-processor 0.55% <ø> (ø)
unittests 94.90% <ø> (-0.04%) ⬇️

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.

@@ -89,7 +89,7 @@ func (s *E2EStorageIntegration) e2eInitialize(t *testing.T, storage string) {
// since the binary config file jaeger_query's ui.config_file points to
// "./cmd/jaeger/config-ui.json"
Dir: "../../../..",
Env: envVars,
Env: append(os.Environ(), envVars...),
Copy link
Member

Choose a reason for hiding this comment

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

I am not sure we want such a blanket copy, I would rather use some kind of whitelist of env vars that should be propagated, and have that list controlled by the individual tests (i.e. empty by default)

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

@yurishkuro Addressed. Let me know what you think

mahadzaryab1 and others added 2 commits May 10, 2025 10:18
Signed-off-by: Mahad Zaryab <mahadzaryab1@gmail.com>
@mahadzaryab1 mahadzaryab1 requested a review from yurishkuro May 10, 2025 14:22
PropagateEnvVars: []string{
"REMOTE_STORAGE_ENDPOINT",
"ARCHIVE_REMOTE_STORAGE_ENDPOINT",
},
Copy link
Member

Choose a reason for hiding this comment

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

we need to add a var for writer endpoint

          endpoint: "${env:REMOTE_STORAGE_ENDPOINT:-localhost:17271}"
          tls:
            insecure: true
          writer:
            endpoint: 0.0.0.0:4316
            tls:
              insecure: true

Signed-off-by: Mahad Zaryab <mahadzaryab1@gmail.com>
Signed-off-by: Mahad Zaryab <mahadzaryab1@gmail.com>
@yurishkuro yurishkuro enabled auto-merge May 10, 2025 14:33
@yurishkuro yurishkuro added this pull request to the merge queue May 10, 2025
Merged via the queue into jaegertracing:main with commit 7060d31 May 10, 2025
58 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants