Update Custom and MigrationOp events to write full context instead of context keys

Co-Authored-By: [email protected] <[email protected]>

Author: devin-ai-integration[bot]

lib/sdk/server/contract-tests/service/src/main/java/sdktest/TestService.java

@@ -35,7 +35,7 @@ public class TestService {
     "filtering",
     "migrations",
     "event-sampling",
-    "inline-context",
+    "inline-context-all",
     "anonymous-redaction",
     "evaluation-hooks",
     "client-prereq-events"

lib/shared/internal/src/main/java/com/launchdarkly/sdk/internal/events/EventOutputFormatter.java

@@ -89,7 +89,7 @@ private boolean writeOutputEvent(Event event, JsonWriter jw) throws IOException
       jw.beginObject();
       writeKindAndCreationDate(jw, "custom", event.getCreationDate());
       jw.name("key").value(ce.getKey());
-      writeContextKeys(ce.getContext(), jw);
+      writeContext(ce.getContext(), jw, false);
       writeLDValue("data", ce.getData(), jw);
       if (ce.getMetricValue() != null) {
         jw.name("metricValue");
@@ -104,7 +104,7 @@ private boolean writeOutputEvent(Event event, JsonWriter jw) throws IOException
     } else if (event instanceof Event.MigrationOp) {
       jw.beginObject();
       writeKindAndCreationDate(jw, "migration_op", event.getCreationDate());
-      writeContextKeys(event.getContext(), jw);
+      writeContext(event.getContext(), jw, false);
 
       Event.MigrationOp me = (Event.MigrationOp)event;
       jw.name("operation").value(me.getOperation());
@@ -296,17 +296,6 @@ private void writeContext(LDContext context, JsonWriter jw, boolean redactAnonym
     contextFormatter.write(context, jw, redactAnonymous);
   }
 
-  private void writeContextKeys(LDContext context, JsonWriter jw) throws IOException {
-    jw.name("contextKeys").beginObject();
-    for (int i = 0; i < context.getIndividualContextCount(); i++) {
-      LDContext c = context.getIndividualContext(i);
-      if (c != null) {
-        jw.name(c.getKind().toString()).value(c.getKey());
-      }
-    }
-    jw.endObject();
-  }
-
   private void writeLDValue(String key, LDValue value, JsonWriter jw) throws IOException {
     if (value == null || value.isNull()) {
       return;

lib/shared/internal/src/test/java/com/launchdarkly/sdk/internal/events/EventOutputTest.java

@@ -265,15 +265,15 @@ public void identifyEventIsSerialized() throws IOException {
   @Test
   public void customEventIsSerialized() throws IOException {
     LDContext context = LDContext.builder("userkey").name("me").build();
-    LDValue contextKeysJson = LDValue.buildObject().put("user", context.getKey()).build();
+    LDValue contextJson = LDValue.buildObject().put("kind", "user").put("key", "userkey").put("name", "me").build();
     EventOutputFormatter f = new EventOutputFormatter(defaultEventsConfig());
 
     Event.Custom ceWithoutData = customEvent(context, "customkey").build();
     LDValue ceJson1 = parseValue("{" +
         "\"kind\":\"custom\"," +
         "\"creationDate\":100000," +
         "\"key\":\"customkey\"," +
-        "\"contextKeys\":" + contextKeysJson +
+        "\"context\":" + contextJson +
         "}");
     assertJsonEquals(ceJson1, getSingleOutputEvent(f, ceWithoutData));
 
@@ -282,7 +282,7 @@ public void customEventIsSerialized() throws IOException {
         "\"kind\":\"custom\"," +
         "\"creationDate\":100000," +
         "\"key\":\"customkey\"," +
-        "\"contextKeys\":" + contextKeysJson + "," +
+        "\"context\":" + contextJson + "," +
         "\"data\":\"thing\"" +
         "}");
     assertJsonEquals(ceJson2, getSingleOutputEvent(f, ceWithData));
@@ -292,7 +292,7 @@ public void customEventIsSerialized() throws IOException {
         "\"kind\":\"custom\"," +
         "\"creationDate\":100000," +
         "\"key\":\"customkey\"," +
-        "\"contextKeys\":" + contextKeysJson + "," +
+        "\"context\":" + contextJson + "," +
         "\"metricValue\":2.5" +
         "}");
     assertJsonEquals(ceJson3, getSingleOutputEvent(f, ceWithMetric));
@@ -303,7 +303,7 @@ public void customEventIsSerialized() throws IOException {
         "\"kind\":\"custom\"," +
         "\"creationDate\":100000," +
         "\"key\":\"customkey\"," +
-        "\"contextKeys\":" + contextKeysJson + "," +
+        "\"context\":" + contextJson + "," +
         "\"data\":\"thing\"," +
         "\"metricValue\":2.5" +
         "}");
@@ -408,8 +408,10 @@ public void migrationOpEventIsSerialized() throws IOException {
             .put("reason", LDValue.buildObject()
                 .put("kind", "FALLTHROUGH")
                 .build()).build())
-        .put("contextKeys", LDValue.buildObject()
-            .put("user", "user-key")
+        .put("context", LDValue.buildObject()
+            .put("kind", "user")
+            .put("key", "user-key")
+            .put("name", "me")
             .build())
         .put("samplingRatio", 2)
         .put("measurements", LDValue.buildArray()
@@ -495,8 +497,10 @@ public void migrationOpEventSerializationCanExcludeOptionalItems() throws IOExce
             .put("reason", LDValue.buildObject()
                 .put("kind", "FALLTHROUGH")
                 .build()).build())
-        .put("contextKeys", LDValue.buildObject()
-            .put("user", "user-key")
+        .put("context", LDValue.buildObject()
+            .put("kind", "user")
+            .put("key", "user-key")
+            .put("name", "me")
             .build())
         .put("measurements", LDValue.buildArray()
             .add(LDValue.buildObject()