From: Ali Masarwa <ali.saed.masarwa@gmail.com>
Date: Tue, 21 Jan 2025 15:45:08 +0000 (+0200)
Subject: Merge pull request #61388 from AliMasarweh/wip-alimasa-bucket-logging-log-info
X-Git-Tag: v20.0.0~354
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b0350bf929b0e5fd78c7e191eb8aa6728a1b4609;p=ceph.git

Merge pull request #61388 from AliMasarweh/wip-alimasa-bucket-logging-log-info

RGW\logging: added missing fields

Reviewed-by: yuvalif<ylifshit@redhat.com>
---

b0350bf929b0e5fd78c7e191eb8aa6728a1b4609
diff --cc src/rgw/rgw_bucket_logging.cc
index dd407f26e8c6,e43196f9d482..d183b54485f4
--- a/src/rgw/rgw_bucket_logging.cc
+++ b/src/rgw/rgw_bucket_logging.cc
@@@ -478,12 -409,17 +479,17 @@@ int log_record(rgw::sal::Driver* driver
      bucket_name = s->src_bucket_name;
    } else {
      bucket_owner = to_string( s->bucket->get_owner());
 -    bucket_name = s->bucket->get_name();
 +    bucket_name = full_bucket_name(s->bucket);
    }
  
+   using namespace rgw::auth::s3;
+   string aws_version("-");
+   string auth_type("-");
+   rgw::auth::s3::get_aws_version_and_auth_type(s, aws_version, auth_type);
+ 
    switch (conf.logging_type) {
      case LoggingType::Standard:
-       record = fmt::format("{} {} [{:%d/%b/%Y:%H:%M:%S %z}] {} {} {} {} {} \"{} {}{}{} HTTP/1.1\" {} {} {} {} {} {} {} {} {} {} {} {} {} {} {} {} {}",
+       record = fmt::format("{} {} [{:%d/%b/%Y:%H:%M:%S %z}] {} {} {} {} {} \"{} {}{}{} HTTP/1.1\" {} {} {} {} {} {} {} \"{}\" {} {} {} {} {} {} {} {} {}",
          dash_if_empty(bucket_owner),
          dash_if_empty(bucket_name),
          t,