Skip to content

Add explicit type conversion to narrower data type #347

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
reyang merged 5 commits into from
Oct 5, 2020
Merged

Add explicit type conversion to narrower data type #347

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
bc9ce90
Add explicit type conversion from double to int
ThomsonTan Sep 30, 2020
2c75ac6
Merge branch 'master' into FixMoreTypes
reyang Oct 1, 2020
092066a
Format spaces
ThomsonTan Oct 2, 2020
288f40c
More format
ThomsonTan Oct 2, 2020
1eb86e8
Rerun GitHub Actions
ThomsonTan Oct 2, 2020
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
8 changes: 4 additions & 4 deletions ext/test/zpages/tracez_data_aggregator_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<unsigned int>(running_span_count, kMaxNumberOfSampleSpans))
std::min<size_t>(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<unsigned int>(error_span_count, kMaxNumberOfSampleSpans))
std::min<size_t>(error_span_count, kMaxNumberOfSampleSpans))
<< " Count of running spans incorrect for " << span_name << "\n";

for (unsigned int boundary = 0; boundary < kLatencyBoundaries.size(); boundary++)
Expand All @@ -77,8 +77,8 @@ 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<unsigned int>(completed_span_count_per_latency_bucket[boundary],
kMaxNumberOfSampleSpans))
std::min<size_t>(completed_span_count_per_latency_bucket[boundary],
kMaxNumberOfSampleSpans))
<< " Count of sample completed spans in latency boundary " << boundary << " incorrect for "
<< span_name << "\n";
}
Expand Down
2 changes: 1 addition & 1 deletion sdk/include/opentelemetry/sdk/metrics/aggregator/sketch_aggregator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ class SketchAggregator final : public Aggregator<T>
}
else
{
idx = ceil(log(val) / log(gamma));
idx = static_cast<int>(ceil(log(val) / log(gamma)));
Comment thread
ThomsonTan marked this conversation as resolved.
}
if (raw_.find(idx) != raw_.end())
{
Expand Down
14 changes: 10 additions & 4 deletions sdk/test/trace/probability_sampler_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<int>(iterations * probability);
int variance = static_cast<int>(iterations * 0.01);

SpanContext c(true, true);
ProbabilitySampler s(probability);
Expand All @@ -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<int>(iterations * probability);
int variance = static_cast<int>(iterations * 0.01);

SpanContext c(true, true);
ProbabilitySampler s(probability);
Expand All @@ -166,7 +170,8 @@ TEST(ProbabilitySampler, ProbabilitySamplerOnePercent)
TEST(ProbabilitySampler, ProbabilitySamplerAll)
{
double probability = 1.0;
int iterations = 100000, expected_count = iterations * probability;
int iterations = 100000;
Comment thread
ThomsonTan marked this conversation as resolved.
int expected_count = static_cast<int>(iterations * probability);

SpanContext c(true, true);
ProbabilitySampler s(probability);
Expand All @@ -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<int>(iterations * probability);

SpanContext c(true, true);
ProbabilitySampler s(probability);
Expand Down