From: Yuval Lifshitz <yuvalif@yahoo.com>
Date: Thu, 11 Nov 2021 17:40:12 +0000 (+0200)
Subject: Merge pull request #43587 from zenomri/wip-omri-tracer-opentelemetry
X-Git-Tag: v17.1.0~456
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d69f196c0fba7a6525d234c90d5bb8ae1ed8bbe3;p=ceph.git

Merge pull request #43587 from zenomri/wip-omri-tracer-opentelemetry

common/tracer: Tracer implementation using opentelemetry sdk
---

d69f196c0fba7a6525d234c90d5bb8ae1ed8bbe3
diff --cc src/rgw/rgw_op.cc
index 14672bd9e341,8da8726e50ed..b2354f3140f3
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@@ -3923,9 -3924,9 +3923,9 @@@ void RGWPutObj::execute(optional_yield 
    rgw_placement_rule *pdest_placement = &s->dest_placement;
  
    if (multipart) {
-     s->trace->SetTag(tracing::UPLOAD_ID, multipart_upload_id);
+     s->trace->SetAttribute(tracing::rgw::UPLOAD_ID, multipart_upload_id);
      std::unique_ptr<rgw::sal::MultipartUpload> upload;
 -    upload = store->get_multipart_upload(s->bucket.get(), s->object->get_name(),
 +    upload = s->bucket->get_multipart_upload(s->object->get_name(),
  					 multipart_upload_id);
      op_ret = upload->get_info(this, s->yield, s->obj_ctx, &pdest_placement);
      if (op_ret < 0) {
@@@ -6277,9 -6278,9 +6277,9 @@@ void RGWCompleteMultipart::execute(opti
      return;
    }
  
 -  upload = store->get_multipart_upload(s->bucket.get(), s->object->get_name(), upload_id);
 +  upload = s->bucket->get_multipart_upload(s->object->get_name(), upload_id);
  
-   s->trace->SetTag(tracing::UPLOAD_ID, upload_id);
+   s->trace->SetAttribute(tracing::rgw::UPLOAD_ID, upload_id);
  
    RGWCompressionInfo cs_info;
    bool compressed = false;