Revert "[OTAGENT-359] use equiv_otel in DD exporter and connector metrics (#1…" (#20013)

songy23 · web-flow · commit 9ddd493bebe1 · 2025-04-04T19:11:24.000Z
This reverts commit 93d9582.
diff --git a/otel/assets/dashboards/otel_collector_metrics_dashboard.json b/otel/assets/dashboards/otel_collector_metrics_dashboard.json
@@ -1994,7 +1994,7 @@
                                 {
                                     "formulas": [
                                         {
-                                            "formula": "equiv_otel(query1)"
+                                            "formula": "query1"
                                         }
                                     ],
                                     "queries": [
@@ -2039,7 +2039,7 @@
                                 {
                                     "formulas": [
                                         {
-                                            "formula": "equiv_otel(query1)"
+                                            "formula": "query1"
                                         }
                                     ],
                                     "queries": [
@@ -2106,11 +2106,11 @@
                                     "formulas": [
                                         {
                                             "alias": "Max",
-                                            "formula": "equiv_otel(query1)"
+                                            "formula": "query1"
                                         },
                                         {
                                             "alias": "Avg",
-                                            "formula": "equiv_otel(query2)"
+                                            "formula": "query2"
                                         }
                                     ],
                                     "queries": [
@@ -2167,7 +2167,7 @@
                                 {
                                     "formulas": [
                                         {
-                                            "formula": "equiv_otel(query1)"
+                                            "formula": "query1"
                                         }
                                     ],
                                     "queries": [
@@ -2219,7 +2219,7 @@
                                 {
                                     "formulas": [
                                         {
-                                            "formula": "equiv_otel(query1)"
+                                            "formula": "query1"
                                         }
                                     ],
                                     "queries": [
@@ -2292,7 +2292,7 @@
                                 {
                                     "formulas": [
                                         {
-                                            "formula": "equiv_otel(query1)"
+                                            "formula": "query1"
                                         }
                                     ],
                                     "queries": [
@@ -2358,7 +2358,7 @@
                                 {
                                     "formulas": [
                                         {
-                                            "formula": "equiv_otel(query1)"
+                                            "formula": "query1"
                                         }
                                     ],
                                     "queries": [
@@ -2410,7 +2410,7 @@
                                 {
                                     "formulas": [
                                         {
-                                            "formula": "equiv_otel(query1)"
+                                            "formula": "query1"
                                         }
                                     ],
                                     "queries": [
@@ -2483,7 +2483,7 @@
                                 {
                                     "formulas": [
                                         {
-                                            "formula": "equiv_otel(query1)"
+                                            "formula": "query1"
                                         }
                                     ],
                                     "queries": [
@@ -2540,12 +2540,13 @@
                                         {
                                             "query": "sum:otelcol_datadog_trace_agent_stats_writer_stats_entries{$host,source:datadogexporter,$service}.as_count()",
                                             "data_source": "metrics",
-                                            "name": "query1"
+                                            "name": "query1",
+                                            "aggregator": "avg"
                                         }
                                     ],
                                     "formulas": [
                                         {
-                                            "formula": "reduce(equiv_otel(query1), 'avg')"
+                                            "formula": "query1"
                                         }
                                     ]
                                 }
@@ -2626,7 +2627,7 @@
                                 {
                                     "formulas": [
                                         {
-                                            "formula": "equiv_otel(query1)"
+                                            "formula": "query1"
                                         }
                                     ],
                                     "queries": [
@@ -2678,7 +2679,7 @@
                                 {
                                     "formulas": [
                                         {
-                                            "formula": "equiv_otel(query1)"
+                                            "formula": "query1"
                                         }
                                     ],
                                     "queries": [
@@ -2730,7 +2731,7 @@
                                 {
                                     "formulas": [
                                         {
-                                            "formula": "equiv_otel(query1)"
+                                            "formula": "query1"
                                         }
                                     ],
                                     "queries": [
@@ -2775,7 +2776,7 @@
                                 {
                                     "formulas": [
                                         {
-                                            "formula": "equiv_otel(query1)"
+                                            "formula": "query1"
                                         }
                                     ],
                                     "queries": [
@@ -2841,7 +2842,7 @@
                                 {
                                     "formulas": [
                                         {
-                                            "formula": "equiv_otel(query1)"
+                                            "formula": "query1"
                                         }
                                     ],
                                     "queries": [
@@ -2886,7 +2887,7 @@
                                 {
                                     "formulas": [
                                         {
-                                            "formula": "equiv_otel(query1)"
+                                            "formula": "query1"
                                         }
                                     ],
                                     "queries": [
@@ -2931,7 +2932,7 @@
                                 {
                                     "formulas": [
                                         {
-                                            "formula": "equiv_otel(query1)"
+                                            "formula": "query1"
                                         }
                                     ],
                                     "queries": [
@@ -2997,7 +2998,7 @@
                                 {
                                     "formulas": [
                                         {
-                                            "formula": "equiv_otel(query1)"
+                                            "formula": "query1"
                                         }
                                     ],
                                     "queries": [

Original file line number	Diff line number	Diff line change
`@@ -1994,7 +1994,7 @@`
`1994`	`1994`	`{`
`1995`	`1995`	`"formulas": [`
`1996`	`1996`	`{`
`1997`		`- "formula": "equiv_otel(query1)"`
	`1997`	`+ "formula": "query1"`
`1998`	`1998`	`}`
`1999`	`1999`	`],`
`2000`	`2000`	`"queries": [`
`@@ -2039,7 +2039,7 @@`
`2039`	`2039`	`{`
`2040`	`2040`	`"formulas": [`
`2041`	`2041`	`{`
`2042`		`- "formula": "equiv_otel(query1)"`
	`2042`	`+ "formula": "query1"`
`2043`	`2043`	`}`
`2044`	`2044`	`],`
`2045`	`2045`	`"queries": [`
`@@ -2106,11 +2106,11 @@`
`2106`	`2106`	`"formulas": [`
`2107`	`2107`	`{`
`2108`	`2108`	`"alias": "Max",`
`2109`		`- "formula": "equiv_otel(query1)"`
	`2109`	`+ "formula": "query1"`
`2110`	`2110`	`},`
`2111`	`2111`	`{`
`2112`	`2112`	`"alias": "Avg",`
`2113`		`- "formula": "equiv_otel(query2)"`
	`2113`	`+ "formula": "query2"`
`2114`	`2114`	`}`
`2115`	`2115`	`],`
`2116`	`2116`	`"queries": [`
`@@ -2167,7 +2167,7 @@`
`2167`	`2167`	`{`
`2168`	`2168`	`"formulas": [`
`2169`	`2169`	`{`
`2170`		`- "formula": "equiv_otel(query1)"`
	`2170`	`+ "formula": "query1"`
`2171`	`2171`	`}`
`2172`	`2172`	`],`
`2173`	`2173`	`"queries": [`
`@@ -2219,7 +2219,7 @@`
`2219`	`2219`	`{`
`2220`	`2220`	`"formulas": [`
`2221`	`2221`	`{`
`2222`		`- "formula": "equiv_otel(query1)"`
	`2222`	`+ "formula": "query1"`
`2223`	`2223`	`}`
`2224`	`2224`	`],`
`2225`	`2225`	`"queries": [`
`@@ -2292,7 +2292,7 @@`
`2292`	`2292`	`{`
`2293`	`2293`	`"formulas": [`
`2294`	`2294`	`{`
`2295`		`- "formula": "equiv_otel(query1)"`
	`2295`	`+ "formula": "query1"`
`2296`	`2296`	`}`
`2297`	`2297`	`],`
`2298`	`2298`	`"queries": [`
`@@ -2358,7 +2358,7 @@`
`2358`	`2358`	`{`
`2359`	`2359`	`"formulas": [`
`2360`	`2360`	`{`
`2361`		`- "formula": "equiv_otel(query1)"`
	`2361`	`+ "formula": "query1"`
`2362`	`2362`	`}`
`2363`	`2363`	`],`
`2364`	`2364`	`"queries": [`
`@@ -2410,7 +2410,7 @@`
`2410`	`2410`	`{`
`2411`	`2411`	`"formulas": [`
`2412`	`2412`	`{`
`2413`		`- "formula": "equiv_otel(query1)"`
	`2413`	`+ "formula": "query1"`
`2414`	`2414`	`}`
`2415`	`2415`	`],`
`2416`	`2416`	`"queries": [`
`@@ -2483,7 +2483,7 @@`
`2483`	`2483`	`{`
`2484`	`2484`	`"formulas": [`
`2485`	`2485`	`{`
`2486`		`- "formula": "equiv_otel(query1)"`
	`2486`	`+ "formula": "query1"`
`2487`	`2487`	`}`
`2488`	`2488`	`],`
`2489`	`2489`	`"queries": [`
`@@ -2540,12 +2540,13 @@`
`2540`	`2540`	`{`
`2541`	`2541`	`"query": "sum:otelcol_datadog_trace_agent_stats_writer_stats_entries{$host,source:datadogexporter,$service}.as_count()",`
`2542`	`2542`	`"data_source": "metrics",`
`2543`		`- "name": "query1"`
	`2543`	`+ "name": "query1",`
	`2544`	`+ "aggregator": "avg"`
`2544`	`2545`	`}`
`2545`	`2546`	`],`
`2546`	`2547`	`"formulas": [`
`2547`	`2548`	`{`
`2548`		`- "formula": "reduce(equiv_otel(query1), 'avg')"`
	`2549`	`+ "formula": "query1"`
`2549`	`2550`	`}`
`2550`	`2551`	`]`
`2551`	`2552`	`}`
`@@ -2626,7 +2627,7 @@`
`2626`	`2627`	`{`
`2627`	`2628`	`"formulas": [`
`2628`	`2629`	`{`
`2629`		`- "formula": "equiv_otel(query1)"`
	`2630`	`+ "formula": "query1"`
`2630`	`2631`	`}`
`2631`	`2632`	`],`
`2632`	`2633`	`"queries": [`
`@@ -2678,7 +2679,7 @@`
`2678`	`2679`	`{`
`2679`	`2680`	`"formulas": [`
`2680`	`2681`	`{`
`2681`		`- "formula": "equiv_otel(query1)"`
	`2682`	`+ "formula": "query1"`
`2682`	`2683`	`}`
`2683`	`2684`	`],`
`2684`	`2685`	`"queries": [`
`@@ -2730,7 +2731,7 @@`
`2730`	`2731`	`{`
`2731`	`2732`	`"formulas": [`
`2732`	`2733`	`{`
`2733`		`- "formula": "equiv_otel(query1)"`
	`2734`	`+ "formula": "query1"`
`2734`	`2735`	`}`
`2735`	`2736`	`],`
`2736`	`2737`	`"queries": [`
`@@ -2775,7 +2776,7 @@`
`2775`	`2776`	`{`
`2776`	`2777`	`"formulas": [`
`2777`	`2778`	`{`
`2778`		`- "formula": "equiv_otel(query1)"`
	`2779`	`+ "formula": "query1"`
`2779`	`2780`	`}`
`2780`	`2781`	`],`
`2781`	`2782`	`"queries": [`
`@@ -2841,7 +2842,7 @@`
`2841`	`2842`	`{`
`2842`	`2843`	`"formulas": [`
`2843`	`2844`	`{`
`2844`		`- "formula": "equiv_otel(query1)"`
	`2845`	`+ "formula": "query1"`
`2845`	`2846`	`}`
`2846`	`2847`	`],`
`2847`	`2848`	`"queries": [`
`@@ -2886,7 +2887,7 @@`
`2886`	`2887`	`{`
`2887`	`2888`	`"formulas": [`
`2888`	`2889`	`{`
`2889`		`- "formula": "equiv_otel(query1)"`
	`2890`	`+ "formula": "query1"`
`2890`	`2891`	`}`
`2891`	`2892`	`],`
`2892`	`2893`	`"queries": [`
`@@ -2931,7 +2932,7 @@`
`2931`	`2932`	`{`
`2932`	`2933`	`"formulas": [`
`2933`	`2934`	`{`
`2934`		`- "formula": "equiv_otel(query1)"`
	`2935`	`+ "formula": "query1"`
`2935`	`2936`	`}`
`2936`	`2937`	`],`
`2937`	`2938`	`"queries": [`
`@@ -2997,7 +2998,7 @@`
`2997`	`2998`	`{`
`2998`	`2999`	`"formulas": [`
`2999`	`3000`	`{`
`3000`		`- "formula": "equiv_otel(query1)"`
	`3001`	`+ "formula": "query1"`
`3001`	`3002`	`}`
`3002`	`3003`	`],`
`3003`	`3004`	`"queries": [`