fix servicegraph bug(orgin open-telemetry#32019)

openinsight-proj · Apr 7, 2024 · 5b57c79 · 5b57c79
1 parent dfb29e3
commit 5b57c79
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 5 deletions.
diff --git a/connector/servicegraphconnector/connector.go b/connector/servicegraphconnector/connector.go
@@ -402,10 +402,9 @@ func (p *serviceGraphConnector) aggregateMetricsForEdge(e *store.Edge) {
 	p.seriesMutex.Lock()
 	defer p.seriesMutex.Unlock()
 	p.updateSeries(metricKey, dimensions)
+	p.updateCountMetrics(metricKey)
 	if e.Failed {
 		p.updateErrorMetrics(metricKey)
-	} else {
-		p.updateCountMetrics(metricKey)
 	}
 	p.updateDurationMetrics(metricKey, e.ServerLatencySec, e.ClientLatencySec)
 }

diff --git a/connector/servicegraphconnector/connector_test.go b/connector/servicegraphconnector/connector_test.go
@@ -124,10 +124,11 @@ func TestConnectorConsume(t *testing.T) {
 		assert.NoError(t, err)
 
 		err = pmetrictest.CompareMetrics(expectedMetrics, actualMetrics,
+			pmetrictest.IgnoreMetricsOrder(),
 			pmetrictest.IgnoreMetricDataPointsOrder(),
-			pmetrictest.IgnoreResourceMetricsOrder(),
-			pmetrictest.IgnoreResourceMetricsOrder(), pmetrictest.IgnoreStartTimestamp(),
-			pmetrictest.IgnoreTimestamp())
+			pmetrictest.IgnoreStartTimestamp(),
+			pmetrictest.IgnoreTimestamp(),
+		)
 		require.NoError(t, err)
 	})
 }

diff --git a/connector/servicegraphconnector/testdata/failed-label-not-work-expect-metrics.yaml b/connector/servicegraphconnector/testdata/failed-label-not-work-expect-metrics.yaml
@@ -23,6 +23,27 @@ resourceMetrics:
                   startTimeUnixNano: "1000000"
                   timeUnixNano: "2000000"
               isMonotonic: true
+          - name: traces_service_graph_request_total
+            sum:
+              aggregationTemporality: 2
+              dataPoints:
+                - asInt: "1"
+                  attributes:
+                    - key: client
+                      value:
+                        stringValue: foo
+                    - key: connection_type
+                      value:
+                        stringValue: ""
+                    - key: failed
+                      value:
+                        boolValue: true
+                    - key: server
+                      value:
+                        stringValue: bar
+                  startTimeUnixNano: "1000000"
+                  timeUnixNano: "2000000"
+              isMonotonic: true
           - name: traces_service_graph_request_failed_total
             sum:
               aggregationTemporality: 2