Skip to content

Commit 6cdce23

Browse files
cameron-p-mcameron-p-m
committed
more env vars and outboundcall fixes
1 parent c31b7e1 commit 6cdce23

File tree

11 files changed

+161
-261
lines changed

11 files changed

+161
-261
lines changed

‎src/postgres/src/backend/tcop/postgres.c‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -768,6 +768,7 @@ pg_analyze_and_rewrite_fixedparams(RawStmt *parsetree,
768768
List *querytree_list;
769769

770770
TRACE_POSTGRESQL_QUERY_REWRITE_START(query_string);
771+
YBCOtelRewriteStart();
771772

772773
/*
773774
* (1) Perform parse analysis.
@@ -786,6 +787,7 @@ pg_analyze_and_rewrite_fixedparams(RawStmt *parsetree,
786787
*/
787788
querytree_list = pg_rewrite_query(query);
788789

790+
YBCOtelRewriteDone();
789791
TRACE_POSTGRESQL_QUERY_REWRITE_DONE(query_string);
790792

791793
return querytree_list;
@@ -807,6 +809,7 @@ pg_analyze_and_rewrite_varparams(RawStmt *parsetree,
807809
List *querytree_list;
808810

809811
TRACE_POSTGRESQL_QUERY_REWRITE_START(query_string);
812+
YBCOtelRewriteStart();
810813

811814
/*
812815
* (1) Perform parse analysis.
@@ -839,6 +842,7 @@ pg_analyze_and_rewrite_varparams(RawStmt *parsetree,
839842
*/
840843
querytree_list = pg_rewrite_query(query);
841844

845+
YBCOtelRewriteDone();
842846
TRACE_POSTGRESQL_QUERY_REWRITE_DONE(query_string);
843847

844848
return querytree_list;
@@ -861,6 +865,7 @@ pg_analyze_and_rewrite_withcb(RawStmt *parsetree,
861865
List *querytree_list;
862866

863867
TRACE_POSTGRESQL_QUERY_REWRITE_START(query_string);
868+
YBCOtelRewriteStart();
864869

865870
/*
866871
* (1) Perform parse analysis.
@@ -879,6 +884,7 @@ pg_analyze_and_rewrite_withcb(RawStmt *parsetree,
879884
*/
880885
querytree_list = pg_rewrite_query(query);
881886

887+
YBCOtelRewriteDone();
882888
TRACE_POSTGRESQL_QUERY_REWRITE_DONE(query_string);
883889

884890
return querytree_list;

‎src/postgres/src/backend/tcop/pquery.c‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -714,8 +714,7 @@ PortalRun(Portal portal, long count, bool isTopLevel, bool run_once,
714714
AssertArg(PortalIsValid(portal));
715715

716716
TRACE_POSTGRESQL_QUERY_EXECUTE_START();
717-
/* Note: YBCOtelExecuteStart() is called in PortalRunMulti for plannable queries
718-
* to avoid duplicate nested execute spans */
717+
YBCOtelExecuteStart();
719718

720719
/* Initialize empty completion data */
721720
if (qc)
@@ -868,7 +867,7 @@ PortalRun(Portal portal, long count, bool isTopLevel, bool run_once,
868867
if (log_executor_stats && portal->strategy != PORTAL_MULTI_QUERY)
869868
ShowUsage("EXECUTOR STATISTICS");
870869

871-
/* Note: YBCOtelExecuteDone() is called in PortalRunMulti for plannable queries */
870+
YBCOtelExecuteDone();
872871
TRACE_POSTGRESQL_QUERY_EXECUTE_DONE();
873872

874873
return result;
@@ -1258,7 +1257,6 @@ PortalRunMulti(Portal portal,
12581257
* process a plannable query.
12591258
*/
12601259
TRACE_POSTGRESQL_QUERY_EXECUTE_START();
1261-
YBCOtelExecuteStart();
12621260

12631261
if (log_executor_stats)
12641262
ResetUsage();
@@ -1323,7 +1321,6 @@ PortalRunMulti(Portal portal,
13231321
if (log_executor_stats)
13241322
ShowUsage("EXECUTOR STATISTICS");
13251323

1326-
YBCOtelExecuteDone();
13271324
TRACE_POSTGRESQL_QUERY_EXECUTE_DONE();
13281325
}
13291326
else

‎src/yb/rpc/outbound_call.cc‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -243,24 +243,19 @@ OutboundCall::OutboundCall(const RemoteMethod& remote_method,
243243
IncrementCounter(rpc_metrics_->outbound_calls_created);
244244
IncrementGauge(rpc_metrics_->outbound_calls_alive);
245245

246-
// Start an OpenTelemetry span for this RPC call
247-
// Only create spans when there's an active parent context to reduce noise
248-
if (OtelTracing::HasActiveContext()) {
249-
otel_span_ = OtelTracing::StartSpan(Format("rpc.client $0", remote_method_.ToString()));
246+
const auto& traceparent = controller_->traceparent();
247+
if (!traceparent.empty()) {
248+
otel_span_ = OtelTracing::StartSpanFromTraceparent(
249+
Format("rpc.client $0", remote_method_.ToString()), traceparent);
250250
if (otel_span_.IsActive()) {
251-
LOG(INFO) << "[OTEL DEBUG] Created RPC span (child) for call_id=" << call_id_
252-
<< " method=" << remote_method_.ToString();
253251
otel_span_.SetAttribute("rpc.system", "yugabytedb");
254252
otel_span_.SetAttribute("rpc.service", remote_method_.service_name());
255253
otel_span_.SetAttribute("rpc.method", remote_method_.method_name());
256254
otel_span_.SetAttribute("rpc.call_id", static_cast<int64_t>(call_id_));
257255
if (controller_->timeout().Initialized()) {
258-
otel_span_.SetAttribute("rpc.timeout_ms",
259-
static_cast<int64_t>(controller_->timeout().ToMilliseconds()));
256+
otel_span_.SetAttribute("rpc.timeout_ms", controller_->timeout().ToMilliseconds());
260257
}
261258
}
262-
} else {
263-
VLOG(3) << "[OTEL DEBUG] No active context, skipping RPC span creation for call_id=" << call_id_;
264259
}
265260
}
266261

‎src/yb/rpc/rpc_controller.h‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
#pragma once
3333

3434
#include <memory>
35+
#include <string>
3536

3637
#include "yb/util/logging.h"
3738

@@ -139,6 +140,11 @@ class RpcController {
139140

140141
InvokeCallbackMode invoke_callback_mode() { return invoke_callback_mode_; }
141142

143+
// Set the traceparent for distributed tracing. If set, the RPC will create
144+
// a child span under this traceparent. If not set, no tracing span is created.
145+
void set_traceparent(const std::string& traceparent) { traceparent_ = traceparent; }
146+
const std::string& traceparent() const { return traceparent_; }
147+
142148
// Return the configured timeout.
143149
MonoDelta timeout() const;
144150

@@ -183,6 +189,7 @@ class RpcController {
183189

184190
std::unique_ptr<Sidecars> outbound_sidecars_;
185191
bool TEST_disable_outbound_call_response_processing = false;
192+
std::string traceparent_;
186193

187194
DISALLOW_COPY_AND_ASSIGN(RpcController);
188195
};

‎src/yb/util/otel_http_exporter.cc‎

Lines changed: 12 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,10 @@ SimpleOtlpHttpSender g_otlp_sender;
3232
} // namespace
3333

3434
SimpleOtlpHttpSender::SimpleOtlpHttpSender()
35-
: service_name_("yugabyte"), enabled_(false) {}
35+
: enabled_(false) {
36+
const char* service_name_env = std::getenv("OTEL_SERVICE_NAME");
37+
service_name_ = (service_name_env && service_name_env[0] != '\0') ? service_name_env : "yugabyte";
38+
}
3639

3740
SimpleOtlpHttpSender::~SimpleOtlpHttpSender() = default;
3841

@@ -56,15 +59,10 @@ bool SimpleOtlpHttpSender::SendSpan(const SimpleSpanData& span) {
5659
}
5760

5861
bool SimpleOtlpHttpSender::SendSpans(const std::vector<SimpleSpanData>& spans) {
59-
if (!IsEnabled()) {
60-
VLOG(2) << "[OTEL] HTTP sender not enabled, skipping export";
62+
if (!IsEnabled() || spans.empty()) {
6163
return true;
6264
}
6365

64-
if (spans.empty()) {
65-
return true; // Nothing to do
66-
}
67-
6866
std::string json_payload = SpansToJson(spans);
6967

7068
LOG(INFO) << "[OTEL] Sending " << spans.size() << " span(s) to " << endpoint_;
@@ -124,7 +122,6 @@ std::string SimpleOtlpHttpSender::JsonEscape(const std::string& str) {
124122
std::string SimpleOtlpHttpSender::SpansToJson(const std::vector<SimpleSpanData>& spans) const {
125123
std::ostringstream json;
126124

127-
// OTLP JSON structure
128125
json << R"({"resourceSpans":[{"resource":{"attributes":[)";
129126
json << R"({"key":"service.name","value":{"stringValue":")" << JsonEscape(service_name_) << R"("}},)";
130127
json << R"({"key":"telemetry.sdk.language","value":{"stringValue":"cpp"}},)";
@@ -153,7 +150,6 @@ std::string SimpleOtlpHttpSender::SpansToJson(const std::vector<SimpleSpanData>&
153150
json << R"("startTimeUnixNano":")" << span.start_time_ns << R"(",)";
154151
json << R"("endTimeUnixNano":")" << span.end_time_ns << R"(",)";
155152

156-
// Attributes
157153
json << R"("attributes":[)";
158154
bool first_attr = true;
159155
for (size_t j = 0; j < span.string_attributes.size(); ++j) {
@@ -170,7 +166,6 @@ std::string SimpleOtlpHttpSender::SpansToJson(const std::vector<SimpleSpanData>&
170166
}
171167
json << "],";
172168

173-
// Status
174169
json << R"("status":{"code":)" << span.status_code;
175170
if (!span.status_message.empty()) {
176171
json << R"(,"message":")" << JsonEscape(span.status_message) << R"(")";
@@ -187,33 +182,29 @@ SimpleOtlpHttpSender& GetGlobalOtlpSender() {
187182
}
188183

189184
void InitGlobalOtlpSenderFromEnv(const std::string& service_name) {
190-
// Read endpoint from OTEL_EXPORTER_OTLP_ENDPOINT environment variable
191185
std::string endpoint;
192186
const char* endpoint_env = std::getenv("OTEL_EXPORTER_OTLP_ENDPOINT");
193-
187+
194188
if (endpoint_env && endpoint_env[0] != '\0') {
195-
// Per OTLP spec, OTEL_EXPORTER_OTLP_ENDPOINT is the base URL
196-
// Append /v1/traces for the traces signal
197189
endpoint = endpoint_env;
198-
// Only append /v1/traces if it's not already part of the URL
199190
if (endpoint.find("/v1/traces") == std::string::npos) {
200-
// Remove trailing slash if present before appending
201191
if (!endpoint.empty() && endpoint.back() == '/') {
202192
endpoint.pop_back();
203193
}
204194
endpoint += "/v1/traces";
205195
}
206196
} else {
207-
// Default endpoint for local development
208197
endpoint = "http://localhost:4318/v1/traces";
209198
}
210-
199+
211200
g_otlp_sender.SetEndpoint(endpoint);
212201
LOG(INFO) << "[OTEL] HTTP exporter endpoint: " << endpoint;
213202

214-
// Set the service name (already resolved by caller)
215-
g_otlp_sender.SetServiceName(service_name);
216-
LOG(INFO) << "[OTEL] HTTP exporter service name: " << service_name;
203+
const char* service_name_env = std::getenv("OTEL_SERVICE_NAME");
204+
std::string resolved_service_name = (service_name_env && service_name_env[0] != '\0')
205+
? service_name_env : "yugabyte";
206+
g_otlp_sender.SetServiceName(resolved_service_name);
207+
LOG(INFO) << "[OTEL] HTTP exporter service name: " << resolved_service_name;
217208
}
218209

219210
} // namespace yb

0 commit comments

Comments
 (0)