Fix backwards compatibility between TraceComponentBaseImpl and TraceComponent. (#575)

2 files changed, 73 insertions, 10 deletions

diff --git a/impl/src/main/java/io/opencensus/impl/trace/TraceComponentImpl.java b/impl/src/main/java/io/opencensus/impl/trace/TraceComponentImpl.java
index 600b25de..1cd70023 100644
--- a/impl/src/main/java/io/opencensus/impl/trace/TraceComponentImpl.java
+++ b/impl/src/main/java/io/opencensus/impl/trace/TraceComponentImpl.java
@@ -16,20 +16,52 @@
 
 package io.opencensus.impl.trace;
 
+import io.opencensus.common.Clock;
 import io.opencensus.impl.internal.DisruptorEventQueue;
 import io.opencensus.impl.trace.internal.ThreadLocalRandomHandler;
 import io.opencensus.implcore.common.MillisClock;
 import io.opencensus.implcore.trace.TraceComponentImplBase;
 import io.opencensus.trace.TraceComponent;
+import io.opencensus.trace.Tracer;
+import io.opencensus.trace.config.TraceConfig;
+import io.opencensus.trace.export.ExportComponent;
+import io.opencensus.trace.propagation.PropagationComponent;
 
 /** Java 7 and 8 implementation of the {@link TraceComponent}. */
-public final class TraceComponentImpl extends TraceComponentImplBase {
+public final class TraceComponentImpl extends TraceComponent {
+  private final TraceComponentImplBase traceComponentImplBase;
 
   /** Public constructor to be used with reflection loading. */
   public TraceComponentImpl() {
-    super(
-        MillisClock.getInstance(),
-        new ThreadLocalRandomHandler(),
-        DisruptorEventQueue.getInstance());
+    traceComponentImplBase =
+        new TraceComponentImplBase(
+            MillisClock.getInstance(),
+            new ThreadLocalRandomHandler(),
+            DisruptorEventQueue.getInstance());
+  }
+
+  @Override
+  public Tracer getTracer() {
+    return traceComponentImplBase.getTracer();
+  }
+
+  @Override
+  public PropagationComponent getPropagationComponent() {
+    return traceComponentImplBase.getPropagationComponent();
+  }
+
+  @Override
+  public Clock getClock() {
+    return traceComponentImplBase.getClock();
+  }
+
+  @Override
+  public ExportComponent getExportComponent() {
+    return traceComponentImplBase.getExportComponent();
+  }
+
+  @Override
+  public TraceConfig getTraceConfig() {
+    return traceComponentImplBase.getTraceConfig();
   }
 }
diff --git a/impl/src/main/java/io/opencensus/trace/TraceComponentImpl.java b/impl/src/main/java/io/opencensus/trace/TraceComponentImpl.java
index fc3b57ee..76da3bd0 100644
--- a/impl/src/main/java/io/opencensus/trace/TraceComponentImpl.java
+++ b/impl/src/main/java/io/opencensus/trace/TraceComponentImpl.java
@@ -16,22 +16,53 @@
 
 package io.opencensus.trace;
 
+import io.opencensus.common.Clock;
 import io.opencensus.impl.internal.DisruptorEventQueue;
 import io.opencensus.impl.trace.internal.ThreadLocalRandomHandler;
 import io.opencensus.implcore.common.MillisClock;
 import io.opencensus.implcore.trace.TraceComponentImplBase;
+import io.opencensus.trace.config.TraceConfig;
+import io.opencensus.trace.export.ExportComponent;
+import io.opencensus.trace.propagation.PropagationComponent;
 
 /** Java 7 and 8 implementation of the {@link TraceComponent}. */
 // TraceComponentImpl was moved to io.opencensus.impl.trace. This class exists for backwards
 // compatibility, so that it can be loaded by opencensus-api 0.5.
 @Deprecated
-public final class TraceComponentImpl extends TraceComponentImplBase {
+public final class TraceComponentImpl extends TraceComponent {
+  private final TraceComponentImplBase traceComponentImplBase;
 
   /** Public constructor to be used with reflection loading. */
   public TraceComponentImpl() {
-    super(
-        MillisClock.getInstance(),
-        new ThreadLocalRandomHandler(),
-        DisruptorEventQueue.getInstance());
+    traceComponentImplBase =
+        new TraceComponentImplBase(
+            MillisClock.getInstance(),
+            new ThreadLocalRandomHandler(),
+            DisruptorEventQueue.getInstance());
+  }
+
+  @Override
+  public Tracer getTracer() {
+    return traceComponentImplBase.getTracer();
+  }
+
+  @Override
+  public PropagationComponent getPropagationComponent() {
+    return traceComponentImplBase.getPropagationComponent();
+  }
+
+  @Override
+  public Clock getClock() {
+    return traceComponentImplBase.getClock();
+  }
+
+  @Override
+  public ExportComponent getExportComponent() {
+    return traceComponentImplBase.getExportComponent();
+  }
+
+  @Override
+  public TraceConfig getTraceConfig() {
+    return traceComponentImplBase.getTraceConfig();
   }
 }