Yggdrasil engine

pom.xml

@@ -56,6 +56,12 @@
   </scm>
 
     <dependencies>
+        <dependency>
+            <groupId>io.getunleash</groupId>
+            <artifactId>yggdrasil-engine</artifactId>
+            <version>0.1.0-alpha.9</version>
+            <classifier>x86_64-linux</classifier>
+        </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>

src/main/java/io/getunleash/FakeUnleash.java

@@ -107,17 +107,6 @@ public void disableAllExcept(String... excludedFeatures) {
         }
     }
 
-    @Override
-    public Variant deprecatedGetVariant(String toggleName, UnleashContext context) {
-        return null;
-    }
-
-    @Override
-    public Variant deprecatedGetVariant(
-            String toggleName, UnleashContext context, Variant defaultValue) {
-        return null;
-    }
-
     public void resetAll() {
         disableAll = false;
         enableAll = false;
@@ -176,15 +165,5 @@ public List<EvaluatedToggle> evaluateAllToggles(@Nullable UnleashContext context
                                             getVariant(toggleName)))
                     .collect(Collectors.toList());
         }
-
-        @Override
-        public void count(String toggleName, boolean enabled) {
-            // Nothing to count
-        }
-
-        @Override
-        public void countVariant(String toggleName, String variantName) {
-            // Nothing to count
-        }
     }
 }

src/main/java/io/getunleash/MoreOperations.java

@@ -19,8 +19,4 @@ public interface MoreOperations {
      * @return
      */
     List<EvaluatedToggle> evaluateAllToggles(UnleashContext context);
-
-    void count(String toggleName, boolean enabled);
-
-    void countVariant(String toggleName, String variantName);
 }

src/main/java/io/getunleash/Unleash.java

@@ -43,19 +43,6 @@ default Variant getVariant(final String toggleName, final Variant defaultValue)
         return getVariant(toggleName, UnleashContext.builder().build(), defaultValue);
     }
 
