1

components/ide-proxy/components/ide-metrics-api/generate.sh → components/ide-metrics-api/generate.sh

@@ -8,7 +8,7 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-ROOT_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd -P)/../../../../
+ROOT_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd -P)/../../
 COMPONENTS_DIR=$ROOT_DIR/components
 
 # include protoc bash functions
@@ -50,7 +50,7 @@ local_java_protoc() {
         --java_out=java/src/main/java \
         ./*.proto
     # remove trailing spaces
-    find "$COMPONENTS_DIR"/ide-proxy/components/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/ide_metrics/api -maxdepth 1 -name "*.java" -exec sed -i -e "s/[[:space:]]*$//" {} \;
 }
 
 install_dependencies

components/ide-proxy/components/ide-metrics-api/go/BUILD.yaml → components/ide-metrics-api/go/BUILD.yaml

@@ -1,6 +1,8 @@
 packages:
   - name: lib
     type: go
+    deps:
+      - components/common-go:lib
     srcs:
       - "**/*.go"
       - "go.mod"

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

@@ -10,12 +10,7 @@ import (
 
 type ServiceConfiguration struct {
 	Server struct {
-		Port int `json:"port"`
-		// TLS  struct {
-		// 	CA          string `json:"ca"`
-		// 	Certificate string `json:"crt"`
-		// 	PrivateKey  string `json:"key"`
-		// } `json:"tls"`
+		Port       int                       `json:"port"`
 		RateLimits map[string]grpc.RateLimit `json:"ratelimits"`
 	} `json:"server"`
 

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

@@ -0,0 +1,34 @@
+module github.com/gitpod-io/gitpod/ide-metrics-api
+
+go 1.18
+
+require (
+	github.com/gitpod-io/gitpod/common-go v0.0.0-00010101000000-000000000000
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.5.0
+	google.golang.org/genproto v0.0.0-20210617175327-b9e0b3197ced
+	google.golang.org/grpc v1.45.0
+	google.golang.org/protobuf v1.28.0
+)
+
+require (
+	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/cespare/xxhash/v2 v2.1.2 // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
+	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
+	github.com/hashicorp/golang-lru v0.5.1 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
+	github.com/opentracing/opentracing-go v1.2.0 // indirect
+	github.com/prometheus/client_golang v1.12.1 // indirect
+	github.com/prometheus/client_model v0.2.0 // indirect
+	github.com/prometheus/common v0.32.1 // indirect
+	github.com/prometheus/procfs v0.7.3 // indirect
+	github.com/sirupsen/logrus v1.8.1 // indirect
+	golang.org/x/net v0.0.0-20211209124913-491a49abca63 // indirect
+	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
+)
+
+replace github.com/gitpod-io/gitpod/common-go => ../../common-go // leeway