Merge uc2 work into main (#140)

Author: keelerm84

.circleci/config.yml

@@ -9,7 +9,7 @@ workflows:
       - test-on-linux:
           matrix:
               parameters:
-                  php-version: ["8.0", "8.1"]
+                  php-version: ["8.1", "8.2"]
                   composer-dependencies: ["lowest", "highest"]
       - test-on-windows
 

README.md

@@ -12,7 +12,7 @@
 
 ## Supported PHP versions
 
-This version of the LaunchDarkly SDK is compatible with PHP 8.0 and higher.
+This version of the LaunchDarkly SDK is compatible with PHP 8.1 and higher.
 
 ## Getting started
 

baseline.xml

@@ -14,17 +14,17 @@
         }
     ],
     "require": {
-        "php": ">=8.0",
+        "php": ">=8.1",
         "monolog/monolog": "^2.0|^3.0",
         "psr/log": "^1.0|^2.0|^3.0"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "^3.12.0",
+        "friendsofphp/php-cs-fixer": "^3.15.0",
         "guzzlehttp/guzzle": "^7",
         "kevinrob/guzzle-cache-middleware": "^4.0",
         "phpunit/php-code-coverage": "^9",
         "phpunit/phpunit": "^9",
-        "vimeo/psalm": "^4.9"
+        "vimeo/psalm": "^5.15"
     },
     "suggest": {
         "guzzlehttp/guzzle": "(^6.3 | ^7) Required when using GuzzleEventPublisher or the default FeatureRequester",

composer.json

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" bootstrap="tests/bootstrap.php" colors="true" beStrictAboutChangesToGlobalState="true" beStrictAboutOutputDuringTests="true" beStrictAboutResourceUsageDuringSmallTests="true" beStrictAboutTestsThatDoNotTestAnything="true" beStrictAboutTodoAnnotatedTests="true" verbose="true" defaultTimeLimit="10">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" bootstrap="vendor/autoload.php" colors="true" beStrictAboutChangesToGlobalState="true" beStrictAboutOutputDuringTests="true" beStrictAboutResourceUsageDuringSmallTests="true" beStrictAboutTestsThatDoNotTestAnything="true" beStrictAboutTodoAnnotatedTests="true" verbose="true" defaultTimeLimit="10">
 
   <logging>
     <junit outputFile="build/phpunit/junit.xml"/>

phpunit.xml

@@ -5,7 +5,6 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
-    errorBaseline="baseline.xml"
 >
     <projectFiles>
         <directory name="src" />

psalm.xml

@@ -83,6 +83,13 @@ class EvaluationReason implements \JsonSerializable
      */
     const EXCEPTION_ERROR = 'EXCEPTION';
 
+    /**
+     * A possible value for getErrorKind(): indicates the value of the
+     * evaluation did not match the PHP type expected.
+     */
+
+    const WRONG_TYPE_ERROR = 'WRONG_TYPE';
+
     private string $_kind;
     private ?string $_errorKind;
     private ?int $_ruleIndex;

src/LaunchDarkly/EvaluationReason.php

@@ -50,7 +50,14 @@ public function newEvalEvent(
             'default' => $default,
             'version' => $flag->getVersion()
         ];
+
         // the following properties are handled separately so we don't waste bandwidth on unused keys
+        if ($flag->getExcludeFromSummaries()) {
+            $e['excludeFromSummaries'] = true;
+        }
+        if ($flag->getSamplingRatio() !== 1) {
+            $e['samplingRatio'] = $flag->getSamplingRatio();
+        }
         if ($forceReasonTracking || $flag->isTrackEvents()) {
             $e['trackEvents'] = true;
         }
@@ -66,33 +73,6 @@ public function newEvalEvent(
         return $e;
     }
 
-    /**
-     * @return mixed[]
-     */
-    public function newDefaultEvent(FeatureFlag $flag, LDContext $context, EvaluationDetail $detail): array
-    {
-        $e = [
-            'kind' => 'feature',
-            'creationDate' => Util::currentTimeUnixMillis(),
-            'key' => $flag->getKey(),
-            'context' => $context,
-            'value' => $detail->getValue(),
-            'default' => $detail->getValue(),
-            'version' => $flag->getVersion()
-        ];
-        // the following properties are handled separately so we don't waste bandwidth on unused keys
-        if ($flag->isTrackEvents()) {
-            $e['trackEvents'] = true;
-        }
-        if ($flag->getDebugEventsUntilDate()) {
-            $e['debugEventsUntilDate'] = $flag->getDebugEventsUntilDate();
-        }
-        if ($this->_withReasons) {
-            $e['reason'] = $detail->getReason()->jsonSerialize();
-        }
-        return $e;
-    }
-
     /**
      * @return mixed[]
      */
@@ -124,7 +104,7 @@ public function newIdentifyEvent(LDContext $context): array
             'context' => $context
         ];
     }
-    
+
     /**
      * @return mixed[]
      */

src/LaunchDarkly/Impl/Events/EventFactory.php

@@ -4,6 +4,7 @@
 
 namespace LaunchDarkly\Impl\Events;
 
+use LaunchDarkly\Impl\Util;
 use LaunchDarkly\Integrations\Curl;
 use LaunchDarkly\Subsystems\EventPublisher;
 
@@ -21,7 +22,7 @@ class EventProcessor
     private int $_capacity;
 
     /**
-     * @psalm-param array{capacity: int} $options
+     * @param array<string, mixed> $options
      */
     public function __construct(string $sdkKey, array $options)
     {
@@ -50,6 +51,13 @@ public function enqueue(array $event): bool
             return false;
         }
 
+        if (isset($event['samplingRatio'])) {
+            $samplingRatio = $event['samplingRatio'];
+            if (is_int($samplingRatio) && !Util::sample($samplingRatio)) {
+                return false;
+            }
+        }
+
         $this->_queue[] = $event;
 
         return true;

src/LaunchDarkly/Impl/Events/EventProcessor.php

@@ -0,0 +1,56 @@
+<?php
+
+declare(strict_types=1);
+
+namespace LaunchDarkly\Impl\Migrations;
+
+use Closure;
+use Exception;
+use LaunchDarkly\Impl\Util;
+use LaunchDarkly\Migrations\OperationResult;
+use LaunchDarkly\Migrations\OpTracker;
+use LaunchDarkly\Migrations\Origin;
+use LaunchDarkly\Types\Result;
+
+/**
+ * Utility class for executing migration operations while also tracking our
+ * built-in migration measurements.
+ */
+class Executor
+{
+    /**
+     * @param Closure(mixed): Result $fn
+     */
+    public function __construct(
+        public readonly Origin $origin,
+        private Closure $fn,
+        private OpTracker $tracker,
+        private bool $trackLatency,
+        private bool $trackErrors,
+        private mixed $payload,
+    ) {
+    }
+
+    public function run(): OperationResult
+    {
+        $start = Util::currentTimeUnixMillis();
+
+        try {
+            $result = ($this->fn)($this->payload);
+        } catch (Exception $e) {
+            $result = Result::error($e->getMessage(), $e);
+        }
+
+        if ($this->trackLatency) {
+            $this->tracker->latency($this->origin, Util::currentTimeUnixMillis() - $start);
+        }
+
+        if ($this->trackErrors && !$result->isSuccessful()) {
+            $this->tracker->error($this->origin);
+        }
+
+        $this->tracker->invoked($this->origin);
+
+        return new OperationResult($this->origin, $result);
+    }
+}