Merge "Fix build with logging_trace_provider" into main