Use ABSL_LOG macros over LOG macros

kyessenov · kyessenov · commit b35780ee26d2 · 2023-05-18T20:19:04.000Z
LOG causes macro pollution and conflicts with ProxyWasm SDK (see proxy-wasm/proxy-wasm-cpp-sdk#154). PiperOrigin-RevId: 533164114
diff --git a/eval/compiler/flat_expr_builder_test.cc b/eval/compiler/flat_expr_builder_test.cc
@@ -1973,7 +1973,7 @@ TEST(FlatExprBuilderTest, CustomDescriptorPoolForSelect) {
 std::pair<google::protobuf::Message*, const google::protobuf::Reflection*> CreateTestMessage(
     const google::protobuf::DescriptorPool& descriptor_pool,
     google::protobuf::MessageFactory& message_factory, absl::string_view name) {
-  const google::protobuf::Descriptor* desc = descriptor_pool.FindMessageTypeByName(std::string(name));
+  const google::protobuf::Descriptor* desc = descriptor_pool.FindMessageTypeByName(name);
   const google::protobuf::Message* message_prototype = message_factory.GetPrototype(desc);
   google::protobuf::Message* message = message_prototype->New();
   const google::protobuf::Reflection* refl = message->GetReflection();
diff --git a/eval/internal/BUILD b/eval/internal/BUILD
@@ -35,7 +35,6 @@ cc_library(
         "//internal:status_macros",
         "@com_google_absl//absl/base:core_headers",
         "@com_google_absl//absl/container:flat_hash_map",
-        "@com_google_absl//absl/log",
         "@com_google_absl//absl/status",
         "@com_google_absl//absl/status:statusor",
         "@com_google_absl//absl/strings",
diff --git a/eval/internal/interop.cc b/eval/internal/interop.cc
@@ -21,7 +21,6 @@
 #include "google/protobuf/arena.h"
 #include "absl/base/attributes.h"
 #include "absl/container/flat_hash_map.h"
-#include "absl/log/log.h"
 #include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
diff --git a/eval/public/BUILD b/eval/public/BUILD
@@ -83,7 +83,7 @@ cc_library(
         "//internal:status_macros",
         "//internal:utf8",
         "@com_google_absl//absl/base:core_headers",
-        "@com_google_absl//absl/log",
+        "@com_google_absl//absl/log:absl_log",
         "@com_google_absl//absl/status",
         "@com_google_absl//absl/status:statusor",
         "@com_google_absl//absl/strings",
@@ -633,7 +633,7 @@ cc_library(
     deps = [
         ":ast_visitor",
         ":source_position",
-        "@com_google_absl//absl/log",
+        "@com_google_absl//absl/log:absl_log",
         "@com_google_absl//absl/types:variant",
         "@com_google_googleapis//google/api/expr/v1alpha1:syntax_cc_proto",
     ],
@@ -651,7 +651,7 @@ cc_library(
         ":ast_visitor_native",
         ":source_position_native",
         "//base:ast_internal",
-        "@com_google_absl//absl/log",
+        "@com_google_absl//absl/log:absl_log",
         "@com_google_absl//absl/types:variant",
     ],
 )
@@ -835,7 +835,7 @@ cc_library(
     deps = [
         ":ast_visitor",
         ":source_position",
-        "@com_google_absl//absl/log",
+        "@com_google_absl//absl/log:absl_log",
         "@com_google_absl//absl/types:span",
         "@com_google_absl//absl/types:variant",
         "@com_google_googleapis//google/api/expr/v1alpha1:syntax_cc_proto",
@@ -870,7 +870,7 @@ cc_library(
     deps = [
         ":ast_visitor_native",
         ":source_position_native",
-        "@com_google_absl//absl/log",
+        "@com_google_absl//absl/log:absl_log",
         "@com_google_absl//absl/types:span",
         "@com_google_absl//absl/types:variant",
     ],
diff --git a/eval/public/ast_rewrite.cc b/eval/public/ast_rewrite.cc
@@ -18,7 +18,7 @@
 #include <vector>
 
 #include "google/api/expr/v1alpha1/syntax.pb.h"
-#include "absl/log/log.h"
+#include "absl/log/absl_log.h"
 #include "absl/types/variant.h"
 #include "eval/public/ast_visitor.h"
 #include "eval/public/source_position.h"
@@ -196,7 +196,7 @@ struct PostVisitor {
       case Expr::EXPR_KIND_NOT_SET:
         break;
       default:
-        LOG(ERROR) << "Unsupported Expr kind: " << expr->expr_kind_case();
+        ABSL_LOG(ERROR) << "Unsupported Expr kind: " << expr->expr_kind_case();
     }
 
     visitor->PostVisitExpr(expr, &position);
diff --git a/eval/public/ast_rewrite_native.cc b/eval/public/ast_rewrite_native.cc
@@ -17,7 +17,7 @@
 #include <stack>
 #include <vector>
 
-#include "absl/log/log.h"
+#include "absl/log/absl_log.h"
 #include "absl/types/variant.h"
 #include "eval/public/ast_visitor_native.h"
 #include "eval/public/source_position_native.h"
@@ -199,7 +199,7 @@ struct PostVisitor {
         visitor->PostVisitComprehension(&comprehension, expr, position);
       }
       void operator()(absl::monostate) {
-        LOG(ERROR) << "Unsupported Expr kind";
+        ABSL_LOG(ERROR) << "Unsupported Expr kind";
       }
     } handler{visitor, record.expr, &position};
     absl::visit(handler, record.expr->expr_kind());
diff --git a/eval/public/ast_traverse.cc b/eval/public/ast_traverse.cc
@@ -17,7 +17,7 @@
 #include <stack>
 
 #include "google/api/expr/v1alpha1/syntax.pb.h"
-#include "absl/log/log.h"
+#include "absl/log/absl_log.h"
 #include "absl/types/variant.h"
 #include "eval/public/ast_visitor.h"
 #include "eval/public/source_position.h"
@@ -197,7 +197,7 @@ struct PostVisitor {
                                         &position);
         break;
       default:
-        LOG(ERROR) << "Unsupported Expr kind: " << expr->expr_kind_case();
+        ABSL_LOG(ERROR) << "Unsupported Expr kind: " << expr->expr_kind_case();
     }
 
     visitor->PostVisitExpr(expr, &position);
diff --git a/eval/public/ast_traverse_native.cc b/eval/public/ast_traverse_native.cc
@@ -16,7 +16,7 @@
 
 #include <stack>
 
-#include "absl/log/log.h"
+#include "absl/log/absl_log.h"
 #include "absl/types/variant.h"
 #include "base/ast_internal.h"
 #include "eval/public/ast_visitor_native.h"
@@ -174,7 +174,7 @@ struct PostVisitor {
                                         &position);
       }
       void operator()(absl::monostate) {
-        LOG(ERROR) << "Unsupported Expr kind";
+        ABSL_LOG(ERROR) << "Unsupported Expr kind";
       }
     } handler{visitor, record.expr,
               SourcePosition(expr->id(), record.source_info)};
diff --git a/eval/public/builtin_func_test.cc b/eval/public/builtin_func_test.cc
@@ -69,7 +69,7 @@ class BuiltinsTest : public ::testing::Test {
     Expr expr;
     SourceInfo source_info;
     auto call = expr.mutable_call_expr();
-    call->set_function(operation.data(), operation.size());
+    call->set_function(operation);
 
     if (target.has_value()) {
       std::string param_name = "target";
diff --git a/eval/public/cel_value.h b/eval/public/cel_value.h
@@ -25,7 +25,7 @@
 #include "absl/base/attributes.h"
 #include "absl/base/macros.h"
 #include "absl/base/optimization.h"
-#include "absl/log/log.h"
+#include "absl/log/absl_log.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
@@ -489,7 +489,8 @@ class CelValue {
 
   // Crashes with a null pointer error.
   static void CrashNullPointer(Type type) ABSL_ATTRIBUTE_COLD {
-    LOG(FATAL) << "Null pointer supplied for " << TypeName(type);  // Crash ok
+    ABSL_LOG(FATAL) << "Null pointer supplied for "
+                    << TypeName(type);  // Crash ok
   }
 
   // Null pointer checker for pointer-based types.
@@ -502,9 +503,9 @@ class CelValue {
   // Crashes with a type mismatch error.
   static void CrashTypeMismatch(Type requested_type,
                                 Type actual_type) ABSL_ATTRIBUTE_COLD {
-    LOG(FATAL) << "Type mismatch"                             // Crash ok
-               << ": expected " << TypeName(requested_type)   // Crash ok
-               << ", encountered " << TypeName(actual_type);  // Crash ok
+    ABSL_LOG(FATAL) << "Type mismatch"                             // Crash ok
+                    << ": expected " << TypeName(requested_type)   // Crash ok
+                    << ", encountered " << TypeName(actual_type);  // Crash ok
   }
 
   // Gets value of type specified
diff --git a/eval/public/structs/cel_proto_lite_wrap_util.cc b/eval/public/structs/cel_proto_lite_wrap_util.cc
@@ -698,7 +698,7 @@ absl::StatusOr<BytesValue*> CreateMessageFromValue(
   if (wrapper == nullptr) {
     wrapper = google::protobuf::Arena::CreateMessage<BytesValue>(arena);
   }
-  wrapper->set_value(view_val.value().data(), view_val.value().size());
+  wrapper->set_value(view_val.value());
   return wrapper;
 }
 
@@ -782,7 +782,7 @@ absl::StatusOr<StringValue*> CreateMessageFromValue(
   if (wrapper == nullptr) {
     wrapper = google::protobuf::Arena::CreateMessage<StringValue>(arena);
   }
-  wrapper->set_value(view_val.value().data(), view_val.value().size());
+  wrapper->set_value(view_val.value());
   return wrapper;
 }
 
@@ -950,7 +950,7 @@ absl::StatusOr<Value*> CreateMessageFromValue(
     case CelValue::Type::kString: {
       CelValue::StringHolder val;
       if (cel_value.GetValue(&val)) {
-        wrapper->set_string_value(val.value().data(), val.value().size());
+        wrapper->set_string_value(val.value());
       }
     } break;
     case CelValue::Type::kTimestamp: {
diff --git a/eval/public/structs/cel_proto_wrap_util.cc b/eval/public/structs/cel_proto_wrap_util.cc
@@ -468,7 +468,7 @@ google::protobuf::Message* MessageFromValue(
   if (!value.GetValue(&view_val)) {
     return nullptr;
   }
-  wrapper->set_value(view_val.value().data(), view_val.value().size());
+  wrapper->set_value(view_val.value());
   return wrapper;
 }
 
@@ -536,7 +536,7 @@ google::protobuf::Message* MessageFromValue(
   if (!value.GetValue(&view_val)) {
     return nullptr;
   }
-  wrapper->set_value(view_val.value().data(), view_val.value().size());
+  wrapper->set_value(view_val.value());
   return wrapper;
 }
 
@@ -682,7 +682,7 @@ google::protobuf::Message* MessageFromValue(const CelValue& value, Value* json,
     case CelValue::Type::kString: {
       CelValue::StringHolder val;
       if (value.GetValue(&val)) {
-        json->set_string_value(val.value().data(), val.value().size());
+        json->set_string_value(val.value());
         return json;
       }
     } break;
diff --git a/eval/public/structs/field_access_impl_test.cc b/eval/public/structs/field_access_impl_test.cc
@@ -184,14 +184,14 @@ class SingleFieldTest : public testing::TestWithParam<AccessFieldTestParam> {
 TEST_P(SingleFieldTest, Getter) {
   TestAllTypes test_message;
   ASSERT_TRUE(
-      google::protobuf::TextFormat::ParseFromString(std::string(message_textproto()), &test_message));
+      google::protobuf::TextFormat::ParseFromString(message_textproto(), &test_message));
   google::protobuf::Arena arena;
 
   ASSERT_OK_AND_ASSIGN(
       CelValue accessed_value,
       CreateValueFromSingleField(
           &test_message,
-          test_message.GetDescriptor()->FindFieldByName(std::string(field_name())),
+          test_message.GetDescriptor()->FindFieldByName(field_name()),
           ProtoWrapperTypeOptions::kUnsetProtoDefault,
           &CelProtoWrapper::InternalWrapMessage, &arena));
 
@@ -204,7 +204,7 @@ TEST_P(SingleFieldTest, Setter) {
   google::protobuf::Arena arena;
 
   ASSERT_OK(SetValueToSingleField(
-      to_set, test_message.GetDescriptor()->FindFieldByName(std::string(field_name())),
+      to_set, test_message.GetDescriptor()->FindFieldByName(field_name()),
       &test_message, &arena));
 
   EXPECT_THAT(test_message, EqualsProto(message_textproto()));
@@ -361,14 +361,14 @@ class RepeatedFieldTest : public testing::TestWithParam<AccessFieldTestParam> {
 TEST_P(RepeatedFieldTest, GetFirstElem) {
   TestAllTypes test_message;
   ASSERT_TRUE(
-      google::protobuf::TextFormat::ParseFromString(std::string(message_textproto()), &test_message));
+      google::protobuf::TextFormat::ParseFromString(message_textproto(), &test_message));
   google::protobuf::Arena arena;
 
   ASSERT_OK_AND_ASSIGN(
       CelValue accessed_value,
       CreateValueFromRepeatedField(
           &test_message,
-          test_message.GetDescriptor()->FindFieldByName(std::string(field_name())), 0,
+          test_message.GetDescriptor()->FindFieldByName(field_name()), 0,
           &CelProtoWrapper::InternalWrapMessage, &arena));
 
   EXPECT_THAT(accessed_value, test::EqualsCelValue(cel_value()));
@@ -380,7 +380,7 @@ TEST_P(RepeatedFieldTest, AppendElem) {
   google::protobuf::Arena arena;
 
   ASSERT_OK(AddValueToRepeatedField(
-      to_add, test_message.GetDescriptor()->FindFieldByName(std::string(field_name())),
+      to_add, test_message.GetDescriptor()->FindFieldByName(field_name()),
       &test_message, &arena));
 
   EXPECT_THAT(test_message, EqualsProto(message_textproto()));
diff --git a/eval/public/structs/proto_message_type_adapter.cc b/eval/public/structs/proto_message_type_adapter.cc
@@ -86,7 +86,7 @@ absl::StatusOr<bool> HasFieldImpl(const google::protobuf::Message* message,
                                   absl::string_view field_name) {
   ABSL_ASSERT(descriptor == message->GetDescriptor());
   const Reflection* reflection = message->GetReflection();
-  const FieldDescriptor* field_desc = descriptor->FindFieldByName(std::string(field_name));
+  const FieldDescriptor* field_desc = descriptor->FindFieldByName(field_name);
   if (field_desc == nullptr && reflection != nullptr) {
     // Search to see whether the field name is referring to an extension.
     field_desc = reflection->FindKnownExtensionByName(field_name);
@@ -122,7 +122,7 @@ absl::StatusOr<CelValue> GetFieldImpl(const google::protobuf::Message* message,
                                       cel::MemoryManager& memory_manager) {
   ABSL_ASSERT(descriptor == message->GetDescriptor());
   const Reflection* reflection = message->GetReflection();
-  const FieldDescriptor* field_desc = descriptor->FindFieldByName(std::string(field_name));
+  const FieldDescriptor* field_desc = descriptor->FindFieldByName(field_name);
   if (field_desc == nullptr && reflection != nullptr) {
     std::string ext_name(field_name);
     field_desc = reflection->FindKnownExtensionByName(ext_name);
@@ -332,7 +332,7 @@ ProtoMessageTypeAdapter::NewInstance(cel::MemoryManager& memory_manager) const {
 }
 
 bool ProtoMessageTypeAdapter::DefinesField(absl::string_view field_name) const {
-  return descriptor_->FindFieldByName(std::string(field_name)) != nullptr;
+  return descriptor_->FindFieldByName(field_name) != nullptr;
 }
 
 absl::StatusOr<bool> ProtoMessageTypeAdapter::HasField(
@@ -365,7 +365,7 @@ absl::Status ProtoMessageTypeAdapter::SetField(
                        UnwrapMessage(instance, "SetField"));
 
   const google::protobuf::FieldDescriptor* field_descriptor =
-      descriptor_->FindFieldByName(std::string(field_name));
+      descriptor_->FindFieldByName(field_name);
   CEL_RETURN_IF_ERROR(
       ValidateSetFieldOp(field_descriptor != nullptr, field_name, "not found"));
 
diff --git a/eval/public/structs/protobuf_descriptor_type_provider.cc b/eval/public/structs/protobuf_descriptor_type_provider.cc
@@ -53,7 +53,7 @@ ProtobufDescriptorProvider::ProvideLegacyTypeInfo(
 std::unique_ptr<ProtoMessageTypeAdapter> ProtobufDescriptorProvider::GetType(
     absl::string_view name) const {
   const google::protobuf::Descriptor* descriptor =
-      descriptor_pool_->FindMessageTypeByName(std::string(name));
+      descriptor_pool_->FindMessageTypeByName(name);
   if (descriptor == nullptr) {
     return nullptr;
   }
diff --git a/extensions/protobuf/type_provider.cc b/extensions/protobuf/type_provider.cc
@@ -23,7 +23,7 @@ namespace cel::extensions {
 absl::StatusOr<absl::optional<Handle<Type>>> ProtoTypeProvider::ProvideType(
     TypeFactory& type_factory, absl::string_view name) const {
   {
-    const auto* desc = pool_->FindMessageTypeByName(std::string(name));
+    const auto* desc = pool_->FindMessageTypeByName(name);
     if (desc != nullptr) {
       return type_factory.CreateStructType<ProtoStructType>(desc, factory_);
     }
