Add Scope as interface for NonThrowingCloseables that work with current context.

This interface allows users to write a shorter, more descriptive type name when
using scoped tags or spans.

3 files changed, 9 insertions, 10 deletions

diff --git a/examples/src/main/java/io/opencensus/examples/stats/StatsRunner.java b/examples/src/main/java/io/opencensus/examples/stats/StatsRunner.java
index 307f254d..3c6e4f4e 100644
--- a/examples/src/main/java/io/opencensus/examples/stats/StatsRunner.java
+++ b/examples/src/main/java/io/opencensus/examples/stats/StatsRunner.java
@@ -13,7 +13,7 @@
 
 package io.opencensus.examples.stats;
 
-import io.opencensus.common.NonThrowingCloseable;
+import io.opencensus.common.Scope;
 import io.opencensus.stats.Measure.MeasureDouble;
 import io.opencensus.stats.MeasureMap;
 import io.opencensus.stats.Stats;
@@ -56,12 +56,12 @@ public class StatsRunner {
     System.out.println("Default Tags: " + DEFAULT);
     System.out.println("Current Tags: " + factory.getCurrentStatsContext());
     StatsContext tags1 = DEFAULT.with(K1, V1, K2, V2);
-    try (NonThrowingCloseable scopedStatsCtx1 = factory.withStatsContext(tags1)) {
+    try (Scope scopedStatsCtx1 = factory.withStatsContext(tags1)) {
       System.out.println("  Current Tags: " + factory.getCurrentStatsContext());
       System.out.println(
           "  Current == Default + tags1: " + factory.getCurrentStatsContext().equals(tags1));
       StatsContext tags2 = tags1.with(K3, V3, K4, V4);
-      try (NonThrowingCloseable scopedStatsCtx2 = factory.withStatsContext(tags2)) {
+      try (Scope scopedStatsCtx2 = factory.withStatsContext(tags2)) {
         System.out.println("    Current Tags: " + factory.getCurrentStatsContext());
         System.out.println(
             "    Current == Default + tags1 + tags2: "
diff --git a/examples/src/main/java/io/opencensus/examples/trace/MultiSpansContextTracing.java b/examples/src/main/java/io/opencensus/examples/trace/MultiSpansContextTracing.java
index 9e066716..262b1000 100644
--- a/examples/src/main/java/io/opencensus/examples/trace/MultiSpansContextTracing.java
+++ b/examples/src/main/java/io/opencensus/examples/trace/MultiSpansContextTracing.java
@@ -13,7 +13,7 @@
 
 package io.opencensus.examples.trace;
 
-import io.opencensus.common.NonThrowingCloseable;
+import io.opencensus.common.Scope;
 import io.opencensus.trace.Span;
 import io.opencensus.trace.Tracer;
 import io.opencensus.trace.Tracing;
@@ -34,7 +34,7 @@ public final class MultiSpansContextTracing {
   private static void doSomeMoreWork() {
     // Create a child Span of the current Span.
     Span span = tracer.spanBuilder("MyChildSpan").startSpan();
-    try (NonThrowingCloseable ws = tracer.withSpan(span)) {
+    try (Scope ws = tracer.withSpan(span)) {
       doSomeOtherWork();
     }
     span.end();
@@ -54,7 +54,7 @@ public final class MultiSpansContextTracing {
   public static void main(String[] args) {
     LoggingExportHandler.register(Tracing.getExportComponent().getSpanExporter());
     Span span = tracer.spanBuilderWithExplicitParent("MyRootSpan", null).startSpan();
-    try (NonThrowingCloseable ws = tracer.withSpan(span)) {
+    try (Scope ws = tracer.withSpan(span)) {
       doWork();
     }
     span.end();
diff --git a/examples/src/main/java/io/opencensus/examples/trace/MultiSpansScopedTracing.java b/examples/src/main/java/io/opencensus/examples/trace/MultiSpansScopedTracing.java
index e663ae11..415cec9a 100644
--- a/examples/src/main/java/io/opencensus/examples/trace/MultiSpansScopedTracing.java
+++ b/examples/src/main/java/io/opencensus/examples/trace/MultiSpansScopedTracing.java
@@ -13,7 +13,7 @@
 
 package io.opencensus.examples.trace;
 
-import io.opencensus.common.NonThrowingCloseable;
+import io.opencensus.common.Scope;
 import io.opencensus.trace.Span;
 import io.opencensus.trace.Tracer;
 import io.opencensus.trace.Tracing;
@@ -33,7 +33,7 @@ public final class MultiSpansScopedTracing {
 
   private static void doSomeMoreWork() {
     // Create a child Span of the current Span.
-    try (NonThrowingCloseable ss = tracer.spanBuilder("MyChildSpan").startScopedSpan()) {
+    try (Scope ss = tracer.spanBuilder("MyChildSpan").startScopedSpan()) {
       doSomeOtherWork();
     }
   }
@@ -51,8 +51,7 @@ public final class MultiSpansScopedTracing {
    */
   public static void main(String[] args) {
     LoggingExportHandler.register(Tracing.getExportComponent().getSpanExporter());
-    try (NonThrowingCloseable ss =
-        tracer.spanBuilderWithExplicitParent("MyRootSpan", null).startScopedSpan()) {
+    try (Scope ss = tracer.spanBuilderWithExplicitParent("MyRootSpan", null).startScopedSpan()) {
       doWork();
     }
   }