address feadback

Author: abelonogov-ld

pkgs/sdk/client/src/Hooks/EvaluationSeriesContext.cs

@@ -25,26 +25,18 @@ public sealed class EvaluationSeriesContext {
         /// </summary>
         public string Method { get;  }
 
-        /// <summary>
-        /// The environment ID for the evaluation, or null if not available.
-        /// </summary>
-        public string EnvironmentId { get; }
-
         /// <summary>
         /// Constructs a new EvaluationSeriesContext.
         /// </summary>
         /// <param name="flagKey">the flag key</param>
         /// <param name="context">the context</param>
         /// <param name="defaultValue">the default value</param>
         /// <param name="method">the variation method</param>
-        /// <param name="environmentId">the environment ID</param>
-        public EvaluationSeriesContext(string flagKey, Context context, LdValue defaultValue, string method,
-            string environmentId = null) {
+        public EvaluationSeriesContext(string flagKey, Context context, LdValue defaultValue, string method) {
             FlagKey = flagKey;
             Context = context;
             DefaultValue = defaultValue;
             Method = method;
-            EnvironmentId = environmentId;
         }
     }
 }

pkgs/sdk/client/src/LdClient.cs

@@ -73,7 +73,6 @@ public sealed class LdClient : ILdClient
         readonly AnonymousKeyContextDecorator _anonymousKeyContextDecorator;
         private readonly AutoEnvContextDecorator _autoEnvContextDecorator;
         private readonly IHookExecutor _hookExecutor;
-        private List<Hook> _pluginHooks = new List<Hook>();
 
         private readonly Logger _log;
 
@@ -234,27 +233,17 @@ public sealed class LdClient : ILdClient
                 });
             }
 
-            PluginConfiguration pluginConfig = null;
-            EnvironmentMetadata environmentMetadata = null;
-            if (_config.Plugins != null)
-            {
-                pluginConfig = _config.Plugins.Build();
-                if (pluginConfig.Plugins.Any())
-                {
-                    environmentMetadata = CreateEnvironmentMetadata();
-                    _pluginHooks = this.GetPluginHooks(pluginConfig.Plugins, environmentMetadata, _log);
-                }
-            }
+            var pluginConfig = (_config.Plugins ?? Components.Plugins()).Build();
+            var environmentMetadata = pluginConfig.Plugins.Any() ? CreateEnvironmentMetadata() : null;
+            var hooks = pluginConfig.Plugins.Any()
+                ? this.GetPluginHooks(pluginConfig.Plugins, environmentMetadata, _log)
+                : new List<Hook>();
 
-            _hookExecutor = _pluginHooks.Any()
-                ? (IHookExecutor)new Executor(_log.SubLogger(LogNames.HooksSubLog), _pluginHooks)
+            _hookExecutor = hooks.Any()
+                ? (IHookExecutor)new Executor(_log.SubLogger(LogNames.HooksSubLog), hooks)
                 : new NoopExecutor();
 
-            // Register plugins after creating the hook executor to ensure hooks are available
-            if (pluginConfig != null && pluginConfig.Plugins.Any())
-            {
-                this.RegisterPlugins(pluginConfig.Plugins, environmentMetadata, _log);
-            }
+            this.RegisterPlugins(pluginConfig.Plugins, environmentMetadata, _log);
 
             _backgroundModeManager = _config.BackgroundModeManager ?? new DefaultBackgroundModeManager();
             _backgroundModeManager.BackgroundModeChanged += OnBackgroundModeChanged;