smart-tests-cli 2.3.2__tar.gz → 2.4.1__tar.gz

smart_tests_cli-2.4.1/.dockerignore

@@ -0,0 +1,4 @@
+# Git files
+.git
+.gitignore
+.gitattributes

smart_tests_cli-2.4.1/CLAUDE.md

@@ -0,0 +1,2 @@
+- In Java code, use JUnit 4 & Google truth. Test needs to be added to AllTests.java or else it won't run. 
+- See README.md & CONTRIBUTING.md

{smart_tests_cli-2.3.2 → smart_tests_cli-2.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: smart-tests-cli
-Version: 2.3.2
+Version: 2.4.1
 Summary: Smart Tests CLI
 Author-email: CloudBees <support@cloudbees.com>
 License: Apache Software License v2
@@ -53,6 +53,9 @@ source .venv/bin/activate
 uv run <command>
 ```
 
+From this shell, run `pip install -e .` to create `launchable` wrapper script from the workspace.
+This is useful to test the CLI with real/local server.
+
 ## Run tests cli
 
 ```shell

{smart_tests_cli-2.3.2 → smart_tests_cli-2.4.1}/README.md

@@ -30,6 +30,9 @@ source .venv/bin/activate
 uv run <command>
 ```
 
+From this shell, run `pip install -e .` to create `launchable` wrapper script from the workspace.
+This is useful to test the CLI with real/local server.
+
 ## Run tests cli
 
 ```shell

{smart_tests_cli-2.3.2 → smart_tests_cli-2.4.1}/smart_tests/__main__.py

@@ -8,6 +8,7 @@ from smart_tests.app import Application
 from smart_tests.args4p.command import Group
 from smart_tests.commands.compare import compare
 from smart_tests.commands.detect_flakes import detect_flakes
+from smart_tests.commands.gate import gate
 from smart_tests.commands.inspect import inspect
 from smart_tests.commands.record import record
 from smart_tests.commands.stats import stats
@@ -23,6 +24,7 @@ cli.add_command(inspect)
 cli.add_command(stats)
 cli.add_command(compare)
 cli.add_command(detect_flakes)
+cli.add_command(gate)
 
 
 def _load_test_runners():

smart_tests_cli-2.4.1/smart_tests/commands/gate.py

@@ -0,0 +1,70 @@
+import json
+import sys
+from http import HTTPStatus
+from typing import Annotated
+
+import click
+from requests import Response
+from tabulate import tabulate
+
+from smart_tests.utils.tracking import TrackingClient
+from .. import args4p
+from ..app import Application
+from ..args4p import typer
+
+from ..utils.commands import Command
+from ..utils.session import SessionId
+from ..utils.smart_tests_client import SmartTestsClient
+
+
+@args4p.command()
+def gate(app_instance: Application,
+         session: Annotated[SessionId, SessionId.as_option()],
+         is_json_format: Annotated[bool, typer.Option(
+                "--json",
+                help="display JSON format")] = False):
+    tracking_client = TrackingClient(Command.GATE, app=app_instance)
+    client = SmartTestsClient(tracking_client=tracking_client, app=app_instance)
+    try:
+        res: Response = client.request("get", "gate", params={"session-id": session.test_part})
+
+        if res.status_code == HTTPStatus.NOT_FOUND:
+            click.echo(click.style(
+                "Gate data currently not available for this workspace.", 'yellow'), err=True)
+            sys.exit()
+
+        res.raise_for_status()
+
+        res_json = res.json()
+
+        if is_json_format:
+            display_as_json(res)
+        else:
+            display_as_table(res)
+
+        # Exit with failure status if gate failed
+        if res_json.get('status') == 'FAILED':
+            sys.exit(1)
+
+    except Exception as e:
+        client.print_exception_and_recover(e, "Warning: failed to fetch gate status")
+
+
+def display_as_json(res: Response):
+    res_json = res.json()
+    click.echo(json.dumps(res_json, indent=2))
+
+
+def display_as_table(res: Response):
+    headers = ["Status", "Quarantined (Ignored)", "Actionable Failures"]
+    res_json = res.json()
+
+    status_icon = "PASSED" if res_json.get('status') == 'PASSED' else "FAILED"
+
+    rows = [[
+        status_icon,
+        res_json.get('quarantinedFailures', 0),
+        res_json.get('actionableFailures', 0)
+    ]]
+
+    click.echo(tabulate(rows, headers, tablefmt="github"))

smart_tests_cli-2.4.1/smart_tests/commands/record/attachment.py

@@ -0,0 +1,151 @@
+import fnmatch
+import tarfile
+import zipfile
+from io import BytesIO
+from typing import Annotated, List, Tuple
+
+import click
+
+import smart_tests.args4p.typer as typer
+from smart_tests.utils.session import SessionId, get_session
+
+from ... import args4p
+from ...app import Application
+from ...utils.fail_fast_mode import warn_and_exit_if_fail_fast_mode
+from ...utils.smart_tests_client import SmartTestsClient
+from tabulate import tabulate
+
+
+class AttachmentStatus:
+    SUCCESS = "✓ Recorded successfully"
+    FAILED = "⚠ Failed to record"
+    SKIPPED_NON_TEXT = "⚠ Skipped: not a valid text file"
+
+
+@args4p.command(help="Record attachment information")
+def attachment(
+    app: Application,
+    session: Annotated[SessionId, SessionId.as_option()],
+    attachments: Annotated[List[str], typer.Argument(
+        multiple=True,
+        help="Attachment files to upload"
+    )],
+    include_patterns: Annotated[List[str], typer.Option(
+        '--include',
+        help='Include only files matching pattern (e.g., "*.log"). Can be specified multiple times.',
+        type=str,
+        multiple=True,
+    )] = []
+):
+    client = SmartTestsClient(app=app)
+    summary_rows = []
+    try:
+        # Note: Call get_session method to check test session exists
+        _ = get_session(session, client)
+        for a in attachments:
+            # If zip file
+            if zipfile.is_zipfile(a):
+                with zipfile.ZipFile(a, 'r') as zip_file:
+                    for zip_info in zip_file.infolist():
+                        if zip_info.is_dir():
+                            continue
+
+                        if not matches_include_patterns(zip_info.filename, include_patterns):
+                            continue
+
+                        file_content = zip_file.read(zip_info.filename)
+
+                        if not valid_utf8_file(file_content):
+                            summary_rows.append(
+                                [zip_info.filename, AttachmentStatus.SKIPPED_NON_TEXT])
+                            continue
+
+                        status = post_attachment(
+                            client, session, file_content, zip_info.filename)
+                        summary_rows.append([zip_info.filename, status])
+
+            # If tar file (tar, tar.gz, tar.bz2, tgz, etc.)
+            elif tarfile.is_tarfile(a):
+                with tarfile.open(a, 'r:*') as tar_file:
+                    for tar_info in tar_file:
+                        if tar_info.isdir():
+                            continue
+
+                        if not matches_include_patterns(tar_info.name, include_patterns):
+                            continue
+
+                        file_obj = tar_file.extractfile(tar_info)
+                        if file_obj is None:
+                            continue
+
+                        file_content = file_obj.read()
+
+                        if not valid_utf8_file(file_content):
+                            summary_rows.append(
+                                [tar_info.name, AttachmentStatus.SKIPPED_NON_TEXT])
+                            continue
+
+                        status = post_attachment(
+                            client, session, file_content, tar_info.name)
+                        summary_rows.append([tar_info.name, status])
+
+            else:
+                with open(a, mode='rb') as f:
+                    file_content = f.read()
+
+                    if not valid_utf8_file(file_content):
+                        summary_rows.append(
+                            [a, AttachmentStatus.SKIPPED_NON_TEXT])
+                        continue
+
+                    status = post_attachment(client, session, file_content, a)
+                    summary_rows.append([a, status])
+    except Exception as e:
+        client.print_exception_and_recover(e)
+
+    display_summary_as_table(summary_rows)
+
+
+def matches_include_patterns(filename: str, include_patterns: List[str]) -> bool:
+    """
+    Check if a file should be included based on the include patterns.
+    If no patterns are specified, all files are included.
+    """
+    if not include_patterns:
+        return True
+
+    for pattern in include_patterns:
+        if fnmatch.fnmatch(filename, pattern):
+            return True
+
+    return False
+
+
+def valid_utf8_file(file_content: bytes) -> bool:
+    # Check for null bytes (binary files)
+    if b'\x00' in file_content:
+        return False
+
+    try:
+        file_content.decode('utf-8')
+        return True
+    except UnicodeDecodeError:
+        return False
+
+
+def post_attachment(client: SmartTestsClient, session: SessionId, file_content: bytes, filename: str) -> str:
+    try:
+        res = client.request(
+            "post", session.subpath("attachment"), compress=True, payload=BytesIO(file_content),
+            additional_headers={"Content-Disposition": "attachment;filename=\"{}\"".format(filename)})
+        res.raise_for_status()
+        return AttachmentStatus.SUCCESS
+    except Exception as e:
+        click.echo("Failed to upload {}: {}".format(
+            filename, str(e)), err=True)
+        return AttachmentStatus.FAILED
+
+
+def display_summary_as_table(rows):
+    headers = ["File", "Status"]
+    click.echo(tabulate(rows, headers, tablefmt="github"))

{smart_tests_cli-2.3.2 → smart_tests_cli-2.4.1}/smart_tests/commands/record/commit.py

@@ -101,6 +101,9 @@ def exec_jar(name: str, source: str, max_days: int, app: Application, is_collect
     # using subprocess.check_out with shell=False and a list of command to prevent vulnerability
     # https://knowledge-base.secureflag.com/vulnerabilities/code_injection/os_command_injection_python.html
     command = [java]
+    debug_opts = os.getenv("LAUNCHABLE_JAVA_DEBUG")
+    if debug_opts:
+        command.extend(debug_opts.split())
     command.extend(_build_proxy_option(os.getenv("HTTPS_PROXY")))
     command.extend([
         "-jar",

{smart_tests_cli-2.3.2 → smart_tests_cli-2.4.1}/smart_tests/commands/subset.py

@@ -115,6 +115,10 @@ class Subset(TestPathWriter):
                 help="Subsetting by confidence from 0% to 100%",
                 metavar="PERCENTAGE"
             )] = None,
+            similarity: Annotated[float | None, typer.Option(
+                type=floatType(min=0.0, max=1.0),
+                help='subsetting by similarity from 0 to 1.0. Tests scoring above this value are included in the subset.',
+            )] = None,
             goal_spec: Annotated[str | None, typer.Option(
                 help="Subsetting by programmatic goal definition",
                 metavar="GOAL_SPEC"
@@ -262,6 +266,7 @@ class Subset(TestPathWriter):
         self.target = target
         self.time = time
         self.confidence = confidence
+        self.similarity = similarity
         self.goal_spec = goal_spec
         self.base_path = base_path
         self.base_path_explicitly_set = (base_path is not None)
@@ -413,6 +418,11 @@ class Subset(TestPathWriter):
                 "type": "subset-by-goal-spec",
                 "goal": self.goal_spec
             }
+        elif self.similarity is not None:
+            payload["goal"] = {
+                "type": "subset-by-similarity",
+                "similarity": self.similarity
+            }
         else:
             payload['useServerSideOptimizationTarget'] = True
 

{smart_tests_cli-2.3.2 → smart_tests_cli-2.4.1}/smart_tests/test_runners/bazel.py

@@ -89,7 +89,6 @@ def record_tests(
             if ts.findtext('system-out', '') == "" and ts.findtext('system-err', '') == "":
                 logfile = path.join(path.dirname(report), 'test.log')
                 if path.exists(logfile):
-                    print("Found {}".format(logfile))
                     for x in ts.findall('system-out'):
                         ts.remove(x)
                     with open(logfile, 'r', encoding='utf-8', errors='replace') as log_file:

{smart_tests_cli-2.3.2 → smart_tests_cli-2.4.1}/smart_tests/test_runners/maven.py

@@ -1,16 +1,18 @@
 import glob
 import os
-from typing import Annotated, Dict, List
+import re
+from typing import Annotated
+from typing import Dict, List, Tuple
 
 import click
 
 import smart_tests.args4p.typer as typer
 from smart_tests.utils import glob as uglob
 from smart_tests.utils.java import junit5_nested_class_path_builder
-
+from . import smart_tests
+from ..args4p.exceptions import BadCmdLineException
 from ..commands.record.tests import RecordTests
 from ..commands.subset import Subset
-from . import smart_tests
 
 # Surefire has the default inclusion pattern
 # https://maven.apache.org/surefire/maven-surefire-plugin/test-mojo.html#includes
@@ -66,8 +68,21 @@ def subset(
         help="Scan testCompile/default-testCompile/createdFiles.lst for *.lst files generated by `mvn compile` and "
              "use them as test inputs."
     )] = False,
+    exclude_rules: Annotated[List[str], typer.Option(
+        "--exclude",
+        multiple=True,
+        help="Exclude tests matching the given Python regular expression pattern. Can be specified multiple times."
+    )] = [],
 ):
 
+    # Compile exclude rules
+    compiled_exclude_rules = []
+    for rule in exclude_rules:
+        try:
+            compiled_exclude_rules.append(re.compile(rule))
+        except re.error as e:
+            raise BadCmdLineException("Invalid regular expression '{}': {}".format(rule, e))
+
     def file2class_test_path(f: str) -> List[Dict[str, str]]:
         # remove extension
         f, _ = os.path.splitext(f)
@@ -78,7 +93,13 @@ def subset(
 
     def file2test(f: str) -> List | None:
         if is_file(f):
-            return file2class_test_path(f)
+            test_path = file2class_test_path(f)
+
+            for pattern in compiled_exclude_rules:
+                if pattern.search(test_path[0]["name"]):
+                    return None
+
+            return test_path
         else:
             return None
 

{smart_tests_cli-2.3.2 → smart_tests_cli-2.4.1}/smart_tests/test_runners/smart_tests.py

@@ -169,16 +169,20 @@ class CommonRecordTestImpls:
                          source_roots: Annotated[list[str], typer.Argument(
                              multiple=True,
                              help="Source directories containing test report files"
-                         )]):
+                         )],
+                         file_path_attribute: Annotated[list[str], typer.Option(
+                             "--file-path-attribute",
+                             multiple=True,
+                             help="Attributes to look for file paths in test reports (e.g., name, classname, file, filepath)"
+                         )] = ["file", "filepath"]):
             def path_builder(
                 case: TestCase, suite: TestSuite, report_file: str
             ) -> TestPath:
                 def find_filename():
                     """look for what looks like file names from test reports"""
                     for e in [case, suite]:
