Skip to content

Commit

Permalink
Fix timeout of OtlpHttpExporterTestPeer and `OtlpHttpLogExporterTes…
Browse files Browse the repository at this point in the history
…tPeer` when run under valgrind. (open-telemetry#1080)
  • Loading branch information
owent authored Nov 22, 2021
1 parent 6e249fd commit 089b04d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions exporters/otlp/test/otlp_http_exporter_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ TEST_F(OtlpHttpExporterTestPeer, ExportJsonIntegrationTest)
report_trace_id.assign(trace_id_hex, sizeof(trace_id_hex));
}

ASSERT_TRUE(waitForRequests(2, old_count + 1));
ASSERT_TRUE(waitForRequests(8, old_count + 1));
auto check_json = received_requests_json_.back();
auto resource_span = *check_json["resource_spans"].begin();
auto instrumentation_library_span = *resource_span["instrumentation_library_spans"].begin();
Expand Down Expand Up @@ -310,7 +310,7 @@ TEST_F(OtlpHttpExporterTestPeer, ExportBinaryIntegrationTest)
report_trace_id.assign(reinterpret_cast<char *>(trace_id_binary), sizeof(trace_id_binary));
}

ASSERT_TRUE(waitForRequests(2, old_count + 1));
ASSERT_TRUE(waitForRequests(8, old_count + 1));

auto received_trace_id = received_requests_binary_.back()
.resource_spans(0)
Expand Down
4 changes: 2 additions & 2 deletions exporters/otlp/test/otlp_http_log_exporter_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ TEST_F(OtlpHttpLogExporterTestPeer, ExportJsonIntegrationTest)
report_span_id.assign(span_id_hex, sizeof(span_id_hex));
}

ASSERT_TRUE(waitForRequests(2, old_count + 1));
ASSERT_TRUE(waitForRequests(8, old_count + 1));
auto check_json = received_requests_json_.back();
auto resource_logs = *check_json["resource_logs"].begin();
auto instrumentation_library_span = *resource_logs["instrumentation_library_logs"].begin();
Expand Down Expand Up @@ -339,7 +339,7 @@ TEST_F(OtlpHttpLogExporterTestPeer, ExportBinaryIntegrationTest)
report_span_id.assign(reinterpret_cast<const char *>(span_id_bin), sizeof(span_id_bin));
}

ASSERT_TRUE(waitForRequests(2, old_count + 1));
ASSERT_TRUE(waitForRequests(8, old_count + 1));
auto received_log =
received_requests_binary_.back().resource_logs(0).instrumentation_library_logs(0).logs(0);
EXPECT_EQ(received_log.trace_id(), report_trace_id);
Expand Down

0 comments on commit 089b04d

Please sign in to comment.