feat: Always inline contexts for feature events (#119)

Author: keelerm84

src/ldclient_event_process_server.erl

@@ -228,8 +228,10 @@ maybe_set_reason(_Event, OutputEvent) ->
     OutputEvent.
 
 -spec format_event_set_context(binary(), ldclient_context:context(), map(), ldclient_config:private_attributes()) -> map().
-format_event_set_context(<<"feature">>, Context, OutputEvent, _) ->
-    OutputEvent#{<<"contextKeys">> => ldclient_context:get_keys_and_kinds(Context)};
+format_event_set_context(<<"feature">>, Context, OutputEvent, GlobalPrivateAttributes) ->
+    OutputEvent#{
+        <<"context">> => ldclient_context_filter:format_context_for_event(GlobalPrivateAttributes, Context)
+    };
 format_event_set_context(<<"debug">>, Context, OutputEvent, GlobalPrivateAttributes) ->
     OutputEvent#{
         <<"context">> => ldclient_context_filter:format_context_for_event(GlobalPrivateAttributes, Context)

test-service/src/ts_service_request_handler.erl

@@ -73,7 +73,8 @@ get_service_detail(Req, State) ->
       <<"all-flags-with-reasons">>,
       <<"tags">>,
       <<"server-side-polling">>,
-      <<"user-type">>
+      <<"user-type">>,
+      <<"inline-context">>
     ],
     <<"clientVersion">> => ldclient_config:get_version()
   }),

test/ldclient_events_SUITE.erl

@@ -342,7 +342,13 @@ add_flag_eval_events_flush_with_track(_) ->
             <<"variation">> := 5,
             <<"version">> := 5,
             <<"creationDate">> := _,
-            <<"contextKeys">> := #{<<"user">> := <<"12345-track">>}
+            <<"context">> :=
+                #{
+                    <<"firstName">> := <<"Tester">>,
+                    <<"key">> := <<"12345-track">>,
+                    <<"kind">> := <<"user">>,
+                    <<"lastName">> := <<"Testerson">>
+                }
         }
     ] = ActualEvents.
 
@@ -397,7 +403,13 @@ add_flag_eval_events_flush_with_track_no_reasons(_) ->
             <<"variation">> := 5,
             <<"version">> := 5,
             <<"creationDate">> := _,
-            <<"contextKeys">> := #{<<"user">> := <<"12345-track-no-reasons">>}
+            <<"context">> :=
+            #{
+                <<"firstName">> := <<"Tester">>,
+                <<"key">> := <<"12345-track-no-reasons">>,
+                <<"kind">> := <<"user">>,
+                <<"lastName">> := <<"Testerson">>
+            }
         }
     ] = ActualEvents.
 
@@ -453,7 +465,13 @@ add_flag_eval_events_flush_with_track_experimentation_rule(_) ->
             <<"variation">> := 5,
             <<"version">> := 5,
             <<"creationDate">> := _,
-            <<"contextKeys">> := #{<<"user">> := <<"12345-track-experimentation-rule">>}
+            <<"context">> :=
+            #{
+                <<"firstName">> := <<"Tester">>,
+                <<"key">> := <<"12345-track-experimentation-rule">>,
+                <<"kind">> := <<"user">>,
+                <<"lastName">> := <<"Testerson">>
+            }
         }
     ] = ActualEvents.
 
@@ -509,7 +527,13 @@ add_flag_eval_events_flush_with_track_experimentation_fallthrough(_) ->
             <<"variation">> := 5,
             <<"version">> := 5,
             <<"creationDate">> := _,
-            <<"contextKeys">> := #{<<"user">> := <<"12345-track-experimentation-fallthrough">>}
+            <<"context">> :=
+            #{
+                <<"firstName">> := <<"Tester">>,
+                <<"key">> := <<"12345-track-experimentation-fallthrough">>,
+                <<"kind">> := <<"user">>,
+                <<"lastName">> := <<"Testerson">>
+            }
         }
     ] = ActualEvents.
 
@@ -917,7 +941,7 @@ add_flag_eval_events_flush_in_experiment_fallthrough(_) ->
             <<"key">> := <<"abc">>,
             <<"default">> := <<"default-value">>,
             <<"reason">> := #{<<"kind">> := <<"FALLTHROUGH">>, <<"inExperiment">> := true},
-            <<"contextKeys">> := #{<<"user">> := <<"experiment-fallthrough">>},
+            <<"context">> := #{<<"key">> := <<"experiment-fallthrough">>, <<"kind">> := <<"user">>},
             <<"value">> := <<"a">>,
             <<"variation">> := 0,
             <<"version">> := 5,
@@ -967,7 +991,7 @@ add_flag_eval_events_flush_in_experiment_rule_match(_) ->
             <<"key">> := <<"abc">>,
             <<"default">> := <<"default-value">>,
             <<"reason">> := #{<<"kind">> := <<"RULE_MATCH">>, <<"ruleIndex">> := 0, <<"ruleId">> := <<"id">>, <<"inExperiment">> := true},
-            <<"contextKeys">> := #{<<"user">> := <<"experiment-rule">>},
+            <<"context">> := #{<<"key">> := <<"experiment-rule">>, <<"kind">> := <<"user">>},
             <<"value">> := <<"a">>,
             <<"variation">> := 0,
             <<"version">> := 5,