feat: update sdk to support sdkPlatform metadata, update WASM lib, update OpenFeature (#166)

* feat: update sdk to support sdkPlatform metadata, update WASM lib, update OpenFeature

* fix: update example apps, set sdkPlatform for OF context.

Signed-off-by: Jonathan Norris <jonathan@taplytics.com>

* chore: cleanup

* feat: update OF version, cleanup event value code

---------

Signed-off-by: Jonathan Norris <jonathan@taplytics.com>

Author: jonathannorris

build.gradle

@@ -84,7 +84,7 @@ sourceCompatibility = JavaVersion.VERSION_11
 targetCompatibility = JavaVersion.VERSION_11
 
 def wasmResourcePath = "$projectDir/src/main/resources"
-def wasmVersion = "1.25.3"
+def wasmVersion = "1.31.2"
 def wasmUrl = "https://unpkg.com/@devcycle/bucketing-assembly-script@$wasmVersion/build/bucketing-lib.release.wasm"
 task downloadDVCBucketingWASM(type: Download) {
     src wasmUrl
@@ -113,7 +113,7 @@ ext {
     junit_version = "4.13.2"
     mockito_core_version = "5.6.0"
     protobuf_version = "3.24.4"
-    openfeature_version = "1.7.0"
+    openfeature_version = "1.14.1"
     eventsource_version = "4.1.1"
 }
 

src/examples/java/com/devcycle/examples/LocalExample.java

@@ -1,6 +1,7 @@
 package com.devcycle.examples;
 
 import com.devcycle.sdk.server.common.logging.SimpleDevCycleLogger;
+import com.devcycle.sdk.server.common.model.DevCycleEvent;
 import com.devcycle.sdk.server.common.model.DevCycleUser;
 import com.devcycle.sdk.server.local.api.DevCycleLocalClient;
 import com.devcycle.sdk.server.local.model.DevCycleLocalOptions;
@@ -24,9 +25,7 @@ public static void main(String[] args) throws InterruptedException {
         Boolean defaultValue = false;
 
         DevCycleLocalOptions options = DevCycleLocalOptions.builder()
-                .configPollingIntervalMS(60000)
                 .customLogger(new SimpleDevCycleLogger(SimpleDevCycleLogger.Level.DEBUG))
-                .enableBetaRealtimeUpdates(true)
                 .build();
 
         // Initialize DevCycle Client
@@ -50,6 +49,10 @@ public static void main(String[] args) throws InterruptedException {
         } else {
             System.out.println("feature is NOT enabled");
         }
-        Thread.sleep(10000);
+
+        DevCycleEvent event = DevCycleEvent.builder().type("local-test").build();
+        client.track(user, event);
+
+        Thread.sleep(20000);
     }
 }

src/examples/java/com/devcycle/examples/OpenFeatureExample.java

@@ -1,5 +1,6 @@
 package com.devcycle.examples;
 
+import com.devcycle.sdk.server.common.logging.SimpleDevCycleLogger;
 import com.devcycle.sdk.server.local.api.DevCycleLocalClient;
 import com.devcycle.sdk.server.local.model.DevCycleLocalOptions;
 import dev.openfeature.sdk.*;
@@ -15,22 +16,16 @@ public static void main(String[] args) throws InterruptedException {
             System.exit(1);
         }
 
-        DevCycleLocalOptions options = DevCycleLocalOptions.builder().configPollingIntervalMS(60000)
-                .disableAutomaticEventLogging(false).disableCustomEventLogging(false).build();
+        DevCycleLocalOptions options = DevCycleLocalOptions.builder()
+                .customLogger(new SimpleDevCycleLogger(SimpleDevCycleLogger.Level.DEBUG))
+                .build();
 
         // Initialize DevCycle Client
         DevCycleLocalClient devCycleClient = new DevCycleLocalClient(server_sdk_key, options);
 
-        for (int i = 0; i < 10; i++) {
-            if (devCycleClient.isInitialized()) {
-                break;
-            }
-            Thread.sleep(500);
-        }
-
         // Setup OpenFeature with the DevCycle Provider
         OpenFeatureAPI api = OpenFeatureAPI.getInstance();
-        api.setProvider(devCycleClient.getOpenFeatureProvider());
+        api.setProviderAndWait(devCycleClient.getOpenFeatureProvider());
 
         Client openFeatureClient = api.getClient();
 
@@ -41,7 +36,7 @@ public static void main(String[] args) throws InterruptedException {
         context.add("language", "en");
         context.add("country", "CA");
         context.add("appVersion", "1.0.0");
-        context.add("appBuild", "1");
+        context.add("appBuild", 1.0);
         context.add("deviceModel", "Macbook");
 
         // Add Devcycle Custom Data values
@@ -81,5 +76,14 @@ public static void main(String[] args) throws InterruptedException {
         System.out.println("Value: " + details.getValue());
         System.out.println("Reason: " + details.getReason());
 
+        MutableTrackingEventDetails eventDetails = new MutableTrackingEventDetails(610.1);
+        eventDetails.add("test-string", "test-value");
+        eventDetails.add("test-number", 123.456);
+        eventDetails.add("test-boolean", true);
+        eventDetails.add("test-json", new Value(Structure.mapToStructure(defaultJsonData)));
+
+        openFeatureClient.track("test-of-event", context, eventDetails);
+
+        Thread.sleep(20000);
     }
 }

src/main/java/com/devcycle/sdk/server/common/api/IDevCycleClient.java

@@ -1,5 +1,7 @@
 package com.devcycle.sdk.server.common.api;
 
+import com.devcycle.sdk.server.common.exception.DevCycleException;
+import com.devcycle.sdk.server.common.model.DevCycleEvent;
 import com.devcycle.sdk.server.common.model.DevCycleUser;
 import com.devcycle.sdk.server.common.model.Variable;
 import dev.openfeature.sdk.FeatureProvider;
@@ -32,6 +34,8 @@ public interface IDevCycleClient {
      */
     <T> Variable<T> variable(DevCycleUser user, String key, T defaultValue);
 
+    void track(DevCycleUser user, DevCycleEvent event) throws DevCycleException;
+
     /**
      * Close the client and release any resources.
      */

src/main/java/com/devcycle/sdk/server/common/model/DevCycleUser.java

@@ -104,6 +104,11 @@ public class DevCycleUser {
     @JsonProperty("sdkVersion")
     private String sdkVersion = getPlatformData().getSdkVersion();
 
+    @Schema(description = "DevCycle SDK Platform")
+    @Builder.Default
+    @JsonProperty("sdkPlatform")
+    private String sdkPlatform = null;
+
     @Schema(description = "Hostname where the SDK is running")
     @Builder.Default
     @JsonProperty("hostname")
@@ -149,13 +154,13 @@ public static DevCycleUser fromEvaluationContext(EvaluationContext ctx) {
             throw new TargetingKeyMissingError();
         }
 
-        DevCycleUser user = DevCycleUser.builder().userId(userId).build();
+        DevCycleUser user = DevCycleUser.builder().userId(userId).sdkPlatform("java-of").build();
 
         Map<String, Object> customData = new LinkedHashMap<>();
         Map<String, Object> privateCustomData = new LinkedHashMap<>();
 
         for (String key : ctx.keySet()) {
-            if (key.equals("user_id")) {
+            if (key.equals("user_id") || key.equals("targetingKey")) {
                 continue;
             }
 

src/main/java/com/devcycle/sdk/server/common/model/PlatformData.java

@@ -20,23 +20,31 @@ public class PlatformData {
     @Schema(description = "Platform the SDK is running on")
     @Builder.Default
     private String platform = "Java";
+
     @Schema(description = "Version of the platform the SDK is running on")
     @Builder.Default
     private String platformVersion = System.getProperty("java.version");
+
     @Schema(description = "DevCycle SDK type")
     @Builder.Default
     private PlatformData.SdkTypeEnum sdkType = PlatformData.SdkTypeEnum.SERVER;
+
     @Schema(description = "DevCycle SDK Version")
     @Builder.Default
     private String sdkVersion = "2.5.0";
+
+    @Schema(description = "DevCycle SDK Platform")
+    private String sdkPlatform = null;
+
     @Schema(description = "Hostname where the SDK is running")
     private String hostname;
 
-    public PlatformData(String platform, String platformVersion, SdkTypeEnum sdkType, String sdkVersion, String hostname) {
+    public PlatformData(String platform, String platformVersion, SdkTypeEnum sdkType, String sdkVersion, String sdkPlatform, String hostname) {
         this.platform = platform;
         this.platformVersion = platformVersion;
         this.sdkType = sdkType;
         this.sdkVersion = sdkVersion;
+        this.sdkPlatform = sdkPlatform;
         try {
             this.hostname = hostname != null ? hostname : InetAddress.getLocalHost().getHostName();
         } catch (UnknownHostException e) {
@@ -53,6 +61,9 @@ public String toString() {
         platformData.put("platformVersion", platformVersion);
         platformData.put("sdkType", sdkType.toString());
         platformData.put("sdkVersion", sdkVersion);
+        if (sdkPlatform != null) {
+            platformData.put("sdkPlatform", sdkPlatform);
+        }
         platformData.put("hostname", hostname);
 
         String platformDataString = null;

src/main/java/com/devcycle/sdk/server/local/api/DevCycleLocalClient.java

@@ -25,7 +25,6 @@
 public final class DevCycleLocalClient implements IDevCycleClient {
 
     private final String sdkKey;
-    private final DevCycleProvider openFeatureProvider;
     private final LocalBucketing localBucketing = new LocalBucketing();
     private final EnvironmentConfigManager configManager;
     private EventQueueManager eventQueueManager;
@@ -61,7 +60,6 @@ public DevCycleLocalClient(String sdkKey, DevCycleLocalOptions dvcOptions) {
         } catch (Exception e) {
             DevCycleLogger.error("Error creating event queue due to error: " + e.getMessage());
         }
-        this.openFeatureProvider = new DevCycleProvider(this);
     }
 
     /**
@@ -249,12 +247,24 @@ public void close() {
         }
     }
 
+
+    private static DevCycleProvider openFeatureProvider = null;
+
     /**
      * @return the OpenFeature provider for this client.
      */
     @Override
     public FeatureProvider getOpenFeatureProvider() {
-        return this.openFeatureProvider;
+        if (openFeatureProvider == null) {
+            synchronized (DevCycleLocalClient.class) {
+                if (openFeatureProvider == null) {
+                    openFeatureProvider = new DevCycleProvider(this);
+                }
+                PlatformData platformData = PlatformData.builder().sdkPlatform("java-of").build();
+                localBucketing.setPlatformData(platformData.toString());
+            }
+        }
+        return openFeatureProvider;
     }
 
     @Override