Skip to content

NH-113981 Remove unnecessary try-except around custom distro load_instrumentor call #660

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.

Sign up for GitHub

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

Merged
tammy-baylis-swi merged 2 commits into from
Jul 3, 2025
Merged

NH-113981 Remove unnecessary try-except around custom distro load_instrumentor call #660

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a4568f0
Remove load_instrumentor try-except and log
tammy-baylis-swi Jul 2, 2025
7db25a3
Testrelease 4.2.0.0
tammy-baylis-swi Jul 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions solarwinds_apm/distro.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,15 +254,7 @@ def load_instrumentor(self, entry_point: EntryPoint, **kwargs):
if self._instrumentor_metrics_enabled is False:
kwargs["meter_provider"] = self._meter_provider

try:
instrumentor: BaseInstrumentor = entry_point.load()
except Exception as ex: # pylint: disable=broad-except
logger.error(
"Could not load instrumentor %s: %s",
entry_point.name,
ex,
)
return
instrumentor: BaseInstrumentor = entry_point.load()
instrumentor().instrument(**kwargs)

def get_enable_commenter_env_map(self) -> dict:
Expand Down
2 changes: 1 addition & 1 deletion solarwinds_apm/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "4.1.0"
__version__ = "4.2.0.0"
Loading