From 77d464e2db5a46319b3687db2353120fddaab097 Mon Sep 17 00:00:00 2001 From: John St John Date: Tue, 26 Sep 2017 17:16:10 -0700 Subject: just use a unit size per span --- .../xyz/driver/core/trace/GoogleStackdriverTraceWithConsumer.scala | 4 ++-- src/main/scala/xyz/driver/core/trace/UnitTraceSizer.scala | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 src/main/scala/xyz/driver/core/trace/UnitTraceSizer.scala diff --git a/src/main/scala/xyz/driver/core/trace/GoogleStackdriverTraceWithConsumer.scala b/src/main/scala/xyz/driver/core/trace/GoogleStackdriverTraceWithConsumer.scala index 13b80bb..cd9170a 100644 --- a/src/main/scala/xyz/driver/core/trace/GoogleStackdriverTraceWithConsumer.scala +++ b/src/main/scala/xyz/driver/core/trace/GoogleStackdriverTraceWithConsumer.scala @@ -6,7 +6,6 @@ import com.google.cloud.trace.sink.TraceSink import com.google.cloud.trace.v1.TraceSinkV1 import com.google.cloud.trace.v1.consumer.{SizedBufferingTraceConsumer, TraceConsumer} import com.google.cloud.trace.v1.producer.TraceProducer -import com.google.cloud.trace.v1.util.RoughTraceSizer import com.google.cloud.trace.{SpanContextHandler, SpanContextHandlerTracer, Tracer} import com.typesafe.scalalogging.Logger @@ -21,8 +20,9 @@ final class GoogleStackdriverTraceWithConsumer(projectId: String, extends GoogleServiceTracer { private val traceProducer: TraceProducer = new TraceProducer() + // use a UnitTraceSizer so the interpretation of bufferSize is # of spans to hold in memory prior to flushing private val threadSafeBufferingTraceConsumer = new ExceptionLoggingFlushableTraceConsumer( - new SizedBufferingTraceConsumer(traceConsumer, new RoughTraceSizer(), bufferSize), + new SizedBufferingTraceConsumer(traceConsumer, new UnitTraceSizer(), bufferSize), log ) diff --git a/src/main/scala/xyz/driver/core/trace/UnitTraceSizer.scala b/src/main/scala/xyz/driver/core/trace/UnitTraceSizer.scala new file mode 100644 index 0000000..a7d6032 --- /dev/null +++ b/src/main/scala/xyz/driver/core/trace/UnitTraceSizer.scala @@ -0,0 +1,7 @@ +package xyz.driver.core.trace +import com.google.cloud.trace.v1.util.Sizer +import com.google.devtools.cloudtrace.v1.Trace + +class UnitTraceSizer extends Sizer[Trace] { + override def size(sizeable: Trace) = 1 +} -- cgit v1.2.3