From 0ecaa5e7c3214e673966c1e05df3da78292faade Mon Sep 17 00:00:00 2001
From: Dorothy Ordogh <dordogh@twitter.com>
Date: Fri, 30 Oct 2020 01:42:34 +0000
Subject: [PATCH] finagle-core: Promote DarkTrafficFilter from finagle-exp

Problem

`DarkTrafficFilter` and `AbstractDarkTrafficFilter` are no longer experimental
as we should inform those who use it when changes occur and develop backwards
compatibility for it moving forward.

Solution

Move it out of the experimental directory into finagle-core with the other
filters.

JIRA Issues: CSL-3026

Differential Revision: https://phabricator.twitter.biz/D572384
---
 CHANGELOG.rst                                              | 7 +++++++
 .../finagle/filter}/AbstractDarkTrafficFilter.scala        | 4 ++--
 .../com/twitter/finagle/filter}/DarkTrafficFilter.scala    | 2 +-
 .../twitter/finagle/filter}/DarkTrafficFilterTest.scala    | 2 +-
 4 files changed, 11 insertions(+), 4 deletions(-)
 rename {finagle-exp/src/main/scala/com/twitter/finagle/exp => finagle-core/src/main/scala/com/twitter/finagle/filter}/AbstractDarkTrafficFilter.scala (95%)
 rename {finagle-exp/src/main/scala/com/twitter/finagle/exp => finagle-core/src/main/scala/com/twitter/finagle/filter}/DarkTrafficFilter.scala (98%)
 rename {finagle-exp/src/test/scala/com/twitter/finagle/exp => finagle-core/src/test/scala/com/twitter/finagle/filter}/DarkTrafficFilterTest.scala (99%)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index b11fd8c17e..1dc9dd137d 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -14,6 +14,13 @@ New Features
   `SslClientEngineFactory` acts as a better example of how to build custom client and server engine
   factories in order to reuse SSL contexts for performance concerns. ``PHAB_ID=D572567``
 
+Breaking API Changes
+~~~~~~~~~~~~~~~~~~~~
+
+* finagle-core: Move `DarkTrafficFilter` and `AbstractDarkTrafficFilter` from the experimental
+  finagle-exp to supported finagle-core. The package containing these classes changed from
+  `c.t.finagle.exp` to `c.t.finagle.filter`. ``PHAB_ID=D572384``
+
 20.10.0
 -------
 
diff --git a/finagle-exp/src/main/scala/com/twitter/finagle/exp/AbstractDarkTrafficFilter.scala b/finagle-core/src/main/scala/com/twitter/finagle/filter/AbstractDarkTrafficFilter.scala
similarity index 95%
rename from finagle-exp/src/main/scala/com/twitter/finagle/exp/AbstractDarkTrafficFilter.scala
rename to finagle-core/src/main/scala/com/twitter/finagle/filter/AbstractDarkTrafficFilter.scala
index dc571f81c6..f4a76555a4 100644
--- a/finagle-exp/src/main/scala/com/twitter/finagle/exp/AbstractDarkTrafficFilter.scala
+++ b/finagle-core/src/main/scala/com/twitter/finagle/filter/AbstractDarkTrafficFilter.scala
@@ -1,7 +1,7 @@
-package com.twitter.finagle.exp
+package com.twitter.finagle.filter
 
 import com.twitter.finagle.Service
-import com.twitter.finagle.exp.DarkTrafficFilter.DarkRequestAnnotation
+import com.twitter.finagle.filter.DarkTrafficFilter.DarkRequestAnnotation
 import com.twitter.finagle.stats.StatsReceiver
 import com.twitter.finagle.tracing.ForwardAnnotation
 import com.twitter.util.{Future, Promise}
diff --git a/finagle-exp/src/main/scala/com/twitter/finagle/exp/DarkTrafficFilter.scala b/finagle-core/src/main/scala/com/twitter/finagle/filter/DarkTrafficFilter.scala
similarity index 98%
rename from finagle-exp/src/main/scala/com/twitter/finagle/exp/DarkTrafficFilter.scala
rename to finagle-core/src/main/scala/com/twitter/finagle/filter/DarkTrafficFilter.scala
index 45e0f0c9b2..74246741c4 100644
--- a/finagle-exp/src/main/scala/com/twitter/finagle/exp/DarkTrafficFilter.scala
+++ b/finagle-core/src/main/scala/com/twitter/finagle/filter/DarkTrafficFilter.scala
@@ -1,4 +1,4 @@
-package com.twitter.finagle.exp
+package com.twitter.finagle.filter
 
 import com.twitter.finagle._
 import com.twitter.finagle.stats.StatsReceiver
diff --git a/finagle-exp/src/test/scala/com/twitter/finagle/exp/DarkTrafficFilterTest.scala b/finagle-core/src/test/scala/com/twitter/finagle/filter/DarkTrafficFilterTest.scala
similarity index 99%
rename from finagle-exp/src/test/scala/com/twitter/finagle/exp/DarkTrafficFilterTest.scala
rename to finagle-core/src/test/scala/com/twitter/finagle/filter/DarkTrafficFilterTest.scala
index dc9b3e43d7..ddf863d487 100644
--- a/finagle-exp/src/test/scala/com/twitter/finagle/exp/DarkTrafficFilterTest.scala
+++ b/finagle-core/src/test/scala/com/twitter/finagle/filter/DarkTrafficFilterTest.scala
@@ -1,4 +1,4 @@
-package com.twitter.finagle.exp
+package com.twitter.finagle.filter
 
 import com.twitter.conversions.DurationOps.RichDuration
 import com.twitter.finagle.client.utils.StringClient