4

Author: iQQBot

components/ide-metrics-api/generate.sh

@@ -50,7 +50,7 @@ local_java_protoc() {
         --java_out=java/src/main/java \
         ./*.proto
     # remove trailing spaces
-    find "$COMPONENTS_DIR"/ide-metrics-api/java/src/main/java/io/gitpod/ide_metrics/api -maxdepth 1 -name "*.java" -exec sed -i -e "s/[[:space:]]*$//" {} \;
+    find "$COMPONENTS_DIR"/ide-metrics-api/java/src/main/java/io/gitpod/idemetrics/api -maxdepth 1 -name "*.java" -exec sed -i -e "s/[[:space:]]*$//" {} \;
 }
 
 install_dependencies

components/ide-metrics-api/go/config/config.go

@@ -5,29 +5,33 @@
 package config
 
 import (
+	"bytes"
+	"encoding/json"
+	"os"
+
 	"github.com/gitpod-io/gitpod/common-go/grpc"
+	"golang.org/x/xerrors"
 )
 
+type LabelAllowList struct {
+	Name        string   `json:"name"`
+	AllowValues []string `json:"allowValues"`
+}
+
 type ServiceConfiguration struct {
 	Server struct {
 		Port           int                       `json:"port"`
 		RateLimits     map[string]grpc.RateLimit `json:"ratelimits"`
 		CounterMetrics []struct {
-			Name   string `json:"name"`
-			Help   string `json:"help"`
-			Labels []struct {
-				Name        string   `json:"name"`
-				AllowValues []string `json:"allowValues"`
-			}
+			Name   string           `json:"name"`
+			Help   string           `json:"help"`
+			Labels []LabelAllowList `json:"labels"`
 		} `json:"counterMetrics"`
 		HistogramMetrics []struct {
-			Name   string `json:"name"`
-			Help   string `json:"help"`
-			Labels []struct {
-				Name        string   `json:"name"`
-				AllowValues []string `json:"allowValues"`
-			}
-			Buckets []float64 `json:"buckets"`
+			Name    string           `json:"name"`
+			Help    string           `json:"help"`
+			Labels  []LabelAllowList `json:"labels"`
+			Buckets []float64        `json:"buckets"`
 		} `json:"histogramMetrics"`
 	} `json:"server"`
 
@@ -39,3 +43,20 @@ type ServiceConfiguration struct {
 		Addr string `json:"addr"`
 	} `json:"prometheus"`
 }
+
+func Read(fn string) (*ServiceConfiguration, error) {
+	ctnt, err := os.ReadFile(fn)
+	if err != nil {
+		return nil, xerrors.Errorf("cannot read config file: %w", err)
+	}
+
+	var cfg ServiceConfiguration
+	dec := json.NewDecoder(bytes.NewReader(ctnt))
+	dec.DisallowUnknownFields()
+	err = dec.Decode(&cfg)
+	if err != nil {
+		return nil, xerrors.Errorf("cannot parse config file: %w", err)
+	}
+
+	return &cfg, nil
+}

components/ide-metrics-api/go/go.mod

@@ -28,7 +28,7 @@ require (
 	golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect
 	golang.org/x/text v0.3.7 // indirect
 	golang.org/x/time v0.0.0-20191024005414-555d28b269f0 // indirect
-	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
+	golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f // indirect
 )
 
 replace github.com/gitpod-io/gitpod/common-go => ../../common-go // leeway

components/ide-metrics-api/go/go.sum

@@ -426,6 +426,8 @@ golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8T
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f h1:uF6paiQQebLeSXkrTqHqz0MXhXXS1KgF41eUdBNvxK0=
+golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
 google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
 google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
 google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=