Fix issue with bad log debug merge of context vars (apache#47589)

dstandish · nailo2c · commit 6260b240562a · 2025-04-04T14:54:22.000-07:00
In the debug log helper, I didn't properly merge in additional kwargs.  Needed to update instead of `**`.
diff --git a/airflow/dag_processing/bundles/git.py b/airflow/dag_processing/bundles/git.py
@@ -166,8 +166,8 @@ def log_debug(msg, **kwargs):
                 versions_path=self.versions_dir,
                 git_conn_id=self.git_conn_id,
                 repo_url=self.repo_url,
-                **kwargs,
             )
+            context.update(kwargs)
 
             for k, v in context.items():
                 msg += f" {k}='{v}'"

Original file line number	Diff line number	Diff line change
`@@ -166,8 +166,8 @@ def log_debug(msg, **kwargs):`
`166`	`166`	`versions_path=self.versions_dir,`
`167`	`167`	`git_conn_id=self.git_conn_id,`
`168`	`168`	`repo_url=self.repo_url,`
`169`		`- **kwargs,`
`170`	`169`	`)`
	`170`	`+ context.update(kwargs)`
`171`	`171`
`172`	`172`	`for k, v in context.items():`
`173`	`173`	`msg += f" {k}='{v}'"`