-                        for a in ["file", "filepath"]:
-                            filepath = e._elem.attrib.get(a)
-                            if filepath:
+                        for a in file_path_attribute:
+                            if filepath := e._elem.attrib.get(a):
                                 return filepath
                     return None  # failing to find a test name
 
@@ -188,9 +192,9 @@ class CommonRecordTestImpls:
 
                 # default test path in `subset` expects to have this file name
                 test_path = [client.make_file_path_component(filepath)]
-                if suite.name:
+                if suite.name and suite.name != filepath:
                     test_path.append({"type": "testsuite", "name": suite.name})
-                if case.name:
+                if case.name and case.name != filepath:
                     test_path.append({"type": "testcase", "name": case.name})
                 return test_path
 

{smart_tests_cli-2.3.2 → smart_tests_cli-2.4.1}/smart_tests/utils/commands.py

@@ -9,6 +9,7 @@ class Command(Enum):
     SUBSET = 'SUBSET'
     COMMIT = 'COMMIT'
     DETECT_FLAKE = 'DETECT_FLAKE'
+    GATE = 'GATE'
 
     def display_name(self):
         return self.value.lower().replace('_', ' ')

{smart_tests_cli-2.3.2 → smart_tests_cli-2.4.1}/smart_tests/utils/session.py

