fix: correctly handle __raw_url__ by replacing url with it if present
#72
Conversation
This file contains 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
nadiamoe
force-pushed
the
raw-url-handling
branch
2 times, most recently
from
8a92a01 to
f92bd13
Compare
nadiamoe
force-pushed
the
raw-url-handling
branch
from
f92bd13 to
00637f5
Compare
nadiamoe
force-pushed
the
raw-url-handling
branch
from
afc8a18 to
d7c3541
Compare
|
Still testing this in dev, but should be reviewable in the meantime. |
nadiamoe
commented
Mar 3, 2025
Comment on lines
-38
to
+46
| ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second) | ||
| ctx, cancel := context.WithTimeout(context.Background(), time.Minute) | ||
| t.Cleanup(cancel) | ||
|
|
||
| outFile := filepath.Join(t.TempDir(), "metrics.txt") | ||
|
|
||
| cmd := exec.CommandContext(ctx, smk6, "run", "-", "-o=sm="+outFile) | ||
| cmd.Stdin = bytes.NewReader(testScript) | ||
| err = cmd.Run() | ||
| if err != nil { | ||
| t.Fatalf("running sm-k6: %v", err) | ||
| if k6out, err := cmd.CombinedOutput(); err != nil { | ||
| t.Fatalf("running sm-k6: %v\n%s", errors.Join(err, ctx.Err()), string(k6out)) |
There was a problem hiding this comment.
I struggled to reliably get tests to pass without this. I'll probably get rid of these changes in favor of #73, when and if it gets merged.
|
To my best knowledge, nothing seems broken. I deployed the change in dev at 15:21 in this screenshot time.
Omw to test multihttp with interpolation now. |
|
Sorry for tagging you directly @d0ugal, but I think you now have a decent hunk of context for this. Hopefully this is a simple change to review! |
d0ugal
approved these changes
Mar 5, 2025
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.
This PR introduced special handling for the
__raw_url__tag, which matches what the agent would expect as per grafana/synthetic-monitoring-agent#683.It also adds tests to assert that the label is correclty replaced, and that
__raw_url__is removed from the output, as otherwise it would make the output invalid as per the prometheus spec.