From 737f5e17681a8cac07702901171e44406ccfc123 Mon Sep 17 00:00:00 2001
From: Jiaqi Zhang <jiaqizhang@meta.com>
Date: Tue, 17 Dec 2024 11:14:15 -0800
Subject: [PATCH] Deprecate regex property for tracing

---
 .../src/main/sphinx/presto_cpp/properties-session.rst    | 9 ---------
 .../NativeWorkerSessionPropertyProvider.java             | 5 -----
 .../presto_cpp/main/SessionProperties.cpp                | 8 --------
 .../presto_cpp/main/SessionProperties.h                  | 5 -----
 4 files changed, 27 deletions(-)

diff --git a/presto-docs/src/main/sphinx/presto_cpp/properties-session.rst b/presto-docs/src/main/sphinx/presto_cpp/properties-session.rst
index 47977a0627d2..6aa098e11bcd 100644
--- a/presto-docs/src/main/sphinx/presto_cpp/properties-session.rst
+++ b/presto-docs/src/main/sphinx/presto_cpp/properties-session.rst
@@ -378,15 +378,6 @@ The fragment id to be traced. If not specified, all fragments will be matched.
 
 The shard id to be traced. If not specified, all shards will be matched.
 
-``native_query_trace_task_reg_exp``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* **Type:** ``varchar``
-* **Default value:** ``""``
-
-The regular expression to match a task for tracing. It will be deprecated if there is
-no issue with native_query_trace_fragment_id and native_query_trace_shard_id.
-
 ``native_scaled_writer_rebalance_max_memory_usage_ratio``
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
diff --git a/presto-main/src/main/java/com/facebook/presto/sessionpropertyproviders/NativeWorkerSessionPropertyProvider.java b/presto-main/src/main/java/com/facebook/presto/sessionpropertyproviders/NativeWorkerSessionPropertyProvider.java
index caf3de920c3f..126a79382782 100644
--- a/presto-main/src/main/java/com/facebook/presto/sessionpropertyproviders/NativeWorkerSessionPropertyProvider.java
+++ b/presto-main/src/main/java/com/facebook/presto/sessionpropertyproviders/NativeWorkerSessionPropertyProvider.java
@@ -62,7 +62,6 @@ public class NativeWorkerSessionPropertyProvider
     public static final String NATIVE_QUERY_TRACE_DIR = "native_query_trace_dir";
     public static final String NATIVE_QUERY_TRACE_NODE_IDS = "native_query_trace_node_ids";
     public static final String NATIVE_QUERY_TRACE_MAX_BYTES = "native_query_trace_max_bytes";
-    public static final String NATIVE_QUERY_TRACE_REG_EXP = "native_query_trace_task_reg_exp";
     public static final String NATIVE_QUERY_TRACE_FRAGMENT_ID = "native_query_trace_fragment_id";
     public static final String NATIVE_QUERY_TRACE_SHARD_ID = "native_query_trace_shard_id";
     public static final String NATIVE_MAX_LOCAL_EXCHANGE_PARTITION_COUNT = "native_max_local_exchange_partition_count";
@@ -237,10 +236,6 @@ public NativeWorkerSessionPropertyProvider(FeaturesConfig featuresConfig)
                         "The max trace bytes limit. Tracing is disabled if zero.",
                         0L,
                         !nativeExecution),
-                stringProperty(NATIVE_QUERY_TRACE_REG_EXP,
-                        "The regexp of traced task id. We only enable trace on a task if its id matches.",
-                        "",
-                        !nativeExecution),
                 stringProperty(NATIVE_OP_TRACE_DIR_CREATE_CONFIG,
                         "Config used to create operator trace directory. This config is provided to underlying file system and the config is free form. The form should be defined by the underlying file system.",
                         "",
diff --git a/presto-native-execution/presto_cpp/main/SessionProperties.cpp b/presto-native-execution/presto_cpp/main/SessionProperties.cpp
index 314e81c3110f..fab89fda0bf7 100644
--- a/presto-native-execution/presto_cpp/main/SessionProperties.cpp
+++ b/presto-native-execution/presto_cpp/main/SessionProperties.cpp
@@ -306,14 +306,6 @@ SessionProperties::SessionProperties() {
       QueryConfig::kQueryTraceMaxBytes,
       std::to_string(c.queryTraceMaxBytes()));
 
-  addSessionProperty(
-      kQueryTraceTaskRegExp,
-      "The regexp of traced task id. We only enable trace on a task if its id"
-      " matches.",
-      VARCHAR(),
-      false,
-      QueryConfig::kQueryTraceTaskRegExp,
-      c.queryTraceTaskRegExp());
 
   addSessionProperty(
       kOpTraceDirectoryCreateConfig,
diff --git a/presto-native-execution/presto_cpp/main/SessionProperties.h b/presto-native-execution/presto_cpp/main/SessionProperties.h
index a952c052845b..8966892e025c 100644
--- a/presto-native-execution/presto_cpp/main/SessionProperties.h
+++ b/presto-native-execution/presto_cpp/main/SessionProperties.h
@@ -232,11 +232,6 @@ class SessionProperties {
   static constexpr const char* kQueryTraceMaxBytes =
       "native_query_trace_max_bytes";
 
-  /// The regexp of traced task id. We only enable trace on a task if its id
-  /// matches.
-  static constexpr const char* kQueryTraceTaskRegExp =
-      "native_query_trace_task_reg_exp";
-
   /// Config used to create operator trace directory. This config is provided to
   /// underlying file system and the config is free form. The form should be
   /// defined by the underlying file system.