@@ -30,9 +30,23 @@ class SessionId:
         '''This is the method in which we parse the user input, so be defensive'''
         if id.startswith('@'):
             file_path = id[1:]
+            # Earlier versions of PowerShell write Unicode BOM when redirecting output to a file.
+            # https://github.com/PowerShell/PowerShell/issues/8592
+            # Since we tell people to redirect `record session` output to a file, here we can
+            # encounter such files. Here's the scheme to cope with this.
+            #
+            # First we try utf-8-sig, which handles UTF-8 BOM correctly.
+            # our session ID only uses ASCII chars, so unless the writer used non ascii compatible encoding
+            # (e.g., EBCDIC but those are very very unlikely), this will read the file correctly.
+            # If the writer used UTF-16 (e.g., legacy PowerShell on Windows), we'll get a decode error, and
+            # then we try UTF-16, which handles BOM correctly.
             try:
-                with open(file_path, 'r') as f:
-                    id = f.read().strip()
+                try:
+                    with open(file_path, 'r', encoding='utf-8-sig') as f:
+                        id = f.read().strip()
+                except UnicodeDecodeError:
+                    with open(file_path, 'r', encoding='utf-16') as f:
+                        id = f.read().strip()
             except FileNotFoundError:
                 raise BadCmdLineException(f"Session file '{file_path}' not found.")
             except IOError as e:

