Upgrade rules_scala to 7.1.0 to include scrooge fixes and fix scala build deps

Signed-off-by: Dom Del Nano <ddelnano@gmail.com>

Author: ddelnano

WORKSPACE

@@ -73,7 +73,27 @@ scala_config(scala_version = scala_version)
 
 load("@io_bazel_rules_scala//scala:toolchains.bzl", "scala_register_toolchains", "scala_toolchains")
 
-scala_toolchains(fetch_sources = True, twitter_scrooge = True)
+# Configure twitter_scrooge toolchain with custom dependencies from thrift_deps.
+# Note: thrift_deps must be loaded before this is evaluated.
+# The finagle dependencies (finagle-thrift, finagle-core) are needed as compile
+# dependencies for the generated scrooge code when thrift services are defined.
+# We use scrooge_core_with_finagle which bundles finagle deps with scrooge_core.
+scala_toolchains(
+    fetch_sources = True,
+    twitter_scrooge = {
+        "libthrift": "@thrift_deps//:org_apache_thrift_libthrift",
+        # Use scrooge_core_with_finagle to include finagle on the compile classpath
+        # for generated thrift service code. Must use @px// prefix to reference
+        # the main workspace from within the generated @rules_scala_toolchains repo.
+        "scrooge_core": "@px//src/stirling/source_connectors/socket_tracer/testing/containers/thriftmux:scrooge_core_with_finagle",
+        "scrooge_generator": "@thrift_deps//:com_twitter_scrooge_generator_2_13",
+        "util_core": "@thrift_deps//:com_twitter_util_core_2_13",
+        "util_logging": "@thrift_deps//:com_twitter_util_logging_2_13",
+        "javax_annotation_api": "@thrift_deps//:javax_annotation_javax_annotation_api",
+        "mustache": "@thrift_deps//:com_github_spullara_mustache_java_compiler",
+        "scopt": "@thrift_deps//:com_github_scopt_scopt_2_13",
+    },
+)
 
 scala_register_toolchains()
 
