mirror of
https://github.com/cloudflare/cloudflared.git
synced 2026-10-12 02:12:14 +00:00
Devin Carr
0f222b39d4
Instead of removing the --transport-loglevel flag, we will mark it as deprecated. It was no longer used in any logging capacity but removing the flag will cause existing cloudflared clients who set the flag to fail to start. The dedicated transport logger was never used for log emission, so remove its construction and plumbing through tunnel configuration, the supervisor, and the connection observer.
107 lines
2.5 KiB
Go
107 lines
2.5 KiB
Go
package connection
|
|
|
|
import (
|
|
"runtime"
|
|
"strconv"
|
|
"sync"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/prometheus/client_golang/prometheus"
|
|
dto "github.com/prometheus/client_model/go"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestSendUrl(t *testing.T) {
|
|
observer := NewObserver(&log)
|
|
|
|
observer.SendURL("my-url.com")
|
|
assert.InEpsilon(t, 1.0, getCounterValue(t, observer.metrics.userHostnamesCounts, "https://my-url.com"), 0.001)
|
|
|
|
observer.SendURL("https://another-long-one.com")
|
|
assert.InEpsilon(t, 1.0, getCounterValue(t, observer.metrics.userHostnamesCounts, "https://another-long-one.com"), 0.001)
|
|
}
|
|
|
|
func getCounterValue(t *testing.T, metric *prometheus.CounterVec, val string) float64 {
|
|
var m = &dto.Metric{}
|
|
err := metric.WithLabelValues(val).Write(m)
|
|
require.NoError(t, err)
|
|
return m.Counter.GetValue()
|
|
}
|
|
|
|
func TestRegisterServerLocation(t *testing.T) {
|
|
m := newTunnelMetrics()
|
|
tunnels := 20
|
|
var wg sync.WaitGroup
|
|
wg.Add(tunnels)
|
|
for i := 0; i < tunnels; i++ {
|
|
go func(i int) {
|
|
id := strconv.Itoa(i)
|
|
m.registerServerLocation(id, "LHR")
|
|
wg.Done()
|
|
}(i)
|
|
}
|
|
wg.Wait()
|
|
for i := 0; i < tunnels; i++ {
|
|
id := strconv.Itoa(i)
|
|
assert.Equal(t, "LHR", m.oldServerLocations[id])
|
|
}
|
|
|
|
wg.Add(tunnels)
|
|
for i := 0; i < tunnels; i++ {
|
|
go func(i int) {
|
|
id := strconv.Itoa(i)
|
|
m.registerServerLocation(id, "AUS")
|
|
wg.Done()
|
|
}(i)
|
|
}
|
|
wg.Wait()
|
|
for i := 0; i < tunnels; i++ {
|
|
id := strconv.Itoa(i)
|
|
assert.Equal(t, "AUS", m.oldServerLocations[id])
|
|
}
|
|
}
|
|
|
|
func TestObserverEventsDontBlock(t *testing.T) {
|
|
observer := NewObserver(&log)
|
|
var mu sync.Mutex
|
|
observer.RegisterSink(EventSinkFunc(func(_ Event) {
|
|
// callback will block if lock is already held
|
|
mu.Lock()
|
|
defer mu.Unlock()
|
|
runtime.Gosched()
|
|
}))
|
|
|
|
timeout := time.AfterFunc(5*time.Second, func() {
|
|
mu.Unlock() // release the callback on timer expiration
|
|
t.Fatal("observer is blocked")
|
|
})
|
|
|
|
mu.Lock() // block the callback
|
|
for i := 0; i < 2*observerChannelBufferSize; i++ {
|
|
observer.sendRegisteringEvent(0)
|
|
}
|
|
if pending := timeout.Stop(); pending {
|
|
// release the callback if timer hasn't expired yet
|
|
mu.Unlock()
|
|
}
|
|
}
|
|
|
|
type eventCollectorSink struct {
|
|
observedEvents []Event
|
|
mu sync.Mutex
|
|
}
|
|
|
|
func (s *eventCollectorSink) OnTunnelEvent(event Event) {
|
|
s.mu.Lock()
|
|
defer s.mu.Unlock()
|
|
s.observedEvents = append(s.observedEvents, event)
|
|
}
|
|
|
|
func (s *eventCollectorSink) assertSawEvent(t *testing.T, event Event) {
|
|
s.mu.Lock()
|
|
defer s.mu.Unlock()
|
|
assert.Contains(t, s.observedEvents, event)
|
|
}
|