From 5890ad7a4b48545ac3ccc12dbd93ee1d33759b27 Mon Sep 17 00:00:00 2001
From: "Claire (Yue) Zhang" <clairezhang@fb.com>
Date: Thu, 20 Aug 2020 10:54:01 -0700
Subject: [PATCH] Back out "Add transport logging to thrift_servers scuba
 table"

Reviewed By: yfeldblum

Differential Revision: D23232709

fbshipit-source-id: ce215686b67a9552c25455ff20cdd5a33cfe14d5
---
 thrift/lib/cpp2/server/Cpp2Worker.cpp | 4 ----
 thrift/lib/cpp2/server/ThriftServer.h | 9 ---------
 2 files changed, 13 deletions(-)

diff --git a/thrift/lib/cpp2/server/Cpp2Worker.cpp b/thrift/lib/cpp2/server/Cpp2Worker.cpp
index 6bc3fda2d6f..3e694361399 100644
--- a/thrift/lib/cpp2/server/Cpp2Worker.cpp
+++ b/thrift/lib/cpp2/server/Cpp2Worker.cpp
@@ -90,10 +90,6 @@ void Cpp2Worker::onNewConnection(
     sock->setZeroCopyEnableFunc(func);
   }
 
-  // log nextProtocolName to scuba
-  if (!nextProtocolName.empty()) {
-    server_->setTransport(nextProtocolName);
-  }
   // Check the security protocol
   switch (secureTransportType) {
     // If no security, peek into the socket to determine type
diff --git a/thrift/lib/cpp2/server/ThriftServer.h b/thrift/lib/cpp2/server/ThriftServer.h
index 3b5c5074a3e..e51b9c96bb2 100644
--- a/thrift/lib/cpp2/server/ThriftServer.h
+++ b/thrift/lib/cpp2/server/ThriftServer.h
@@ -194,7 +194,6 @@ class ThriftServer : public apache::thrift::BaseThriftServer,
 
   std::unique_ptr<ThriftProcessor> thriftProcessor_;
   std::vector<std::unique_ptr<TransportRoutingHandler>> routingHandlers_;
-  folly::Optional<std::string> nextProtocol_;
 
   friend class Cpp2Connection;
   friend class Cpp2Worker;
@@ -477,14 +476,6 @@ class ThriftServer : public apache::thrift::BaseThriftServer,
     return sslCacheOptions_;
   }
 
-  void setTransport(const std::string& nextProtocolName) {
-    nextProtocol_ = nextProtocolName;
-  }
-
-  folly::Optional<std::string> getTransport() const {
-    return nextProtocol_;
-  }
-
   wangle::ServerSocketConfig getServerSocketConfig() {
     wangle::ServerSocketConfig config;
     if (sslContextObserver_.has_value()) {