{smart_tests_cli-2.3.2 → smart_tests_cli-2.4.1}/smart_tests_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: smart-tests-cli
-Version: 2.3.2
+Version: 2.4.1
 Summary: Smart Tests CLI
 Author-email: CloudBees <support@cloudbees.com>
 License: Apache Software License v2
@@ -53,6 +53,9 @@ source .venv/bin/activate
 uv run <command>
 ```
 
+From this shell, run `pip install -e .` to create `launchable` wrapper script from the workspace.
+This is useful to test the CLI with real/local server.
+
 ## Run tests cli
 
 ```shell

{smart_tests_cli-2.3.2 → smart_tests_cli-2.4.1}/smart_tests_cli.egg-info/SOURCES.txt

@@ -1,10 +1,12 @@
 .bazelrc
 .bazelversion
+.dockerignore
 .editorconfig
 .gitignore
 .pre-commit-config.yaml
 .python-version
 .tagpr
+CLAUDE.md
 CONTRIBUTING.md
 Dockerfile
 LICENSE.txt
@@ -38,6 +40,7 @@ smart_tests/args4p/converters/__init__.py
 smart_tests/args4p/typer/__init__.py
 smart_tests/commands/__init__.py
 smart_tests/commands/detect_flakes.py
+smart_tests/commands/gate.py
 smart_tests/commands/subset.py
 smart_tests/commands/test_path_writer.py
 smart_tests/commands/verify.py