@@ -193,26 +213,6 @@ load("@thrift_deps//:defs.bzl", thrift_pinned_maven_install = "pinned_maven_inst
 
 thrift_pinned_maven_install()
 
-# twitter_scrooge will use incompatible versions of @scrooge_jars and @thrift_jars.
-# These bind statements ensure that the correct versions of finagle libthrift, scrooge core
-# and scrooge generator are used to ensure successful compilation.
-# See https://github.com/bazelbuild/rules_scala/issues/592 and
-# https://github.com/bazelbuild/rules_scala/pull/847 for more details.
-bind(
-    name = "io_bazel_rules_scala/dependency/thrift/scrooge_core",
-    actual = "//src/stirling/source_connectors/socket_tracer/testing/containers/thriftmux:scrooge_jars",
-)
-
-bind(
-    name = "io_bazel_rules_scala/dependency/thrift/scrooge_generator",
-    actual = "//src/stirling/source_connectors/socket_tracer/testing/containers/thriftmux:scrooge_jars",
-)
-
-bind(
-    name = "io_bazel_rules_scala/dependency/thrift/libthrift",
-    actual = "//src/stirling/source_connectors/socket_tracer/testing/containers/thriftmux:thrift_jars",
-)
-
 # gazelle:repo bazel_gazelle
 # Gazelle depes need to be loaded last to make sure they don't override our dependencies.
 # The first one wins when it comes to package declaration.

bazel/repository_locations.bzl

@@ -439,18 +439,18 @@ REPOSITORY_LOCATIONS = dict(
         ],
     ),
     io_bazel_rules_scala = dict(
-        sha256 = "a4700d6e6cdf13cf85e29029ec998e2ec3ba94791606ec83d2c96e3c5b0aebed",
+        sha256 = "6a900a39bf643c5c9308c8200f9a61e27588dc54a67aa08fcfc798f25add4f7b",
         urls = [
-            "https://github.com/bazelbuild/rules_scala/releases/download/v7.0.0/rules_scala-v7.0.0.tar.gz",
+            "https://github.com/bazelbuild/rules_scala/releases/download/v7.1.0/rules_scala-v7.1.0.tar.gz",
         ],
-        strip_prefix = "rules_scala-7.0.0",
+        strip_prefix = "rules_scala-7.1.0",
     ),
     rules_scala = dict(
-        sha256 = "a4700d6e6cdf13cf85e29029ec998e2ec3ba94791606ec83d2c96e3c5b0aebed",
+        sha256 = "6a900a39bf643c5c9308c8200f9a61e27588dc54a67aa08fcfc798f25add4f7b",
         urls = [
-            "https://github.com/bazelbuild/rules_scala/releases/download/v7.0.0/rules_scala-v7.0.0.tar.gz",
+            "https://github.com/bazelbuild/rules_scala/releases/download/v7.1.0/rules_scala-v7.1.0.tar.gz",
         ],
-        strip_prefix = "rules_scala-7.0.0",
+        strip_prefix = "rules_scala-7.1.0",
     ),
     org_tensorflow = dict(
         sha256 = "a640d1f97be316a09301dfc9347e3d929ad4d9a2336e3ca23c32c93b0ff7e5d0",

bazel/thrift.bzl

@@ -17,21 +17,32 @@
 load("@rules_jvm_external//:defs.bzl", "maven_install")
 
 def thrift_deps(scala_version):
-    # twitter_scrooge is now set up via scala_toolchains(twitter_scrooge = True) in WORKSPACE
+    # twitter_scrooge is now set up via scala_toolchains(twitter_scrooge = {...}) in WORKSPACE
 
     finagle_version = "22.7.0"
     scala_minor_version = ".".join(scala_version.split(".")[:2])
 
     maven_install(
         name = "thrift_deps",
         artifacts = [
+            # Finagle dependencies (needed for generated service code)
             "com.twitter:finagle-thriftmux_%s:%s" % (scala_minor_version, finagle_version),
+            "com.twitter:finagle-thrift_%s:%s" % (scala_minor_version, finagle_version),
             "com.twitter:finagle-mux_%s:%s" % (scala_minor_version, finagle_version),
             "com.twitter:finagle-core_%s:%s" % (scala_minor_version, finagle_version),
+            "com.twitter:finagle-http_%s:%s" % (scala_minor_version, finagle_version),
+            # Scrooge dependencies (needed for code generation toolchain)
             "com.twitter:scrooge-core_%s:%s" % (scala_minor_version, finagle_version),
             "com.twitter:scrooge-generator_%s:%s" % (scala_minor_version, finagle_version),
-            "com.twitter:finagle-http_%s:%s" % (scala_minor_version, finagle_version),
+            "com.twitter:util-core_%s:%s" % (scala_minor_version, finagle_version),
+            "com.twitter:util-logging_%s:%s" % (scala_minor_version, finagle_version),
+            # Scrooge generator dependencies
+            "com.github.spullara.mustache.java:compiler:0.8.18",
+            "com.github.scopt:scopt_%s:4.0.0-RC2" % scala_minor_version,
+            "javax.annotation:javax.annotation-api:1.3.2",
+            # Thrift
             "org.apache.thrift:libthrift:0.10.0",
+            # Logging
             "org.slf4j:slf4j-api:1.7.36",
             "ch.qos.logback:logback-core:1.2.10",
             "ch.qos.logback:logback-classic:1.2.10",

src/stirling/source_connectors/socket_tracer/testing/containers/thriftmux/BUILD.bazel

@@ -67,6 +67,19 @@ thrift_library(
     srcs = glob(["**/*.thrift"]),
 )
 
+# Scrooge core with finagle dependencies bundled.
+# This is used as the scrooge_core for the toolchain, so that the generated
+# service code has access to finagle classes at compile time.
+scala_library(
+    name = "scrooge_core_with_finagle",
+    visibility = ["//visibility:public"],
+    exports = [
+        "@thrift_deps//:com_twitter_finagle_core_2_13",
+        "@thrift_deps//:com_twitter_finagle_thrift_2_13",
+        "@thrift_deps//:com_twitter_scrooge_core_2_13",
+    ],
+)
+
 scala_library(
     name = "scrooge_jars",
     visibility = ["//visibility:public"],
@@ -81,6 +94,31 @@ scala_library(
     ],
 )
 
+# Runtime dependencies for generated scrooge code (for downstream consumers)
+scala_library(
+    name = "scrooge_runtime_deps",
+    visibility = ["//visibility:public"],
+    exports = [
+        "@thrift_deps//:com_twitter_finagle_core_2_13",
+        "@thrift_deps//:com_twitter_finagle_thrift_2_13",
+        "@thrift_deps//:com_twitter_scrooge_core_2_13",
+        "@thrift_deps//:org_apache_thrift_libthrift",
+    ],
+)
+
+# Full finagle dependencies for Server/Client scala files
+scala_library(
+    name = "finagle_deps",
+    visibility = ["//visibility:public"],
+    exports = [
+        "@thrift_deps//:com_twitter_finagle_core_2_13",
+        "@thrift_deps//:com_twitter_finagle_http_2_13",
+        "@thrift_deps//:com_twitter_finagle_mux_2_13",
+        "@thrift_deps//:com_twitter_finagle_thrift_2_13",
+        "@thrift_deps//:com_twitter_finagle_thriftmux_2_13",
+    ],
+)
+
 scala_library(
     name = "thrift_jars",
     visibility = ["//visibility:public"],
@@ -94,6 +132,9 @@ scrooge_scala_library(
     deps = [
         ":thrift_library",
     ],
+    exports = [
+        ":scrooge_runtime_deps",
+    ],
 )
 
 scala_library(
@@ -110,6 +151,7 @@ scala_binary(
     srcs = glob(["**/*.scala"]),
     main_class = "Server",
     deps = [
+        ":finagle_deps",
         ":thriftmux_scrooge",
     ],
 )
@@ -119,6 +161,7 @@ scala_binary(
     srcs = glob(["**/*.scala"]),
     main_class = "Client",
     deps = [
+        ":finagle_deps",
         ":thriftmux_scrooge",
     ],
 )
@@ -144,6 +187,7 @@ scala_image(
     ],
     main_class = "Server",
     deps = [
+        ":finagle_deps",
         ":logging",
         ":thriftmux_scrooge",
     ],