Add Span::SetName() (#335)

census-instrumentation · Jun 26, 2019 · 858195c · 858195c
1 parent a506cf8
commit 858195c
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 5 deletions.
diff --git a/opencensus/trace/internal/span.cc b/opencensus/trace/internal/span.cc
@@ -202,6 +202,12 @@ void Span::SetStatus(StatusCode canonical_code,
   }
 }
 
+void Span::SetName(absl::string_view name) const {
+  if (IsRecording()) {
+    span_impl_->SetName(name);
+  }
+}
+
 void Span::End() const {
   if (IsRecording()) {
     if (!span_impl_->End()) {

diff --git a/opencensus/trace/internal/span_impl.cc b/opencensus/trace/internal/span_impl.cc
@@ -137,6 +137,13 @@ void SpanImpl::SetStatus(exporter::Status&& status) {
   }
 }
 
+void SpanImpl::SetName(absl::string_view name) {
+  absl::MutexLock l(&mu_);
+  if (!has_ended_) {
+    name_ = std::string(name);
+  }
+}
+
 bool SpanImpl::End() {
   absl::MutexLock l(&mu_);
   if (has_ended_) {

diff --git a/opencensus/trace/internal/span_impl.h b/opencensus/trace/internal/span_impl.h
@@ -85,6 +85,8 @@ class SpanImpl final {
 
   void SetStatus(exporter::Status&& status) LOCKS_EXCLUDED(mu_);
 
+  void SetName(absl::string_view name) LOCKS_EXCLUDED(mu_);
+
   // Returns true on success (if this is the first time the Span has ended) and
   // also marks the end of the Span and sets its end_time_.
   bool End() LOCKS_EXCLUDED(mu_);
@@ -119,7 +121,7 @@ class SpanImpl final {
   // The status of the span. Only set if start_options_.record_events is true.
   exporter::Status status_ GUARDED_BY(mu_);
   // The displayed name of the span.
-  const std::string name_;
+  std::string name_ GUARDED_BY(mu_);
   // The parent SpanId of this span. Parent SpanId will be not valid if this is
   // a root span.
   const SpanId parent_span_id_;

diff --git a/opencensus/trace/internal/span_test.cc b/opencensus/trace/internal/span_test.cc
@@ -203,6 +203,9 @@ TEST(SpanTest, FullSpanTest) {
 
   span.SetStatus(StatusCode::DEADLINE_EXCEEDED, "desc");
 
+  // Change span name
+  span.SetName("NewSpanName");
+
   EXPECT_TRUE(span.context().IsValid());
   span.End();
   // Add a few extra things and make sure they are NOT included since the span
@@ -213,7 +216,7 @@ TEST(SpanTest, FullSpanTest) {
 
   const exporter::SpanData data = SpanTestPeer::ToSpanData(&span);
 
-  EXPECT_EQ("MyRootSpan", data.name());
+  EXPECT_EQ("NewSpanName", data.name());
   EXPECT_EQ(parent.context().span_id(), data.parent_span_id());
   EXPECT_EQ(0, data.annotations().dropped_events_count());
   EXPECT_EQ(0, data.message_events().dropped_events_count());

diff --git a/opencensus/trace/span.h b/opencensus/trace/span.h
@@ -154,6 +154,9 @@ class Span final {
   void SetStatus(StatusCode canonical_code,
                  absl::string_view message = "") const;
 
+  // Set the span name.
+  void SetName(absl::string_view name) const;
+
   // Marks the end of a Span. No further changes can be made to the Span after
   // End is called.
   void End() const;

diff --git a/tools/travis/build_bazel.sh b/tools/travis/build_bazel.sh
@@ -27,9 +27,11 @@ if [[ "$TRAVIS_COMPILER" = "clang" ]]; then
   export BAZEL_OPTIONS="$BAZEL_OPTIONS --copt=-Werror=thread-safety"
 fi
 
-wget https://github.com/bazelbuild/bazel/releases/download/0.20.0/bazel-0.20.0-installer-${BAZEL_OS}-x86_64.sh
-chmod +x bazel-0.20.0-installer-${BAZEL_OS}-x86_64.sh
-./bazel-0.20.0-installer-${BAZEL_OS}-x86_64.sh --user
+export BAZEL_VERSION="0.24.1"
+
+wget https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${BAZEL_VERSION}-installer-${BAZEL_OS}-x86_64.sh
+chmod +x bazel-${BAZEL_VERSION}-installer-${BAZEL_OS}-x86_64.sh
+./bazel-${BAZEL_VERSION}-installer-${BAZEL_OS}-x86_64.sh --user
 echo "build --disk_cache=$HOME/bazel-cache" > ~/.bazelrc
 echo "build --experimental_strict_action_env" >> ~/.bazelrc
 du -sk $HOME/bazel-cache || true