@@ -124,9 +127,12 @@ src/BUILD
 src/maven_install.json
 src/main/java/com/launchableinc/ingest/commits/Authenticator.java
 src/main/java/com/launchableinc/ingest/commits/BUILD
+src/main/java/com/launchableinc/ingest/commits/BackgroundWorkStatus.java
+src/main/java/com/launchableinc/ingest/commits/BoundedExecutorService.java
 src/main/java/com/launchableinc/ingest/commits/ChunkStreamer.java
 src/main/java/com/launchableinc/ingest/commits/CommitChunkStreamer.java
 src/main/java/com/launchableinc/ingest/commits/CommitGraphCollector.java
+src/main/java/com/launchableinc/ingest/commits/ConcurrentConsumer.java
 src/main/java/com/launchableinc/ingest/commits/CountingDiffFormatter.java
 src/main/java/com/launchableinc/ingest/commits/FileChunkStreamer.java
 src/main/java/com/launchableinc/ingest/commits/FlushableConsumer.java
@@ -134,22 +140,27 @@ src/main/java/com/launchableinc/ingest/commits/GitFile.java
 src/main/java/com/launchableinc/ingest/commits/GitHubActionsAuthenticator.java
 src/main/java/com/launchableinc/ingest/commits/GitHubIdTokenAuthenticator.java
 src/main/java/com/launchableinc/ingest/commits/IOConsumer.java
