Remove deprecated log filter predicates for 4.1

Update the logging framework tests: since hooks operate
by name, they cannot be anonymous. I'm also dropping the &optional
attribute from the status field, since here know that the values are
actually defined, and access to an optional status field should
normally be guarded by the existence test operator.

Also includes baseline update for plugins.hooks, which picks up the
fact that the pred record field is now gone.

scripts/base/frameworks/logging/main.zeek

@@ -210,16 +210,6 @@ export {
 		## The logging writer implementation to use.
 		writer: Writer &default=default_writer;
 
-		## Indicates whether a log entry should be recorded.
-		## If not given, all entries are recorded.
-		##
-		## rec: An instance of the stream's ``columns`` type with its
-		##      fields set to the values to be logged.
-		##
-		## Returns: True if the entry is to be recorded.
-		pred: function(rec: any): bool &optional
-			&deprecated="Remove in 4.1. PolicyHooks will replace the $pred function.";
-
 		## Output path for recording entries matching this
 		## filter.
 		##

src/logging/Manager.cc

@@ -37,7 +37,6 @@ struct Manager::Filter {
 	string name;
 	EnumVal* id;
 	Func* policy;
-	Func* pred;
 	Func* path_func;
 	string path;
 	Val* path_val;
@@ -560,7 +559,6 @@ bool Manager::AddFilter(EnumVal* id, RecordVal* fval)
 
 	auto name = fval->GetFieldOrDefault("name");
 	auto policy = fval->GetFieldOrDefault("policy");
-	auto pred = fval->GetFieldOrDefault("pred");
 	auto path_func = fval->GetFieldOrDefault("path_func");
 	auto log_local = fval->GetFieldOrDefault("log_local");
 	auto log_remote = fval->GetFieldOrDefault("log_remote");
@@ -577,7 +575,6 @@ bool Manager::AddFilter(EnumVal* id, RecordVal* fval)
 	filter->name = name->AsString()->CheckString();
 	filter->id = id->Ref()->AsEnumVal();
 	filter->policy = policy ? policy->AsFunc() : stream->policy;
-	filter->pred = pred ? pred->AsFunc() : nullptr;
 	filter->path_func = path_func ? path_func->AsFunc() : nullptr;
 	filter->writer = writer->Ref()->AsEnumVal();
 	filter->local = log_local->AsBool();
@@ -660,7 +657,6 @@ bool Manager::AddFilter(EnumVal* id, RecordVal* fval)
 	DBG_LOG(DBG_LOGGING, "   path      : %s", filter->path.c_str());
 	DBG_LOG(DBG_LOGGING, "   path_func : %s", (filter->path_func ? "set" : "not set"));
 	DBG_LOG(DBG_LOGGING, "   policy    : %s", (filter->policy ? "set" : "not set"));
-	DBG_LOG(DBG_LOGGING, "   pred      : %s", (filter->pred ? "set" : "not set"));
 
 	for ( int i = 0; i < filter->num_fields; i++ )
 		{
@@ -747,18 +743,6 @@ bool Manager::Write(EnumVal* id, RecordVal* columns_arg)
 				continue;
 			}
 
-		// $pred is deprecated and will get removed in 4.1.
-		// This block can go when that time comes.
-		if ( filter->pred )
-			{
-			// See whether the predicate indicates that we want
-			// to log this record.
-			auto v = filter->pred->Invoke(columns);
-
-			if ( v && ! v->AsBool() )
-				continue;
-			}
-
 		if ( filter->path_func )
 			{
 			ValPtr path_arg;

testing/btest/scripts/base/frameworks/logging/pred.zeek

@@ -14,26 +14,32 @@ export {
 	type Log: record {
 		t: time;
 		id: conn_id; # Will be rolled out into individual columns.
-		status: string &optional;
+		status: string;
 		country: string &default="unknown";
 	} &log;
 }
 
-function fail(rec: Log): bool
+hook success(rec: Log, id: Log::ID, filter: Log::Filter)
 	{
-	return rec$status != "success";
+	if ( rec$status != "success" )
+		break;
+	}
+
+hook fail(rec: Log, id: Log::ID, filter: Log::Filter)
+	{
+	if ( rec$status == "success" )
+		break;
 	}
 
 event zeek_init()
 {
 	Log::create_stream(Test::LOG, [$columns=Log]);
 	Log::remove_default_filter(Test::LOG);
-	Log::add_filter(Test::LOG, [$name="f1", $path="test.success", $pred=function(rec: Log): bool { return rec$status == "success"; }]);
+	Log::add_filter(Test::LOG, [$name="f1", $path="test.success", $policy=success]);
-	Log::add_filter(Test::LOG, [$name="f2", $path="test.failure", $pred=fail]);
+	Log::add_filter(Test::LOG, [$name="f2", $path="test.failure", $policy=fail]);
 
 	local cid = [$orig_h=1.2.3.4, $orig_p=1234/tcp, $resp_h=2.3.4.5, $resp_p=80/tcp];
 	local r: Log = [$t=network_time(), $id=cid, $status="success"];
 	Log::write(Test::LOG, r);
 	Log::write(Test::LOG, [$t=network_time(), $id=cid, $status="failure", $country="US"]);
-	
 }

testing/btest/scripts/base/frameworks/logging/remove.zeek

@@ -15,15 +15,21 @@ export {
 	type Log: record {
 		t: time;
 		id: conn_id; # Will be rolled out into individual columns.
-		status: string &optional;
+		status: string;
 		country: string &default="unknown";
 	} &log;
 }
 
+hook fail_only(rec: Log, id: Log::ID, filter: Log::Filter)
+	{
+	if ( rec$status != "failure" )
+		break;
+	}
+
 event zeek_init()
 {
 	Log::create_stream(SSH::LOG, [$columns=Log]);
-	Log::add_filter(SSH::LOG, [$name="f1", $path="ssh.failure", $pred=function(rec: Log): bool { return rec$status == "failure"; }]);
+	Log::add_filter(SSH::LOG, [$name="f1", $path="ssh.failure", $policy=fail_only]);
 
 	local cid = [$orig_h=1.2.3.4, $orig_p=1234/tcp, $resp_h=2.3.4.5, $resp_p=80/tcp];