Merge pull request #57765 from nextcloud/fix/noid/openmetrics-multiple-app-exporters

pull/53524/merge
Kate 4 months ago committed by GitHub
commit 739b018312
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 19
      lib/private/OpenMetrics/ExporterManager.php

@ -63,13 +63,18 @@ class ExporterManager {
if (!isset($appInfo[self::XML_ENTRY]) || !is_array($appInfo[self::XML_ENTRY])) {
continue;
}
foreach ($appInfo[self::XML_ENTRY] as $classname) {
if (isset($this->skippedClasses[$classname])) {
continue;
}
$exporter = $this->loadExporter($classname, $appId);
if ($exporter !== null) {
yield $exporter;
foreach ($appInfo[self::XML_ENTRY] as $classEntries) {
// When multiple exporters are specified, $classEntries will be an array, instead of a string
$classnames = is_array($classEntries) ? $classEntries : [$classEntries];
foreach ($classnames as $classname) {
if (isset($this->skippedClasses[$classname])) {
continue;
}
$exporter = $this->loadExporter($classname, $appId);
if ($exporter !== null) {
yield $exporter;
}
}
}
}

Loading…
Cancel
Save