+src/main/java/com/launchableinc/ingest/commits/JSAsyncFileCollectionProgress.java
+src/main/java/com/launchableinc/ingest/commits/JSAsyncFileCollectionResponse.java
 src/main/java/com/launchableinc/ingest/commits/JSCommit.java
 src/main/java/com/launchableinc/ingest/commits/JSFileChange.java
+src/main/java/com/launchableinc/ingest/commits/LaunchableHttpClient.java
 src/main/java/com/launchableinc/ingest/commits/Main.java
 src/main/java/com/launchableinc/ingest/commits/ObjectRevFilter.java
-src/main/java/com/launchableinc/ingest/commits/ProgressReportingConsumer.java
+src/main/java/com/launchableinc/ingest/commits/ProgressReporter.java
 src/main/java/com/launchableinc/ingest/commits/SSLBypass.java
 src/main/java/com/launchableinc/ingest/commits/TokenAuthenticator.java
 src/main/java/com/launchableinc/ingest/commits/TreeReceiver.java
 src/main/java/com/launchableinc/ingest/commits/VirtualFile.java
 src/test/java/com/launchableinc/ingest/commits/AllTests.java
 src/test/java/com/launchableinc/ingest/commits/BUILD
+src/test/java/com/launchableinc/ingest/commits/BoundedExecutorServiceTest.java
 src/test/java/com/launchableinc/ingest/commits/CommitGraphCollectorTest.java
+src/test/java/com/launchableinc/ingest/commits/ConcurrentConsumerTest.java
 src/test/java/com/launchableinc/ingest/commits/FileChunkStreamerTest.java
 src/test/java/com/launchableinc/ingest/commits/MainTest.java
 src/test/java/com/launchableinc/ingest/commits/PassThroughTreeReceiverImpl.java
-src/test/java/com/launchableinc/ingest/commits/ProgressReportingConsumerTest.java
+src/test/java/com/launchableinc/ingest/commits/ProgressReporterTest.java
 src/test/java/com/launchableinc/ingest/commits/SSLBypassTest.java
 src/test/java/com/launchableinc/ingest/commits/java8-compat.sh
 test-runner/__main__.py
@@ -173,6 +184,7 @@ tests/args4p/converters/test_converters.py
 tests/commands/__init__.py
 tests/commands/test_api_error.py
 tests/commands/test_detect_flakes.py
+tests/commands/test_gate.py
 tests/commands/test_subset.py
 tests/commands/test_verify.py
 tests/commands/compare/__init__.py
@@ -253,6 +265,10 @@ tests/data/cypress/subset_result.json
 tests/data/cypress/test-result.xml
 tests/data/dotnet/record_test_result.json
 tests/data/dotnet/test-result.xml
