fixes

Author: idanasulin2706

superclient/agent/interceptor.py

@@ -73,8 +73,12 @@ def init_patch(self, *args, **kwargs):
 
             # Apply optimized configuration
             for k, v in opt_cfg.items():
-                if kwargs.get(k) != v:
-                    logger.debug("Overriding configuration: {} -> {}", k, v)
+                current_val = kwargs.get(k)
+                if current_val != v:
+                    if k in kwargs:
+                        logger.debug("Overriding configuration: {} ({} -> {})", k, current_val, v)
+                    else:
+                        logger.debug("Overriding configuration: {} ((not set) -> {})", k, v)
                     kwargs[k] = v
 
             # Set up reporting interval
@@ -189,8 +193,12 @@ def init_patch(self, *args, **kwargs):
                 # Get optimized configuration if Superstream is active
                 opt_cfg = optimal_cfg(metadata, topics_env, orig_cfg, "aiokafka")
             for k, v in opt_cfg.items():
-                if kwargs.get(k) != v:
-                    logger.debug("Overriding configuration: {} -> {}", k, v)
+                current_val = kwargs.get(k)
+                if current_val != v:
+                    if k in kwargs:
+                        logger.debug("Overriding configuration: {} ({} -> {})", k, current_val, v)
+                    else:
+                        logger.debug("Overriding configuration: {} ((not set) -> {})", k, v)
                     kwargs[k] = v
             report_interval = metadata.get("report_interval_ms") if metadata else _DEFAULT_REPORT_INTERVAL_MS
             tr = ProducerTracker(
@@ -288,8 +296,12 @@ def init_patch(self, conf: Dict[str, Any], *args, **kwargs):
                 # Get optimized configuration if Superstream is active
                 opt_cfg = optimal_cfg(metadata, topics_env, conf, "confluent")
             for k, v in opt_cfg.items():
-                if conf.get(k) != v:
-                    logger.debug("Overriding configuration: {} -> {}", k, v)
+                current_val = conf.get(k)
+                if current_val != v:
+                    if k in conf:
+                        logger.debug("Overriding configuration: {} ({} -> {})", k, current_val, v)
+                    else:
+                        logger.debug("Overriding configuration: {} ((not set) -> {})", k, v)
                     conf[k] = v
             report_interval = metadata.get("report_interval_ms") if metadata else _DEFAULT_REPORT_INTERVAL_MS
             tr = ProducerTracker(

superclient/agent/metadata.py

@@ -147,11 +147,20 @@ def optimal_cfg(metadata: Optional[Dict[str, Any]], topics: list[str], orig: Dic
                 cfg.setdefault(k, v)
     if latency:
         cfg.pop("linger.ms", None)
-    for p in ("batch.size", "linger.ms"):
-        if p in orig and p in cfg:
+    
+    # Translate Java-style keys to library-specific keys for comparison
+    java_keys_to_check = ["batch.size", "linger.ms"]
+    lib_keys_to_check = []
+    for java_key in java_keys_to_check:
+        translated = translate_java_to_lib({java_key: ""}, lib_name)
+        lib_key = list(translated.keys())[0] if translated else java_key
+        lib_keys_to_check.append(lib_key)
+    
+    for java_key, lib_key in zip(java_keys_to_check, lib_keys_to_check):
+        if lib_key in orig and java_key in cfg:
             try:
-                if int(orig[p]) > int(cfg[p]):
-                    cfg[p] = orig[p]
+                if int(orig[lib_key]) > int(cfg[java_key]):
+                    cfg[java_key] = orig[lib_key]
             except Exception:
                 pass