-
Notifications
You must be signed in to change notification settings - Fork 7
GitHub Issue #1130: Metrics to track R & Python package usage #7881
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
cnathe
wants to merge
21
commits into
develop
Choose a base branch
from
fb_pacakgeUsage1130
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
21 commits
Select commit
Hold shift + click to select a range
4de8ef9
ExternalScriptEngine refactor to allow for getPackageCaptureEpilog, r…
cnathe d98a36b
RScriptEngine implementations for tracking package usages and recordi…
cnathe 76cbf5e
PythonScriptEngine implementations for tracking package usages and re…
cnathe cea599a
ScriptPackageUsageTracker to use SimpleMetricsService to increment co…
cnathe 4b91d83
add try/catches to make sure we don't faile a valid script execution
cnathe f79850e
CR feedback
cnathe 10e9b21
Merge remote-tracking branch 'origin/develop' into fb_pacakgeUsage1130
cnathe a659a9b
Merge remote-tracking branch 'origin/develop' into fb_pacakgeUsage1130
cnathe 42473bb
Code review feedback: limit # packages read and truncate long package…
cnathe e2f06e4
RserveScriptEngine implementation of package capture (given that it h…
cnathe 2f781f9
change to prepend instead of append script so that we can capture pac…
cnathe 802cbfa
revert back to epilog instead of prolog
cnathe c17e00f
change to python epilog to track packages
cnathe 8dacba1
change to python epilog to track packages
cnathe f0aa7cc
claude cr feedback
cnathe 93a7b37
Merge remote-tracking branch 'origin/develop' into fb_pacakgeUsage1130
cnathe eec7b1b
Merge remote-tracking branch 'origin/develop' into fb_pacakgeUsage1130
cnathe 0373caf
Add simple metric count for when MAX_PACKAGES_PER_RUN is reached
cnathe d394d56
CR feedback - embed the working directory path for the sidecar txt file
cnathe 4b2114c
Merge remote-tracking branch 'origin/develop' into fb_pacakgeUsage1130
cnathe 41bf6be
WIP PythonScriptEngine updates from claude
cnathe File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
92 changes: 92 additions & 0 deletions
92
api/src/org/labkey/api/reports/report/ScriptPackageUsageTracker.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,92 @@ | ||
| /* | ||
| * Copyright (c) 2026 LabKey Corporation | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.labkey.api.reports.report; | ||
|
|
||
| import org.apache.logging.log4j.Logger; | ||
| import org.labkey.api.reports.ExternalScriptEngine; | ||
| import org.labkey.api.usageMetrics.SimpleMetricsService; | ||
| import org.labkey.api.util.logging.LogHelper; | ||
|
|
||
| import java.util.Map; | ||
| import java.util.Set; | ||
|
|
||
| /** | ||
| * Tracks which packages/modules are loaded by scripts run on this server (R reports, assay transform scripts, Python | ||
| * scripts, and anything else that runs through {@link ExternalScriptEngine}). Populated by a language-specific epilog | ||
| * appended to each script that writes the loaded packages to a sidecar file, which the engine reads back after the | ||
| * script has run successfully. Usage is tracked per language (e.g. "r", "python"). | ||
| * <p> | ||
| * Note that this only sees scripts that ran to completion: a script that fails, or that exits early via q() or | ||
| * sys.exit(), never reaches the epilog and so reports nothing. Counts are a lower bound. | ||
| * | ||
| * Each load is recorded via {@link SimpleMetricsService}, which persists a cumulative per-package load count across | ||
| * restarts and reports it to mothership under "simpleMetricCounts". The package name is the metric name and the feature | ||
| * area is "<language>PackageUsage". | ||
| */ | ||
| public class ScriptPackageUsageTracker | ||
| { | ||
| private static final Logger LOG = LogHelper.getLogger(ScriptPackageUsageTracker.class, "Tracks R & Python package usage by server-side scripts"); | ||
|
|
||
| private static final String MODULE_NAME = "API"; | ||
| private static final String FEATURE_AREA_SUFFIX = "PackageUsage"; | ||
| private static final int MAX_METRIC_NAME_LENGTH = 255; | ||
|
|
||
| /** | ||
| * Packages that ship with a given language's runtime and are always present, so aren't interesting as "library | ||
| * usage". R's base packages are filtered here; Python needs no entry because its capture epilog already subtracts | ||
| * sys.stdlib_module_names. | ||
| */ | ||
| private static final Map<String, Set<String>> BASE_PACKAGES = Map.of( | ||
| "r", Set.of("base", "compiler", "datasets", "graphics", "grDevices", "grid", "methods", "parallel", "splines", "stats", "stats4", "tcltk", "tools", "utils") | ||
| ); | ||
|
|
||
| private ScriptPackageUsageTracker() | ||
| { | ||
| } | ||
|
|
||
| private static boolean isBasePackage(String language, String packageName) | ||
| { | ||
| return BASE_PACKAGES.getOrDefault(language, Set.of()).contains(packageName); | ||
| } | ||
|
|
||
| /** | ||
| * Record that the given package was loaded by a script run in the given language (e.g. "r", "python"). Safe to call | ||
| * repeatedly; base packages and blank names are ignored. | ||
| */ | ||
| public static void record(String language, String packageName) | ||
| { | ||
| if (packageName == null || packageName.isBlank() || isBasePackage(language, packageName)) | ||
| return; | ||
|
|
||
| try | ||
| { | ||
| SimpleMetricsService.get().increment(MODULE_NAME, language + FEATURE_AREA_SUFFIX, truncateMetricName(packageName)); | ||
| } | ||
| catch (Exception e) | ||
| { | ||
| LOG.warn("Failed to record {} package usage for '{}'", language, packageName, e); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * The package name is used as the metric name, and the names come from whatever the script actually loaded rather | ||
| * than from a fixed list, so cap the length at what the DB column holds. | ||
| */ | ||
| private static String truncateMetricName(String packageName) | ||
| { | ||
| return packageName.length() <= MAX_METRIC_NAME_LENGTH ? packageName : packageName.substring(0, MAX_METRIC_NAME_LENGTH); | ||
| } | ||
| } |
94 changes: 94 additions & 0 deletions
94
api/src/org/labkey/api/reports/report/python/PythonScriptEngine.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,94 @@ | ||
| /* | ||
| * Copyright (c) 2026 LabKey Corporation | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.labkey.api.reports.report.python; | ||
|
|
||
| import org.jetbrains.annotations.Nullable; | ||
| import org.labkey.api.reports.ExternalScriptEngine; | ||
| import org.labkey.api.reports.ExternalScriptEngineDefinition; | ||
| import org.labkey.vfs.FileLike; | ||
|
|
||
| import javax.script.ScriptContext; | ||
|
|
||
| /** | ||
| * Script engine for locally-executed Python scripts (Python assay transform scripts configured as an | ||
| * external ".py" engine). Behaves like the base {@link ExternalScriptEngine} except that it appends a capture epilog to | ||
| * track which Python packages each script imports; see | ||
| * {@link org.labkey.api.reports.report.ScriptPackageUsageTracker}. | ||
| */ | ||
| public class PythonScriptEngine extends ExternalScriptEngine | ||
| { | ||
| private static final String PACKAGES_FILE = "labkeyPythonPackages.txt"; | ||
|
|
||
| // Python appended to a user script to capture the modules it imports. The sidecar file's absolute path is | ||
| // embedded (see getPackageCaptureEpilog) rather than derived from os.getcwd(), so that a script that changes the | ||
| // working directory still writes the sidecar where recordPackageUsage() looks for it. | ||
| // try/except means a capture failure can never break the script run. | ||
| // Note: we are tracking module names as written in the source, not installable distribution names - 'yaml', not 'PyYAML'. | ||
| private static final String PACKAGE_CAPTURE_EPILOG = """ | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This looks good to me, and I have tested a version of it locally (outside of a LabKey server) |
||
| try: | ||
| import ast as _lk_ast, sys as _lk_sys | ||
|
|
||
| def _lk_pkg(_lk_dotted): | ||
| # Report the shortest prefix that is a real module | ||
| _lk_parts = _lk_dotted.split('.') | ||
| for _lk_i in range(1, len(_lk_parts)): | ||
| _lk_prefix = '.'.join(_lk_parts[:_lk_i]) | ||
| if getattr(_lk_sys.modules.get(_lk_prefix), '__file__', None): | ||
| return _lk_prefix | ||
| # Nothing loaded under this name - an optional dependency this server lacks, or an import in a | ||
| # branch that never ran - so record it as written. | ||
| return _lk_dotted if _lk_parts[0] in _lk_sys.modules else _lk_parts[0] | ||
|
|
||
| with open(globals().get('__file__') or _lk_sys.argv[0], 'rb') as _lk_src: | ||
| _lk_tree = _lk_ast.parse(_lk_src.read()) | ||
| _lk_names = set() | ||
| for _lk_node in _lk_ast.walk(_lk_tree): | ||
| if isinstance(_lk_node, _lk_ast.Import): | ||
| _lk_names.update(_lk_pkg(_lk_a.name) for _lk_a in _lk_node.names) | ||
| elif isinstance(_lk_node, _lk_ast.ImportFrom) and not _lk_node.level and _lk_node.module: | ||
| _lk_names.update(_lk_pkg(_lk_node.module + '.' + _lk_a.name) for _lk_a in _lk_node.names) | ||
| _lk_std = set(getattr(_lk_sys, 'stdlib_module_names', ('ast', 'sys'))) | ||
| _lk_names = sorted(n for n in _lk_names if n[:1] != '_' and n.split('.')[0] not in _lk_std) | ||
| with open('%s', 'w') as _lk_f: | ||
| _lk_f.write('\\n'.join(_lk_names)) | ||
| except Exception: | ||
| pass | ||
| """; | ||
|
|
||
| public PythonScriptEngine(ExternalScriptEngineDefinition def) | ||
| { | ||
| super(def); | ||
| } | ||
|
|
||
| @Override | ||
| protected @Nullable String getPackageCaptureEpilog(ScriptContext context) | ||
| { | ||
| return PACKAGE_CAPTURE_EPILOG.formatted(toPythonPath(getWorkingDir(context).resolveChild(PACKAGES_FILE))); | ||
| } | ||
|
|
||
| private static String toPythonPath(FileLike file) | ||
| { | ||
| return file.toNioPathForWrite().toFile().getAbsolutePath() | ||
| .replace('\\', '/') | ||
| .replace("'", "\\'"); | ||
| } | ||
|
|
||
| @Override | ||
| protected void recordPackageUsage(ScriptContext context) | ||
| { | ||
| readPackageSidecar(context, PACKAGES_FILE, "python"); | ||
| } | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is a good warning to log. We could also inject a special packageName like
~~packageLimitReached~~here that would should up in metrics.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done