+tests/data/file/record_test_result.json
+tests/data/file/record_test_result_custom_attribute.json
+tests/data/file/result.xml
+tests/data/file/result_custom_attribute.xml
 tests/data/flutter/record_test_result.json
 tests/data/flutter/report.json
 tests/data/git_log_ingest/sample.out
@@ -293,8 +309,10 @@ tests/data/maven/subset_by_confidence_result.json
 tests/data/maven/subset_from_file_result.json
 tests/data/maven/subset_result.json
 tests/data/maven/subset_scan_test_compile_lst_result.json
+tests/data/maven/subset_with_exclude_rules_result.json
 tests/data/maven/java/test/src/java/com/example/sample_app_maven/App2Test.java
 tests/data/maven/java/test/src/java/com/example/sample_app_maven/AppTest.java
+tests/data/maven/java/test/src/java/com/launchableinc/rocket_car_maven/e2e/E2ETest.java
 tests/data/maven/reports/TEST-1.xml
 tests/data/maven/reports/TEST-2.xml
 tests/data/maven/reports/TEST-nested.xml
@@ -366,6 +384,7 @@ tests/test_runners/test_cts.py
 tests/test_runners/test_cucumber.py
 tests/test_runners/test_cypress.py
 tests/test_runners/test_dotnet.py
+tests/test_runners/test_file.py
 tests/test_runners/test_go_test.py
 tests/test_runners/test_googletest.py
 tests/test_runners/test_gradle.py

smart_tests_cli-2.4.1/src/main/java/com/launchableinc/ingest/commits/BackgroundWorkStatus.java

@@ -0,0 +1,8 @@
+package com.launchableinc.ingest.commits;
+
+public enum BackgroundWorkStatus {
+  IN_PROGRESS,
+  SUCCEEDED,
+  FAILED,
+  ABANDONED
+}

smart_tests_cli-2.4.1/src/main/java/com/launchableinc/ingest/commits/BoundedExecutorService.java

@@ -0,0 +1,80 @@
+package com.launchableinc.ingest.commits;
+
+import java.util.List;
+import java.util.concurrent.AbstractExecutorService;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.RejectedExecutionException;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * {@link ExecutorService} decorator that limits the number of concurrent tasks,
+ * and make the caller block when the limit is reached.
+ */
+class BoundedExecutorService extends AbstractExecutorService {
+  private final ExecutorService delegate;
+  private final Semaphore semaphore;
+  /** # of threads that are blocked trying to {@link #execute(Runnable)}. Just for diagnostics. */
+  private final AtomicInteger blockCount = new AtomicInteger(0);
+
+  BoundedExecutorService(int limit) {
+    this(Executors.newFixedThreadPool(limit), limit);
+  }
+
+  BoundedExecutorService(ExecutorService delegate, int limit) {
+    this.delegate = delegate;
+    this.semaphore = new Semaphore(limit);
+  }
+
+  @Override
+  public void execute(Runnable command) {
+    try {
+      blockCount.incrementAndGet();
+      semaphore.acquire();
+    } catch (InterruptedException e) {
+      throw new RejectedExecutionException(e);
+    } finally {
+      blockCount.decrementAndGet();
+    }
+
+    try {
+      delegate.execute(() -> {
+        try {
+          command.run();
+        } finally {
+          semaphore.release();
+        }
+      });
+    } catch (RejectedExecutionException e) {
+      semaphore.release();
+      throw e;
+    }
+  }
+
+  @Override
+  public void shutdown() {
+    delegate.shutdown();
+  }
+
+  @Override
+  public List<Runnable> shutdownNow() {
+    return delegate.shutdownNow();
+  }
+
+  @Override
+  public boolean isShutdown() {
+    return delegate.isShutdown();
+  }
+
+  @Override
+  public boolean isTerminated() {
+    return delegate.isTerminated();
+  }
+
+  @Override
+  public boolean awaitTermination(long timeout, TimeUnit unit) throws InterruptedException {
+    return delegate.awaitTermination(timeout, unit);
+  }
+}