fix: v1 metrics schema with scope metrics (#52)

Co-authored-by: Kristof Kowalski <k@ko.wal.ski>
krzko · Oct 6, 2022 · ef7cbcf · ef7cbcf
1 parent 5771f1b
commit ef7cbcf
Showing 1 changed file with 13 additions and 13 deletions.
diff --git a/library/otel_metrics_schema.sh b/library/otel_metrics_schema.sh
@@ -31,10 +31,10 @@ otel_metrics_resource_metrics=$(cat <<EOF
           {"key":"telemetry.sdk.language","value":{"stringValue":"${telemetry_sdk_lang}"}},
           {"key":"telemetry.sdk.version","value":{"stringValue":"${telemetry_sdk_ver}"}}
         ]
-	},
-      "instrumentationLibraryMetrics": [
+      },
+      "scopeMetrics": [
         {
-          "instrumentationLibrary": {},
+          "scope": {},
           "metrics": []
         }
       ]
@@ -115,7 +115,7 @@ otel_metrics_add_gauge() {
 EOF
 )
 
-  otel_metrics_resource_metrics=$(jq -r ".resourceMetrics[].instrumentationLibraryMetrics[-1].metrics += [$obj]" <<< "$otel_metrics_resource_metrics")
+  otel_metrics_resource_metrics=$(jq -r ".resourceMetrics[].scopeMetrics[-1].metrics += [$obj]" <<< "$otel_metrics_resource_metrics")
 
 }
 
@@ -151,7 +151,7 @@ otel_metrics_add_gauge_datapoint_int() {
 EOF
 )
 
-  otel_metrics_resource_metrics=$(jq -r ".resourceMetrics[].instrumentationLibraryMetrics[].metrics[-1].gauge.dataPoints += [$obj]" <<< "$otel_metrics_resource_metrics")
+  otel_metrics_resource_metrics=$(jq -r ".resourceMetrics[].scopeMetrics[].metrics[-1].gauge.dataPoints += [$obj]" <<< "$otel_metrics_resource_metrics")
 
 }
 
@@ -187,7 +187,7 @@ otel_metrics_add_gauge_datapoint_double() {
 EOF
 )
 
-  otel_metrics_resource_metrics=$(jq -r ".resourceMetrics[].instrumentationLibraryMetrics[].metrics[-1].gauge.dataPoints += [$obj]" <<< "$otel_metrics_resource_metrics")
+  otel_metrics_resource_metrics=$(jq -r ".resourceMetrics[].scopeMetrics[].metrics[-1].gauge.dataPoints += [$obj]" <<< "$otel_metrics_resource_metrics")
 
 }
 
@@ -220,7 +220,7 @@ otel_metrics_add_sum() {
 EOF
 )
 
-  otel_metrics_resource_metrics=$(jq -r ".resourceMetrics[].instrumentationLibraryMetrics[-1].metrics += [$obj]" <<< "$otel_metrics_resource_metrics")
+  otel_metrics_resource_metrics=$(jq -r ".resourceMetrics[].scopeMetrics[-1].metrics += [$obj]" <<< "$otel_metrics_resource_metrics")
 
 }
 
@@ -250,11 +250,11 @@ otel_metrics_add_sum_datapoint_double() {
 EOF
 )
 
-  otel_metrics_resource_metrics=$(jq -r ".resourceMetrics[].instrumentationLibraryMetrics[].metrics[-1].sum.dataPoints += [$obj]" <<< "$otel_metrics_resource_metrics")
+  otel_metrics_resource_metrics=$(jq -r ".resourceMetrics[].scopeMetrics[].metrics[-1].sum.dataPoints += [$obj]" <<< "$otel_metrics_resource_metrics")
 
 
-  otel_metrics_resource_metrics=$(jq -r ".resourceMetrics[].instrumentationLibraryMetrics[].metrics[-1].sum.aggregationTemporality = \"AGGREGATION_TEMPORALITY_CUMULATIVE\"" <<< "$otel_metrics_resource_metrics")
-  otel_metrics_resource_metrics=$(jq -r ".resourceMetrics[].instrumentationLibraryMetrics[].metrics[-1].sum.isMonotonic = true" <<< "$otel_metrics_resource_metrics")
+  otel_metrics_resource_metrics=$(jq -r ".resourceMetrics[].scopeMetrics[].metrics[-1].sum.aggregationTemporality = \"AGGREGATION_TEMPORALITY_CUMULATIVE\"" <<< "$otel_metrics_resource_metrics")
+  otel_metrics_resource_metrics=$(jq -r ".resourceMetrics[].scopeMetrics[].metrics[-1].sum.isMonotonic = true" <<< "$otel_metrics_resource_metrics")
 
 }
 
@@ -284,9 +284,9 @@ otel_metrics_add_sum_datapoint_int() {
 EOF
 )
 
-  otel_metrics_resource_metrics=$(jq -r ".resourceMetrics[].instrumentationLibraryMetrics[].metrics[-1].sum.dataPoints += [$obj]" <<< "$otel_metrics_resource_metrics")
+  otel_metrics_resource_metrics=$(jq -r ".resourceMetrics[].scopeMetrics[].metrics[-1].sum.dataPoints += [$obj]" <<< "$otel_metrics_resource_metrics")
 
 
-  otel_metrics_resource_metrics=$(jq -r ".resourceMetrics[].instrumentationLibraryMetrics[].metrics[-1].sum.aggregationTemporality = \"AGGREGATION_TEMPORALITY_CUMULATIVE\"" <<< "$otel_metrics_resource_metrics")
-  otel_metrics_resource_metrics=$(jq -r ".resourceMetrics[].instrumentationLibraryMetrics[].metrics[-1].sum.isMonotonic = true" <<< "$otel_metrics_resource_metrics")
+  otel_metrics_resource_metrics=$(jq -r ".resourceMetrics[].scopeMetrics[].metrics[-1].sum.aggregationTemporality = \"AGGREGATION_TEMPORALITY_CUMULATIVE\"" <<< "$otel_metrics_resource_metrics")
+  otel_metrics_resource_metrics=$(jq -r ".resourceMetrics[].scopeMetrics[].metrics[-1].sum.isMonotonic = true" <<< "$otel_metrics_resource_metrics")
 }