From 9919c6720c918643627ce2f6726f6e11fea39bf4 Mon Sep 17 00:00:00 2001
From: Phil Freeman <paf31@cantab.net>
Date: Wed, 22 Jul 2020 11:12:39 -0700
Subject: [PATCH] Respond to code review

---
 server/src-rsr/initialise.sql          |  2 +-
 server/src-rsr/migrations/36_to_37.sql | 11 ++++++-----
 server/src-rsr/migrations/37_to_36.sql | 13 ++-----------
 3 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/server/src-rsr/initialise.sql b/server/src-rsr/initialise.sql
index 9e0dcd33e7ff2..97f34defc85a4 100644
--- a/server/src-rsr/initialise.sql
+++ b/server/src-rsr/initialise.sql
@@ -610,7 +610,7 @@ CREATE OR REPLACE FUNCTION
     server_version_num := current_setting('server_version_num');
     IF server_version_num >= 90600 THEN
       session_variables := current_setting('hasura.user', 't');
-      trace_context := current_setting('hasura.tracecontext');
+      trace_context := current_setting('hasura.tracecontext', 't');
     ELSE
       BEGIN
         session_variables := current_setting('hasura.user');
diff --git a/server/src-rsr/migrations/36_to_37.sql b/server/src-rsr/migrations/36_to_37.sql
index c86efe9bd0c47..0d7ebbe539be1 100644
--- a/server/src-rsr/migrations/36_to_37.sql
+++ b/server/src-rsr/migrations/36_to_37.sql
@@ -11,18 +11,19 @@ CREATE OR REPLACE FUNCTION hdb_catalog.insert_event_log(schema_name text, table_
     server_version_num := current_setting('server_version_num');
     IF server_version_num >= 90600 THEN
       session_variables := current_setting('hasura.user', 't');
+      trace_context := current_setting('hasura.tracecontext', 't');
     ELSE
       BEGIN
         session_variables := current_setting('hasura.user');
       EXCEPTION WHEN OTHERS THEN
                   session_variables := NULL;
       END;
+      BEGIN
+        trace_context := current_setting('hasura.tracecontext');
+      EXCEPTION WHEN OTHERS THEN
+        trace_context := NULL;
+      END;
     END IF;
-    BEGIN
-      trace_context := current_setting('hasura.tracecontext');
-    EXCEPTION WHEN OTHERS THEN
-      trace_context := NULL;
-    END;
     payload := json_build_object(
       'op', op,
       'data', row_data,
diff --git a/server/src-rsr/migrations/37_to_36.sql b/server/src-rsr/migrations/37_to_36.sql
index ffdef19d4b621..9976529f8b7c2 100644
--- a/server/src-rsr/migrations/37_to_36.sql
+++ b/server/src-rsr/migrations/37_to_36.sql
@@ -1,5 +1,4 @@
-
-CREATE OR REPLACE FUNCTION
+CREATE OR REPLACE FUNCTION 
   hdb_catalog.insert_event_log(schema_name text, table_name text, trigger_name text, op text, row_data json)
   RETURNS text AS $$
   DECLARE
@@ -7,30 +6,22 @@ CREATE OR REPLACE FUNCTION
     payload json;
     session_variables json;
     server_version_num int;
-    trace_context json;
   BEGIN
     id := gen_random_uuid();
     server_version_num := current_setting('server_version_num');
     IF server_version_num >= 90600 THEN
       session_variables := current_setting('hasura.user', 't');
-      trace_context := current_setting('hasura.tracecontext');
     ELSE
       BEGIN
         session_variables := current_setting('hasura.user');
       EXCEPTION WHEN OTHERS THEN
                   session_variables := NULL;
       END;
-      BEGIN
-        trace_context := current_setting('hasura.tracecontext');
-      EXCEPTION WHEN OTHERS THEN
-        trace_context := NULL;
-      END;
     END IF;
     payload := json_build_object(
       'op', op,
       'data', row_data,
-      'session_variables', session_variables,
-      'trace_context', trace_context
+      'session_variables', session_variables
     );
     INSERT INTO hdb_catalog.event_log
                 (id, schema_name, table_name, trigger_name, payload)