[pull] master from mattermost:master

CODEOWNERS

@@ -9,3 +9,5 @@
 /server/channels/db/migrations @mattermost/server-platform
 /server/boards/services/store/sqlstore/migrations @mattermost/server-platform
 /server/playbooks/server/sqlstore/migrations @mattermost/server-platform
+/server/channels/app/authentication.go @mattermost/product-security
+/server/channels/app/authorization.go @mattermost/product-security

api/v4/source/custom_profile_attributes.yaml

@@ -6,8 +6,6 @@
       description: |
         List all the Custom Profile Attributes fields.
 
-        _This endpoint is experimental._
-
         __Minimum server version__: 10.5
 
         ##### Permissions
@@ -32,8 +30,6 @@
       description: |
         Create a new Custom Profile Attribute field on the system.
 
-        _This endpoint is experimental._
-
         __Minimum server version__: 10.5
 
         ##### Permissions
@@ -122,8 +118,6 @@
         **Note:** Fields with `attrs.protected = true` cannot be
         modified and will return an error.
 
-        _This endpoint is experimental._
-
         __Minimum server version__: 10.5
 
         ##### Permissions
@@ -214,8 +208,6 @@
         Marks a Custom Profile Attribute field and all its values as
         deleted.
 
-        _This endpoint is experimental._
-
         __Minimum server version__: 10.5
 
         ##### Permissions
@@ -257,8 +249,6 @@
         **Note:** Values for fields with `attrs.protected = true` cannot be
         updated and will return an error.
 
-        _This endpoint is experimental._
-
         __Minimum server version__: 10.5
 
         ##### Permissions
@@ -343,8 +333,6 @@
       description: |
         List all the Custom Profile Attributes values for specified user.
 
-        _This endpoint is experimental._
-
         __Minimum server version__: 10.5
 
         ##### Permissions
@@ -387,8 +375,6 @@
         **Note:** Values for fields with `attrs.protected = true` cannot be
         updated and will return an error.
 
-        _This endpoint is experimental._
-
         __Minimum server version__: 11
 
         ##### Permissions

server/channels/app/metrics.go

@@ -157,6 +157,8 @@ func (a *App) RegisterPerformanceReport(rctx request.CTX, report *model.Performa
 			a.Metrics().ObserveDesktopCpuUsage(commonLabels["platform"], commonLabels["desktop_app_version"], h.Labels["process"], h.Value)
 		case model.DesktopClientMemoryUsage:
 			a.Metrics().ObserveDesktopMemoryUsage(commonLabels["platform"], commonLabels["desktop_app_version"], h.Labels["process"], h.Value/1000)
+		case model.PluginWebappPerf:
+			a.Metrics().ObservePluginWebappPerf(commonLabels["platform"], commonLabels["agent"], h.Labels["plugin_id"], h.Labels["plugin_metric_label"], h.Value)
 		default:
 			// we intentionally skip unknown metrics
 		}

server/einterfaces/metrics.go

@@ -134,6 +134,7 @@ type MetricsInterface interface {
 	ObserveMobileClientSessionMetadata(version string, platform string, value float64, notificationDisabled string)
 	ObserveDesktopCpuUsage(platform, version, process string, usage float64)
 	ObserveDesktopMemoryUsage(platform, version, process string, usage float64)
+	ObservePluginWebappPerf(platform, agent, pluginID, pluginMetricLabel string, elapsed float64)
 
 	ObserveAccessControlSearchQueryDuration(value float64)
 	ObserveAccessControlExpressionCompileDuration(value float64)

server/enterprise/metrics/metrics.go

@@ -235,6 +235,8 @@ type MetricsInterfaceImpl struct {
 	DesktopClientCPUUsage    *prometheus.HistogramVec
 	DesktopClientMemoryUsage *prometheus.HistogramVec
 
+	PluginWebappPerf *prometheus.HistogramVec
+
 	AccessControlExpressionCompileDuration prometheus.Histogram
 	AccessControlEvaluateDuration          prometheus.Histogram
 	AccessControlSearchQueryDuration       prometheus.Histogram
@@ -1369,6 +1371,18 @@ func New(ps *platform.PlatformService, driver, dataSource string) *MetricsInterf
 	)
 	m.Registry.MustRegister(m.ClientGlobalThreadsLoadDuration)
 
+	// Plugin webapp performance metrics
+	m.PluginWebappPerf = prometheus.NewHistogramVec(
+		withLabels(prometheus.HistogramOpts{
+			Namespace: MetricsNamespace,
+			Subsystem: MetricsSubsystemPlugin,
+			Name:      "webapp_perf",
+			Help:      "Plugin webapp performance measurements",
+		}),
+		[]string{"platform", "agent", "plugin_id", "plugin_metric_label"},
+	)
+	m.Registry.MustRegister(m.PluginWebappPerf)
+
 	m.MobileClientLoadDuration = prometheus.NewHistogramVec(
 		withLabels(prometheus.HistogramOpts{
 			Namespace: MetricsNamespace,
@@ -2202,6 +2216,15 @@ func (mi *MetricsInterfaceImpl) ObserveGlobalThreadsLoadDuration(platform, agent
 	mi.ClientGlobalThreadsLoadDuration.With(prometheus.Labels{"platform": platform, "agent": agent, "user_id": effectiveUserID}).Observe(elapsed)
 }
 
+func (mi *MetricsInterfaceImpl) ObservePluginWebappPerf(platform, agent, pluginID, pluginMetricLabel string, elapsed float64) {
+	mi.PluginWebappPerf.With(prometheus.Labels{
+		"platform":            platform,
+		"agent":               agent,
+		"plugin_id":           pluginID,
+		"plugin_metric_label": pluginMetricLabel,
+	}).Observe(elapsed)
+}
+
 func (mi *MetricsInterfaceImpl) ObserveDesktopCpuUsage(platform, version, process string, usage float64) {
 	mi.DesktopClientCPUUsage.With(prometheus.Labels{"platform": platform, "version": version, "processName": process}).Observe(usage)
 }

server/i18n/en.json

@@ -11782,11 +11782,11 @@
   },
   {
     "id": "web.error.unsupported_browser.min_browser_version.safari",
-    "translation": "Version 17.4+"
+    "translation": "Version 26.2+"
   },
   {
     "id": "web.error.unsupported_browser.min_os_version.mac",
-    "translation": "macOS 12+"
+    "translation": "macOS 14+"
   },
   {
     "id": "web.error.unsupported_browser.min_os_version.windows",

server/public/model/metrics.go

@@ -44,6 +44,9 @@ const (
 	DesktopClientCPUUsage    MetricType = "desktop_cpu"
 	DesktopClientMemoryUsage MetricType = "desktop_memory"
 
+	// PluginWebappPerf is the metric type for plugin webapp performance metrics
+	PluginWebappPerf MetricType = "plugin_webapp_perf"
+
 	performanceReportTTLMilliseconds = 300 * 1000 // 300 seconds/5 minutes
 )