Merge branch 'main' into coralogix-proc-impl

.chloggen/feat_33227.yaml

@@ -0,0 +1,29 @@
+# Use this changelog template to create an entry for release notes.
+
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: breaking
+
+# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
+component: spanmetricsconnector
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Improve consistency between metrics generated by spanmetricsconnector. Added traces.span.metrics as default namespace 
+
+# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
+issues: [33227, 32818]
+
+# (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: "Default namespace for the generated metrics is traces.span.metrics now. |
+  The deprecated metrics are: calls, duration and events. |
+  The feature flag connector.spanmetrics.legacyLatencyMetricNames was added to revert the behavior."
+
+# 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: [user]

.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)"

cmd/otelcontribcol/go.mod

@@ -289,65 +289,65 @@ require (
 	github.com/Azure/go-autorest/tracing v0.6.0 // indirect
 	github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect
 	github.com/ClickHouse/ch-go v0.61.5 // indirect
-	github.com/ClickHouse/clickhouse-go/v2 v2.28.1 // indirect
+	github.com/ClickHouse/clickhouse-go/v2 v2.28.2 // indirect
 	github.com/Code-Hex/go-generics-cache v1.5.1 // indirect
 	github.com/DataDog/agent-payload/v5 v5.0.131 // indirect
-	github.com/DataDog/datadog-agent/comp/core/config v0.56.0 // indirect
-	github.com/DataDog/datadog-agent/comp/core/flare/builder v0.56.0 // indirect
-	github.com/DataDog/datadog-agent/comp/core/flare/types v0.56.0 // indirect
-	github.com/DataDog/datadog-agent/comp/core/hostname/hostnameinterface v0.56.0 // indirect
-	github.com/DataDog/datadog-agent/comp/core/log v0.56.0 // indirect
-	github.com/DataDog/datadog-agent/comp/core/secrets v0.56.0 // indirect
-	github.com/DataDog/datadog-agent/comp/core/telemetry v0.56.0 // indirect
-	github.com/DataDog/datadog-agent/comp/def v0.56.0 // indirect
-	github.com/DataDog/datadog-agent/comp/logs/agent/config v0.56.0 // indirect
-	github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline v0.56.0 // indirect
-	github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline/logsagentpipelineimpl v0.56.0 // indirect
-	github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/exporter/logsagentexporter v0.56.0 // indirect
-	github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/metricsclient v0.56.0 // indirect
-	github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/statsprocessor v0.56.0 // indirect
-	github.com/DataDog/datadog-agent/comp/trace/compression/def v0.56.0 // indirect
-	github.com/DataDog/datadog-agent/comp/trace/compression/impl-gzip v0.56.0 // indirect
-	github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.56.0 // indirect
-	github.com/DataDog/datadog-agent/pkg/config/env v0.56.0 // indirect
-	github.com/DataDog/datadog-agent/pkg/config/model v0.56.0 // indirect
-	github.com/DataDog/datadog-agent/pkg/config/setup v0.56.0 // indirect
-	github.com/DataDog/datadog-agent/pkg/config/utils v0.56.0 // indirect
-	github.com/DataDog/datadog-agent/pkg/logs/auditor v0.56.0 // indirect
-	github.com/DataDog/datadog-agent/pkg/logs/client v0.56.0 // indirect
-	github.com/DataDog/datadog-agent/pkg/logs/diagnostic v0.56.0 // indirect
-	github.com/DataDog/datadog-agent/pkg/logs/message v0.56.0 // indirect
-	github.com/DataDog/datadog-agent/pkg/logs/metrics v0.56.0 // indirect
-	github.com/DataDog/datadog-agent/pkg/logs/pipeline v0.56.0 // indirect
-	github.com/DataDog/datadog-agent/pkg/logs/processor v0.56.0 // indirect
-	github.com/DataDog/datadog-agent/pkg/logs/sds v0.56.0 // indirect
-	github.com/DataDog/datadog-agent/pkg/logs/sender v0.56.0 // indirect
-	github.com/DataDog/datadog-agent/pkg/logs/sources v0.56.0 // indirect
-	github.com/DataDog/datadog-agent/pkg/logs/status/statusinterface v0.56.0 // indirect
-	github.com/DataDog/datadog-agent/pkg/logs/status/utils v0.56.0 // indirect
-	github.com/DataDog/datadog-agent/pkg/obfuscate v0.56.0 // indirect
-	github.com/DataDog/datadog-agent/pkg/proto v0.56.0 // indirect
-	github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.56.0 // indirect
-	github.com/DataDog/datadog-agent/pkg/status/health v0.56.0 // indirect
-	github.com/DataDog/datadog-agent/pkg/telemetry v0.56.0 // indirect
+	github.com/DataDog/datadog-agent/comp/core/config v0.56.2 // indirect
+	github.com/DataDog/datadog-agent/comp/core/flare/builder v0.56.2 // indirect
+	github.com/DataDog/datadog-agent/comp/core/flare/types v0.56.2 // indirect
+	github.com/DataDog/datadog-agent/comp/core/hostname/hostnameinterface v0.56.2 // indirect
+	github.com/DataDog/datadog-agent/comp/core/log v0.56.2 // indirect
+	github.com/DataDog/datadog-agent/comp/core/secrets v0.56.2 // indirect
+	github.com/DataDog/datadog-agent/comp/core/telemetry v0.56.2 // indirect
+	github.com/DataDog/datadog-agent/comp/def v0.56.2 // indirect
+	github.com/DataDog/datadog-agent/comp/logs/agent/config v0.56.2 // indirect
+	github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline v0.56.2 // indirect
+	github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline/logsagentpipelineimpl v0.56.2 // indirect
+	github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/exporter/logsagentexporter v0.56.2 // indirect
+	github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/metricsclient v0.56.2 // indirect
+	github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/statsprocessor v0.56.2 // indirect
+	github.com/DataDog/datadog-agent/comp/trace/compression/def v0.56.2 // indirect
+	github.com/DataDog/datadog-agent/comp/trace/compression/impl-gzip v0.56.2 // indirect
+	github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.56.2 // indirect
+	github.com/DataDog/datadog-agent/pkg/config/env v0.56.2 // indirect
+	github.com/DataDog/datadog-agent/pkg/config/model v0.56.2 // indirect
+	github.com/DataDog/datadog-agent/pkg/config/setup v0.56.2 // indirect
+	github.com/DataDog/datadog-agent/pkg/config/utils v0.56.2 // indirect
+	github.com/DataDog/datadog-agent/pkg/logs/auditor v0.56.2 // indirect
+	github.com/DataDog/datadog-agent/pkg/logs/client v0.56.2 // indirect
+	github.com/DataDog/datadog-agent/pkg/logs/diagnostic v0.56.2 // indirect
+	github.com/DataDog/datadog-agent/pkg/logs/message v0.56.2 // indirect
+	github.com/DataDog/datadog-agent/pkg/logs/metrics v0.56.2 // indirect
+	github.com/DataDog/datadog-agent/pkg/logs/pipeline v0.56.2 // indirect
+	github.com/DataDog/datadog-agent/pkg/logs/processor v0.56.2 // indirect
+	github.com/DataDog/datadog-agent/pkg/logs/sds v0.56.2 // indirect
+	github.com/DataDog/datadog-agent/pkg/logs/sender v0.56.2 // indirect
+	github.com/DataDog/datadog-agent/pkg/logs/sources v0.56.2 // indirect
+	github.com/DataDog/datadog-agent/pkg/logs/status/statusinterface v0.56.2 // indirect
+	github.com/DataDog/datadog-agent/pkg/logs/status/utils v0.56.2 // indirect
+	github.com/DataDog/datadog-agent/pkg/obfuscate v0.56.2 // indirect
+	github.com/DataDog/datadog-agent/pkg/proto v0.56.2 // indirect
+	github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.56.2 // indirect
+	github.com/DataDog/datadog-agent/pkg/status/health v0.56.2 // indirect
+	github.com/DataDog/datadog-agent/pkg/telemetry v0.56.2 // indirect
 	github.com/DataDog/datadog-agent/pkg/trace v0.57.0-devel.0.20240722160158-ad956a31a730 // indirect
-	github.com/DataDog/datadog-agent/pkg/util/backoff v0.56.0 // indirect
-	github.com/DataDog/datadog-agent/pkg/util/cgroups v0.56.0 // indirect
-	github.com/DataDog/datadog-agent/pkg/util/executable v0.56.0 // indirect
-	github.com/DataDog/datadog-agent/pkg/util/filesystem v0.56.0 // indirect
-	github.com/DataDog/datadog-agent/pkg/util/fxutil v0.56.0 // indirect
-	github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.56.0 // indirect
-	github.com/DataDog/datadog-agent/pkg/util/http v0.56.0 // indirect
-	github.com/DataDog/datadog-agent/pkg/util/log v0.56.0 // indirect
-	github.com/DataDog/datadog-agent/pkg/util/optional v0.56.0 // indirect
-	github.com/DataDog/datadog-agent/pkg/util/pointer v0.56.0 // indirect
-	github.com/DataDog/datadog-agent/pkg/util/scrubber v0.56.0 // indirect
-	github.com/DataDog/datadog-agent/pkg/util/startstop v0.56.0 // indirect
-	github.com/DataDog/datadog-agent/pkg/util/statstracker v0.56.0 // indirect
-	github.com/DataDog/datadog-agent/pkg/util/system v0.56.0 // indirect
-	github.com/DataDog/datadog-agent/pkg/util/system/socket v0.56.0 // indirect
-	github.com/DataDog/datadog-agent/pkg/util/winutil v0.56.0 // indirect
-	github.com/DataDog/datadog-agent/pkg/version v0.56.0 // indirect
+	github.com/DataDog/datadog-agent/pkg/util/backoff v0.56.2 // indirect
+	github.com/DataDog/datadog-agent/pkg/util/cgroups v0.56.2 // indirect
+	github.com/DataDog/datadog-agent/pkg/util/executable v0.56.2 // indirect
+	github.com/DataDog/datadog-agent/pkg/util/filesystem v0.56.2 // indirect
+	github.com/DataDog/datadog-agent/pkg/util/fxutil v0.56.2 // indirect
+	github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.56.2 // indirect
+	github.com/DataDog/datadog-agent/pkg/util/http v0.56.2 // indirect
+	github.com/DataDog/datadog-agent/pkg/util/log v0.56.2 // indirect
+	github.com/DataDog/datadog-agent/pkg/util/optional v0.56.2 // indirect
+	github.com/DataDog/datadog-agent/pkg/util/pointer v0.56.2 // indirect
+	github.com/DataDog/datadog-agent/pkg/util/scrubber v0.56.2 // indirect
+	github.com/DataDog/datadog-agent/pkg/util/startstop v0.56.2 // indirect
+	github.com/DataDog/datadog-agent/pkg/util/statstracker v0.56.2 // indirect
+	github.com/DataDog/datadog-agent/pkg/util/system v0.56.2 // indirect
+	github.com/DataDog/datadog-agent/pkg/util/system/socket v0.56.2 // indirect
+	github.com/DataDog/datadog-agent/pkg/util/winutil v0.56.2 // indirect
+	github.com/DataDog/datadog-agent/pkg/version v0.56.2 // indirect
 	github.com/DataDog/datadog-api-client-go/v2 v2.29.0 // indirect
 	github.com/DataDog/datadog-go/v5 v5.5.0 // indirect
 	github.com/DataDog/dd-sensitive-data-scanner/sds-go/go v0.0.0-20240419161837-f1b2f553edfe // indirect
@@ -446,7 +446,7 @@ require (
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
 	github.com/digitalocean/godo v1.118.0 // indirect
 	github.com/distribution/reference v0.6.0 // indirect
-	github.com/docker/docker v27.1.1+incompatible // indirect
+	github.com/docker/docker v27.2.0+incompatible // indirect
 	github.com/docker/go-connections v0.5.0 // indirect
 	github.com/docker/go-units v0.5.0 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
@@ -463,7 +463,7 @@ require (
 	github.com/elastic/go-sysinfo v1.7.1 // indirect
 	github.com/elastic/go-windows v1.0.1 // indirect
 	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
-	github.com/envoyproxy/go-control-plane v0.12.0 // indirect
+	github.com/envoyproxy/go-control-plane v0.12.1-0.20240621013728-1eb8caab5155 // indirect
 	github.com/envoyproxy/protoc-gen-validate v1.0.4 // indirect
 	github.com/euank/go-kmsg-parser v2.0.0+incompatible // indirect
 	github.com/expr-lang/expr v1.16.9 // indirect
@@ -689,6 +689,7 @@ require (
 	github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pkg/sftp v1.13.6 // indirect
+	github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c // indirect
 	github.com/pquerna/cachecontrol v0.1.0 // indirect
@@ -712,14 +713,14 @@ require (
 	github.com/secure-systems-lab/go-securesystemslib v0.7.0 // indirect
 	github.com/segmentio/asm v1.2.0 // indirect
 	github.com/shirou/gopsutil/v3 v3.24.5 // indirect
-	github.com/shirou/gopsutil/v4 v4.24.7 // indirect
+	github.com/shirou/gopsutil/v4 v4.24.8 // indirect
 	github.com/shoenig/go-m1cpu v0.1.6 // indirect
 	github.com/shopspring/decimal v1.4.0 // indirect
 	github.com/signalfx/com_signalfx_metrics_protobuf v0.0.3 // indirect
 	github.com/signalfx/sapm-proto v0.14.0 // indirect
 	github.com/sijms/go-ora/v2 v2.8.19 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
-	github.com/snowflakedb/gosnowflake v1.11.0 // indirect
+	github.com/snowflakedb/gosnowflake v1.11.1 // indirect
 	github.com/soheilhy/cmux v0.1.5 // indirect
 	github.com/solarwindscloud/apm-proto v1.0.7 // indirect
 	github.com/sourcegraph/conc v0.3.0 // indirect
@@ -835,7 +836,7 @@ require (
 	google.golang.org/genproto v0.0.0-20240814211410-ddb44dafa142 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20240822170219-fc7c04adadcd // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20240822170219-fc7c04adadcd // indirect
-	google.golang.org/grpc v1.65.0 // indirect
+	google.golang.org/grpc v1.66.0 // indirect
 	google.golang.org/protobuf v1.34.2 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect