feat: multiple instance support

Author: sakshamg1304

CHANGELOG.md

@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+
+## [1.16.0] - 2025-12-12
+
+### Fixed
+
+- Fixed singleton class issue where single service instance was being used across multiple sdk instances.
+
 ## [1.15.0] - 2025-12-10
 
 ### Added

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "vwo/vwo-fme-php-sdk",
 
-    "version": "1.15.0",
+    "version": "1.16.0",
     "keywords": ["vwo", "fme", "sdk"],
     "license": "Apache-2.0",
     "authors": [{

src/Api/GetFlag.php

@@ -22,6 +22,7 @@
 use vwo\Models\SettingsModel;
 use vwo\Enums\EventEnum;
 use vwo\Utils\NetworkUtil;
+use vwo\Services\ServiceContainer;
 
 interface ISetAttribute
 {
@@ -42,10 +43,10 @@ class SetAttribute implements ISetAttribute
      * @param array $attributes Key-value map of attributes.
      * @param ContextModel $context Context containing user information.
      */
-    public function setAttribute(SettingsModel $settings, array $attributes, ContextModel $context, bool $isDebuggerUsed = false)
+    public function setAttribute(SettingsModel $settings, array $attributes, ContextModel $context, bool $isDebuggerUsed = false, ServiceContainer $serviceContainer = null)
     {
         if (!$isDebuggerUsed) {
-            $this->createImpressionForAttributes($settings, $attributes, $context);
+            $this->createImpressionForAttributes($settings, $attributes, $context, $serviceContainer);
         }
     }
 
@@ -54,10 +55,11 @@ public function setAttribute(SettingsModel $settings, array $attributes, Context
      * @param SettingsModel $settings Configuration settings.
      * @param array $attributes Key-value map of attributes.
      * @param ContextModel $context Context containing user information.
+     * @param ServiceContainer $serviceContainer The service container (optional).
      */
-    private function createImpressionForAttributes(SettingsModel $settings, array $attributes, ContextModel $context)
+    private function createImpressionForAttributes(SettingsModel $settings, array $attributes, ContextModel $context, ServiceContainer $serviceContainer = null)
     {
-        $networkUtil = new NetworkUtil();
+        $networkUtil = new NetworkUtil($serviceContainer);
 
         // Retrieve base properties for the event
         $properties = $networkUtil->getEventsBaseProperties(

src/Api/SetAttribute.php

@@ -22,11 +22,11 @@
 use vwo\Enums\ErrorLogMessagesEnum;
 use vwo\Models\SettingsModel;
 use vwo\Models\User\ContextModel;
-use vwo\Packages\Logger\Core\LogManager;
 use vwo\Services\HooksService;
 use vwo\Utils\FunctionUtil as FunctionUtil;
 use vwo\Utils\NetworkUtil as NetworkUtil;
 use vwo\Utils\LogMessageUtil as LogMessageUtil;
+use vwo\Services\ServiceContainer;
 
 // Interface for tracking functionality
 interface ITrack
@@ -55,13 +55,13 @@ class TrackEvent implements ITrack
      * @param HooksService $hooksService Manager for handling hooks and callbacks.
      * @return array Returns an array indicating the success or failure of the event tracking.
      */
-    public function track(SettingsModel $settings, string $eventName, ContextModel $context, array $eventProperties, HooksService $hooksService, bool $isDebuggerUsed = false): array
+    public function track(SettingsModel $settings, string $eventName, ContextModel $context, array $eventProperties, HooksService $hooksService, bool $isDebuggerUsed = false, ServiceContainer $serviceContainer = null): array
     {
         if (FunctionUtil::doesEventBelongToAnyFeature($eventName, $settings)) {
             // Create an impression for the track event
             // if settings passed in init options is true, then we don't need to send an impression
             if (!$isDebuggerUsed) {
-                $this->createImpressionForTrack($settings, $eventName, $context, $eventProperties);
+                $this->createImpressionForTrack($settings, $eventName, $context, $eventProperties, $serviceContainer);
             }
 
             // Set and execute integration callback for the track event
@@ -72,7 +72,8 @@ public function track(SettingsModel $settings, string $eventName, ContextModel $
         }
 
         // Log an error if the event does not exist
-        LogManager::instance()->error("Event '$eventName' not found in any of the features");
+        $logManager = $serviceContainer->getLogManager();
+        $logManager->error("Event '$eventName' not found in any of the features");
 
 
         return [$eventName => false];
@@ -84,10 +85,11 @@ public function track(SettingsModel $settings, string $eventName, ContextModel $
      * @param string $eventName Name of the event to track.
      * @param ContextModel $context Contextual information like user details.
      * @param array $eventProperties Properties associated with the event.
+     * @param ServiceContainer $serviceContainer The service container (optional).
      */
-    private function createImpressionForTrack(SettingsModel $settings, string $eventName, ContextModel $context, array $eventProperties)
+    private function createImpressionForTrack(SettingsModel $settings, string $eventName, ContextModel $context, array $eventProperties, ServiceContainer $serviceContainer = null)
     {
-        $networkUtil = new NetworkUtil();
+        $networkUtil = new NetworkUtil($serviceContainer);
 
         // Get base properties for the event
         $properties = $networkUtil->getEventsBaseProperties($eventName, $context->getUserAgent(), $context->getIpAddress());

src/Api/TrackEvent.php

@@ -40,7 +40,7 @@ class Constants {
     const DEFAULT_EVENTS_PER_REQUEST = 100;
     const SDK_NAME = 'vwo-fme-php-sdk';
 
-    const SDK_VERSION = '1.15.0';
+    const SDK_VERSION = '1.16.0';
     const AP = 'server';
 
     const SETTINGS = 'settings';

src/Constants/Constants.php

@@ -18,24 +18,24 @@
 
 namespace vwo\Decorators;
 
-use vwo\Packages\Logger\Core\LogManager;
 use vwo\Services\StorageService;
 use vwo\Enums\StorageEnum;
 use vwo\Models\FeatureModel;
 use vwo\Models\VariationModel;
 use vwo\Models\User\ContextModel;
+use vwo\Services\ServiceContainer;
 
 interface IStorageDecorator
 {
-    public function getFeatureFromStorage($featureKey, $context, $storageService);
-    public function setDataInStorage($data, $storageService);
+    public function getFeatureFromStorage($featureKey, $context, $storageService, ServiceContainer $serviceContainer = null);
+    public function setDataInStorage($data, $storageService, ServiceContainer $serviceContainer = null);
 }
 
 class StorageDecorator implements IStorageDecorator
 {
-    public function getFeatureFromStorage($featureKey, $context, $storageService)
+    public function getFeatureFromStorage($featureKey, $context, $storageService, ServiceContainer $serviceContainer = null)
     {
-        $campaignMap = $storageService->getDataInStorage($featureKey, $context);
+        $campaignMap = $storageService->getDataInStorage($featureKey, $context, $serviceContainer);
 
         switch ($campaignMap) {
             case StorageEnum::STORAGE_UNDEFINED:
@@ -55,9 +55,10 @@ public function getFeatureFromStorage($featureKey, $context, $storageService)
         }
     }
 
-    public function setDataInStorage($data, $storageService)
+    public function setDataInStorage($data, $storageService, ServiceContainer $serviceContainer = null)
     {
         $featureKey = $data['featureKey'] ?? null;
+        $featureId = $data['featureId'] ?? null;
         $context = $data['context'] ?? null;
         $rolloutId = $data['rolloutId'] ?? null;
         $rolloutKey = $data['rolloutKey'] ?? null;
@@ -66,27 +67,29 @@ public function setDataInStorage($data, $storageService)
         $experimentKey = $data['experimentKey'] ?? null;
         $experimentVariationId = $data['experimentVariationId'] ?? null;
 
+        $logManager = $serviceContainer->getLogManager();
+
         if (!$featureKey) {
-            LogManager::instance()->error("Error storing data: featureKey is invalid.");
+            $logManager->error("Error storing data: featureKey is invalid.");
             return false;
         }
 
         if ($context->getId() == null) {
-            LogManager::instance()->error("Error storing data: Context or Context.id is invalid.");
+            $logManager->error("Error storing data: Context or Context.id is invalid.");
             return false;
         }
 
         if ($rolloutKey && !$experimentKey && !$rolloutVariationId) {
-            LogManager::instance()->error("Error storing data: Variation (rolloutKey, experimentKey or rolloutVariationId) is invalid.");
+            $logManager->error("Error storing data: Variation (rolloutKey, experimentKey or rolloutVariationId) is invalid.");
             return false;
         }
 
         if ($experimentKey && !$experimentVariationId) {
-            LogManager::instance()->error("Error storing data: Variation (experimentKey or experimentVariationId) is invalid.");
+            $logManager->error("Error storing data: Variation (experimentKey or experimentVariationId) is invalid.");
             return false;
         }
 
-        $storageService->setDataInStorage([
+        $storageData = [
             'featureKey' => $featureKey,
             'userId' => $context->getId(),
             'rolloutId' => isset($rolloutId) ? $rolloutId : null,
@@ -95,7 +98,14 @@ public function setDataInStorage($data, $storageService)
             'experimentId' => isset($experimentId) ? $experimentId : null,
             'experimentKey' => isset($experimentKey) ? $experimentKey : null,
             'experimentVariationId' => isset($experimentVariationId) ? $experimentVariationId : null,
-        ]);
+        ];
+
+        // Add featureId if provided
+        if ($featureId !== null) {
+            $storageData['featureId'] = $featureId;
+        }
+
+        $storageService->setDataInStorage($storageData, $serviceContainer);
 
         return true;
     }

src/Decorators/StorageDecorator.php

@@ -56,19 +56,18 @@ public function __construct($config = []) {
             return (new \DateTime())->format(\DateTime::ISO8601);
         };
 
-        if (!isset(self::$instance)) {
-            self::$instance = $this;
-
-            $this->config['name'] = $config['name'] ?? $this->name;
-            $this->config['requestId'] = $config['requestId'] ?? Uuid::uuid4()->toString();
-            $this->config['level'] = $config['level'] ?? $this->level;
-            $this->config['prefix'] = $config['prefix'] ?? $this->prefix;
-            $this->config['dateTimeFormat'] = $config['dateTimeFormat'] ?? $this->dateTimeFormat;
-
-            $this->transportManager = new LogTransportManager($this->config);
-
-            $this->handleTransports();
-        }
+        // Always initialize config and transportManager for this instance
+        $this->config['name'] = $config['name'] ?? $this->name;
+        $this->config['requestId'] = $config['requestId'] ?? Uuid::uuid4()->toString();
+        $this->config['level'] = $config['level'] ?? $this->level;
+        $this->config['prefix'] = $config['prefix'] ?? $this->prefix;
+        $this->config['dateTimeFormat'] = $config['dateTimeFormat'] ?? $this->dateTimeFormat;
+
+        $this->transportManager = new LogTransportManager($this->config);
+        $this->handleTransports();
+
+        // Always update singleton to the latest instance to support multiple SDK instances
+        self::$instance = $this;
     }
 
     public static function instance() {

src/Packages/Logger/Core/LogManager.php

@@ -23,6 +23,8 @@
 use vwo\Services\LoggerService;
 use vwo\Enums\LogLevelEnum;
 use vwo\Constants\Constants;
+use vwo\Packages\NetworkLayer\Manager\NetworkManager;
+use vwo\Packages\Logger\Core\LogManager;
 
 class NetworkClient implements NetworkClientInterface
 {
@@ -31,6 +33,7 @@ class NetworkClient implements NetworkClientInterface
     private $isGatewayUrlNotSecure = false; // Flag to store the value
     private $shouldWaitForTrackingCalls = false;
     private $retryConfig = Constants::DEFAULT_RETRY_CONFIG;
+    private $logManager;
 
     // Constructor to accept options and store the flag
     public function __construct($options = []) {
@@ -43,6 +46,9 @@ public function __construct($options = []) {
         if(isset($options['retryConfig'])) {
             $this->retryConfig = $options['retryConfig'];
         }
+        if(isset($options['logManager'])) {
+            $this->logManager = $options['logManager'];
+        }
     }
 
     private function shouldUseCurl($networkOptions)
@@ -268,7 +274,8 @@ public function GET($request)
                 'GET',
                 $networkOptions['headers'],
                 null,
-                $networkOptions['timeout'] / 1000
+                $networkOptions['timeout'] / 1000,
+                $this->retryConfig
             );
             $rawResponse = $curlResponse['body'];
             $responseModel->setStatusCode($curlResponse['status_code']);
@@ -304,7 +311,7 @@ public function POST($request)
                     $networkOptions['headers'],
                     $networkOptions['body'],
                     $networkOptions['timeout'] / 1000,
-                    $retryConfig
+                    $this->retryConfig
                 );
 
                 $rawResponse = $curlResponse['body'];

src/Packages/NetworkLayer/Client/NetworkClient.php

@@ -33,6 +33,11 @@ class NetworkManager {
     private $isGatewayUrlNotSecure = false; // Store the flag here
     private $shouldWaitForTrackingCalls = false;
     private $retryConfig = Constants::DEFAULT_RETRY_CONFIG;
+    private $logManager;
+
+    // public function __construct() {
+    //     $this->config = new GlobalRequestModel(null, null, null, null);
+    // }
 
     public function attachClient($client = null, $options = []) {
         $this->config = new GlobalRequestModel(null, null, null, null);
@@ -42,6 +47,12 @@ public function attachClient($client = null, $options = []) {
         if(isset($options['shouldWaitForTrackingCalls'])) {
             $this->shouldWaitForTrackingCalls = $options['shouldWaitForTrackingCalls'];
         }
+        if(isset($options['retryConfig'])) {
+            $this->retryConfig = $options['retryConfig'];
+        }
+        if(isset($options['logManager'])) {
+            $this->logManager = $options['logManager'];
+        }
         // Normalize retry config from options (if any)
         $providedRetry = isset($options['retryConfig']) && is_array($options['retryConfig']) ? $options['retryConfig'] : [];
         $this->retryConfig = $this->validateRetryConfig($providedRetry);
@@ -51,6 +62,7 @@ public function attachClient($client = null, $options = []) {
             'isGatewayUrlNotSecure' => $this->isGatewayUrlNotSecure,
             'shouldWaitForTrackingCalls' => $this->shouldWaitForTrackingCalls,
             'retryConfig' => $this->retryConfig,
+            'logManager' => $this->logManager,
         ];
         $this->client = $client ?: new NetworkClient($clientOptions);
     }
@@ -88,6 +100,10 @@ public function createRequest($request): RequestModel {
     }
 
     public function get($request) {
+        if ($this->client === null) {
+            throw new \Exception('NetworkManager client is not initialized. Please call attachClient() first.');
+        }
+
         $networkOptions = $this->createRequest($request);
 
         if ($networkOptions === null) {
@@ -103,6 +119,10 @@ public function get($request) {
     }
 
     public function post($request) {
+        if ($this->client === null) {
+            throw new \Exception('NetworkManager client is not initialized. Please call attachClient() first.');
+        }
+
         $networkOptions = $this->createRequest($request);
 
         if ($networkOptions === null) {