ttweaks to get the calls query working, including migrating the call …

…table

weave/trace_server/calls_query_builder.py

@@ -672,10 +672,11 @@ def _as_sql_base_format(
         )
 
         where_filter_sql = combine_conditions(
-            having_conditions_sql
-            + [c.as_sql(pb, table_alias, no_agg=True) for c in self.query_conditions],
+            [c.as_sql(pb, table_alias, no_agg=True) for c in self.query_conditions],
             "AND",
         )
+        if where_filter_sql:
+            where_filter_sql = "AND " + where_filter_sql
 
         order_by_sql_no_agg = ""
         if len(self.order_fields) > 0:

weave/trace_server/clickhouse_trace_server_batched.py

@@ -1947,8 +1947,8 @@ def _ch_call_dict_to_call_schema_dict(ch_call_dict: dict) -> dict:
         "op_name": ch_call_dict.get("op_name"),
         "started_at": started_at,
         "ended_at": ended_at,
-        "attributes": _dict_dump_to_dict(ch_call_dict.get("attributes_dump", "{}")),
-        "inputs": _dict_dump_to_dict(ch_call_dict.get("inputs_dump", "{}")),
+        "attributes": _dict_dump_to_dict(ch_call_dict.get("attributes_dump") or {}),
+        "inputs": _dict_dump_to_dict(ch_call_dict.get("inputs_dump") or {}),
         "output": _nullable_any_dump_to_any(ch_call_dict.get("output_dump")),
         "summary": make_derived_summary_fields(
             summary=summary or {},

weave/trace_server/migrations/011_display_name_simple.down.sql

@@ -1,14 +1,8 @@
 ALTER TABLE calls_merged
-    DROP COLUMN display_name;
-
-ALTER TABLE calls_merged
-    ADD COLUMN display_name AggregateFunction(argMax, Nullable(String), DateTime64(3));
-
-ALTER TABLE calls_merged_stats
-    DROP COLUMN display_name;
+    MODIFY COLUMN display_name AggregateFunction(argMax, Nullable(String), DateTime64(3));
 
 ALTER TABLE calls_merged_stats
-    ADD COLUMN display_name AggregateFunction(argMax, Nullable(String), DateTime64(3));
+    MODIFY COLUMN display_name AggregateFunction(argMax, Nullable(String), DateTime64(3));
 
 ALTER TABLE calls_merged_view MODIFY QUERY
     SELECT project_id,

weave/trace_server/migrations/011_display_name_simple.up.sql

@@ -1,14 +1,4 @@
-ALTER TABLE calls_merged
-    DROP COLUMN display_name;
-
-ALTER TABLE calls_merged
-    ADD COLUMN display_name SimpleAggregateFunction(any, Nullable(String));
-
-ALTER TABLE calls_merged_stats
-    DROP COLUMN display_name;
-
-ALTER TABLE calls_merged_stats
-    ADD COLUMN display_name SimpleAggregateFunction(any, Nullable(String));
+ALTER TABLE calls_merged MODIFY COLUMN display_name SimpleAggregateFunction(any, Nullable(String));
 
 ALTER TABLE calls_merged_view MODIFY QUERY
     SELECT project_id,

weave/trace_server/migrations/012_migrate_to_simple_calls_query.down.sql

@@ -0,0 +1,2 @@
+
+ALTER TABLE calls_merged MODIFY SETTING min_bytes_for_wide_part = 10485760, min_age_to_force_merge_seconds = 0;

weave/trace_server/migrations/012_migrate_to_simple_calls_query.up.sql

@@ -0,0 +1,5 @@
+
+ALTER TABLE calls_merged 
+MODIFY SETTING min_bytes_for_wide_part = 0, min_age_to_force_merge_seconds = 10;
+
+OPTIMIZE TABLE calls_merged FINAL;

weave/trace_server/trace_server_common.py

@@ -70,7 +70,7 @@ def hydrate_calls_with_feedback(
 
 def make_derived_summary_fields(
     summary: dict[str, Any],
-    op_name: str,
+    op_name: Optional[str],
     started_at: Optional[datetime.datetime] = None,
     ended_at: Optional[datetime.datetime] = None,
     exception: Optional[str] = None,
@@ -101,7 +101,7 @@ def make_derived_summary_fields(
 
     if display_name:
         weave_summary["display_name"] = display_name
-    else:
+    elif op_name:
         if ri.string_will_be_interpreted_as_ref(op_name):
             op = ri.parse_internal_uri(op_name)
             if isinstance(op, ri.InternalObjectRef):