Merge branch 'main' into getDimensionValue

.chloggen/fix-wrong-latency.yaml

@@ -0,0 +1,27 @@
+# Use this changelog template to create an entry for release notes.
+
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: bug_fix
+
+# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
+component: servicegraphconnector
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Fix incorrectly reversed latency settings for the server and client
+
+# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
+issues: [34933]
+
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext:
+
+# If your change doesn't affect end users or the exported elements of any package,
+# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
+# Optional: The change log or logs in which this entry should be included.
+# e.g. '[user]' or '[user, api]'
+# Include 'user' if the change is relevant to end users.
+# Include 'api' if there is a change to a library API.
+# Default: '[user]'
+change_logs: []

.golangci.yml

@@ -137,14 +137,14 @@ linters-settings:
       - compares
       - empty
       - error-is-as
-      - error-nil
       - expected-actual
       - float-compare
+      - formatter
       - go-require
       - negative-positive
-      - nil-compare
       - require-error
       - suite-dont-use-pkg
+      - suite-subtest-run
       - useless-assert
     enable-all: true
 

Makefile

@@ -147,6 +147,14 @@ golint:
 gogovulncheck:
 	$(MAKE) $(FOR_GROUP_TARGET) TARGET="govulncheck"
 
+.PHONY: gotestifylint
+gotestifylint:
+	$(MAKE) $(FOR_GROUP_TARGET) TARGET="testifylint"
+
+.PHONY: gotestifylint-fix
+gotestifylint-fix:
+	$(MAKE) $(FOR_GROUP_TARGET) TARGET="testifylint-fix"
+
 .PHONY: goporto
 goporto: $(PORTO)
 	$(PORTO) -w --include-internal --skip-dirs "^cmd$$" ./

Makefile.Common

@@ -72,8 +72,10 @@ BUILDER             := $(TOOLS_BIN_DIR)/builder
 GOVULNCHECK         := $(TOOLS_BIN_DIR)/govulncheck
 GCI                 := $(TOOLS_BIN_DIR)/gci
 GOTESTSUM           := $(TOOLS_BIN_DIR)/gotestsum
+TESTIFYLINT         := $(TOOLS_BIN_DIR)/testifylint
 
 GOTESTSUM_OPT?= --rerun-fails=1
+TESTIFYLINT_OPT?= --enable-all --disable=compares,empty,error-is-as,expected-actual,float-compare,formatter,go-require,negative-positive,require-error,suite-dont-use-pkg,suite-subtest-run,useless-assert
 
 # BUILD_TYPE should be one of (dev, release).
 BUILD_TYPE?=release
@@ -220,6 +222,15 @@ misspell-correction: $(TOOLS_BIN_DIR)/misspell
 moddownload:
 	$(GOCMD) mod download
 
+.PHONY: testifylint
+testifylint: $(TESTIFYLINT)
+	@echo "running $(TESTIFYLINT)"
+	$(TESTIFYLINT) $(TESTIFYLINT_OPT) ./...
+
+.PHONY: testifylint-fix
+testifylint-fix:
+	@$(MAKE) testifylint TESTIFYLINT_OPT="${TESTIFYLINT_OPT} --fix"
+
 .PHONY: gci
 gci: $(TOOLS_BIN_DIR)/gci
 	@echo "running $(GCI)"

README.md

