Skip to content

fix: Remote logging in Airflow 3.x #683

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adwk67 merged 6 commits into from
Sep 6, 2025
+724 −6
Merged

fix: Remote logging in Airflow 3.x #683

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4192248
adapt custom logging to resolve RemoteLogIO handler
adwk67 Sep 4, 2025
d5970a3
switch logic branches so that change extends beyond 3.x
adwk67 Sep 4, 2025
f501f34
fixed version match
adwk67 Sep 4, 2025
245f264
integration test
adwk67 Sep 4, 2025
3b8e80e
Merge branch 'main' into fix/remote-logging-3.x
adwk67 Sep 5, 2025
83232f4
changelog, cleaned up minio install
adwk67 Sep 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions rust/operator-binary/src/airflow_controller.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -806,6 +806,7 @@ fn build_rolegroup_config_map(
container,
&Container::Vector,
&mut cm_builder,
resolved_product_image,
)
.context(InvalidLoggingConfigSnafu {
cm_name: rolegroup.object_name(),
Expand Down
31 changes: 25 additions & 6 deletions rust/operator-binary/src/product_logging.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ use std::fmt::{Display, Write};
use snafu::Snafu;
use stackable_operator::{
builder::configmap::ConfigMapBuilder,
commons::product_image_selection::ResolvedProductImage,
kube::Resource,
product_logging::{
self,
Expand Down Expand Up @@ -43,6 +44,7 @@ pub fn extend_config_map_with_log_config<C, K>(
main_container: &C,
vector_container: &C,
cm_builder: &mut ConfigMapBuilder,
resolved_product_image: &ResolvedProductImage,
) -> Result<()>
where
C: Clone + Ord + Display,
Expand All @@ -53,7 +55,10 @@ where
}) = logging.containers.get(main_container)
{
let log_dir = format!("{STACKABLE_LOG_DIR}/{main_container}");
cm_builder.add_data(LOG_CONFIG_FILE, create_airflow_config(log_config, &log_dir));
cm_builder.add_data(
LOG_CONFIG_FILE,
create_airflow_config(log_config, &log_dir, resolved_product_image),
);
}

let vector_log_config = if let Some(ContainerLogConfig {
Expand All @@ -75,7 +80,11 @@ where
Ok(())
}

fn create_airflow_config(log_config: &AutomaticContainerLogConfig, log_dir: &str) -> String {
fn create_airflow_config(
log_config: &AutomaticContainerLogConfig,
log_dir: &str,
resolved_product_image: &ResolvedProductImage,
) -> String {
let loggers_config = log_config
.loggers
.iter()
Expand All @@ -92,18 +101,28 @@ LOGGING_CONFIG['loggers']['{name}']['level'] = {level}
output
});

let remote_task_log = if resolved_product_image.product_version.starts_with("3") {
Comment thread
sbernauer marked this conversation as resolved.
Outdated
"
# This will cause the relevant RemoteLogIO handler to be initialized
REMOTE_TASK_LOG = airflow_local_settings.REMOTE_TASK_LOG
log = logging.getLogger(__name__)
log.info('Custom logging remote task log %s', REMOTE_TASK_LOG)
"
} else {
""
};

format!(
"\
import logging
import os
from copy import deepcopy
from airflow.config_templates.airflow_local_settings import DEFAULT_LOGGING_CONFIG
from airflow.config_templates import airflow_local_settings

os.makedirs('{log_dir}', exist_ok=True)

LOGGING_CONFIG = deepcopy(DEFAULT_LOGGING_CONFIG)

REMOTE_TASK_LOG = None
LOGGING_CONFIG = deepcopy(airflow_local_settings.DEFAULT_LOGGING_CONFIG)
{remote_task_log}

LOGGING_CONFIG.setdefault('loggers', {{}})
for logger_name, logger_config in LOGGING_CONFIG['loggers'].items():
Expand Down
Loading