From bc9ce902dd59ae5bb4241410768871270d0dc7b3 Mon Sep 17 00:00:00 2001 From: Tom Tan Date: Wed, 30 Sep 2020 11:12:07 -0700 Subject: [PATCH 1/4] Add explicit type conversion from double to int --- ext/test/zpages/tracez_data_aggregator_test.cc | 6 +++--- .../sdk/metrics/aggregator/sketch_aggregator.h | 2 +- sdk/test/trace/probability_sampler_test.cc | 14 ++++++++++---- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/ext/test/zpages/tracez_data_aggregator_test.cc b/ext/test/zpages/tracez_data_aggregator_test.cc index 1a1cc92dcc..1aa9feb712 100644 --- a/ext/test/zpages/tracez_data_aggregator_test.cc +++ b/ext/test/zpages/tracez_data_aggregator_test.cc @@ -60,14 +60,14 @@ void VerifySpanCountsInTracezData( << " Count of running spans incorrect for " << span_name << "\n"; EXPECT_EQ(aggregated_data.sample_running_spans.size(), - std::min(running_span_count, kMaxNumberOfSampleSpans)) + std::min(running_span_count, kMaxNumberOfSampleSpans)) << " Size of sample running spans incorrect for " << span_name << "\n"; EXPECT_EQ(aggregated_data.error_span_count, error_span_count) << " Count of error spans incorrect for " << span_name << "\n"; EXPECT_EQ(aggregated_data.sample_error_spans.size(), - std::min(error_span_count, kMaxNumberOfSampleSpans)) + std::min(error_span_count, kMaxNumberOfSampleSpans)) << " Count of running spans incorrect for " << span_name << "\n"; for (unsigned int boundary = 0; boundary < kLatencyBoundaries.size(); boundary++) @@ -77,7 +77,7 @@ void VerifySpanCountsInTracezData( << " Count of completed spans in latency boundary " << boundary << " incorrect for " << span_name << "\n"; EXPECT_EQ(aggregated_data.sample_latency_spans[boundary].size(), - std::min(completed_span_count_per_latency_bucket[boundary], + std::min(completed_span_count_per_latency_bucket[boundary], kMaxNumberOfSampleSpans)) << " Count of sample completed spans in latency boundary " << boundary << " incorrect for " << span_name << "\n"; diff --git a/sdk/include/opentelemetry/sdk/metrics/aggregator/sketch_aggregator.h b/sdk/include/opentelemetry/sdk/metrics/aggregator/sketch_aggregator.h index 617d320570..9f0545d993 100644 --- a/sdk/include/opentelemetry/sdk/metrics/aggregator/sketch_aggregator.h +++ b/sdk/include/opentelemetry/sdk/metrics/aggregator/sketch_aggregator.h @@ -72,7 +72,7 @@ class SketchAggregator final : public Aggregator } else { - idx = ceil(log(val) / log(gamma)); + idx = static_cast(ceil(log(val) / log(gamma))); } if (raw_.find(idx) != raw_.end()) { diff --git a/sdk/test/trace/probability_sampler_test.cc b/sdk/test/trace/probability_sampler_test.cc index 5062fb3b3a..0b7b2c0b65 100644 --- a/sdk/test/trace/probability_sampler_test.cc +++ b/sdk/test/trace/probability_sampler_test.cc @@ -138,7 +138,9 @@ TEST(ProbabilitySampler, ShouldSampleWithContext) TEST(ProbabilitySampler, ProbabilitySamplerHalf) { double probability = 0.5; - int iterations = 100000, expected_count = iterations * probability, variance = iterations * 0.01; + int iterations = 100000; + int expected_count = static_cast(iterations * probability); + int variance = static_cast(iterations * 0.01); SpanContext c(true, true); ProbabilitySampler s(probability); @@ -152,7 +154,9 @@ TEST(ProbabilitySampler, ProbabilitySamplerHalf) TEST(ProbabilitySampler, ProbabilitySamplerOnePercent) { double probability = 0.01; - int iterations = 100000, expected_count = iterations * probability, variance = iterations * 0.01; + int iterations = 100000; + int expected_count = static_cast(iterations * probability); + int variance = static_cast(iterations * 0.01); SpanContext c(true, true); ProbabilitySampler s(probability); @@ -166,7 +170,8 @@ TEST(ProbabilitySampler, ProbabilitySamplerOnePercent) TEST(ProbabilitySampler, ProbabilitySamplerAll) { double probability = 1.0; - int iterations = 100000, expected_count = iterations * probability; + int iterations = 100000; + int expected_count = static_cast(iterations * probability); SpanContext c(true, true); ProbabilitySampler s(probability); @@ -179,7 +184,8 @@ TEST(ProbabilitySampler, ProbabilitySamplerAll) TEST(ProbabilitySampler, ProbabilitySamplerNone) { double probability = 0.0; - int iterations = 100000, expected_count = iterations * probability; + int iterations = 100000; + int expected_count = static_cast(iterations * probability); SpanContext c(true, true); ProbabilitySampler s(probability); From 092066ac3c728b90f3c00c1ace53146e8d80d43e Mon Sep 17 00:00:00 2001 From: Tom Tan Date: Thu, 1 Oct 2020 18:06:38 -0700 Subject: [PATCH 2/4] Format spaces --- sdk/test/trace/probability_sampler_test.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sdk/test/trace/probability_sampler_test.cc b/sdk/test/trace/probability_sampler_test.cc index 0b7b2c0b65..f7afd57398 100644 --- a/sdk/test/trace/probability_sampler_test.cc +++ b/sdk/test/trace/probability_sampler_test.cc @@ -138,9 +138,9 @@ TEST(ProbabilitySampler, ShouldSampleWithContext) TEST(ProbabilitySampler, ProbabilitySamplerHalf) { double probability = 0.5; - int iterations = 100000; + int iterations = 100000; int expected_count = static_cast(iterations * probability); - int variance = static_cast(iterations * 0.01); + int variance = static_cast(iterations * 0.01); SpanContext c(true, true); ProbabilitySampler s(probability); @@ -154,9 +154,9 @@ TEST(ProbabilitySampler, ProbabilitySamplerHalf) TEST(ProbabilitySampler, ProbabilitySamplerOnePercent) { double probability = 0.01; - int iterations = 100000; + int iterations = 100000; int expected_count = static_cast(iterations * probability); - int variance = static_cast(iterations * 0.01); + int variance = static_cast(iterations * 0.01); SpanContext c(true, true); ProbabilitySampler s(probability); @@ -170,7 +170,7 @@ TEST(ProbabilitySampler, ProbabilitySamplerOnePercent) TEST(ProbabilitySampler, ProbabilitySamplerAll) { double probability = 1.0; - int iterations = 100000; + int iterations = 100000; int expected_count = static_cast(iterations * probability); SpanContext c(true, true); @@ -184,7 +184,7 @@ TEST(ProbabilitySampler, ProbabilitySamplerAll) TEST(ProbabilitySampler, ProbabilitySamplerNone) { double probability = 0.0; - int iterations = 100000; + int iterations = 100000; int expected_count = static_cast(iterations * probability); SpanContext c(true, true); From 288f40cff05a035e1b081139d8e5be23517ab8a7 Mon Sep 17 00:00:00 2001 From: Tom Tan Date: Thu, 1 Oct 2020 19:40:30 -0700 Subject: [PATCH 3/4] More format --- ext/test/zpages/tracez_data_aggregator_test.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/test/zpages/tracez_data_aggregator_test.cc b/ext/test/zpages/tracez_data_aggregator_test.cc index 1aa9feb712..78812e22b3 100644 --- a/ext/test/zpages/tracez_data_aggregator_test.cc +++ b/ext/test/zpages/tracez_data_aggregator_test.cc @@ -78,7 +78,7 @@ void VerifySpanCountsInTracezData( << span_name << "\n"; EXPECT_EQ(aggregated_data.sample_latency_spans[boundary].size(), std::min(completed_span_count_per_latency_bucket[boundary], - kMaxNumberOfSampleSpans)) + kMaxNumberOfSampleSpans)) << " Count of sample completed spans in latency boundary " << boundary << " incorrect for " << span_name << "\n"; } From 1eb86e8df63cd0f2add45be13310c2cfadec3168 Mon Sep 17 00:00:00 2001 From: Tom Tan Date: Fri, 2 Oct 2020 09:17:51 -0700 Subject: [PATCH 4/4] Rerun GitHub Actions