-    Variant deprecatedGetVariant(final String toggleName, final UnleashContext context);
-
-    Variant deprecatedGetVariant(
-            final String toggleName, final UnleashContext context, final Variant defaultValue);
-
-    default Variant deprecatedGetVariant(final String toggleName) {
-        return deprecatedGetVariant(toggleName, UnleashContext.builder().build());
-    }
-
-    default Variant deprecatedGetVariant(final String toggleName, final Variant defaultValue) {
-        return deprecatedGetVariant(toggleName, UnleashContext.builder().build(), defaultValue);
-    }
-
     /**
      * Use more().getFeatureToggleNames() instead
      *

src/main/java/io/getunleash/YggdrasilAdapters.java

@@ -0,0 +1,84 @@
+package io.getunleash;
+
+import io.getunleash.engine.Context;
+import io.getunleash.engine.IStrategy;
+import io.getunleash.engine.Payload;
+import io.getunleash.engine.VariantDef;
+import io.getunleash.lang.Nullable;
+import io.getunleash.strategy.Strategy;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
+import java.util.Map;
+import java.util.Optional;
+import org.jetbrains.annotations.NotNull;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+final class YggdrasilAdapters {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(DefaultUnleash.class);
+
+    @NotNull
+    public static IStrategy adapt(Strategy s) {
+        return new IStrategy() {
+            @Override
+            public String getName() {
+                return s.getName();
+            }
+
+            @Override
+            public boolean isEnabled(Map<String, String> map, Context context) {
+                return s.isEnabled(map, adapt(context));
+            }
+        };
+    }
+
+    public static UnleashContext adapt(Context context) {
+        ZonedDateTime currentTime = ZonedDateTime.now();
+        if (context.getCurrentTime() != null) {
+            try {
+                currentTime = ZonedDateTime.parse(context.getCurrentTime());
+            } catch (DateTimeParseException e) {
+                LOGGER.warn("Could not parse current time from context, falling back to system time: ", context.getCurrentTime());
+                currentTime = ZonedDateTime.now();
+            }
+        }
+
+        return new UnleashContext(
+                context.getAppName(),
+                context.getEnvironment(),
+                context.getUserId(),
+                context.getSessionId(),
+                context.getRemoteAddress(),
+                currentTime,
+                context.getProperties());
+    }
+
+    public static Context adapt(UnleashContext context) {
+        Context mapped = new Context();
+        mapped.setAppName(context.getAppName().orElse(null));
+        mapped.setEnvironment(context.getEnvironment().orElse(null));
+        mapped.setUserId(context.getUserId().orElse(null));
+        mapped.setSessionId(context.getSessionId().orElse(null));
+        mapped.setRemoteAddress(context.getRemoteAddress().orElse(null));
+        mapped.setProperties(context.getProperties());
+        mapped.setCurrentTime(
+                DateTimeFormatter.ISO_DATE_TIME.format(
+                        context.getCurrentTime().orElse(ZonedDateTime.now())));
+        return mapped;
+    }
+
+    public static Variant adapt(VariantDef variant, Variant defaultValue) {
+        if (variant == null) {
+            return defaultValue;
+        }
+        return new Variant(variant.getName(), adapt(variant.getPayload()), variant.isEnabled());
+    }
+
+    public static @Nullable io.getunleash.variant.Payload adapt(@Nullable Payload payload) {
+        return Optional.ofNullable(payload)
+                .map(p -> new io.getunleash.variant.Payload(p.getType(), p.getValue()))
+                .orElse(new io.getunleash.variant.Payload("string", null));
+    }
+}

src/main/java/io/getunleash/metric/ClientMetrics.java

@@ -1,5 +1,6 @@
 package io.getunleash.metric;
 
+import io.getunleash.engine.MetricsBucket;
 import io.getunleash.event.UnleashEvent;
 import io.getunleash.event.UnleashSubscriber;
 import io.getunleash.lang.Nullable;

src/main/java/io/getunleash/metric/DefaultHttpMetricsSender.java

@@ -5,12 +5,14 @@
 import io.getunleash.event.EventDispatcher;
 import io.getunleash.util.AtomicLongSerializer;
 import io.getunleash.util.DateTimeSerializer;
+import io.getunleash.util.InstantSerializer;
 import io.getunleash.util.UnleashConfig;
 import io.getunleash.util.UnleashURLs;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.net.HttpURLConnection;
 import java.net.URL;
+import java.time.Instant;
 import java.time.LocalDateTime;
 import java.util.concurrent.atomic.AtomicLong;
 
@@ -33,6 +35,7 @@ public DefaultHttpMetricsSender(UnleashConfig unleashConfig) {
         this.gson =
                 new GsonBuilder()
                         .registerTypeAdapter(LocalDateTime.class, new DateTimeSerializer())
+                        .registerTypeAdapter(Instant.class, new InstantSerializer())
                         .registerTypeAdapter(AtomicLong.class, new AtomicLongSerializer())
                         .create();
     }

src/main/java/io/getunleash/metric/UnleashMetricService.java

@@ -4,8 +4,4 @@
 
 public interface UnleashMetricService {
     void register(Set<String> strategies);
-
-    void count(String toggleName, boolean active);
-
-    void countVariant(String toggleName, String variantName);
 }

src/main/java/io/getunleash/metric/UnleashMetricServiceImpl.java

@@ -1,5 +1,8 @@
 package io.getunleash.metric;
 
+import io.getunleash.engine.MetricsBucket;
+import io.getunleash.engine.UnleashEngine;
+import io.getunleash.engine.YggdrasilError;
 import io.getunleash.util.Throttler;
 import io.getunleash.util.UnleashConfig;
 import io.getunleash.util.UnleashScheduledExecutor;
@@ -15,21 +18,25 @@ public class UnleashMetricServiceImpl implements UnleashMetricService {
     private final UnleashConfig unleashConfig;
     private final MetricSender metricSender;
 
-    // mutable
-    private volatile MetricsBucket currentMetricsBucket;
+    // synchronization is handled in the engine itself
+    private final UnleashEngine engine;
 
     private final Throttler throttler;
 
     public UnleashMetricServiceImpl(
-            UnleashConfig unleashConfig, UnleashScheduledExecutor executor) {
-        this(unleashConfig, unleashConfig.getMetricSenderFactory().apply(unleashConfig), executor);
+            UnleashConfig unleashConfig, UnleashScheduledExecutor executor, UnleashEngine engine) {
+        this(
+                unleashConfig,
+                unleashConfig.getMetricSenderFactory().apply(unleashConfig),
+                executor,
+                engine);
     }
 
     public UnleashMetricServiceImpl(
             UnleashConfig unleashConfig,
             MetricSender metricSender,
-            UnleashScheduledExecutor executor) {
-        this.currentMetricsBucket = new MetricsBucket();
+            UnleashScheduledExecutor executor,
+            UnleashEngine engine) {
         this.started = LocalDateTime.now(ZoneId.of("UTC"));
         this.unleashConfig = unleashConfig;
         this.metricSender = metricSender;
@@ -38,6 +45,7 @@ public UnleashMetricServiceImpl(
                         (int) unleashConfig.getSendMetricsInterval(),
                         300,
                         unleashConfig.getUnleashURLs().getClientMetricsURL());
+        this.engine = engine;
         long metricsInterval = unleashConfig.getSendMetricsInterval();
 
         executor.setInterval(sendMetrics(), metricsInterval, metricsInterval);
@@ -50,29 +58,24 @@ public void register(Set<String> strategies) {
         metricSender.registerClient(registration);
     }
 
-    @Override
-    public void count(String toggleName, boolean active) {
-        currentMetricsBucket.registerCount(toggleName, active);
-    }
-
-    @Override
-    public void countVariant(String toggleName, String variantName) {
-        currentMetricsBucket.registerCount(toggleName, variantName);
-    }
-
     private Runnable sendMetrics() {
         return () -> {
             if (throttler.performAction()) {
-                MetricsBucket metricsBucket = this.currentMetricsBucket;
-                this.currentMetricsBucket = new MetricsBucket();
-                metricsBucket.end();
-                ClientMetrics metrics = new ClientMetrics(unleashConfig, metricsBucket);
-                int statusCode = metricSender.sendMetrics(metrics);
-                if (statusCode >= 200 && statusCode < 400) {
-                    throttler.decrementFailureCountAndResetSkips();
-                }
-                if (statusCode >= 400) {
-                    throttler.handleHttpErrorCodes(statusCode);
+                try {
+                    MetricsBucket bucket = this.engine.getMetrics();
+
+                    ClientMetrics metrics = new ClientMetrics(unleashConfig, bucket);
+                    int statusCode = metricSender.sendMetrics(metrics);
+                    if (statusCode >= 200 && statusCode < 400) {
+                        throttler.decrementFailureCountAndResetSkips();
+                    }
+                    if (statusCode >= 400) {
+                        throttler.handleHttpErrorCodes(statusCode);
+                    }
+                } catch (YggdrasilError e) {
+                    LOGGER.error(
+                            "Failed to retrieve metrics from the engine, this is a serious error, please report it",
+                            e);
                 }
             } else {
                 throttler.skipped();

src/main/java/io/getunleash/repository/FeatureRepository.java

@@ -10,6 +10,7 @@
 import io.getunleash.util.UnleashConfig;
 import io.getunleash.util.UnleashScheduledExecutor;
 import java.util.Collections;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
@@ -24,6 +25,8 @@ public class FeatureRepository implements IFeatureRepository {
     private final FeatureFetcher featureFetcher;
     private final EventDispatcher eventDispatcher;
 
+    private List<Consumer<FeatureCollection>> consumers = new LinkedList<>();
+
     private final Throttler throttler;
 
     private FeatureCollection featureCollection;
@@ -116,6 +119,10 @@ private void initCollections(UnleashScheduledExecutor executor) {
         }
     }
 
+    public void addConsumer(Consumer<FeatureCollection> consumer) {
+        this.consumers.add(consumer);
+    }
+
     private Runnable updateFeatures(final Consumer<UnleashException> handler) {
         return () -> {
             if (throttler.performAction()) {
@@ -131,6 +138,14 @@ private Runnable updateFeatures(final Consumer<UnleashException> handler) {
                                                 ? segmentCollection
                                                 : new SegmentCollection(Collections.emptyList()));
 
+                        consumers.forEach(
+                                consumer -> {
+                                    try {
+                                        consumer.accept(featureCollection);
+                                    } catch (Exception e) {
+                                        LOGGER.error("Error when calling consumer {}", consumer, e);
+                                    }
+                                });
                         featureBackupHandler.write(featureCollection);
                     } else if (response.getStatus() == ClientFeaturesResponse.Status.UNAVAILABLE) {
                         if (!ready && unleashConfig.isSynchronousFetchOnInitialisation()) {

src/main/java/io/getunleash/repository/IFeatureRepository.java

@@ -2,8 +2,11 @@
 
 import io.getunleash.Segment;
 import io.getunleash.lang.Nullable;
+import java.util.function.Consumer;
 
 public interface IFeatureRepository extends ToggleRepository {
     @Nullable
     Segment getSegment(Integer id);
+
+    void addConsumer(Consumer<FeatureCollection> consumer);
 }