Revert "Simplify"

This reverts commit 9312257.

Author: trask

instrumentation/thrift-0.13/library/src/main/java/io/opentelemetry/instrumentation/thrift/v0_13/internal/ClientProtocolDecorator.java

@@ -29,6 +29,7 @@
  */
 public final class ClientProtocolDecorator extends TProtocolDecorator {
 
+  private final TProtocol protocol;
   private final String serviceName;
   private final Instrumenter<ThriftRequest, ThriftResponse> instrumenter;
   private final ContextPropagators propagators;
@@ -53,6 +54,7 @@ private ClientProtocolDecorator(
       State state,
       boolean endSpanInline) {
     super(protocol);
+    this.protocol = protocol;
     this.serviceName = serviceName;
     this.instrumenter = instrumenter;
     this.propagators = propagators;
@@ -128,7 +130,7 @@ public void writeFieldStop() throws TException {
                   carrier.put(key, value);
                 }
               });
-      ContextPropagationUtil.writeHeaders(this, headers);
+      ContextPropagationUtil.writeHeaders(protocol, headers);
       state.contextPropagated = true;
     }
 

instrumentation/thrift-0.13/library/src/main/java/io/opentelemetry/instrumentation/thrift/v0_13/internal/ServerInProtocolDecorator.java

@@ -28,6 +28,7 @@
  */
 public final class ServerInProtocolDecorator extends TProtocolDecorator {
 
+  private final TProtocol protocol;
   private final Instrumenter<ThriftRequest, ThriftResponse> instrumenter;
   private final String serviceName;
 
@@ -41,6 +42,7 @@ public ServerInProtocolDecorator(
       String serviceName,
       Instrumenter<ThriftRequest, ThriftResponse> instrumenter) {
     super(protocol);
+    this.protocol = protocol;
     this.serviceName = serviceName;
     this.instrumenter = instrumenter;
   }
@@ -58,7 +60,7 @@ public TField readFieldBegin() throws TException {
     // start span when context propagation field is read, if the message doesn't include context
     // propagation field, span will be started in readMessageEnd()
     if (field.id == ContextPropagationUtil.TRACE_CONTEXT_FIELD_ID && field.type == TType.MAP) {
-      Map<String, String> headers = ContextPropagationUtil.readHeaders(this);
+      Map<String, String> headers = ContextPropagationUtil.readHeaders(protocol);
       super.readFieldEnd();
 
       Socket socket = SocketAccessor.getSocket(super.getTransport());