mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-05-03 19:41:24 -05:00
Code Issues Packages Projects Releases 159 Wiki Activity

gauges measuring percentage of CPU, virtual memory, and disk used

Browse Source
This commit is contained in:
Brian Hendriks
2026-01-12 13:21:12 -08:00
parent 8375e3cb34
commit 2e0e0e10aa
5 changed files with 483 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
go/Godeps/LICENSES
Generated
+367
View File
@@ -11753,6 +11753,34 @@ Copyright (c) 2016 Felix Geisendörfer (felix@debuggable.com)
= LICENSE 41cbff0d41b7d20dd9d70de1e0380fdca6ec1f42d2533c75c5c1bec3 =
================================================================================
================================================================================
= github.com/go-ole/go-ole licensed under: =
The MIT License (MIT)
Copyright © 2013-2017 Yasuhiro Matsumoto, <mattn.jp@gmail.com>
Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the “Software”), to deal in
the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
of the Software, and to permit persons to whom the Software is furnished to do
so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
= LICENSE 8e725f36d6489d067bb45b7a6bef28d3b14f3729a5b84d3ba2304da4 =
================================================================================
================================================================================
= github.com/go-sql-driver/mysql licensed under: =
@@ -15882,6 +15910,73 @@ DEALINGS IN THE SOFTWARE.
= LICENSE 4f259259199d1875581689ffebe5dccc398f7fe7a31d03b481aeea2e =
================================================================================
================================================================================
= github.com/shirou/gopsutil licensed under: =
gopsutil is distributed under BSD license reproduced below.
Copyright (c) 2014, WAKAYAMA Shirou
All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
* Neither the name of the gopsutil authors nor the names of its contributors
may be used to endorse or promote products derived from this software without
specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-------
internal/common/binary.go in the gopsutil is copied and modifid from golang/encoding/binary.go.
Copyright (c) 2009 The Go Authors. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above
copyright notice, this list of conditions and the following disclaimer
in the documentation and/or other materials provided with the
distribution.
* Neither the name of Google Inc. nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
= LICENSE 95976e03a0151034ea8a8be18588db9eebf6c68b258763bb96d0cb4d =
================================================================================
================================================================================
= github.com/shopspring/decimal licensed under: =
@@ -16409,6 +16504,251 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
= LICENSE 1f160a4ae8ef3a78226669d0d335c257e25202501dd3e5884fa3e955 =
================================================================================
================================================================================
= github.com/tklauser/go-sysconf licensed under: =
BSD 3-Clause License
Copyright (c) 2018-2021, Tobias Klauser
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
* Neither the name of the copyright holder nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
= LICENSE 3cd49841e659190638b5cb4cfeeba983a825b2fffad7229aa44564c0 =
================================================================================
================================================================================
= github.com/tklauser/numcpus licensed under: =
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
1. Definitions.
"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.
"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.
"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.
"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.
"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.
"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.
"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).
"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.
"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."
"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.
2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.
3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.
4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:
(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and
(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and
(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and
(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.
You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.
5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.
6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.
7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.
8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.
9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.
END OF TERMS AND CONDITIONS
APPENDIX: How to apply the Apache License to your work.
To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "{}"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.
Copyright {yyyy} Authors of Cilium
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.
= LICENSE 480254410b9ea90d4d2b72c54375c01ac653fcc8e3bb4b4c4303a3ae =
================================================================================
================================================================================
= github.com/vbauerster/mpb/v8 licensed under: =
@@ -16886,6 +17226,33 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
= LICENSE b9cd4bdaf39aa5b3058fd5f0dcc25d1b7ef3d120dd8ffab7669399ff =
================================================================================
================================================================================
= github.com/yusufpapurcu/wmi licensed under: =
The MIT License (MIT)
Copyright (c) 2013 Stack Exchange
Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
the Software, and to permit persons to whom the Software is furnished to do so,
subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
= LICENSE 730a0cb25162ff1049c5f35f2ac66fd5232b9be6893be27ef4b436d3 =
================================================================================
================================================================================
= github.com/zeebo/errs licensed under: =
go/cmd/dolt/commands/sqlserver/metrics_listener.go
+106 -12
View File
@@ -16,11 +16,16 @@ package sqlserver
import (
"fmt"
"strings"
"sync"
"time"
"github.com/dolthub/go-mysql-server/server"
"github.com/prometheus/client_golang/prometheus"
"github.com/shirou/gopsutil/cpu"
"github.com/shirou/gopsutil/disk"
"github.com/shirou/gopsutil/mem"
"github.com/sirupsen/logrus"
"github.com/dolthub/dolt/go/libraries/doltcore/sqle/cluster"
"github.com/dolthub/dolt/go/libraries/doltcore/sqle/clusterdb"
@@ -28,7 +33,7 @@ import (
)
const (
clusterUpdateInterval = time.Second * 5
metricsUpdateInterval = time.Second * 5
dbLabel = "database"
roleLabel = "role"
@@ -51,6 +56,13 @@ type metricsListener struct {
isReplicaGauges *prometheus.GaugeVec
replicationLagGauges *prometheus.GaugeVec
// sys metrics
cpuUsage prometheus.Gauge
diskUsage prometheus.Gauge
memUsage prometheus.Gauge
mountPoint string
// used in updating cluster metrics
clusterStatus clusterdb.ClusterStatusProvider
mu *sync.Mutex
@@ -58,7 +70,28 @@ type metricsListener struct {
clusterSeenDbs map[string]struct{}
}
func newMetricsListener(labels prometheus.Labels, versionStr string, clusterStatus clusterdb.ClusterStatusProvider) (*metricsListener, error) {
func newMetricsListener(labels prometheus.Labels, versionStr, path string, clusterStatus clusterdb.ClusterStatusProvider) (*metricsListener, error) {
mountPoint := ""
if path != "" {
partitions, err := disk.Partitions(false)
if err != nil {
logrus.Info(fmt.Sprintf("Error getting disk partitions: %v", err))
} else {
for _, partition := range partitions {
if strings.HasPrefix(path, partition.Mountpoint) {
mountPoint = partition.Mountpoint
break
}
}
if mountPoint == "" {
logrus.Info(fmt.Sprintf("Could not find mount point for path '%s'", path))
}
}
}
ml := &metricsListener{
labels: labels,
cntConnections: prometheus.NewCounter(prometheus.CounterOpts{
@@ -102,9 +135,25 @@ func newMetricsListener(labels prometheus.Labels, versionStr string, clusterStat
Help: "one if the server is currently in this role, zero otherwise",
ConstLabels: labels,
}, []string{dbLabel}),
cpuUsage: prometheus.NewGauge(prometheus.GaugeOpts{
Name: "sys_cpu_usage",
Help: "The percentage of CPU used by the system",
ConstLabels: labels,
}),
diskUsage: prometheus.NewGauge(prometheus.GaugeOpts{
Name: "sys_disk_usage",
Help: "The percentage of disk used by the system",
ConstLabels: labels,
}),
memUsage: prometheus.NewGauge(prometheus.GaugeOpts{
Name: "sys_mem_usage",
Help: "The percentage of memory used by the system",
ConstLabels: labels,
}),
clusterStatus: clusterStatus,
mu: &sync.Mutex{},
clusterSeenDbs: make(map[string]struct{}),
mountPoint: mountPoint,
}
u32Version, err := version.Encode(versionStr)
@@ -126,10 +175,13 @@ func newMetricsListener(labels prometheus.Labels, versionStr string, clusterStat
prometheus.MustRegister(ml.histQueryDur)
prometheus.MustRegister(ml.replicationLagGauges)
prometheus.MustRegister(ml.isReplicaGauges)
prometheus.MustRegister(ml.cpuUsage)
prometheus.MustRegister(ml.diskUsage)
prometheus.MustRegister(ml.memUsage)
go func() {
for ml.updateReplMetrics() {
time.Sleep(clusterUpdateInterval)
for ml.pollMetrics() {
time.Sleep(metricsUpdateInterval)
}
}()
@@ -137,7 +189,7 @@ func newMetricsListener(labels prometheus.Labels, versionStr string, clusterStat
return ml, nil
}
func (ml *metricsListener) updateReplMetrics() bool {
func (ml *metricsListener) pollMetrics() bool {
ml.mu.Lock()
defer ml.mu.Unlock()
@@ -145,9 +197,16 @@ func (ml *metricsListener) updateReplMetrics() bool {
return false
}
ml.pollReplicationMetrics()
ml.pollSysMetrics()
return true
}
func (ml *metricsListener) pollReplicationMetrics() {
perDbStatus := ml.clusterStatus.GetClusterStatus()
if perDbStatus == nil {
return true
return
}
dbNames := make(map[string]struct{})
@@ -177,8 +236,36 @@ func (ml *metricsListener) updateReplMetrics() bool {
}
}
ml.clusterSeenDbs = dbNames
}
return true
func (ml *metricsListener) pollSysMetrics() {
percentages, err := cpu.Percent(0, false)
if err != nil {
logrus.Info(fmt.Sprintf("Error getting CPU diskUsage: %v", err))
} else if len(percentages) == 1 {
ml.cpuUsage.Set(percentages[0])
} else {
logrus.Info("Unexpected number of CPU diskUsage percentages returned: %d", len(percentages))
}
memStats, err := mem.VirtualMemory()
if err != nil {
logrus.Info(fmt.Sprintf("Error getting memory diskUsage: %v", err))
} else {
ml.memUsage.Set(memStats.UsedPercent)
}
diskUsage, err := disk.Usage(ml.mountPoint)
if err != nil {
logrus.Info(fmt.Sprintf("Error getting disk diskUsage for mount point '%s': %v", ml.mountPoint, err))
} else {
ml.diskUsage.Set(diskUsage.UsedPercent)
}
logrus.Info(fmt.Sprintf("Cpu: %.2f%%, Mem: %.2f%%, Disk: %.2f%%", percentages[0], memStats.UsedPercent, diskUsage.UsedPercent))
}
func (ml *metricsListener) ClientConnected() {
@@ -201,6 +288,11 @@ func (ml *metricsListener) QueryCompleted(success bool, duration time.Duration)
}
func (ml *metricsListener) Close() {
ml.mu.Lock()
defer ml.mu.Unlock()
ml.done = true
prometheus.Unregister(ml.gaugeVersion)
prometheus.Unregister(ml.cntConnections)
prometheus.Unregister(ml.cntDisconnects)
@@ -209,14 +301,16 @@ func (ml *metricsListener) Close() {
prometheus.Unregister(ml.histQueryDur)
ml.closeReplicationMetrics()
ml.closeSysMetrics()
}
func (ml *metricsListener) closeReplicationMetrics() {
ml.mu.Lock()
defer ml.mu.Unlock()
prometheus.Unregister(ml.replicationLagGauges)
prometheus.Unregister(ml.isReplicaGauges)
ml.done = true
}
func (ml *metricsListener) closeSysMetrics() {
prometheus.Unregister(ml.cpuUsage)
prometheus.Unregister(ml.diskUsage)
prometheus.Unregister(ml.memUsage)
}
go/cmd/dolt/commands/sqlserver/server.go
+7 -1
View File
@@ -526,7 +526,13 @@ func ConfigureServices(
InitMetricsListener := &svcs.AnonService{
InitF: func(context.Context) (err error) {
labels := cfg.ServerConfig.MetricsLabels()
metListener, err = newMetricsListener(labels, cfg.Version, clusterController)
path, err := cfg.DoltEnv.FS.Abs(".")
if err != nil {
logrus.Debug(fmt.Sprintf("Error getting absolute path for metrics listener: %v", err))
path = ""
}
metListener, err = newMetricsListener(labels, cfg.Version, path, clusterController)
return err
},
StopF: func() error {
go/go.mod
+1
View File
@@ -78,6 +78,7 @@ require (
github.com/oracle/oci-go-sdk/v65 v65.55.0
github.com/prometheus/client_golang v1.23.2
github.com/rs/zerolog v1.28.0
github.com/shirou/gopsutil v3.21.11+incompatible
github.com/shirou/gopsutil/v3 v3.22.1
github.com/tidwall/gjson v1.14.4
github.com/tidwall/sjson v1.2.5
go/go.sum
+2
View File
@@ -474,6 +474,8 @@ github.com/ruudk/golang-pdf417 v0.0.0-20181029194003-1af4ab5afa58/go.mod h1:6lfF
github.com/ruudk/golang-pdf417 v0.0.0-20201230142125-a7e3863a1245/go.mod h1:pQAZKsJ8yyVxGRWYNEm9oFB8ieLgKFnamEyDmSA0BRk=
github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0=
github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
github.com/shirou/gopsutil v3.21.11+incompatible h1:+1+c1VGhc88SSonWP6foOcLhvnKlUeu/erjjvaPEYiI=
github.com/shirou/gopsutil v3.21.11+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
github.com/shirou/gopsutil/v3 v3.22.1 h1:33y31Q8J32+KstqPfscvFwBlNJ6xLaBy4xqBXzlYV5w=
github.com/shirou/gopsutil/v3 v3.22.1/go.mod h1:WapW1AOOPlHyXr+yOyw3uYx36enocrtSoSBy0L5vUHY=
github.com/shopspring/decimal v1.4.0 h1:bxl37RwXBklmTi0C79JfXCEBD1cqqHt0bbgBAGFp81k=