Merge branch 'sbruens/service' into sbruens/caddy

cmd/outline-ss-server/metrics.go

@@ -46,17 +46,19 @@ func newPrometheusServerMetrics() *serverMetrics {
 		}),
 		ports: prometheus.NewGauge(prometheus.GaugeOpts{
 			Name: "ports",
-			Help: "Count of open Shadowsocks ports",
+			Help: "Count of open ports",
 		}),
 	}
 }
 
 func (m *serverMetrics) Describe(ch chan<- *prometheus.Desc) {
+	m.buildInfo.Describe(ch)
 	m.accessKeys.Describe(ch)
 	m.ports.Describe(ch)
 }
 
 func (m *serverMetrics) Collect(ch chan<- prometheus.Metric) {
+	m.buildInfo.Describe(ch)
 	m.accessKeys.Collect(ch)
 	m.ports.Collect(ch)
 }

cmd/outline-ss-server/server_test.go

@@ -17,14 +17,17 @@ package main
 import (
 	"testing"
 	"time"
+
+	"github.com/Jigsaw-Code/outline-ss-server/prometheus"
 )
 
 func TestRunSSServer(t *testing.T) {
-	m, err := newPrometheusOutlineMetrics(nil)
+	serverMetrics := newPrometheusServerMetrics()
+	serviceMetrics, err := prometheus.NewServiceMetrics(nil)
 	if err != nil {
-		t.Fatalf("Failed to create Prometheus metrics: %v", err)
+		t.Fatalf("Failed to create Prometheus service metrics: %v", err)
 	}
-	server, err := RunSSServer("config_example.yml", 30*time.Second, m, 10000)
+	server, err := RunSSServer("config_example.yml", 30*time.Second, serverMetrics, serviceMetrics, 10000)
 	if err != nil {
 		t.Fatalf("RunSSServer() error = %v", err)
 	}