@@ -77,7 +77,7 @@ Triagers ([@open-telemetry/collector-contrib-triagers](https://github.com/orgs/o
 
 Emeritus Triagers:
 
-- [Alolita Sharma](https://github.com/alolita), AWS
+- [Alolita Sharma](https://github.com/alolita), Apple
 - [Gabriel Aszalos](https://github.com/gbbr), DataDog
 - [Goutham Veeramachaneni](https://github.com/gouthamve), Grafana
 - [Punya Biswal](https://github.com/punya), Google

connector/countconnector/README.md

@@ -35,7 +35,7 @@ default behavior of the connector.
 | [Exporter Pipeline Type] | Description                         | Default Metric Names                         |
 | ------------------------ | ----------------------------------- | -------------------------------------------- |
 | traces                   | Counts all spans and span events.   | `trace.span.count`, `trace.span.event.count` |
-| metrics                  | Counts all metrics and data points. | `metric.count`, `metric.data_point.count`    |
+| metrics                  | Counts all metrics and data points. | `metric.count`, `metric.datapoint.count`    |
 | logs                     | Counts all log records.             | `log.record.count`                           |
 
 For example, in the following configuration the connector will count spans and span events from the `traces/in`

connector/servicegraphconnector/connector.go

@@ -546,9 +546,9 @@ func (p *serviceGraphConnector) collectClientLatencyMetrics(ilm pmetric.ScopeMet
 			dpDuration.SetStartTimestamp(pcommon.NewTimestampFromTime(p.startTime))
 			dpDuration.SetTimestamp(timestamp)
 			dpDuration.ExplicitBounds().FromRaw(p.reqDurationBounds)
-			dpDuration.BucketCounts().FromRaw(p.reqServerDurationSecondsBucketCounts[key])
-			dpDuration.SetCount(p.reqServerDurationSecondsCount[key])
-			dpDuration.SetSum(p.reqServerDurationSecondsSum[key])
+			dpDuration.BucketCounts().FromRaw(p.reqClientDurationSecondsBucketCounts[key])
+			dpDuration.SetCount(p.reqClientDurationSecondsCount[key])
+			dpDuration.SetSum(p.reqClientDurationSecondsSum[key])
 
 			// TODO: Support exemplars
 			dimensions, ok := p.dimensionsForSeries(key)
@@ -576,9 +576,9 @@ func (p *serviceGraphConnector) collectServerLatencyMetrics(ilm pmetric.ScopeMet
 			dpDuration.SetStartTimestamp(pcommon.NewTimestampFromTime(p.startTime))
 			dpDuration.SetTimestamp(timestamp)
 			dpDuration.ExplicitBounds().FromRaw(p.reqDurationBounds)
-			dpDuration.BucketCounts().FromRaw(p.reqClientDurationSecondsBucketCounts[key])
-			dpDuration.SetCount(p.reqClientDurationSecondsCount[key])
-			dpDuration.SetSum(p.reqClientDurationSecondsSum[key])
+			dpDuration.BucketCounts().FromRaw(p.reqServerDurationSecondsBucketCounts[key])
+			dpDuration.SetCount(p.reqServerDurationSecondsCount[key])
+			dpDuration.SetSum(p.reqServerDurationSecondsSum[key])
 
 			// TODO: Support exemplars
 			dimensions, ok := p.dimensionsForSeries(key)

connector/servicegraphconnector/connector_test.go

@@ -81,7 +81,7 @@ func TestConnectorConsume(t *testing.T) {
 				},
 			},
 			sampleTraces:  buildSampleTrace(t, "val"),
-			verifyMetrics: verifyHappyCaseMetrics,
+			verifyMetrics: verifyHappyCaseMetricsWithDuration(2, 1),
 		},
 		{
 			name: "test fix failed label not work",
@@ -163,7 +163,7 @@ func TestConnectorConsume(t *testing.T) {
 			},
 			sampleTraces:  buildSampleTrace(t, "val"),
 			gates:         []*featuregate.Gate{legacyLatencyUnitMsFeatureGate},
-			verifyMetrics: verifyHappyCaseMetricsWithDuration(1000),
+			verifyMetrics: verifyHappyCaseMetricsWithDuration(2000, 1000),
 		},
 	} {
 		t.Run(tc.name, func(t *testing.T) {
@@ -209,11 +209,7 @@ func getGoldenTraces(t *testing.T, file string) ptrace.Traces {
 	return td
 }
 
-func verifyHappyCaseMetrics(t *testing.T, md pmetric.Metrics) {
-	verifyHappyCaseMetricsWithDuration(1)(t, md)
-}
-
-func verifyHappyCaseMetricsWithDuration(durationSum float64) func(t *testing.T, md pmetric.Metrics) {
+func verifyHappyCaseMetricsWithDuration(serverDurationSum, clientDurationSum float64) func(t *testing.T, md pmetric.Metrics) {
 	return func(t *testing.T, md pmetric.Metrics) {
 		assert.Equal(t, 3, md.MetricCount())
 
@@ -231,11 +227,11 @@ func verifyHappyCaseMetricsWithDuration(durationSum float64) func(t *testing.T,
 
 		mServerDuration := ms.At(1)
 		assert.Equal(t, "traces_service_graph_request_server_seconds", mServerDuration.Name())
-		verifyDuration(t, mServerDuration, durationSum)
+		verifyDuration(t, mServerDuration, serverDurationSum, []uint64{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0})
 
 		mClientDuration := ms.At(2)
 		assert.Equal(t, "traces_service_graph_request_client_seconds", mClientDuration.Name())
-		verifyDuration(t, mClientDuration, durationSum)
+		verifyDuration(t, mClientDuration, clientDurationSum, []uint64{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0})
 	}
 }
 
@@ -259,16 +255,16 @@ func verifyCount(t *testing.T, m pmetric.Metric) {
 	verifyAttr(t, attributes, "client_some-attribute", "val")
 }
 
-func verifyDuration(t *testing.T, m pmetric.Metric, durationSum float64) {
+func verifyDuration(t *testing.T, m pmetric.Metric, durationSum float64, bs []uint64) {
 	assert.Equal(t, pmetric.MetricTypeHistogram, m.Type())
 	dps := m.Histogram().DataPoints()
 	assert.Equal(t, 1, dps.Len())
 
 	dp := dps.At(0)
-	assert.Equal(t, durationSum, dp.Sum()) // Duration: 1sec
+	assert.Equal(t, durationSum, dp.Sum()) // Duration: client is 1sec, server is 2sec
 	assert.Equal(t, uint64(1), dp.Count())
 	buckets := pcommon.NewUInt64Slice()
-	buckets.FromRaw([]uint64{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0})
+	buckets.FromRaw(bs)
 	assert.Equal(t, buckets, dp.BucketCounts())
 
 	attributes := dp.Attributes()
@@ -287,7 +283,10 @@ func verifyAttr(t *testing.T, attrs pcommon.Map, k, expected string) {
 
 func buildSampleTrace(t *testing.T, attrValue string) ptrace.Traces {
 	tStart := time.Date(2022, 1, 2, 3, 4, 5, 6, time.UTC)
-	tEnd := time.Date(2022, 1, 2, 3, 4, 6, 6, time.UTC)
+	// client: 1s
+	cEnd := time.Date(2022, 1, 2, 3, 4, 6, 6, time.UTC)
+	// server: 2s
+	sEnd := time.Date(2022, 1, 2, 3, 4, 7, 6, time.UTC)
 
 	traces := ptrace.NewTraces()
 
@@ -312,7 +311,7 @@ func buildSampleTrace(t *testing.T, attrValue string) ptrace.Traces {
 	clientSpan.SetTraceID(traceID)
 	clientSpan.SetKind(ptrace.SpanKindClient)
 	clientSpan.SetStartTimestamp(pcommon.NewTimestampFromTime(tStart))
-	clientSpan.SetEndTimestamp(pcommon.NewTimestampFromTime(tEnd))
+	clientSpan.SetEndTimestamp(pcommon.NewTimestampFromTime(cEnd))
 	clientSpan.Attributes().PutStr("some-attribute", attrValue) // Attribute selected as dimension for metrics
 	serverSpan := scopeSpans.Spans().AppendEmpty()
 	serverSpan.SetName("server span")
@@ -321,7 +320,7 @@ func buildSampleTrace(t *testing.T, attrValue string) ptrace.Traces {
 	serverSpan.SetParentSpanID(clientSpanID)
 	serverSpan.SetKind(ptrace.SpanKindServer)
 	serverSpan.SetStartTimestamp(pcommon.NewTimestampFromTime(tStart))
-	serverSpan.SetEndTimestamp(pcommon.NewTimestampFromTime(tEnd))
+	serverSpan.SetEndTimestamp(pcommon.NewTimestampFromTime(sEnd))
 
 	return traces
 }

connector/servicegraphconnector/testdata/virtual-node-label-client-expected-metrics.yaml

@@ -32,74 +32,74 @@ resourceMetrics:
           - histogram:
               aggregationTemporality: 2
               dataPoints:
-                  - attributes:
-                      - key: client
-                        value:
-                          stringValue: user
-                      - key: connection_type
-                        value:
-                          stringValue: virtual_node
-                      - key: failed
-                        value:
-                          boolValue: false
-                      - key: server
-                        value:
-                          stringValue: bar-requester
-                      - key: server_peer.service
-                        value:
-                          stringValue: external-platform
-                      - key: virtual_node
-                        value:
-                          stringValue: client
-                    bucketCounts:
-                      - "1"
-                      - "0"
-                      - "0"
-                      - "0"
-                    count: "1"
-                    explicitBounds:
-                      - 0.1
-                      - 1
-                      - 10
-                    startTimeUnixNano: "1000000"
-                    sum: 0.000000
-                    timeUnixNano: "2000000"
+                - attributes:
+                    - key: client
+                      value:
+                        stringValue: user
+                    - key: connection_type
+                      value:
+                        stringValue: virtual_node
+                    - key: failed
+                      value:
+                        boolValue: false
+                    - key: server
+                      value:
+                        stringValue: bar-requester
+                    - key: server_peer.service
+                      value:
+                        stringValue: external-platform
+                    - key: virtual_node
+                      value:
+                        stringValue: client
+                  bucketCounts:
+                    - "1"
+                    - "0"
+                    - "0"
+                    - "0"
+                  count: "1"
+                  explicitBounds:
+                    - 0.1
+                    - 1
+                    - 10
+                  startTimeUnixNano: "1000000"
+                  sum: 1e-06
+                  timeUnixNano: "2000000"
             name: traces_service_graph_request_server_seconds
           - histogram:
               aggregationTemporality: 2
               dataPoints:
-                  - attributes:
-                      - key: client
-                        value:
-                          stringValue: user
-                      - key: connection_type
-                        value:
-                          stringValue: virtual_node
-                      - key: failed
-                        value:
-                          boolValue: false
-                      - key: server
-                        value:
-                          stringValue: bar-requester
-                      - key: server_peer.service
-                        value:
-                          stringValue: external-platform
-                      - key: virtual_node
-                        value:
-                          stringValue: client
-                    bucketCounts:
-                      - "1"
-                      - "0"
-                      - "0"
-                      - "0"
-                    count: "1"
-                    explicitBounds:
-                      - 0.1
-                      - 1
-                      - 10
-                    startTimeUnixNano: "1000000"
-                    sum: 0.000001
-                    timeUnixNano: "2000000"
+                - attributes:
+                    - key: client
+                      value:
+                        stringValue: user
+                    - key: connection_type
+                      value:
+                        stringValue: virtual_node
+                    - key: failed
+                      value:
+                        boolValue: false
+                    - key: server
+                      value:
+                        stringValue: bar-requester
+                    - key: server_peer.service
+                      value:
+                        stringValue: external-platform
+                    - key: virtual_node
+                      value:
+                        stringValue: client
+                  bucketCounts:
+                    - "1"
+                    - "0"
+                    - "0"
+                    - "0"
+                  count: "1"
+                  explicitBounds:
+                    - 0.1
+                    - 1
+                    - 10
+                  startTimeUnixNano: "1000000"
+                  sum: 0
+                  timeUnixNano: "2000000"
             name: traces_service_graph_request_client_seconds
         scope:
           name: traces_service_graph

connector/servicegraphconnector/testdata/virtual-node-label-server-expected-metrics.yaml

@@ -56,7 +56,7 @@ resourceMetrics:
                     - 1
                     - 10
                   startTimeUnixNano: "1000000"
-                  sum: 0.000001
+                  sum: 0
                   timeUnixNano: "2000000"
             name: traces_service_graph_request_server_seconds
           - histogram:
@@ -89,7 +89,7 @@ resourceMetrics:
                     - 1
                     - 10
                   startTimeUnixNano: "1000000"
-                  sum: 0.000000
+                  sum: 1e-06
                   timeUnixNano: "2000000"
             name: traces_service_graph_request_client_seconds
         scope:

exporter/alibabacloudlogserviceexporter/trace_exporter_test.go

@@ -31,7 +31,7 @@ func TestNewTracesExporter(t *testing.T) {
 	// This will put trace data to send buffer and return success.
 	err = got.ConsumeTraces(context.Background(), traces)
 	assert.NoError(t, err)
-	assert.Nil(t, got.Shutdown(context.Background()))
+	assert.NoError(t, got.Shutdown(context.Background()))
 }
 
 func TestNewFailsWithEmptyTracesExporterName(t *testing.T) {