diff options
| author | Bogdan Drutu <bdrutu@google.com> | 2017-04-13 08:33:42 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-13 08:33:42 -0700 |
| commit | 2559a87bb26ffe3823021dc1b82b780dfd13fb07 (patch) | |
| tree | ab887fffa8644a372ec7567d4cd9390dc20954e9 | |
| parent | e0f6ae0640ac9ebeb20733aa8b5400d5b8261ed7 (diff) | |
| download | platform_external_opencensus-java-2559a87bb26ffe3823021dc1b82b780dfd13fb07.tar.gz platform_external_opencensus-java-2559a87bb26ffe3823021dc1b82b780dfd13fb07.tar.bz2 platform_external_opencensus-java-2559a87bb26ffe3823021dc1b82b780dfd13fb07.zip | |
Run google java formatter on the tracing. (#205)
7 files changed, 72 insertions, 69 deletions
diff --git a/core/src/main/java/com/google/instrumentation/trace/BinaryPropagationHandler.java b/core/src/main/java/com/google/instrumentation/trace/BinaryPropagationHandler.java index 9825d8e6..5dd9451e 100644 --- a/core/src/main/java/com/google/instrumentation/trace/BinaryPropagationHandler.java +++ b/core/src/main/java/com/google/instrumentation/trace/BinaryPropagationHandler.java @@ -99,4 +99,4 @@ public abstract class BinaryPropagationHandler { private NoopBinaryPropagationHandler() {} } -}
\ No newline at end of file +} diff --git a/core/src/main/java/com/google/instrumentation/trace/EndSpanOptions.java b/core/src/main/java/com/google/instrumentation/trace/EndSpanOptions.java index 7de270a6..31ad6774 100644 --- a/core/src/main/java/com/google/instrumentation/trace/EndSpanOptions.java +++ b/core/src/main/java/com/google/instrumentation/trace/EndSpanOptions.java @@ -17,7 +17,6 @@ import static com.google.common.base.Preconditions.checkNotNull; import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import javax.annotation.Nullable; import javax.annotation.concurrent.Immutable; /** @@ -74,9 +73,7 @@ public final class EndSpanOptions { @Override public String toString() { - return MoreObjects.toStringHelper(this) - .add("status", status) - .toString(); + return MoreObjects.toStringHelper(this).add("status", status).toString(); } /** Builder class for {@link EndSpanOptions}. */ diff --git a/core_impl/src/main/java/com/google/instrumentation/trace/TimedEvent.java b/core_impl/src/main/java/com/google/instrumentation/trace/TimedEvent.java index 6f8f5032..d4bc1739 100644 --- a/core_impl/src/main/java/com/google/instrumentation/trace/TimedEvent.java +++ b/core_impl/src/main/java/com/google/instrumentation/trace/TimedEvent.java @@ -58,8 +58,7 @@ public final class TimedEvent<T> { } TimedEvent<?> that = (TimedEvent<?>) obj; - return Objects.equal(timestamp, that.timestamp) - && Objects.equal(event, that.event); + return Objects.equal(timestamp, that.timestamp) && Objects.equal(event, that.event); } @Override diff --git a/core_impl/src/main/java/com/google/instrumentation/trace/TraceParams.java b/core_impl/src/main/java/com/google/instrumentation/trace/TraceParams.java index e733f2b5..ec0f9507 100644 --- a/core_impl/src/main/java/com/google/instrumentation/trace/TraceParams.java +++ b/core_impl/src/main/java/com/google/instrumentation/trace/TraceParams.java @@ -87,8 +87,8 @@ abstract class TraceParams { abstract static class Builder { /** - * Sets the global default {@code Sampler}. It must be not {@code null} otherwise - * {@link #build()} will throw an exception. + * Sets the global default {@code Sampler}. It must be not {@code null} otherwise {@link + * #build()} will throw an exception. * * @param sampler the global default {@code Sampler}. * @return this. @@ -98,8 +98,8 @@ abstract class TraceParams { /** * Sets the global default max number of attributes per {@link Span}. * - * @param maxNumberOfAttributes the global default max number of attributes per {@link - * Span}. It must be positive otherwise {@link #build()} will throw an exception. + * @param maxNumberOfAttributes the global default max number of attributes per {@link Span}. It + * must be positive otherwise {@link #build()} will throw an exception. * @return this. */ abstract Builder setMaxNumberOfAttributes(int maxNumberOfAttributes); diff --git a/core_impl/src/test/java/com/google/instrumentation/trace/SpanDataTest.java b/core_impl/src/test/java/com/google/instrumentation/trace/SpanDataTest.java index 6ca4375b..15fe55fa 100644 --- a/core_impl/src/test/java/com/google/instrumentation/trace/SpanDataTest.java +++ b/core_impl/src/test/java/com/google/instrumentation/trace/SpanDataTest.java @@ -43,8 +43,8 @@ public class SpanDataTest { private SpanId parentSpanId; private final Map<String, AttributeValue> attributes = new HashMap<String, AttributeValue>(); private final List<TimedEvent<Annotation>> annotations = new LinkedList<TimedEvent<Annotation>>(); - private final List<TimedEvent<NetworkEvent>> networkEvents = new - LinkedList<TimedEvent<NetworkEvent>>(); + private final List<TimedEvent<NetworkEvent>> networkEvents = + new LinkedList<TimedEvent<NetworkEvent>>(); private final List<Link> links = new LinkedList<Link>(); @Before @@ -56,31 +56,34 @@ public class SpanDataTest { SpanId.generateRandomId(random), TraceOptions.DEFAULT); parentSpanId = SpanId.generateRandomId(random); - annotations.add(new TimedEvent<Annotation>(eventTimestamp1, Annotation.fromDescription - (ANNOTATION_TEXT))); - annotations.add(new TimedEvent<Annotation>(eventTimestamp3, Annotation.fromDescription - (ANNOTATION_TEXT))); - networkEvents.add(new TimedEvent<NetworkEvent>(eventTimestamp1, NetworkEvent.builder - (NetworkEvent.Type.RECV, 1).build())); - networkEvents.add(new TimedEvent<NetworkEvent>(eventTimestamp2, NetworkEvent.builder - (NetworkEvent.Type.SENT, 1).build())); + annotations.add( + new TimedEvent<Annotation>(eventTimestamp1, Annotation.fromDescription(ANNOTATION_TEXT))); + annotations.add( + new TimedEvent<Annotation>(eventTimestamp3, Annotation.fromDescription(ANNOTATION_TEXT))); + networkEvents.add( + new TimedEvent<NetworkEvent>( + eventTimestamp1, NetworkEvent.builder(NetworkEvent.Type.RECV, 1).build())); + networkEvents.add( + new TimedEvent<NetworkEvent>( + eventTimestamp2, NetworkEvent.builder(NetworkEvent.Type.SENT, 1).build())); attributes.put("MyAttributeKey1", AttributeValue.longAttributeValue(10)); attributes.put("MyAttributeKey2", AttributeValue.booleanAttributeValue(true)); } @Test public void spanData_AllValues() { - SpanData spanData = new SpanData( - spanContext, - parentSpanId, - DISPLAY_NAME, - startTimestamp, - attributes, - annotations, - networkEvents, - links, - status, - endTimestamp); + SpanData spanData = + new SpanData( + spanContext, + parentSpanId, + DISPLAY_NAME, + startTimestamp, + attributes, + annotations, + networkEvents, + links, + status, + endTimestamp); assertThat(spanData.getContext()).isEqualTo(spanContext); assertThat(spanData.getParentSpanId()).isEqualTo(parentSpanId); assertThat(spanData.getDisplayName()).isEqualTo(DISPLAY_NAME); @@ -95,17 +98,18 @@ public class SpanDataTest { @Test public void spanData_RootActiveSpan() { - SpanData spanData = new SpanData( - spanContext, - null, - DISPLAY_NAME, - startTimestamp, - attributes, - annotations, - networkEvents, - links, - null, - null); + SpanData spanData = + new SpanData( + spanContext, + null, + DISPLAY_NAME, + startTimestamp, + attributes, + annotations, + networkEvents, + links, + null, + null); assertThat(spanData.getContext()).isEqualTo(spanContext); assertThat(spanData.getParentSpanId()).isNull(); assertThat(spanData.getDisplayName()).isEqualTo(DISPLAY_NAME); @@ -120,17 +124,18 @@ public class SpanDataTest { @Test public void spanData_AllDataEmpty() { - SpanData spanData = new SpanData( - spanContext, - parentSpanId, - DISPLAY_NAME, - startTimestamp, - Collections.<String, AttributeValue>emptyMap(), - Collections.<TimedEvent<Annotation>>emptyList(), - Collections.<TimedEvent<NetworkEvent>>emptyList(), - Collections.<Link>emptyList(), - status, - endTimestamp); + SpanData spanData = + new SpanData( + spanContext, + parentSpanId, + DISPLAY_NAME, + startTimestamp, + Collections.<String, AttributeValue>emptyMap(), + Collections.<TimedEvent<Annotation>>emptyList(), + Collections.<TimedEvent<NetworkEvent>>emptyList(), + Collections.<Link>emptyList(), + status, + endTimestamp); assertThat(spanData.getContext()).isEqualTo(spanContext); assertThat(spanData.getParentSpanId()).isEqualTo(parentSpanId); assertThat(spanData.getDisplayName()).isEqualTo(DISPLAY_NAME); @@ -145,17 +150,19 @@ public class SpanDataTest { @Test public void spanData_ToString() { - String spanDataString = new SpanData( - spanContext, - parentSpanId, - DISPLAY_NAME, - startTimestamp, - attributes, - annotations, - networkEvents, - links, - status, - endTimestamp).toString(); + String spanDataString = + new SpanData( + spanContext, + parentSpanId, + DISPLAY_NAME, + startTimestamp, + attributes, + annotations, + networkEvents, + links, + status, + endTimestamp) + .toString(); assertThat(spanDataString).contains(spanContext.toString()); assertThat(spanDataString).contains(parentSpanId.toString()); assertThat(spanDataString).contains(DISPLAY_NAME); diff --git a/core_impl/src/test/java/com/google/instrumentation/trace/TimedEventTest.java b/core_impl/src/test/java/com/google/instrumentation/trace/TimedEventTest.java index dd97ab3d..be8d1502 100644 --- a/core_impl/src/test/java/com/google/instrumentation/trace/TimedEventTest.java +++ b/core_impl/src/test/java/com/google/instrumentation/trace/TimedEventTest.java @@ -26,8 +26,8 @@ import org.junit.runners.JUnit4; public class TimedEventTest { private static final Timestamp timestamp = Timestamp.create(123, 456); private static final Annotation annotation = Annotation.fromDescription("MyTextAnnotation"); - private static final NetworkEvent networkEvent = NetworkEvent.builder(NetworkEvent.Type.RECV, - 1).build(); + private static final NetworkEvent networkEvent = + NetworkEvent.builder(NetworkEvent.Type.RECV, 1).build(); @Test public void timedEvent_WithAnnotation() { diff --git a/examples/src/main/java/com/google/instrumentation/examples/trace/MultiSpansScopedTracing.java b/examples/src/main/java/com/google/instrumentation/examples/trace/MultiSpansScopedTracing.java index 72ca0feb..9f9b1df2 100644 --- a/examples/src/main/java/com/google/instrumentation/examples/trace/MultiSpansScopedTracing.java +++ b/examples/src/main/java/com/google/instrumentation/examples/trace/MultiSpansScopedTracing.java @@ -18,8 +18,8 @@ import com.google.instrumentation.trace.Span; import com.google.instrumentation.trace.Tracer; /** - * Example showing how to create a child {@link Span} using scoped Spans, install it in the - * current context, and add annotations. + * 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 { // Per class Tracer. |
