Skip to content

Fix sporadic test failure in otlp exporter http driver #1906

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MrAlias merged 5 commits into from
May 13, 2021
Merged

Fix sporadic test failure in otlp exporter http driver #1906

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
213807f
Fix sporadic test failure in otlp exporter http driver
MrAlias May 12, 2021
4a104b8
Shorten driver timeout
MrAlias May 12, 2021
00c7ec1
Merge branch 'main' into fix-1905
MrAlias May 12, 2021
6179087
Merge branch 'main' into fix-1905
MrAlias May 12, 2021
a69dbcc
Merge branch 'main' into fix-1905
MrAlias May 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions exporters/otlp/otlphttp/driver_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,15 +171,15 @@ func TestRetry(t *testing.T) {
}

func TestTimeout(t *testing.T) {
mcCfg := mockCollectorConfig{
InjectDelay: 100 * time.Millisecond,
}
delay := make(chan struct{})
mcCfg := mockCollectorConfig{Delay: delay}
mc := runMockCollector(t, mcCfg)
defer mc.MustStop(t)
defer func() { close(delay) }()
driver := otlphttp.NewDriver(
otlphttp.WithEndpoint(mc.Endpoint()),
otlphttp.WithInsecure(),
otlphttp.WithTimeout(50*time.Millisecond),
otlphttp.WithTimeout(time.Nanosecond),
)
ctx := context.Background()
exporter, err := otlp.NewExporter(ctx, driver)
Expand All @@ -188,7 +188,7 @@ func TestTimeout(t *testing.T) {
assert.NoError(t, exporter.Shutdown(ctx))
}()
err = exporter.ExportSpans(ctx, otlptest.SingleReadOnlySpan())
assert.Equal(t, true, os.IsTimeout(err))
assert.Equalf(t, true, os.IsTimeout(err), "expected timeout error, got: %v", err)
}

func TestRetryFailed(t *testing.T) {
Expand Down
23 changes: 15 additions & 8 deletions exporters/otlp/otlphttp/mock_collector_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ import (
"net/http"
"sync"
"testing"
"time"

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
Expand All @@ -53,7 +52,7 @@ type mockCollector struct {

injectHTTPStatus []int
injectContentType string
injectDelay time.Duration
delay <-chan struct{}

clientTLSConfig *tls.Config
expectedHeaders map[string]string
Expand Down Expand Up @@ -94,8 +93,12 @@ func (c *mockCollector) ClientTLSConfig() *tls.Config {
}

func (c *mockCollector) serveMetrics(w http.ResponseWriter, r *http.Request) {
if c.injectDelay != 0 {
time.Sleep(c.injectDelay)
if c.delay != nil {
select {
case <-c.delay:
case <-r.Context().Done():
return
}
}

if !c.checkHeaders(r) {
Expand Down Expand Up @@ -139,8 +142,12 @@ func unmarshalMetricsRequest(rawRequest []byte, contentType string) (*collectorm
}

func (c *mockCollector) serveTraces(w http.ResponseWriter, r *http.Request) {
if c.injectDelay != 0 {
time.Sleep(c.injectDelay)
if c.delay != nil {
select {
case <-c.delay:
case <-r.Context().Done():
return
}
}

if !c.checkHeaders(r) {
Expand Down Expand Up @@ -247,7 +254,7 @@ type mockCollectorConfig struct {
Port int
InjectHTTPStatus []int
InjectContentType string
InjectDelay time.Duration
Delay <-chan struct{}
WithTLS bool
ExpectedHeaders map[string]string
}
Expand All @@ -273,7 +280,7 @@ func runMockCollector(t *testing.T, cfg mockCollectorConfig) *mockCollector {
metricsStorage: otlptest.NewMetricsStorage(),
injectHTTPStatus: cfg.InjectHTTPStatus,
injectContentType: cfg.InjectContentType,
injectDelay: cfg.InjectDelay,
delay: cfg.Delay,
expectedHeaders: cfg.ExpectedHeaders,
}
mux := http.NewServeMux()
Expand Down