Skip to content

Commit 04916eb

Browse files
authored
fixed #104 (#105)
1 parent 8098ff5 commit 04916eb

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

source/tracing_context_impl.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,8 @@ TracingContextImpl::TracingContextImpl(
138138
SpanContextExtensionPtr parent_ext_span_context, RandomGenerator& random)
139139
: parent_span_context_(std::move(parent_span_context)),
140140
parent_ext_span_context_(std::move(parent_ext_span_context)) {
141-
segment_store_.set_traceid(random.uuid());
141+
segment_store_.set_traceid(
142+
parent_span_context_ ? parent_span_context_->traceId() : random.uuid());
142143
segment_store_.set_tracesegmentid(random.uuid());
143144
segment_store_.set_service(service_name);
144145
segment_store_.set_serviceinstance(instance_name);

test/tracing_context_test.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ TEST_F(TracingContextTest, SW8CreateTest) {
330330
span2->endSpan();
331331

332332
std::string expect_sw8(
333-
"1-dXVpZA==-dXVpZA==-1-bWVzaA==-c2VydmljZV8w-c2FtcGxlMQ==-"
333+
"1-MQ==-dXVpZA==-1-bWVzaA==-c2VydmljZV8w-c2FtcGxlMQ==-"
334334
"MTAuMC4wLjE6NDQz");
335335

336336
EXPECT_EQ(expect_sw8, *sc.createSW8HeaderValue(target_address));
@@ -388,7 +388,7 @@ TEST_F(TracingContextTest, TraceLogTest) {
388388
TracingContextImpl sc(config_.service_name(), config_.instance_name(),
389389
span_ctx_, span_ext_ctx_, random_);
390390
EXPECT_EQ(
391-
"test\", \"SW_CTX\": [\"mesh\",\"service_0\",\"uuid\",\"uuid\",\"-1\"]}",
391+
"test\", \"SW_CTX\": [\"mesh\",\"service_0\",\"1\",\"uuid\",\"-1\"]}",
392392
sc.logMessage("test"));
393393
}
394394

0 commit comments

Comments
 (0)