ES|QL: make telemetry more strict

Author: luigidellaquila

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/telemetry/FeatureMetric.java

@@ -7,23 +7,38 @@
 
 package org.elasticsearch.xpack.esql.telemetry;
 
+import org.elasticsearch.xpack.esql.EsqlIllegalArgumentException;
 import org.elasticsearch.xpack.esql.plan.logical.Aggregate;
+import org.elasticsearch.xpack.esql.plan.logical.ChangePoint;
+import org.elasticsearch.xpack.esql.plan.logical.Dedup;
 import org.elasticsearch.xpack.esql.plan.logical.Dissect;
 import org.elasticsearch.xpack.esql.plan.logical.Drop;
 import org.elasticsearch.xpack.esql.plan.logical.Enrich;
 import org.elasticsearch.xpack.esql.plan.logical.EsRelation;
 import org.elasticsearch.xpack.esql.plan.logical.Eval;
 import org.elasticsearch.xpack.esql.plan.logical.Filter;
+import org.elasticsearch.xpack.esql.plan.logical.Fork;
 import org.elasticsearch.xpack.esql.plan.logical.Grok;
+import org.elasticsearch.xpack.esql.plan.logical.InlineStats;
+import org.elasticsearch.xpack.esql.plan.logical.Insist;
 import org.elasticsearch.xpack.esql.plan.logical.Keep;
+import org.elasticsearch.xpack.esql.plan.logical.Limit;
 import org.elasticsearch.xpack.esql.plan.logical.LogicalPlan;
 import org.elasticsearch.xpack.esql.plan.logical.MvExpand;
 import org.elasticsearch.xpack.esql.plan.logical.OrderBy;
+import org.elasticsearch.xpack.esql.plan.logical.Project;
 import org.elasticsearch.xpack.esql.plan.logical.Rename;
 import org.elasticsearch.xpack.esql.plan.logical.Row;
+import org.elasticsearch.xpack.esql.plan.logical.RrfScoreEval;
+import org.elasticsearch.xpack.esql.plan.logical.UnresolvedRelation;
+import org.elasticsearch.xpack.esql.plan.logical.inference.Completion;
+import org.elasticsearch.xpack.esql.plan.logical.inference.Rerank;
+import org.elasticsearch.xpack.esql.plan.logical.join.LookupJoin;
+import org.elasticsearch.xpack.esql.plan.logical.local.EsqlProject;
 import org.elasticsearch.xpack.esql.plan.logical.show.ShowInfo;
 
 import java.util.BitSet;
+import java.util.List;
 import java.util.Locale;
 import java.util.function.Predicate;
 
@@ -42,7 +57,26 @@ public enum FeatureMetric {
     FROM(EsRelation.class::isInstance),
     DROP(Drop.class::isInstance),
     KEEP(Keep.class::isInstance),
-    RENAME(Rename.class::isInstance);
+    RENAME(Rename.class::isInstance),
+    LOOKUP_JOIN(LookupJoin.class::isInstance),
+    CHANGE_POINT(ChangePoint.class::isInstance),
+    INLINESTATS(InlineStats.class::isInstance),
+    RERANK(Rerank.class::isInstance),
+    DEDUP(Dedup.class::isInstance),
+    INSIST(Insist.class::isInstance),
+    FORK(Fork.class::isInstance),
+    RRF(RrfScoreEval.class::isInstance),
+    COMPLETION(Completion.class::isInstance);
+
+    /**
+     * List here plans we want to exclude from telemetry
+     */
+    private static final List<Class<? extends LogicalPlan>> excluded = List.of(
+        UnresolvedRelation.class,
+        EsqlProject.class,
+        Project.class,
+        Limit.class // LIMIT is managed in another way, see above
+    );
 
     private Predicate<LogicalPlan> planCheck;
 
@@ -61,6 +95,13 @@ public static void set(LogicalPlan plan, BitSet bitset) {
                 return;
             }
         }
+        if (explicitlyExcluded(plan) == false) {
+            throw new EsqlIllegalArgumentException("Command not mapped for telemetry [{}]", plan.getClass().getSimpleName());
+        }
+    }
+
+    private static boolean explicitlyExcluded(LogicalPlan plan) {
+        return excluded.stream().anyMatch(x -> x.isInstance(plan));
     }
 
     public static boolean set(LogicalPlan plan, BitSet bitset, FeatureMetric metric) {