3pp-mirror/pomerium
1
0
Fork 0
mirror of https://github.com/pomerium/pomerium.git synced 2025-08-06 10:21:05 +02:00
Code Issues Projects Releases Packages Wiki Activity

add span events in TestEnvironment.debugf

Browse source
This commit is contained in:
Joe Kralicky 2024-12-05 22:55:26 +00:00
parent 80e559c817
commit 63fad4e3d6
No known key found for this signature in database
GPG key ID: 75C4875F34A9FB79
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
internal/retry/retry.go
View file

@ -9,6 +9,7 @@ import (
"time" "time"
"github.com/rs/zerolog" "github.com/rs/zerolog"
"go.opentelemetry.io/otel/trace"
"github.com/pomerium/pomerium/internal/log" "github.com/pomerium/pomerium/internal/log"
) )
@ -47,7 +48,10 @@ restart:
backoff: backoff:
for { for {
interval := backoff.NextBackOff() interval := backoff.NextBackOff()
log.Ctx(ctx).Info().Msgf("backing off for %s...", interval.String()) span := trace.SpanFromContext(ctx)
msg := fmt.Sprintf("backing off for %s...", interval.String())
span.AddEvent(msg)
log.Ctx(ctx).Info().Msg(msg)
timer := time.NewTimer(interval) timer := time.NewTimer(interval)
s := makeSelect(ctx, watches, name, timer.C, fn) s := makeSelect(ctx, watches, name, timer.C, fn)
next, err := s.Exec(ctx) next, err := s.Exec(ctx)

4
internal/testenv/environment.go
View file

@ -412,10 +412,12 @@ func New(t testing.TB, opts ...EnvironmentOption) Environment {
func (e *environment) debugf(format string, args ...any) { func (e *environment) debugf(format string, args ...any) {
e.t.Helper() e.t.Helper()
if e.rootSpan.IsRecording() {
e.rootSpan.AddEvent(fmt.Sprintf(format, args...))
}
if !e.debug { if !e.debug {
return return
} }
e.t.Logf("\x1b[34m[debug] "+format+"\x1b[0m", args...) e.t.Logf("\x1b[34m[debug] "+format+"\x1b[0m", args...)
} }