]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #43587 from zenomri/wip-omri-tracer-opentelemetry
authorYuval Lifshitz <yuvalif@yahoo.com>
Thu, 11 Nov 2021 17:40:12 +0000 (19:40 +0200)
committerGitHub <noreply@github.com>
Thu, 11 Nov 2021 17:40:12 +0000 (19:40 +0200)
common/tracer: Tracer implementation using opentelemetry sdk

1  2 
src/common/options/global.yaml.in
src/osd/OSD.cc
src/osd/PrimaryLogPG.cc
src/rgw/rgw_op.cc

Simple merge
diff --cc src/osd/OSD.cc
Simple merge
Simple merge
index 14672bd9e341035a3b1f490de54d9be20fa90055,8da8726e50ed68267497ba58b2c7fbbcd8abcd3b..b2354f3140f33b4ebe22543f0e92f5af9c4c7a53
@@@ -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;