Skip to content
Merged
Show file tree
Hide file tree
Changes from 21 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
- Fix data race when writing log entries with `context.Context` fields in `go.opentelemetry.io/contrib/bridges/otelzap`. (#7368)
- Fix nil pointer dereference when `ClientTracer` did not have a span in `go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace`. (#7464)
- Record all non-failure metrics on transport round trip errors in `go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp`. (#7146)
- Skip the exporter tests on Windows due to flaky test runs in `go.opentelemetry.io/contrib/otelconf` (#7446)
Comment thread
bacherfl marked this conversation as resolved.
Outdated

<!-- Released section -->
<!-- Don't change this section unless doing release -->
Expand Down
14 changes: 12 additions & 2 deletions otelconf/v0.3.0/log_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
"os"
"path/filepath"
"reflect"
"runtime"
"strings"
"testing"
"time"
Expand Down Expand Up @@ -706,6 +707,10 @@ func TestLogProcessor(t *testing.T) {
}

func Test_otlpGRPCLogExporter(t *testing.T) {
if runtime.GOOS == "windows" {
// TODO (#7446): Fix the flakiness on Windows.
t.Skip("Test is flaky on Windows.")
}
type args struct {
ctx context.Context
otlpConfig *OTLP
Expand Down Expand Up @@ -841,10 +846,15 @@ func startGRPCLogsCollector(t *testing.T, listener net.Listener, serverOptions [
c := &grpcLogsCollector{}

collogpb.RegisterLogsServiceServer(srv, c)
go func() { _ = srv.Serve(listener) }()

errCh := make(chan error, 1)
go func() { errCh <- srv.Serve(listener) }()

t.Cleanup(func() {
srv.Stop()
srv.GracefulStop()
if err := <-errCh; err != nil && !errors.Is(err, grpc.ErrServerStopped) {
assert.NoError(t, err)
}
})
}

Expand Down
14 changes: 12 additions & 2 deletions otelconf/v0.3.0/metric_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import (
"os"
"path/filepath"
"reflect"
"runtime"
"strings"
"testing"
"time"
Expand Down Expand Up @@ -1398,6 +1399,10 @@ func TestPrometheusIPv6(t *testing.T) {
}

func Test_otlpGRPCMetricExporter(t *testing.T) {
if runtime.GOOS == "windows" {
// TODO (#7446): Fix the flakiness on Windows.
t.Skip("Test is flaky on Windows.")
}
type args struct {
ctx context.Context
otlpConfig *OTLPMetric
Expand Down Expand Up @@ -1548,10 +1553,15 @@ func startGRPCMetricCollector(t *testing.T, listener net.Listener, serverOptions
c := &grpcMetricCollector{}

v1.RegisterMetricsServiceServer(srv, c)
go func() { _ = srv.Serve(listener) }()

errCh := make(chan error, 1)
go func() { errCh <- srv.Serve(listener) }()

t.Cleanup(func() {
srv.Stop()
srv.GracefulStop()
if err := <-errCh; err != nil && !errors.Is(err, grpc.ErrServerStopped) {
assert.NoError(t, err)
}
})
}

Expand Down
14 changes: 12 additions & 2 deletions otelconf/v0.3.0/trace_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
"os"
"path/filepath"
"reflect"
"runtime"
"strings"
"testing"
"time"
Expand Down Expand Up @@ -854,6 +855,10 @@ func TestSampler(t *testing.T) {
}

func Test_otlpGRPCTraceExporter(t *testing.T) {
if runtime.GOOS == "windows" {
// TODO (#7446): Fix the flakiness on Windows.
t.Skip("Test is flaky on Windows.")
}
type args struct {
ctx context.Context
otlpConfig *OTLP
Expand Down Expand Up @@ -989,10 +994,15 @@ func startGRPCTraceCollector(t *testing.T, listener net.Listener, serverOptions
c := &grpcTraceCollector{}

v1.RegisterTraceServiceServer(srv, c)
go func() { _ = srv.Serve(listener) }()

errCh := make(chan error, 1)
go func() { errCh <- srv.Serve(listener) }()

t.Cleanup(func() {
srv.Stop()
srv.GracefulStop()
if err := <-errCh; err != nil && !errors.Is(err, grpc.ErrServerStopped) {
assert.NoError(t, err)
}
})
}

Expand Down
Loading