patch: Add ids to metric proto message and remove job reference message

cluttrdev · Jul 18, 2024 · f9c9fc2 · f9c9fc2
1 parent 44bf374
commit f9c9fc2
Show file tree

Hide file tree

Showing 3 changed files with 72 additions and 132 deletions.
diff --git a/internal/gitlab/client.go b/internal/gitlab/client.go
@@ -166,18 +166,18 @@ func (c *Client) GetPipelineHierarchy(ctx context.Context, projectID int64, pipe
 				}
 
 				if opt.FetchJobMetrics {
+					var metricIID int = 0
 					for _, m := range data.Metrics {
+						metricIID++
 						metric := &typespb.Metric{
+							Id:        []byte(fmt.Sprintf("%d-%d", job.Id, metricIID)),
+							Iid:       int64(metricIID),
+							JobId:     job.Id,
 							Name:      m.Name,
 							Labels:    convertLabels(m.Labels),
 							Value:     m.Value,
 							Timestamp: convertUnixMilli(m.Timestamp),
-							Job: &typespb.Metric_JobReference{
-								Id:   job.Id,
-								Name: job.Name,
-							},
 						}
-
 						metrics = append(metrics, metric)
 					}
 				}

diff --git a/protobuf/typespb/metric.pb.go b/protobuf/typespb/metric.pb.go
diff --git a/protos/gitlabexporter/protobuf/metric.proto b/protos/gitlabexporter/protobuf/metric.proto
@@ -7,22 +7,19 @@ package gitlabexporter.protobuf;
 import "google/protobuf/timestamp.proto";
 
 message Metric {
-    string name = 1;
+    bytes id = 1;
+    int64 iid = 2;
+    int64 job_id = 3;
+
+    string name = 10;
 
     message Label {
         string name = 1;
         string value = 2;
     }
-    repeated Label labels = 2;
-
-    double value = 3;
+    repeated Label labels = 11;
 
-    google.protobuf.Timestamp timestamp = 4;
-
-    message JobReference {
-        int64 id = 1;
-        string name = 2;
-    }
+    double value = 12;
 
-    JobReference job = 5;
+    google.protobuf.Timestamp timestamp = 13;
 }