7 files changed, 29 insertions, 9 deletions
diff --git a/examples/src/main/java/com/google/instrumentation/stats/StatsRunner.java b/examples/src/main/java/com/google/instrumentation/examples/stats/StatsRunner.java
index 0e1e0c2f..0641b842 100644
--- a/examples/src/main/java/com/google/instrumentation/stats/StatsRunner.java
+++ b/examples/src/main/java/com/google/instrumentation/examples/stats/StatsRunner.java
@@ -11,10 +11,16 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.stats;
+package com.google.instrumentation.examples.stats;
 
+import com.google.instrumentation.stats.MeasurementDescriptor;
 import com.google.instrumentation.stats.MeasurementDescriptor.BasicUnit;
 import com.google.instrumentation.stats.MeasurementDescriptor.MeasurementUnit;
+import com.google.instrumentation.stats.MeasurementMap;
+import com.google.instrumentation.stats.Stats;
+import com.google.instrumentation.stats.StatsContext;
+import com.google.instrumentation.stats.TagKey;
+import com.google.instrumentation.stats.TagValue;
 import io.grpc.Context;
 import java.util.Arrays;
 
diff --git a/examples/src/main/java/com/google/instrumentation/trace/BasicContextTracing.java b/examples/src/main/java/com/google/instrumentation/examples/trace/BasicContextTracing.java
index 1b8b9951..33cdfcc7 100644
--- a/examples/src/main/java/com/google/instrumentation/trace/BasicContextTracing.java
+++ b/examples/src/main/java/com/google/instrumentation/examples/trace/BasicContextTracing.java
@@ -11,9 +11,11 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.trace;
+package com.google.instrumentation.examples.trace;
 
 import com.google.instrumentation.common.NonThrowingCloseable;
+import com.google.instrumentation.trace.Span;
+import com.google.instrumentation.trace.Tracer;
 
 /**
  * Example showing how to create a {@link Span}, install it to the current context and add
diff --git a/examples/src/main/java/com/google/instrumentation/trace/BasicScopedTracing.java b/examples/src/main/java/com/google/instrumentation/examples/trace/BasicScopedTracing.java
index 17879825..ced5a962 100644
--- a/examples/src/main/java/com/google/instrumentation/trace/BasicScopedTracing.java
+++ b/examples/src/main/java/com/google/instrumentation/examples/trace/BasicScopedTracing.java
@@ -11,12 +11,14 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.trace;
+package com.google.instrumentation.examples.trace;
 
 import com.google.instrumentation.common.NonThrowingCloseable;
+import com.google.instrumentation.trace.Span;
+import com.google.instrumentation.trace.Tracer;
 
 /**
- * Example showing how to create a {@link Span} using {@link ScopedSpan}, install it in the current
+ * Example showing how to create a {@link Span} using scoped Span, install it in the current
  * context, and add annotations.
  */
 public final class BasicScopedTracing {
diff --git a/examples/src/main/java/com/google/instrumentation/trace/BasicTracing.java b/examples/src/main/java/com/google/instrumentation/examples/trace/BasicTracing.java
index daaf911d..ef05affa 100644
--- a/examples/src/main/java/com/google/instrumentation/trace/BasicTracing.java
+++ b/examples/src/main/java/com/google/instrumentation/examples/trace/BasicTracing.java
@@ -11,7 +11,10 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.trace;
+package com.google.instrumentation.examples.trace;
+
+import com.google.instrumentation.trace.Span;
+import com.google.instrumentation.trace.Tracer;
 
 /** Example showing how to create a {@link Span} and add annotations. */
 public final class BasicTracing {
diff --git a/examples/src/main/java/com/google/instrumentation/trace/MultiSpansContextTracing.java b/examples/src/main/java/com/google/instrumentation/examples/trace/MultiSpansContextTracing.java
index 8b849de3..c68a2e74 100644
--- a/examples/src/main/java/com/google/instrumentation/trace/MultiSpansContextTracing.java
+++ b/examples/src/main/java/com/google/instrumentation/examples/trace/MultiSpansContextTracing.java
@@ -11,9 +11,11 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.trace;
+package com.google.instrumentation.examples.trace;
 
 import com.google.instrumentation.common.NonThrowingCloseable;
+import com.google.instrumentation.trace.Span;
+import com.google.instrumentation.trace.Tracer;
 
 /**
  * Example showing how to create a child {@link Span}, install it to the current context and add
diff --git a/examples/src/main/java/com/google/instrumentation/trace/MultiSpansScopedTracing.java b/examples/src/main/java/com/google/instrumentation/examples/trace/MultiSpansScopedTracing.java
index 457f4a16..72ca0feb 100644
--- a/examples/src/main/java/com/google/instrumentation/trace/MultiSpansScopedTracing.java
+++ b/examples/src/main/java/com/google/instrumentation/examples/trace/MultiSpansScopedTracing.java
@@ -11,12 +11,14 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.trace;
+package com.google.instrumentation.examples.trace;
 
 import com.google.instrumentation.common.NonThrowingCloseable;
+import com.google.instrumentation.trace.Span;
+import com.google.instrumentation.trace.Tracer;
 
 /**
- * Example showing how to create a child {@link Span} using {@link ScopedSpan}, install it in the
+ * Example showing how to create a child {@link Span} using scoped Spans, install it in the
  * current context, and add annotations.
  */
 public final class MultiSpansScopedTracing {
diff --git a/examples/src/main/java/com/google/instrumentation/trace/MultiSpansTracing.java b/examples/src/main/java/com/google/instrumentation/examples/trace/MultiSpansTracing.java
index fcc74125..80d5ba28 100644
--- a/examples/src/main/java/com/google/instrumentation/trace/MultiSpansTracing.java
+++ b/examples/src/main/java/com/google/instrumentation/examples/trace/MultiSpansTracing.java
@@ -11,7 +11,10 @@
  * limitations under the License.
  */
 
-package com.google.instrumentation.trace;
+package com.google.instrumentation.examples.trace;
+
+import com.google.instrumentation.trace.Span;
+import com.google.instrumentation.trace.Tracer;
 
 /** Example showing how to directly create a child {@link Span} and add annotations. */
 public final class MultiSpansTracing {