[integration_test] Add RunForEachImageAndFeatureFlag and improve Otel Logging integration tests.
#2102
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rafaelwestphal
requested changes
Oct 23, 2025
| } | ||
|
|
||
| // RunForEachImageAndLoggingSubagent runs a subtest for each image and logging subagent (fluent-bit, otel). | ||
| func RunForEachImageAndLoggingSubagent(t *testing.T, testBody func(t *testing.T, imageSpec string, otel bool)) { |
Contributor
There was a problem hiding this comment.
Change it to be agnostic of what you are testing.
RunForEachImageAndFeatureFlag
func RunForEachImageAndFeatureFlag(t *testing.T, []string features, testBody func(t *testing.T, imageSpec string, feature string)) {
gce.RunForEachImage(t, func(t *testing.T, imageSpec string) {
t.Parallel()
// Run base case also
t.Run("default", func(t *testing.T) {
testBody(t, "default")
})
for _, feature := range featureList {
t.Run(feature, func(t *testing.T) {
testBody(t, feature)
})
}
})
}
Contributor
Author
There was a problem hiding this comment.
Done!
| func TestCustomLogFormat(t *testing.T) { | ||
| t.Parallel() | ||
| RunForEachLoggingSubagent(t, func(t *testing.T, otel bool) { | ||
| RunForEachImageAndLoggingSubagent(t, func(t *testing.T, imageSpec string, otel bool) { |
Contributor
There was a problem hiding this comment.
This would change to:
RunForEachFeatureFlag(t, []string{"otel"}, func(t *testing.T, feature string) {
you can check for your feature by checking the value of feature
Contributor
Author
There was a problem hiding this comment.
Done!
| // setExperimentalFeatures sets the EXPERIMENTAL_FEATURES environment variable. | ||
| func setExperimentalFeatures(ctx context.Context, logger *log.Logger, vm *gce.VM, feature string) error { | ||
| return gce.SetEnvironmentVariables(ctx, logger, vm, map[string]string{"EXPERIMENTAL_FEATURES": feature}) | ||
| // SetupOpsAgentForLoggingSubagent configures the VM and the config depending on the selected logging subagent (fluent-bit, otel) |
Contributor
There was a problem hiding this comment.
Also make this generic so other features can be used. Maybe pass in a function instead of coding it here.
Contributor
Author
There was a problem hiding this comment.
Done!
rafaelwestphal
approved these changes
Oct 23, 2025
Contributor
rafaelwestphal
left a comment
There was a problem hiding this comment.
Thanks!
I think this looks much better now :)
RunForEachImageAndLoggingSubagent and improve Otel Logging integration tests.RunForEachImageAndFeatureFlag and improve Otel Logging integration tests.
Contributor
Author
|
All 3P app failures are unrelated. Flake on |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Created
RunForEachImageAndFeatureFlagand other test helper functions. The goal is that followup PR "diffs" to convert an existing test to be anOtel Loggingtest is minimal.Related issue
b/416048587
How has this been tested?
Checklist: