Merge branch 'feature/json-tree-viewer' of github.com:odeimaiz/osparc-simcore into feature/json-tree-viewer

Author: odeimaiz

packages/service-library/src/servicelib/prometheus_metrics.py

@@ -40,7 +40,6 @@ class PrometheusMetrics:
     request_count: Counter
     in_flight_requests: Gauge
     response_latency_with_labels: Histogram
-    response_latency_detailed_buckets: Histogram
 
 
 def _get_exemplar() -> dict[str, str] | None:
@@ -87,14 +86,7 @@ def get_prometheus_metrics() -> PrometheusMetrics:
         documentation="Time processing a request with detailed labels",
         labelnames=["method", "endpoint", "simcore_user_agent"],
         registry=registry,
-        buckets=(0.1, 0.5, 1),
-    )
-
-    response_latency_detailed_buckets = Histogram(
-        name="http_request_latency_seconds_detailed_buckets",
-        documentation="Time processing a request with detailed buckets but no labels",
-        registry=registry,
-        buckets=(0.005, 0.01, 0.025, 0.05, 0.1, 0.25, 0.5, 1, 2, 5, 10),
+        buckets=(0.1, 1, 5, 10),
     )
 
     return PrometheusMetrics(
@@ -105,7 +97,6 @@ def get_prometheus_metrics() -> PrometheusMetrics:
         request_count=request_count,
         in_flight_requests=in_flight_requests,
         response_latency_with_labels=response_latency_with_labels,
-        response_latency_detailed_buckets=response_latency_detailed_buckets,
     )
 
 
@@ -150,6 +141,3 @@ def record_response_metrics(
     metrics.response_latency_with_labels.labels(method, endpoint, user_agent).observe(
         amount=response_latency_seconds, exemplar=exemplar
     )
-    metrics.response_latency_detailed_buckets.observe(
-        amount=response_latency_seconds, exemplar=exemplar
-    )

services/web/server/src/simcore_service_webserver/application_settings.py

@@ -462,19 +462,20 @@ def log_level(self) -> int:
     def is_enabled(self, field_name: str) -> bool:
         return bool(getattr(self, field_name, None))
 
-    def _get_disabled_public_plugins(self) -> list[str]:
+    def _get_disabled_advertised_plugins(self) -> list[str]:
+        """List of plugins that are disabled to be advertised to the client"""
         # NOTE: this list is limited for security reasons. An unbounded list
         # might reveal critical info on the settings of a deploy to the client.
-        # TODO: more reliable definition of a "plugin" and whether it can be advertised or not
-        # (extra var? e.g. Field( ... , x_advertise_plugin=True))
-        public_plugin_candidates: Final = {
+        # SEE https://github.com/ITISFoundation/osparc-simcore/issues/7688
+        advertised_plugins: Final = {
             "WEBSERVER_EXPORTER",
             "WEBSERVER_FOLDERS",
+            "WEBSERVER_FUNCTIONS",
             "WEBSERVER_LICENSES",
             "WEBSERVER_PAYMENTS",
             "WEBSERVER_SCICRUNCH",
         }
-        return [_ for _ in public_plugin_candidates if not self.is_enabled(_)] + [
+        return [_ for _ in advertised_plugins if not self.is_enabled(_)] + [
             # NOTE: Permanently retired in https://github.com/ITISFoundation/osparc-simcore/pull/7182
             # Kept here to disable front-end
             "WEBSERVER_META_MODELING",
@@ -556,7 +557,7 @@ def to_client_statics(self) -> dict[str, Any]:
             },
             exclude_none=True,
         )
-        data["plugins_disabled"] = self._get_disabled_public_plugins()
+        data["plugins_disabled"] = self._get_disabled_advertised_plugins()
 
         # Alias in addition MUST be camelcase here
         return {snake_to_camel(k): v for k, v in data.items()}