inject-mdc: Move MDC integration from inject-slf4j

Problem `inject/inject-slf4j` should not have any dependency on Finagle. Thus the library should not bring in a `finagle/finagle-core` dependency which bleeds into any dependency that only wants to use the `c.t.inject.Logging` trait. The `finagle/finagle-core` dependency in `inject-slf4j` comes from the MDC integration with Finagle. Solution Move the MDC integration to `inject/inject-mdc`. Result No finagle/finagle-core dependency when using `inject/inject-slf4j`. JIRA Issues: CSL-9772 Differential Revision: https://phabricator.twitter.biz/D485870
twitter · May 18, 2020 · daf8716 · daf8716
1 parent e827d91
commit daf8716
Show file tree

Hide file tree

Showing 74 changed files with 211 additions and 136 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -10,6 +10,9 @@ Unreleased
 Added
 ~~~~~
 
+* inject-mdc: Move MDC integration from `inject/inject-slf4j` to `inject/inject-mdc`.
+  ``PHAB_ID=D485870``
+
 * finatra-http|finatra-thrift: Update TraceIdMDCFilter to log traceSampled and traceSpanId
   ``PHAB_ID=472013``
 
@@ -20,6 +23,9 @@ Added
 Changed
 ~~~~~~~
 
+* inject-slf4j: Move MDC integration from `inject/inject-slf4j` to `inject/inject-mdc`.
+  ``PHAB_ID=D485870``
+
 * finatra-http: Allow extensions of the `c.t.finatra.http.filters.HttpResponseFilter`
   to specify how to set the Location Header value into a Response. Additionally, don't
   allow exceptions resulting from the inability to set a non-compliant 'Location' response

diff --git a/build.sbt b/build.sbt
@@ -273,6 +273,7 @@ lazy val finatraModules = Seq[sbt.ProjectReference](
   injectCore,
   injectDtab,
   injectLogback,
+  injectMdc,
   injectModules,
   injectPorts,
   injectRequestScope,
@@ -372,6 +373,7 @@ lazy val injectCore = (project in file("inject/inject-core"))
       "com.google.inject" % "guice" % versions.guice,
       "com.google.inject.extensions" % "guice-assistedinject" % versions.guice,
       "com.google.inject.extensions" % "guice-multibindings" % versions.guice,
+      "com.twitter" %% "finagle-core" % versions.twLibVersion, // for StackTransformer -- todo: move
       "com.twitter" %% "util-app" % versions.twLibVersion,
       "javax.inject" % "javax.inject" % "1",
       "joda-time" % "joda-time" % versions.jodaTime,
@@ -560,6 +562,23 @@ lazy val injectServer = (project in file("inject/inject-server"))
     injectSlf4j,
     injectUtils)
 
+lazy val injectMdc = (project in file("inject/inject-mdc"))
+  .settings(projectSettings)
+  .settings(
+    name := "inject-mdc",
+    moduleName := "inject-mdc",
+    ScoverageKeys.coverageExcludedPackages := "<empty>;",
+    libraryDependencies ++= Seq(
+      "com.twitter" %% "finagle-core" % versions.twLibVersion,
+      "com.twitter" %% "util-core" % versions.twLibVersion,
+      "com.twitter" %% "util-slf4j-api" % versions.twLibVersion,
+      "org.slf4j" % "slf4j-api" % versions.slf4j
+    )
+  ).dependsOn(
+    injectSlf4j,
+    injectCore % "test->test"
+  )
+
 lazy val injectSlf4j = (project in file("inject/inject-slf4j"))
   .settings(projectSettings)
   .settings(
@@ -568,7 +587,7 @@ lazy val injectSlf4j = (project in file("inject/inject-slf4j"))
     ScoverageKeys.coverageExcludedPackages := "<empty>;",
     libraryDependencies ++= Seq(
       "com.fasterxml.jackson.core" % "jackson-annotations" % versions.jackson,
-      "com.twitter" %% "finagle-core" % versions.twLibVersion,
+      "com.twitter" %% "util-core" % versions.twLibVersion,
       "com.twitter" %% "util-slf4j-api" % versions.twLibVersion,
       "org.slf4j" % "slf4j-api" % versions.slf4j
     )
@@ -876,6 +895,7 @@ lazy val http = project
     httpclient % "test->test",
     injectRequestScope % Test,
     injectPorts % "test->test",
+    injectMdc,
     injectSlf4j,
     injectServer % "test->test;compile->compile",
     jackson % "test->test;compile->compile",
@@ -989,6 +1009,7 @@ lazy val thrift = project
   ).dependsOn(
     injectPorts % "test->test",
     injectServer % "test->test;compile->compile",
+    injectMdc,
     injectSlf4j,
     injectThrift)
 

