Fixing build errors

open-telemetry · Mar 29, 2021 · d01a4e3 · d01a4e3
1 parent a452a20
commit d01a4e3
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/api/include/opentelemetry/common/string_util.h b/api/include/opentelemetry/common/string_util.h
@@ -25,15 +25,15 @@ class StringUtil
 public:
   static nostd::string_view Trim(nostd::string_view str, size_t left, size_t right)
   {
-    while (str[static_cast<std::size_t>(right)] == ' ' && left < right)
+    while (str[static_cast<std::size_t>(left)] == ' ' && left <= right)
     {
-      right--;
+      left++;
     }
-    while (str[static_cast<std::size_t>(left)] == ' ' && left < right)
+    while (str[static_cast<std::size_t>(right)] == ' ' && left <= right)
     {
-      left++;
+      right--;
     }
-    return str.substr(left, right - left + 1);
+    return str.substr(left, 1 + right - left);
   }
 };
 

diff --git a/api/include/opentelemetry/trace/trace_state.h b/api/include/opentelemetry/trace/trace_state.h
@@ -106,7 +106,7 @@ class TraceState
     std::string header_s;
     bool first = true;
     kv_properties_->GetAllEntries(
-        [&header_s, &first ](nostd::string_view key, nostd::string_view value) noexcept {
+        [&header_s, &first](nostd::string_view key, nostd::string_view value) noexcept {
           if (!first)
           {
             header_s.append(",");

diff --git a/api/test/common/BUILD b/api/test/common/BUILD
@@ -9,7 +9,7 @@ otel_cc_benchmark(
 cc_test(
     name = "kv_properties_test",
     srcs = [
-        "kv_properties_test.cc"
+        "kv_properties_test.cc",
     ],
     deps = [
         "//api",
@@ -20,7 +20,7 @@ cc_test(
 cc_test(
     name = "string_util_test",
     srcs = [
-        "string_util_test.cc"
+        "string_util_test.cc",
     ],
     deps = [
         "//api",

diff --git a/api/test/common/string_util_test.cc b/api/test/common/string_util_test.cc
@@ -31,7 +31,7 @@ TEST(StringUtilTest, TrimString)
     const char *expected;
   } testcases[] = {{"k1=v1", "k1=v1"},     {"k1=v1,k2=v2, k3=v3", "k1=v1,k2=v2, k3=v3"},
                    {"   k1=v1", "k1=v1"},  {"k1=v1   ", "k1=v1"},
-                   {"   k1=v1 ", "k1=v1"}, {"", ""}};
+                   {"   k1=v1 ", "k1=v1"}, {" ", ""}};
   for (auto &testcase : testcases)
   {
     EXPECT_EQ(StringUtil::Trim(testcase.input, 0, strlen(testcase.input) - 1), testcase.expected);