StringView conversions

Author: yashykt

src/cpp/ext/otel/otel_plugin.cc

@@ -89,16 +89,6 @@ absl::flat_hash_set<std::string> BaseMetrics() {
   return base_metrics;
 }
 
-absl::string_view NoStdStringViewToAbslStringView(
-    opentelemetry::nostd::string_view string) {
-  return absl::string_view(string.data(), string.size());
-}
-
-opentelemetry::nostd::string_view AbslStringViewToNoStdStringView(
-    absl::string_view string) {
-  return opentelemetry::nostd::string_view(string.data(), string.size());
-}
-
 }  // namespace
 
 class OpenTelemetryPluginImpl::NPCMetricsKeyValueIterable
@@ -156,6 +146,16 @@ class OpenTelemetryPluginImpl::NPCMetricsKeyValueIterable
   const OptionalLabelsBitSet& optional_labels_bits_;
 };
 
+absl::string_view NoStdStringViewToAbslStringView(
+    opentelemetry::nostd::string_view string) {
+  return absl::string_view(string.data(), string.size());
+}
+
+opentelemetry::nostd::string_view AbslStringViewToNoStdStringView(
+    absl::string_view string) {
+  return opentelemetry::nostd::string_view(string.data(), string.size());
+}
+
 //
 // OpenTelemetryPluginBuilderImpl
 //
@@ -1113,9 +1113,8 @@ class GrpcTraceBinTextMapPropagator : public TextMapPropagator {
     opentelemetry::nostd::string_view grpc_trace_bin_val =
         carrier.Get("grpc-trace-bin");
     std::string base64_unescaped_val;
-    absl::Base64Unescape(
-        absl::string_view(grpc_trace_bin_val.data(), grpc_trace_bin_val.size()),
-        &base64_unescaped_val);
+    absl::Base64Unescape(NoStdStringViewToAbslStringView(grpc_trace_bin_val),
+                         &base64_unescaped_val);
     return opentelemetry::trace::SetSpan(
         context,
         std::shared_ptr<opentelemetry::trace::Span>(

src/cpp/ext/otel/otel_plugin.h

@@ -556,6 +556,12 @@ class GrpcTextMapCarrier
   grpc_metadata_batch* metadata_;
 };
 
+absl::string_view NoStdStringViewToAbslStringView(
+    opentelemetry::nostd::string_view string);
+
+opentelemetry::nostd::string_view AbslStringViewToNoStdStringView(
+    absl::string_view string);
+
 }  // namespace internal
 }  // namespace grpc
 

test/cpp/ext/otel/grpc_text_map_carrier_test.cc

@@ -50,15 +50,15 @@ TEST(GrpcTextMapCarrierTest, GrpcTraceBinGet) {
   GrpcTextMapCarrier carrier(&md);
   auto arena = grpc_core::SimpleArenaAllocator()->MakeArena();
   grpc_core::TestContext<grpc_core::Arena> context(arena.get());
-  auto escaped_value = carrier.Get("grpc-trace-bin");
+  std::string_view escaped_value = carrier.Get("grpc-trace-bin");
   std::string value;
   ASSERT_TRUE(absl::Base64Unescape(escaped_value, &value));
   EXPECT_EQ(value, "value");
 }
 
 TEST(GrpcTextMapCarrierTest, OtherBinaryGet) {
   grpc_metadata_batch md;
-  md.Append("random-binadd", grpc_core::Slice::FromCopiedString("value"),
+  md.Append("random-bin", grpc_core::Slice::FromCopiedString("value"),
             [](absl::string_view, const grpc_core::Slice&) {
               FAIL() << "Failed to add tracing information in metadata.";
             });
@@ -81,7 +81,8 @@ TEST(GrpcTextMapCarrierTest, SimpleSet) {
 TEST(GrpcTextMapCarrierTest, GrpcTraceBinSet) {
   grpc_metadata_batch md;
   GrpcTextMapCarrier carrier(&md);
-  carrier.Set("grpc-trace-bin", absl::Base64Escape("value"));
+  carrier.Set("grpc-trace-bin",
+              AbslStringViewToNoStdStringView(absl::Base64Escape("value")));
   std::string scratch;
   auto* slice = md.get_pointer(grpc_core::GrpcTraceBinMetadata());
   EXPECT_EQ(slice->as_string_view(), "value");

test/cpp/ext/otel/grpc_trace_bin_text_map_propagator_test.cc

@@ -73,7 +73,9 @@ TEST(GrpcTraceBinTextMapPropagatorTest, Inject) {
                   opentelemetry::trace::TraceFlags(1), /*is_remote=*/true))));
   propagator->Inject(carrier, context);
   std::string unescaped_val;
-  absl::Base64Unescape(carrier.Get("grpc-trace-bin"), &unescaped_val);
+  absl::Base64Unescape(
+      internal::NoStdStringViewToAbslStringView(carrier.Get("grpc-trace-bin")),
+      &unescaped_val);
   EXPECT_EQ(unescaped_val[0], 0);
   EXPECT_EQ(unescaped_val[0], 0);
   EXPECT_EQ(absl::string_view(unescaped_val).substr(2, 16), trace_id);