Skip to content

Commit 4952733

Browse files
authored
CXXCBC-737: Create top-level spans in the Public API for all HTTP operations (#859)
1 parent 0ec1346 commit 4952733

19 files changed

+1883
-671
lines changed

core/cluster.cxx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -835,7 +835,11 @@ class cluster_impl : public std::enable_shared_from_this<cluster_impl>
835835
self->session_manager_->set_configuration(config, self->origin_.options());
836836
self->session_->on_configuration_update(self->session_manager_);
837837
self->session_->on_configuration_update(self->app_telemetry_reporter_);
838+
self->session_->on_configuration_update(self->tracer_);
839+
self->session_->on_configuration_update(self->meter_);
838840
self->app_telemetry_reporter_->update_config(config);
841+
self->tracer_->update_config(config);
842+
self->meter_->update_config(config);
839843
self->session_->on_stop([self]() {
840844
if (self->session_) {
841845
self->session_.reset();

core/impl/analytics.cxx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,8 @@ auto
149149
build_analytics_request(std::string statement,
150150
analytics_options::built options,
151151
std::optional<std::string> bucket_name,
152-
std::optional<std::string> scope_name)
152+
std::optional<std::string> scope_name,
153+
std::shared_ptr<couchbase::tracing::request_span> op_span)
153154
-> core::operations::analytics_request
154155
{
155156
core::operations::analytics_request request{
@@ -167,7 +168,7 @@ build_analytics_request(std::string statement,
167168
std::move(options.client_context_id),
168169
options.timeout,
169170
};
170-
request.parent_span = options.parent_span;
171+
request.parent_span = std::move(op_span);
171172
if (!options.raw.empty()) {
172173
for (auto& [name, value] : options.raw) {
173174
request.raw[name] = std::move(value);

core/impl/analytics.hxx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ auto
3333
build_analytics_request(std::string statement,
3434
analytics_options::built options,
3535
std::optional<std::string> bucket_name,
36-
std::optional<std::string> scope_name)
36+
std::optional<std::string> scope_name,
37+
std::shared_ptr<couchbase::tracing::request_span> op_span)
3738
-> core::operations::analytics_request;
3839
} // namespace couchbase::core::impl

0 commit comments

Comments
 (0)