add le to bucket metrics

hasura · Sep 28, 2024 · 80aa596 · 80aa596
1 parent ef0939e
commit 80aa596
Show file tree

Hide file tree

Showing 14 changed files with 7,117 additions and 48 deletions.
diff --git a/Makefile b/Makefile
@@ -38,7 +38,7 @@ ci-build-configuration: clean
 		-output="$(OUTPUT_DIR)/ndc-prometheus-{{.OS}}-{{.Arch}}" \
 		./configuration
 
-.PHONY: ci-build
+.PHONY: build-supergraph-test
 build-supergraph-test:
 	cd tests/engine && \
 		ddn connector-link update prometheus --add-all-resources --subgraph ./app/subgraph.yaml && \

diff --git a/connector/metadata/schema.go b/connector/metadata/schema.go
@@ -71,20 +71,24 @@ func (scb *connectorSchemaBuilder) buildMetrics() error {
 		case model.MetricTypeHistogram, model.MetricTypeGaugeHistogram:
 			for _, suffix := range []string{"sum", "count", "bucket"} {
 				metricName := fmt.Sprintf("%s_%s", name, suffix)
-				if err := scb.buildMetricsItem(metricName, info); err != nil {
+				labels := info.Labels
+				if suffix == "bucket" {
+					labels["le"] = LabelInfo{}
+				}
+				if err := scb.buildMetricsItem(metricName, info, labels); err != nil {
 					return err
 				}
 			}
 		default:
-			if err := scb.buildMetricsItem(name, info); err != nil {
+			if err := scb.buildMetricsItem(name, info, info.Labels); err != nil {
 				return err
 			}
 		}
 	}
 	return nil
 }
 
-func (scb *connectorSchemaBuilder) buildMetricsItem(name string, info MetricInfo) error {
+func (scb *connectorSchemaBuilder) buildMetricsItem(name string, info MetricInfo, labels map[string]LabelInfo) error {
 	if err := scb.checkDuplicatedOperation(name); err != nil {
 		return err
 	}
@@ -93,8 +97,8 @@ func (scb *connectorSchemaBuilder) buildMetricsItem(name string, info MetricInfo
 		Fields: createQueryResultValuesObjectFields(),
 	}
 
-	labelEnums := make([]string, 0, len(info.Labels))
-	for key, label := range info.Labels {
+	labelEnums := make([]string, 0, len(labels))
+	for key, label := range labels {
 		labelEnums = append(labelEnums, key)
 		objectType.Fields[key] = schema.ObjectField{
 			Description: label.Description,

diff --git a/tests/configuration/configuration.yaml b/tests/configuration/configuration.yaml
@@ -8,11 +8,6 @@ connection_settings:
         env: PROMETHEUS_USERNAME
       password:
         env: PROMETHEUS_PASSWORD
-runtime:
-  flat: true
-  format:
-    timestamp: rfc3339
-    value: float64
 generator:
   metrics:
     enabled: true
@@ -213,3 +208,8 @@ metadata:
             type: String
           job:
             type: String
+runtime:
+  flat: true
+  format:
+    timestamp: rfc3339
+    value: float64