Skip to content

Commit 75aa431

Browse files
committed
Run format tool
1 parent b460bd4 commit 75aa431

File tree

4 files changed

+21
-16
lines changed

4 files changed

+21
-16
lines changed

api/include/opentelemetry/trace/propagation/http_trace_context.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ class HttpTraceContext : public context::propagation::TextMapPropagator
8686
}
8787

8888
private:
89-
static constexpr uint8_t kInvalidVersion = 0xFF;
89+
static constexpr uint8_t kInvalidVersion = 0xFF;
9090
static constexpr uint8_t kDefaultAssumedVersion = 0x00;
9191

9292
static bool IsValidVersion(nostd::string_view version_hex)

api/test/trace/propagation/detail/string_test.cc

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,34 +17,35 @@ struct SplitStringTestData
1717
};
1818

1919
const SplitStringTestData split_string_test_cases[] = {
20-
{"foo,bar,baz", ',', 4,
21-
std::vector<opentelemetry::nostd::string_view>{"foo", "bar", "baz"}, 3},
20+
{"foo,bar,baz", ',', 4, std::vector<opentelemetry::nostd::string_view>{"foo", "bar", "baz"}, 3},
2221
{"foo,bar,baz,foobar", ',', 4,
2322
std::vector<opentelemetry::nostd::string_view>{"foo", "bar", "baz", "foobar"}, 4},
2423
{"foo,bar,baz,foobar", '.', 4,
2524
std::vector<opentelemetry::nostd::string_view>{"foo,bar,baz,foobar"}, 1},
2625
{"foo,bar,baz,", ',', 4,
27-
std::vector<opentelemetry::nostd::string_view>{"foo","bar","baz",""}, 4},
28-
{"foo,bar,baz,", ',', 2,
29-
std::vector<opentelemetry::nostd::string_view>{"foo","bar"}, 2},
26+
std::vector<opentelemetry::nostd::string_view>{"foo", "bar", "baz", ""}, 4},
27+
{"foo,bar,baz,", ',', 2, std::vector<opentelemetry::nostd::string_view>{"foo", "bar"}, 2},
3028
{"foo ,bar, baz ", ',', 4,
31-
std::vector<opentelemetry::nostd::string_view>{"foo ","bar"," baz "}, 3},
29+
std::vector<opentelemetry::nostd::string_view>{"foo ", "bar", " baz "}, 3},
3230
{"foo ,bar, baz ", ',', 4,
33-
std::vector<opentelemetry::nostd::string_view>{"foo ","bar"," baz "}, 3},
31+
std::vector<opentelemetry::nostd::string_view>{"foo ", "bar", " baz "}, 3},
3432
{"00-0af7651916cd43dd8448eb211c80319c-00f067aa0ba902b7-01", '-', 4,
35-
std::vector<opentelemetry::nostd::string_view>{"00","0af7651916cd43dd8448eb211c80319c","00f067aa0ba902b7", "01"}, 4},
33+
std::vector<opentelemetry::nostd::string_view>{"00", "0af7651916cd43dd8448eb211c80319c",
34+
"00f067aa0ba902b7", "01"},
35+
4},
3636
};
3737

3838
// Test fixture
39-
class SplitStringTestFixture : public ::testing::TestWithParam<SplitStringTestData> {};
39+
class SplitStringTestFixture : public ::testing::TestWithParam<SplitStringTestData>
40+
{};
4041

4142
TEST_P(SplitStringTestFixture, SplitsAsExpected)
4243
{
4344
SplitStringTestData test_param = GetParam();
4445
std::vector<opentelemetry::nostd::string_view> fields{};
4546
fields.reserve(test_param.expected_number_strings);
46-
size_t got_splits_num = opentelemetry::trace::propagation::detail::SplitString(test_param.input, test_param.separator, fields.data(), test_param.max_count);
47-
47+
size_t got_splits_num = opentelemetry::trace::propagation::detail::SplitString(
48+
test_param.input, test_param.separator, fields.data(), test_param.max_count);
4849

4950
// Assert on the output
5051
EXPECT_EQ(got_splits_num, test_param.expected_number_strings);
@@ -55,4 +56,6 @@ TEST_P(SplitStringTestFixture, SplitsAsExpected)
5556
}
5657
}
5758

58-
INSTANTIATE_TEST_SUITE_P(SplitStringTestCases, SplitStringTestFixture, ::testing::ValuesIn(split_string_test_cases));
59+
INSTANTIATE_TEST_SUITE_P(SplitStringTestCases,
60+
SplitStringTestFixture,
61+
::testing::ValuesIn(split_string_test_cases));

ext/include/opentelemetry/ext/http/server/http_server.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -650,8 +650,10 @@ class HttpServer : private SocketTools::Reactor::SocketCallback
650650
}
651651
if (!conn.request.headers[name].empty())
652652
{
653-
conn.request.headers[name] = conn.request.headers[name].append(",").append(std::string(begin, ptr));
654-
} else
653+
conn.request.headers[name] =
654+
conn.request.headers[name].append(",").append(std::string(begin, ptr));
655+
}
656+
else
655657
{
656658
conn.request.headers[name] = std::string(begin, ptr);
657659
}

ext/test/w3c_tracecontext_test/main.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ class TextMapCarrierTest : public context::propagation::TextMapCarrier
5151
TextMapCarrierTest(std::map<std::string, std::string> &headers) : headers_(headers) {}
5252
nostd::string_view Get(nostd::string_view key) const noexcept override
5353
{
54-
for(const auto& elem : headers_)
54+
for (const auto &elem : headers_)
5555
{
5656
if (equalsIgnoreCase(elem.first, std::string(key)))
5757
{

0 commit comments

Comments
 (0)