diff --git a/examples/advanced/streaming-example/src/main/scala/BUILD b/examples/advanced/streaming-example/src/main/scala/BUILD
@@ -25,7 +25,7 @@ scala_library(
         "finatra/inject/inject-app/src/main/scala",
         "finatra/inject/inject-core/src/main/scala",
         "finatra/inject/inject-server/src/main/scala",
-        "finatra/inject/inject-slf4j/src/main/scala",
+        "finatra/inject/inject-slf4j/src/main/scala/com/twitter/inject",
         "twitter-server/server/src/main/scala",
         "util/util-app/src/main/scala",
         "util/util-lint/src/main/scala",

diff --git a/examples/advanced/twitter-clone/src/main/scala/BUILD b/examples/advanced/twitter-clone/src/main/scala/BUILD
@@ -35,7 +35,7 @@ scala_library(
         "finatra/inject/inject-core/src/main/scala/com/twitter/inject",
         "finatra/inject/inject-dtab/src/main/scala/com/twitter/inject/app",
         "finatra/inject/inject-server/src/main/scala",
-        "finatra/inject/inject-slf4j/src/main/scala",
+        "finatra/inject/inject-slf4j/src/main/scala/com/twitter/inject",
         "finatra/inject/inject-utils/src/main/scala",
         "finatra/jackson/src/main/scala",
         "finatra/validation/src/main/scala/com/twitter/finatra/validation",

diff --git a/examples/advanced/web-dashboard/src/main/scala/BUILD b/examples/advanced/web-dashboard/src/main/scala/BUILD
@@ -37,7 +37,7 @@ scala_library(
         "finatra/inject/inject-app/src/main/scala",
         "finatra/inject/inject-core/src/main/scala",
         "finatra/inject/inject-server/src/main/scala",
-        "finatra/inject/inject-slf4j/src/main/scala",
+        "finatra/inject/inject-slf4j/src/main/scala/com/twitter/inject",
         "finatra/inject/inject-utils/src/main/scala",
         "twitter-server/server/src/main/scala",
         "util/util-app/src/main/scala",

diff --git a/examples/benchmark/src/main/scala/BUILD b/examples/benchmark/src/main/scala/BUILD
@@ -27,7 +27,7 @@ scala_library(
         "finatra/inject/inject-app/src/main/scala",
         "finatra/inject/inject-core/src/main/scala",
         "finatra/inject/inject-server/src/main/scala",
-        "finatra/inject/inject-slf4j/src/main/scala",
+        "finatra/inject/inject-slf4j/src/main/scala/com/twitter/inject",
         "twitter-server/server/src/main/scala",
         "util/util-app/src/main/scala",
         "util/util-lint/src/main/scala",

diff --git a/examples/http-server/scala/src/main/scala/com/twitter/finatra/example/BUILD b/examples/http-server/scala/src/main/scala/com/twitter/finatra/example/BUILD
@@ -25,7 +25,7 @@ scala_library(
         "finatra/inject/inject-app/src/main/scala",
         "finatra/inject/inject-core/src/main/scala",
         "finatra/inject/inject-server/src/main/scala",
-        "finatra/inject/inject-slf4j/src/main/scala",
+        "finatra/inject/inject-slf4j/src/main/scala/com/twitter/inject",
         "twitter-server/server/src/main/scala",
         "util/util-app/src/main/scala",
         "util/util-lint/src/main/scala",

diff --git a/examples/injectable-twitter-server/scala/src/main/scala/com/twitter/finatra/example/BUILD b/examples/injectable-twitter-server/scala/src/main/scala/com/twitter/finatra/example/BUILD
@@ -4,7 +4,7 @@ scala_library(
     dependencies = [
         "3rdparty/jvm/com/google/inject:guice",
         "finatra/inject/inject-server/src/main/scala/com/twitter/inject/server",
-        "finatra/inject/inject-slf4j/src/main/scala",
+        "finatra/inject/inject-slf4j/src/main/scala/com/twitter/inject",
         "finatra/utils/src/main/scala/com/twitter/finatra/utils",
     ],
 )

diff --git a/examples/thrift-server/scala/src/main/scala/com/twitter/finatra/example/BUILD b/examples/thrift-server/scala/src/main/scala/com/twitter/finatra/example/BUILD
@@ -12,7 +12,7 @@ scala_library(
         "finatra/inject/inject-app/src/main/scala",
         "finatra/inject/inject-core/src/main/scala",
         "finatra/inject/inject-server/src/main/scala",
-        "finatra/inject/inject-slf4j/src/main/scala",
+        "finatra/inject/inject-slf4j/src/main/scala/com/twitter/inject",
         "finatra/thrift/src/main/scala/com/twitter/finatra/thrift",
         "finatra/thrift/src/main/scala/com/twitter/finatra/thrift:controller",
         "finatra/thrift/src/main/scala/com/twitter/finatra/thrift/exceptions",

diff --git a/http/src/main/scala/com/twitter/finatra/http/BUILD b/http/src/main/scala/com/twitter/finatra/http/BUILD
@@ -64,7 +64,7 @@ scala_library(
         "finatra/http/src/main/scala/com/twitter/finatra/http/request",
         "finatra/http/src/main/scala/com/twitter/finatra/http/response",
         "finatra/inject/inject-core/src/main/scala",
-        "finatra/inject/inject-slf4j/src/main/scala",
+        "finatra/inject/inject-slf4j/src/main/scala/com/twitter/inject",
         "util/util-core:util-core-util",
     ],
     exports = [
@@ -74,6 +74,6 @@ scala_library(
         "finatra/http/src/main/scala/com/twitter/finatra/http/internal/routing",
         "finatra/http/src/main/scala/com/twitter/finatra/http/request",
         "finatra/http/src/main/scala/com/twitter/finatra/http/response",
-        "finatra/inject/inject-slf4j/src/main/scala",
+        "finatra/inject/inject-slf4j/src/main/scala/com/twitter/inject",
     ],
 )
diff --git a/http/src/main/scala/com/twitter/finatra/http/conversions/BUILD b/http/src/main/scala/com/twitter/finatra/http/conversions/BUILD
@@ -10,7 +10,7 @@ scala_library(
     dependencies = [
         "finagle/finagle-base-http/src/main",
         "finatra/http/src/main/scala/com/twitter/finatra/http/exceptions",
-        "finatra/inject/inject-slf4j/src/main/scala",
+        "finatra/inject/inject-slf4j/src/main/scala/com/twitter/inject",
         "finatra/inject/inject-utils/src/main/scala",
         "util/util-core:util-core-util",
     ],

diff --git a/http/src/main/scala/com/twitter/finatra/http/filters/BUILD b/http/src/main/scala/com/twitter/finatra/http/filters/BUILD
@@ -15,7 +15,8 @@ scala_library(
         "finatra/http/src/main/scala/com/twitter/finatra/http/exceptions",
         "finatra/http/src/main/scala/com/twitter/finatra/http/request",
         "finatra/http/src/main/scala/com/twitter/finatra/http/response",
-        "finatra/inject/inject-slf4j/src/main/scala",
+        "finatra/inject/inject-mdc/src/main/scala",
+        "finatra/inject/inject-slf4j/src/main/scala/com/twitter/inject",
         "finatra/utils/src/main/scala/com/twitter/finatra/filters",
         "util/util-core:util-core-util",
         "util/util-stats/src/main/scala/com/twitter/finagle/stats",
@@ -25,7 +26,7 @@ scala_library(
         "finagle/finagle-base-http/src/main",
         "finagle/finagle-core/src/main",
         "finatra/http/src/main/scala/com/twitter/finatra/http/exceptions",
-        "finatra/inject/inject-slf4j/src/main/scala",
+        "finatra/inject/inject-slf4j/src/main/scala/com/twitter/inject",
         "finatra/utils/src/main/scala/com/twitter/finatra/filters",
         "util/util-core:util-core-util",
         "util/util-stats/src/main/scala/com/twitter/finagle/stats",

diff --git a/http/src/main/scala/com/twitter/finatra/http/filters/TraceIdMDCFilter.scala b/http/src/main/scala/com/twitter/finatra/http/filters/TraceIdMDCFilter.scala
@@ -2,6 +2,7 @@ package com.twitter.finatra.http.filters
 
 import com.twitter.finagle.tracing.Trace
 import com.twitter.finagle.{Service, SimpleFilter}
+import com.twitter.inject.logging.MDCKeys
 import com.twitter.util.Future
 import javax.inject.Singleton
 import org.slf4j.MDC
@@ -17,11 +18,12 @@ import org.slf4j.MDC
 class TraceIdMDCFilter[Req, Rep] extends SimpleFilter[Req, Rep] {
 
   override def apply(request: Req, service: Service[Req, Rep]): Future[Rep] = {
-    MDC.put("traceId", Trace.id.traceId.toString)
+    val trace = Trace()
+    MDC.put(MDCKeys.TraceId, trace.id.traceId.toString)
     // If sampling decision is not made yet
     // consider the trace not sampled for this span scope
-    MDC.put("traceSampled", Trace.id._sampled.getOrElse(false).toString)
-    MDC.put("traceSpanId", Trace.id.spanId.toString)
+    MDC.put(MDCKeys.TraceSampled, trace.id._sampled.getOrElse(false).toString)
+    MDC.put(MDCKeys.TraceSpanId, trace.id.spanId.toString)
     service(request)
   }
 }
diff --git a/http/src/main/scala/com/twitter/finatra/http/internal/exceptions/BUILD b/http/src/main/scala/com/twitter/finatra/http/internal/exceptions/BUILD
@@ -15,7 +15,7 @@ scala_library(
         "finagle/finagle-core/src/main",
         "finatra/http/src/main/scala/com/twitter/finatra/http/exceptions",
         "finatra/http/src/main/scala/com/twitter/finatra/http/response",
-        "finatra/inject/inject-slf4j/src/main/scala",
+        "finatra/inject/inject-slf4j/src/main/scala/com/twitter/inject",
         "finatra/inject/inject-utils/src/main/scala",
         "finatra/utils/src/main/scala/com/twitter/finatra/utils",
     ],

diff --git a/http/src/main/scala/com/twitter/finatra/http/internal/exceptions/json/BUILD b/http/src/main/scala/com/twitter/finatra/http/internal/exceptions/json/BUILD
@@ -13,7 +13,7 @@ scala_library(
         "finagle/finagle-base-http/src/main",
         "finatra/http/src/main/scala/com/twitter/finatra/http/exceptions",
         "finatra/http/src/main/scala/com/twitter/finatra/http/response",
-        "finatra/inject/inject-slf4j/src/main/scala",
+        "finatra/inject/inject-slf4j/src/main/scala/com/twitter/inject",
         "finatra/jackson/src/main/scala/com/twitter/finatra/jackson/caseclass",
         "finatra/jackson/src/main/scala/com/twitter/finatra/jackson/caseclass/exceptions",
     ],

diff --git a/http/src/main/scala/com/twitter/finatra/http/internal/routing/BUILD b/http/src/main/scala/com/twitter/finatra/http/internal/routing/BUILD
@@ -18,7 +18,7 @@ scala_library(
         "finatra/http/src/main/scala/com/twitter/finatra/http/response",
         "finatra/http/src/main/scala/com/twitter/finatra/http/streaming",
         "finatra/inject/inject-core/src/main/scala",
-        "finatra/inject/inject-slf4j/src/main/scala",
+        "finatra/inject/inject-slf4j/src/main/scala/com/twitter/inject",
         "finatra/inject/inject-utils/src/main/scala",
         "finatra/jackson/src/main/scala/com/twitter/finatra/jackson",
         "finatra/jackson/src/main/scala/com/twitter/finatra/jackson/streaming",

diff --git a/http/src/main/scala/com/twitter/finatra/http/request/BUILD b/http/src/main/scala/com/twitter/finatra/http/request/BUILD
@@ -12,12 +12,12 @@ scala_library(
         "finatra/http/src/main/java/com/twitter/finatra/http/request",
         "finatra/http/src/main/scala/com/twitter/finatra/http/exceptions",
         "finatra/http/src/main/scala/com/twitter/finatra/http/fileupload",
-        "finatra/inject/inject-slf4j/src/main/scala",
+        "finatra/inject/inject-slf4j/src/main/scala/com/twitter/inject",
         "finatra/inject/inject-utils/src/main/scala",
     ],
     exports = [
         "finagle/finagle-base-http/src/main",
         "finatra/http/src/main/java/com/twitter/finatra/http/request",
-        "finatra/inject/inject-slf4j/src/main/scala",
+        "finatra/inject/inject-slf4j/src/main/scala/com/twitter/inject",
     ],
 )
diff --git a/http/src/main/scala/com/twitter/finatra/http/response/BUILD b/http/src/main/scala/com/twitter/finatra/http/response/BUILD
@@ -17,7 +17,7 @@ scala_library(
         "finatra/http/src/main/scala/com/twitter/finatra/http/marshalling",
         "finatra/http/src/main/scala/com/twitter/finatra/http/streaming",
         "finatra/inject/inject-app/src/main/java/com/twitter/inject/annotations",
-        "finatra/inject/inject-slf4j/src/main/scala",
+        "finatra/inject/inject-slf4j/src/main/scala/com/twitter/inject",
         "finatra/inject/inject-utils/src/main/scala",
         "finatra/jackson/src/main/scala/com/twitter/finatra/jackson",
         "finatra/utils/src/main/scala/com/twitter/finatra/utils",
@@ -31,7 +31,7 @@ scala_library(
         "finagle/finagle-core/src/main",
         "finagle/finagle-http/src/main/scala",
         "finatra/http/src/main/scala/com/twitter/finatra/http/marshalling",
-        "finatra/inject/inject-slf4j/src/main/scala",
+        "finatra/inject/inject-slf4j/src/main/scala/com/twitter/inject",
         "finatra/utils/src/main/scala/com/twitter/finatra/utils",
         "util/util-core:util-core-util",
         "util/util-core/src/main/scala/com/twitter/concurrent",

diff --git a/http/src/main/scala/com/twitter/finatra/http/routing/BUILD b/http/src/main/scala/com/twitter/finatra/http/routing/BUILD
@@ -15,7 +15,7 @@ scala_library(
         "finatra/http/src/main/scala/com/twitter/finatra/http/internal/routing",
         "finatra/http/src/main/scala/com/twitter/finatra/http/request",
         "finatra/inject/inject-core/src/main/scala/com/twitter/inject/internal",
-        "finatra/inject/inject-slf4j/src/main/scala",
+        "finatra/inject/inject-slf4j/src/main/scala/com/twitter/inject",
         "finatra/jackson/src/main/scala/com/twitter/finatra/jackson",
         "twitter-server/server/src/main/scala",
         "util/util-core:util-core-util",
@@ -24,7 +24,7 @@ scala_library(
         "3rdparty/jvm/javax/inject:javax.inject",
         "finagle/finagle-base-http/src/main",
         "finatra/http/src/main/scala/com/twitter/finatra/http:controller",
-        "finatra/inject/inject-slf4j/src/main/scala",
+        "finatra/inject/inject-slf4j/src/main/scala/com/twitter/inject",
         "twitter-server/server/src/main/scala",
         "util/util-core:util-core-util",
     ],

diff --git a/http/src/test/java/com/twitter/finatra/http/tests/BUILD b/http/src/test/java/com/twitter/finatra/http/tests/BUILD
@@ -33,7 +33,7 @@ junit_tests(
         "finatra/inject/inject-core/src/main/scala",
         "finatra/inject/inject-server/src/main/scala",
         "finatra/inject/inject-server/src/test/scala:test-deps",
-        "finatra/inject/inject-slf4j/src/main/scala",
+        "finatra/inject/inject-slf4j/src/main/scala/com/twitter/inject",
         "finatra/inject/inject-utils/src/main/scala",
         "finatra/jackson/src/main/scala/com/twitter/finatra/jackson",
         "finatra/jackson/src/main/scala/com/twitter/finatra/jackson/streaming",

diff --git a/http/src/test/scala/com/twitter/finatra/http/tests/BUILD b/http/src/test/scala/com/twitter/finatra/http/tests/BUILD
@@ -49,12 +49,13 @@ junit_tests(
         "finatra/inject/inject-app/src/main/scala",
         "finatra/inject/inject-app/src/test/scala:test-deps",
         "finatra/inject/inject-core/src/main/scala",
+        "finatra/inject/inject-mdc/src/main/scala",
         "finatra/inject/inject-modules/src/main/scala/com/twitter/inject/modules",
         "finatra/inject/inject-modules/src/test/scala/com/twitter/inject/modules",
         "finatra/inject/inject-request-scope/src/main/scala",
         "finatra/inject/inject-server/src/main/scala",
         "finatra/inject/inject-server/src/test/scala:test-deps",
-        "finatra/inject/inject-slf4j/src/main/scala",
+        "finatra/inject/inject-slf4j/src/main/scala/com/twitter/inject",
         "finatra/inject/inject-utils/src/main/scala",
         "finatra/jackson/src/main/scala",
         "finatra/jackson/src/test/scala:test-deps",

diff --git a/httpclient/src/main/scala/BUILD b/httpclient/src/main/scala/BUILD
@@ -16,7 +16,7 @@ scala_library(
         "finagle/finagle-http/src/main/scala",
         "finatra/inject/inject-core/src/main/scala",
         "finatra/inject/inject-modules/src/main/scala/com/twitter/inject/modules",
-        "finatra/inject/inject-slf4j/src/main/scala",
+        "finatra/inject/inject-slf4j/src/main/scala/com/twitter/inject",
         "finatra/inject/inject-utils/src/main/scala",
         "finatra/jackson/src/main/scala/com/twitter/finatra/jackson",
         "util/util-core:scala",

diff --git a/httpclient/src/test/scala/BUILD b/httpclient/src/test/scala/BUILD
@@ -44,7 +44,7 @@ scala_library(
         "finatra/inject/inject-app/src/test/scala:test-deps",
         "finatra/inject/inject-core/src/main/scala",
         "finatra/inject/inject-core/src/test/scala:test-deps",
-        "finatra/inject/inject-slf4j/src/main/scala",
+        "finatra/inject/inject-slf4j/src/main/scala/com/twitter/inject",
         "util/util-core:scala",
         "util/util-slf4j-api/src/main/scala",
     ],

diff --git a/inject-thrift-client-http-mapper/src/main/scala/BUILD b/inject-thrift-client-http-mapper/src/main/scala/BUILD
@@ -31,7 +31,7 @@ scala_library(
         "finatra/http/src/main/scala/com/twitter/finatra/http/routing",
         "finatra/http/src/main/scala/com/twitter/finatra/http/streaming",
         "finatra/inject/inject-core/src/main/scala",
-        "finatra/inject/inject-slf4j/src/main/scala",
+        "finatra/inject/inject-slf4j/src/main/scala/com/twitter/inject",
         "finatra/inject/inject-thrift-client/src/main/scala",
         "finatra/inject/inject-utils/src/main/scala",
         "scrooge/scrooge-core/src/main/scala",

diff --git a/inject-thrift-client-http-mapper/src/test/scala/BUILD b/inject-thrift-client-http-mapper/src/test/scala/BUILD
@@ -42,7 +42,7 @@ junit_tests(
         "finatra/inject/inject-core/src/test/scala:test-deps",
         "finatra/inject/inject-server/src/main/scala",
         "finatra/inject/inject-server/src/test/scala:test-deps",
-        "finatra/inject/inject-slf4j/src/main/scala",
+        "finatra/inject/inject-slf4j/src/main/scala/com/twitter/inject",
         "finatra/inject/inject-thrift-client/src/main/scala",
         "finatra/jackson/src/main/scala",
         "finatra/thrift/src/main/scala/com/twitter/finatra/thrift",

diff --git a/inject/inject-app/src/main/scala/com/twitter/inject/app/BUILD b/inject/inject-app/src/main/scala/com/twitter/inject/app/BUILD
@@ -34,15 +34,15 @@ scala_library(
         "finatra/inject/inject-app/src/main/java/com/twitter/inject/annotations",
         "finatra/inject/inject-app/src/main/scala/com/twitter/inject/app/internal",
         "finatra/inject/inject-core/src/main/scala/com/twitter/inject",
-        "finatra/inject/inject-slf4j/src/main/scala",
+        "finatra/inject/inject-slf4j/src/main/scala/com/twitter/inject",
         "util/util-app/src/main/scala",
     ],
     exports = [
         "3rdparty/jvm/com/google/inject:guice",
         "3rdparty/jvm/org/slf4j:slf4j-api",
         "finatra/inject/inject-app/src/main/scala/com/twitter/inject/app/internal",
         "finatra/inject/inject-core/src/main/scala/com/twitter/inject",
-        "finatra/inject/inject-slf4j/src/main/scala",
+        "finatra/inject/inject-slf4j/src/main/scala/com/twitter/inject",
         "util/util-app/src/main/scala",
     ],
 )
diff --git a/inject/inject-app/src/main/scala/com/twitter/inject/app/internal/BUILD b/inject/inject-app/src/main/scala/com/twitter/inject/app/internal/BUILD
@@ -13,13 +13,13 @@ scala_library(
         "3rdparty/jvm/joda-time",
         "finatra/inject/inject-app/src/main/java/com/twitter/inject/annotations",
         "finatra/inject/inject-core/src/main/scala/com/twitter/inject",
-        "finatra/inject/inject-slf4j/src/main/scala",
+        "finatra/inject/inject-slf4j/src/main/scala/com/twitter/inject",
         "finatra/inject/inject-utils/src/main/scala",
         "util/util-core:util-core-util",
     ],
     exports = [
         "finatra/inject/inject-app/src/main/java/com/twitter/inject/annotations",
         "finatra/inject/inject-core/src/main/scala/com/twitter/inject",
-        "finatra/inject/inject-slf4j/src/main/scala",
+        "finatra/inject/inject-slf4j/src/main/scala/com/twitter/inject",
     ],
 )
diff --git a/inject/inject-app/src/test/java/com/twitter/inject/app/BUILD b/inject/inject-app/src/test/java/com/twitter/inject/app/BUILD
@@ -20,7 +20,7 @@ junit_tests(
         "finatra/inject/inject-core/src/main/scala",
         "finatra/inject/inject-core/src/test/scala:test-deps",
         "finatra/inject/inject-modules/src/main/scala/com/twitter/inject/modules",
-        "finatra/inject/inject-slf4j/src/main/scala",
+        "finatra/inject/inject-slf4j/src/main/scala/com/twitter/inject",
         "util/util-app/src/main/scala",
         "util/util-core:scala",
     ],