delay doneAt as needed #223
Open
+52
−4
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
in terminal logs and directory output meta.jsons, this will
output a json
```
{"middlewareRequestID":"c3e36c64","doneAt":"2025-10-13T17:06:32.026094+02:00"}
{"middlewareRequestID":"777bfc30","doneAt":"2025-10-13T17:06:38.413933+02:00"}
{"middlewareRequestID":"777bfc30","watchOptions":"-trunc(0)/-trunc(0)","when":"2025-10-13T15:06:38.385144025Z","normHost":"location.hotrod-devmesh.svc.cluster.local:8081","routingKey":"g9wqf90gqw9mj","destWorkload":"Deployment/hotrod-devmesh/location","requestURI":"http://sbr-dep-location-2c37fc13.hotrod-devmesh.svc:8081/locations","method":"GET","proto":"HTTP/1.1","userAgent":"curl/8.7.1"}
```
Note the order between doneAt and the initial request is not guaranteed
(I think it would be hard and likely buggy to do so...)
In request directories, the meta.jsons gets updated to include "doneAt":
- overwrite on first apply - fix retErrs overwrites - fix a couple of logic issues
* adds doneAt reporting
in terminal logs and directory output meta.jsons, this will
output a json
```
{"middlewareRequestID":"c3e36c64","doneAt":"2025-10-13T17:06:32.026094+02:00"}
{"middlewareRequestID":"777bfc30","doneAt":"2025-10-13T17:06:38.413933+02:00"}
{"middlewareRequestID":"777bfc30","watchOptions":"-trunc(0)/-trunc(0)","when":"2025-10-13T15:06:38.385144025Z","normHost":"location.hotrod-devmesh.svc.cluster.local:8081","routingKey":"g9wqf90gqw9mj","destWorkload":"Deployment/hotrod-devmesh/location","requestURI":"http://sbr-dep-location-2c37fc13.hotrod-devmesh.svc:8081/locations","method":"GET","proto":"HTTP/1.1","userAgent":"curl/8.7.1"}
```
Note the order between doneAt and the initial request is not guaranteed
(I think it would be hard and likely buggy to do so...)
In request directories, the meta.jsons gets updated to include "doneAt":
* fixes to continuous readiness checking
- overwrite on first apply
- fix retErrs overwrites
- fix a couple of logic issues
…ot/cli into tw-continuous-ready-match
* implementation of tw directory default
also,
- improve help
- improve signal handling
* add --clean flag
* fix sentence in help
* use -{json,yaml} for directory
* update flags after discussion
- no-instrument is hidden
- --to has become --output-dir, which only applies when !short
- --output-file may be provided with --short
* check match consistency as well.
* rename watch command to record
* add 'r' alias for record
* rename files to reflect 'record' command name
* use trafficwatch.MiddlewareName everywhere
* rename cli mw to trafficwatch from trafficwatch-client
(depends on PR in signadot repo)
|
Gitar automatically fixes CI failures and addresses comments starting with ⚙️ Options:
🔄 To revert changes, post a comment: * Gitar never force pushes to your branch |
Comment on lines
13
to
42
| func waitLogged(logged, done <-chan string) chan string { | ||
| res := make(chan string) | ||
| go func() { | ||
| d := map[string]bool{} | ||
| for { | ||
| select { | ||
| case id, ok := <-logged: | ||
| if !ok { | ||
| if done == nil { | ||
| return | ||
| } | ||
| logged = nil | ||
| } else { | ||
| d[id] = true | ||
| } | ||
| case id, ok := <-done: | ||
| if !ok { | ||
| if logged == nil { | ||
| return | ||
| } | ||
| done = nil | ||
| } else { | ||
| res <- id | ||
| delete(d, id) | ||
| } | ||
| } | ||
| } | ||
| }() | ||
| return res | ||
| } |
There was a problem hiding this comment.
Are we supposed to use d within this code?
There was a problem hiding this comment.
fixed but in a merge commit due to merge conflicts
6fd0371
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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 adds a filter to doneAt that delays it until after the initial received meta has been logged