diff --git a/.ddqa/config.toml b/.ddqa/config.toml index e8a8ab270bc88..8b75f9e3059bd 100644 --- a/.ddqa/config.toml +++ b/.ddqa/config.toml @@ -22,8 +22,8 @@ exclude_members = [""] jira_project = "AGTMETRICS" jira_issue_type = "Task" jira_statuses = ["To Do", "In Progress", "Done"] -github_team = "agent-metrics" -github_labels = ["team/agent-metrics"] +github_team = "agent-metric-pipelines" +github_labels = ["team/agent-metric-pipelines"] exclude_members = [""] [teams."Agent Processing and Routing"] diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index ff810ccf8f6d2..2fbd74cea1634 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -36,7 +36,7 @@ /Makefile.trace @DataDog/agent-delivery /mkdocs.yml @DataDog/agent-devx-infra -/release.json @DataDog/agent-delivery @DataDog/agent-metrics @DataDog/windows-kernel-integrations @DataDog/agent-security +/release.json @DataDog/agent-delivery @DataDog/agent-metric-pipelines @DataDog/windows-kernel-integrations @DataDog/agent-security /renovate.json @DataDog/agent-devx-infra /requirements.txt @DataDog/agent-devx-infra /pyproject.toml @DataDog/agent-devx-infra @DataDog/agent-devx-loops @@ -95,7 +95,7 @@ /.gitlab/binary_build/linux.yml @DataDog/agent-devx-infra @DataDog/agent-delivery /.gitlab/functional_test/include.yml @DataDog/agent-devx-infra /.gitlab/install_script_testing/install_script_testing.yml @DataDog/agent-delivery @DataDog/container-ecosystems -/.gitlab/integration_test/dogstatsd.yml @DataDog/agent-devx-infra @DataDog/agent-metrics +/.gitlab/integration_test/dogstatsd.yml @DataDog/agent-devx-infra @DataDog/agent-metric-pipelines /.gitlab/integration_test/include.yml @DataDog/agent-devx-infra /.gitlab/integration_test/linux.yml @DataDog/agent-devx-infra /.gitlab/integration_test/otel.yml @DataDog/agent-devx-infra @DataDog/opentelemetry @DataDog/opentelemetry-agent @@ -188,9 +188,9 @@ /cmd/ @DataDog/agent-configuration /cmd/trace-agent/ @DataDog/agent-apm /cmd/agent/subcommands/controlsvc @DataDog/windows-agent -/cmd/agent/subcommands/dogstatsd* @DataDog/agent-metrics +/cmd/agent/subcommands/dogstatsd* @DataDog/agent-metric-pipelines /cmd/agent/subcommands/integrations @DataDog/agent-integrations @DataDog/agent-runtimes -/cmd/agent/subcommands/dogstatsd* @DataDog/agent-metrics-logs +/cmd/agent/subcommands/dogstatsd* @DataDog/agent-metric-pipelines /cmd/agent/subcommands/remoteconfig @Datadog/remote-config /cmd/agent/subcommands/snmp @DataDog/ndm-core /cmd/agent/subcommands/streamlogs @DataDog/agent-log-pipelines @@ -217,7 +217,7 @@ /cmd/cluster-agent-cloudfoundry/ @DataDog/agent-integrations /cmd/cluster-agent/api/v1/cloudfoundry_metadata.go @DataDog/agent-integrations /cmd/cws-instrumentation/ @DataDog/agent-security -/cmd/dogstatsd/ @DataDog/agent-metrics +/cmd/dogstatsd/ @DataDog/agent-metric-pipelines /cmd/otel-agent/ @DataDog/opentelemetry @DataDog/opentelemetry-agent /cmd/process-agent/ @DataDog/container-intake /cmd/serverless/ @DataDog/serverless @Datadog/serverless-aws @@ -252,15 +252,15 @@ /Dockerfiles/agent/entrypoint.ps1 @DataDog/container-integrations @DataDog/windows-agent /Dockerfiles/agent/windows/ @DataDog/container-integrations @DataDog/windows-agent /Dockerfiles/agent-ot @DataDog/opentelemetry @DataDog/opentelemetry-agent -/Dockerfiles/agent/bouncycastle-fips @DataDog/agent-metrics +/Dockerfiles/agent/bouncycastle-fips @DataDog/agent-metric-pipelines /docs/ @DataDog/agent-devx-loops -/docs/dev/checks/ @DataDog/agent-metrics +/docs/dev/checks/ @DataDog/agent-metric-pipelines /docs/cloud-workload-security/ @DataDog/documentation @DataDog/agent-security /docs/public/components/ @DataDog/agent-runtimes /docs/public/hostname/ @DataDog/agent-runtimes -/docs/public/architecture/dogstatsd/ @DataDog/agent-metrics +/docs/public/architecture/dogstatsd/ @DataDog/agent-metric-pipelines /docs/public/guidelines/deprecated-components-documentation/ @DataDog/agent-runtimes /google-marketplace/ @DataDog/container-ecosystems @@ -288,13 +288,13 @@ # BEGIN COMPONENTS /comp @DataDog/agent-runtimes /comp/agent @DataDog/agent-runtimes -/comp/aggregator @DataDog/agent-metrics +/comp/aggregator @DataDog/agent-metric-pipelines /comp/api @DataDog/agent-runtimes -/comp/checks @DataDog/agent-metrics -/comp/collector @DataDog/agent-metrics +/comp/checks @DataDog/agent-metric-pipelines +/comp/collector @DataDog/agent-metric-pipelines /comp/core @DataDog/agent-runtimes -/comp/dogstatsd @DataDog/agent-metrics -/comp/forwarder @DataDog/agent-metrics +/comp/dogstatsd @DataDog/agent-metric-pipelines +/comp/forwarder @DataDog/agent-metric-pipelines /comp/logs @DataDog/agent-log-pipelines /comp/metadata @DataDog/agent-configuration /comp/ndmtmp @DataDog/ndm-core @@ -308,7 +308,7 @@ /comp/trace @DataDog/agent-apm /comp/updater @DataDog/fleet @DataDog/windows-agent /comp/agent/cloudfoundrycontainer @DataDog/agent-integrations -/comp/agent/jmxlogger @DataDog/agent-metrics +/comp/agent/jmxlogger @DataDog/agent-metric-pipelines /comp/aggregator/diagnosesendermanager @DataDog/agent-configuration /comp/checks/agentcrashdetect @DataDog/windows-kernel-integrations /comp/checks/windowseventlog @DataDog/windows-agent @@ -335,7 +335,7 @@ /comp/languagedetection/client @DataDog/container-platform /comp/rdnsquerier @DataDog/ndm-integrations /comp/serializer/logscompression @DataDog/agent-log-pipelines -/comp/serializer/metricscompression @DataDog/agent-metrics +/comp/serializer/metricscompression @DataDog/agent-metric-pipelines /comp/snmpscan @DataDog/ndm-core # END COMPONENTS @@ -348,9 +348,9 @@ # pkg /pkg/ @DataDog/agent-runtimes /pkg/api/ @DataDog/agent-runtimes -/pkg/aggregator/ @DataDog/agent-metrics -/pkg/collector/ @DataDog/agent-metrics -/pkg/commonchecks/ @DataDog/agent-metrics +/pkg/aggregator/ @DataDog/agent-metric-pipelines +/pkg/collector/ @DataDog/agent-metric-pipelines +/pkg/commonchecks/ @DataDog/agent-metric-pipelines /pkg/cli/ @DataDog/agent-configuration /pkg/cli/subcommands/clusterchecks @DataDog/container-platform /pkg/discovery/ @DataDog/agent-discovery @@ -358,11 +358,11 @@ /pkg/fips @DataDog/agent-runtimes /pkg/gohai @DataDog/agent-configuration /pkg/gpu/ @DataDog/ebpf-platform -/pkg/jmxfetch/ @DataDog/agent-metrics -/pkg/metrics/ @DataDog/agent-metrics -/pkg/metrics/metricsource.go @DataDog/agent-metrics @DataDog/agent-integrations -/pkg/serializer/ @DataDog/agent-metrics -/pkg/serializer/internal/metrics/origin_mapping.go @DataDog/agent-metrics @DataDog/agent-integrations +/pkg/jmxfetch/ @DataDog/agent-metric-pipelines +/pkg/metrics/ @DataDog/agent-metric-pipelines +/pkg/metrics/metricsource.go @DataDog/agent-metric-pipelines @DataDog/agent-integrations +/pkg/serializer/ @DataDog/agent-metric-pipelines +/pkg/serializer/internal/metrics/origin_mapping.go @DataDog/agent-metric-pipelines @DataDog/agent-integrations /pkg/serverless/ @DataDog/serverless @Datadog/serverless-aws /pkg/serverless/appsec/ @DataDog/asm-go /pkg/status/ @DataDog/agent-configuration @@ -393,7 +393,7 @@ /pkg/clusteragent/admission/mutate/cwsinstrumentation @Datadog/agent-security /pkg/clusteragent/orchestrator/ @DataDog/container-app /pkg/clusteragent/telemetry/ @DataDog/apm-trace-storage -/pkg/collector/ @DataDog/agent-metrics +/pkg/collector/ @DataDog/agent-metric-pipelines /pkg/collector/corechecks/cluster/ @DataDog/container-integrations /pkg/collector/corechecks/cluster/orchestrator @DataDog/container-app /pkg/collector/corechecks/containers/ @DataDog/container-integrations @@ -450,7 +450,7 @@ /pkg/fleet/ @DataDog/fleet @DataDog/windows-agent /pkg/fleet/installer/setup/djm/ @DataDog/fleet @DataDog/data-jobs-monitoring /pkg/pidfile/ @DataDog/agent-runtimes -/pkg/persistentcache/ @DataDog/agent-metrics +/pkg/persistentcache/ @DataDog/agent-metric-pipelines /pkg/proto/ @DataDog/agent-runtimes /pkg/proto/datadog/languagedetection @DataDog/container-intake /pkg/proto/datadog/process @DataDog/container-intake @@ -569,13 +569,13 @@ /releasenotes/ @DataDog/documentation /releasenotes-dca/ @DataDog/documentation -/rtloader/ @DataDog/agent-metrics +/rtloader/ @DataDog/agent-metric-pipelines /tasks/ @DataDog/agent-devx-loops @DataDog/agent-devx-infra /tasks/msi.py @DataDog/windows-agent /tasks/agent.py @DataDog/agent-runtimes /tasks/go_deps.py @DataDog/agent-runtimes -/tasks/dogstatsd.py @DataDog/agent-metrics +/tasks/dogstatsd.py @DataDog/agent-metric-pipelines /tasks/update_go.py @DataDog/agent-runtimes /tasks/unit_tests/update_go_tests.py @DataDog/agent-runtimes /tasks/cluster_agent_cloudfoundry.py @DataDog/agent-integrations @@ -587,7 +587,7 @@ /tasks/kernel_matrix_testing/ @DataDog/ebpf-platform /tasks/ebpf_verifier/ @DataDog/ebpf-platform /tasks/trace_agent.py @DataDog/agent-apm -/tasks/rtloader.py @DataDog/agent-metrics +/tasks/rtloader.py @DataDog/agent-metric-pipelines /tasks/security_agent.py @DataDog/agent-security /tasks/sds.py @DataDog/agent-log-pipelines /tasks/systray.py @DataDog/windows-agent @@ -606,7 +606,7 @@ /tasks/unit_tests/testdata/components_src/ @DataDog/agent-runtimes /tasks/installer.py @DataDog/fleet /test/ @DataDog/agent-devx-loops -/test/benchmarks/ @DataDog/agent-metrics +/test/benchmarks/ @DataDog/agent-metric-pipelines /test/benchmarks/kubernetes_state/ @DataDog/container-integrations /test/integration/ @DataDog/container-integrations /test/integration/docker/otel_agent_build_tests.py @DataDog/opentelemetry @DataDog/opentelemetry-agent @@ -650,7 +650,7 @@ /test/new-e2e/tests/gpu @Datadog/ebpf-platform /test/otel/ @DataDog/opentelemetry @DataDog/opentelemetry-agent /test/system/ @DataDog/agent-runtimes -/test/system/dogstatsd/ @DataDog/agent-metrics +/test/system/dogstatsd/ @DataDog/agent-metric-pipelines /test/benchmarks/apm_scripts/ @DataDog/agent-apm /test/regression/ @DataDog/single-machine-performance @@ -660,10 +660,10 @@ /tools/gdb/ @DataDog/agent-runtimes /tools/go-update/ @DataDog/agent-runtimes /tools/NamedPipeCmd/ @DataDog/windows-kernel-integrations -/tools/retry_file_dump/ @DataDog/agent-metrics +/tools/retry_file_dump/ @DataDog/agent-metric-pipelines /tools/windows/ @DataDog/windows-agent /tools/windows/DatadogAgentInstaller/WixSetup/localization-en-us.wxl @DataDog/windows-agent @DataDog/documentation -/tools/agent_QA/ @DataDog/agent-metrics @DataDog/agent-log-pipelines +/tools/agent_QA/ @DataDog/agent-metric-pipelines @DataDog/agent-log-pipelines /internal/tools/ @DataDog/agent-devx-loops @DataDog/agent-devx-infra /internal/third_party/client-go @DataDog/container-platform diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml index 0c58dbf133343..c90f579c43877 100644 --- a/.github/dependabot.yaml +++ b/.github/dependabot.yaml @@ -214,7 +214,7 @@ updates: directory: Dockerfiles/agent/bouncycastle-fips labels: - dependencies - - team/agent-metrics-logs + - team/agent-metric-pipelines - changelog/no-changelog schedule: interval: weekly diff --git a/.gitlab/JOBOWNERS b/.gitlab/JOBOWNERS index f0caeeddd203c..f50aa342c7035 100644 --- a/.gitlab/JOBOWNERS +++ b/.gitlab/JOBOWNERS @@ -14,7 +14,7 @@ build_clang_* @DataDog/ebpf-platform build_processed_btfhub_archive @DataDog/ebpf-platform # Deps fetch -fetch_openjdk @DataDog/agent-metrics +fetch_openjdk @DataDog/agent-metric-pipelines # Source test # Notifications are handled separately for more fine-grained control on go tests diff --git a/comp/README.md b/comp/README.md index e27271c4fda95..e3bbec80305b0 100644 --- a/comp/README.md +++ b/comp/README.md @@ -26,13 +26,13 @@ Package expvarserver contains the component type for the expVar server. ### [comp/agent/jmxlogger](https://pkg.go.dev/github.com/DataDog/datadog-agent/comp/agent/jmxlogger) -*Datadog Team*: agent-metrics +*Datadog Team*: agent-metric-pipelines Package jmxlogger implements the logger for JMX. ## [comp/aggregator](https://pkg.go.dev/github.com/DataDog/datadog-agent/comp/aggregator) (Component Bundle) -*Datadog Team*: agent-metrics +*Datadog Team*: agent-metric-pipelines Package aggregator implements the "aggregator" bundle, @@ -68,7 +68,7 @@ auth_token file but can fetch it it's available. ## [comp/checks](https://pkg.go.dev/github.com/DataDog/datadog-agent/comp/checks) (Component Bundle) -*Datadog Team*: agent-metrics +*Datadog Team*: agent-metric-pipelines Package checks implements the "checks" bundle, for all of the component based agent checks @@ -92,7 +92,7 @@ Package winregistry implements the Windows Registry check ## [comp/collector](https://pkg.go.dev/github.com/DataDog/datadog-agent/comp/collector) (Component Bundle) -*Datadog Team*: agent-metrics +*Datadog Team*: agent-metric-pipelines Package collector defines the collector bundle. @@ -215,7 +215,7 @@ Package workloadmeta provides the workloadmeta component for the Datadog Agent ## [comp/dogstatsd](https://pkg.go.dev/github.com/DataDog/datadog-agent/comp/dogstatsd) (Component Bundle) -*Datadog Team*: agent-metrics +*Datadog Team*: agent-metric-pipelines @@ -245,7 +245,7 @@ Package status implements the core status component information provider interfa ## [comp/forwarder](https://pkg.go.dev/github.com/DataDog/datadog-agent/comp/forwarder) (Component Bundle) -*Datadog Team*: agent-metrics +*Datadog Team*: agent-metric-pipelines Package forwarder implements the "forwarder" bundle @@ -643,7 +643,7 @@ Package logscompression provides the component for logs compression ### [comp/serializer/metricscompression](https://pkg.go.dev/github.com/DataDog/datadog-agent/comp/serializer/metricscompression) -*Datadog Team*: agent-metrics +*Datadog Team*: agent-metric-pipelines Package metricscompression provides the component for metrics compression diff --git a/comp/agent/jmxlogger/component.go b/comp/agent/jmxlogger/component.go index 4d800ab0e7b93..d82ba9dd9ac58 100644 --- a/comp/agent/jmxlogger/component.go +++ b/comp/agent/jmxlogger/component.go @@ -6,7 +6,7 @@ // Package jmxlogger implements the logger for JMX. package jmxlogger -// team: agent-metrics +// team: agent-metric-pipelines // Component is the component type. type Component interface { diff --git a/comp/aggregator/bundle.go b/comp/aggregator/bundle.go index 014444a5a9938..57ef4f8957e85 100644 --- a/comp/aggregator/bundle.go +++ b/comp/aggregator/bundle.go @@ -11,7 +11,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/util/fxutil" ) -// team: agent-metrics +// team: agent-metric-pipelines // Bundle defines the fx options for this bundle. func Bundle(params demultiplexerimpl.Params) fxutil.BundleOptions { diff --git a/comp/aggregator/demultiplexer/component.go b/comp/aggregator/demultiplexer/component.go index 52ccb66a1e16d..fd7a8574f1a54 100644 --- a/comp/aggregator/demultiplexer/component.go +++ b/comp/aggregator/demultiplexer/component.go @@ -12,7 +12,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/serializer" ) -// team: agent-metrics +// team: agent-metric-pipelines // Component is the component type. type Component interface { diff --git a/comp/aggregator/demultiplexerendpoint/def/component.go b/comp/aggregator/demultiplexerendpoint/def/component.go index 182819bbbd78c..bcb5cde3e04a2 100644 --- a/comp/aggregator/demultiplexerendpoint/def/component.go +++ b/comp/aggregator/demultiplexerendpoint/def/component.go @@ -6,7 +6,7 @@ // Package demultiplexerendpoint component provides the /dogstatsd-contexts-dump API endpoint that can register via Fx value groups. package demultiplexerendpoint -// team: agent-metrics +// team: agent-metric-pipelines // Component is the component type. type Component interface { diff --git a/comp/checks/bundle.go b/comp/checks/bundle.go index a7fe71d75bf56..ed0b2654a7796 100644 --- a/comp/checks/bundle.go +++ b/comp/checks/bundle.go @@ -15,7 +15,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/util/fxutil" ) -// team: agent-metrics +// team: agent-metric-pipelines // Bundle defines the fx options for this bundle. func Bundle() fxutil.BundleOptions { diff --git a/comp/collector/bundle.go b/comp/collector/bundle.go index 0071e37dd69a0..43bb86bc9fbb8 100644 --- a/comp/collector/bundle.go +++ b/comp/collector/bundle.go @@ -11,7 +11,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/util/fxutil" ) -// team: agent-metrics +// team: agent-metric-pipelines // Bundle defines the fx options for this bundle. func Bundle() fxutil.BundleOptions { diff --git a/comp/collector/collector/component.go b/comp/collector/collector/component.go index 9f2400e67a424..e8f8a581162eb 100644 --- a/comp/collector/collector/component.go +++ b/comp/collector/collector/component.go @@ -14,7 +14,7 @@ import ( "go.uber.org/fx" ) -// team: agent-metrics +// team: agent-metric-pipelines // EventType represents the type of events emitted by the collector type EventType uint32 diff --git a/comp/core/agenttelemetry/impl/agenttelemetry_test.go b/comp/core/agenttelemetry/impl/agenttelemetry_test.go index ddd1edfb1c751..2a465ac9d69c3 100644 --- a/comp/core/agenttelemetry/impl/agenttelemetry_test.go +++ b/comp/core/agenttelemetry/impl/agenttelemetry_test.go @@ -205,7 +205,7 @@ func getCommonOverrideConfig(enabled bool, site string) map[string]any { func (p *Payload) UnmarshalAgentMetrics(itfPayload map[string]interface{}) error { var ok bool - p.RequestType = "agent-metrics" + p.RequestType = "agent-metric-pipelines" p.APIVersion = itfPayload["request_type"].(string) var metricsItfPayload map[string]interface{} @@ -257,7 +257,7 @@ func (p *Payload) UnmarshalMessageBatch(itfPayload map[string]interface{}) error return fmt.Errorf("payload not found") } - // ensure all payloads which should be agent-metrics + // ensure all payloads which should be agent-metric-pipelines var payloads []Payload for _, payloadRaw := range payloadsRaw { itfChildPayload, ok := payloadRaw.(map[string]interface{}) @@ -274,8 +274,8 @@ func (p *Payload) UnmarshalMessageBatch(itfPayload map[string]interface{}) error return fmt.Errorf("request_type type is invalid") } - if requestType != "agent-metrics" { - return fmt.Errorf("request_type should be agent-metrics") + if requestType != "agent-metric-pipelines" { + return fmt.Errorf("request_type should be agent-metric-pipelines") } var payload Payload @@ -307,7 +307,7 @@ func (p *Payload) UnmarshalJSON(b []byte) (err error) { return fmt.Errorf("request_type type is invalid") } - if requestType == "agent-metrics" { + if requestType == "agent-metric-pipelines" { return p.UnmarshalAgentMetrics(itfPayload) } @@ -315,7 +315,7 @@ func (p *Payload) UnmarshalJSON(b []byte) (err error) { return p.UnmarshalMessageBatch(itfPayload) } - return fmt.Errorf("request_type should be either agent-metrics or message-batch") + return fmt.Errorf("request_type should be either agent-metric-pipelines or message-batch") } func getPayload(a *atel) (*Payload, error) { @@ -501,7 +501,7 @@ func TestNoTagSpecifiedAggregationCounter(t *testing.T) { profiles: - name: foo metric: - metrics: + metrics: - name: bar.zoo aggregate_tags: [] ` @@ -541,7 +541,7 @@ func TestNoTagSpecifiedExplicitAggregationGauge(t *testing.T) { profiles: - name: foo metric: - metrics: + metrics: - name: bar.zoo aggregate_tags: [] ` @@ -581,7 +581,7 @@ func TestNoTagSpecifiedImplicitAggregationGauge(t *testing.T) { profiles: - name: foo metric: - metrics: + metrics: - name: bar.zoo ` @@ -620,7 +620,7 @@ func TestNoTagSpecifiedAggregationHistogram(t *testing.T) { profiles: - name: foo metric: - metrics: + metrics: - name: bar.zoo aggregate_tags: [] ` @@ -662,7 +662,7 @@ func TestTagSpecifiedAggregationCounter(t *testing.T) { profiles: - name: foo metric: - metrics: + metrics: - name: bar.zoo aggregate_tags: - tag1 @@ -711,7 +711,7 @@ func TestTagAggregateTotalCounter(t *testing.T) { profiles: - name: foo metric: - metrics: + metrics: - name: bar.zoo aggregate_total: true aggregate_tags: @@ -855,7 +855,7 @@ func TestOneProfileWithOneMetricMultipleContextsGenerateTwoPayloads(t *testing.T require.True(t, ok) requestType1, ok := payload1["request_type"] require.True(t, ok) - assert.Equal(t, "agent-metrics", requestType1) + assert.Equal(t, "agent-metric-pipelines", requestType1) metricsPayload1, ok := payload1["payload"].(map[string]interface{}) require.True(t, ok) metrics1, ok := metricsPayload1["metrics"].(map[string]interface{}) @@ -869,7 +869,7 @@ func TestOneProfileWithOneMetricMultipleContextsGenerateTwoPayloads(t *testing.T require.True(t, ok) requestType2, ok := payload2["request_type"] require.True(t, ok) - assert.Equal(t, "agent-metrics", requestType2) + assert.Equal(t, "agent-metric-pipelines", requestType2) metricsPayload2, ok := payload2["payload"].(map[string]interface{}) require.True(t, ok) metrics2, ok := metricsPayload2["metrics"].(map[string]interface{}) diff --git a/comp/core/agenttelemetry/impl/sender.go b/comp/core/agenttelemetry/impl/sender.go index b7b62f460b933..1188d8ee413fc 100644 --- a/comp/core/agenttelemetry/impl/sender.go +++ b/comp/core/agenttelemetry/impl/sender.go @@ -343,8 +343,8 @@ func (ss *senderSession) flush() Payload { if len(ss.metricPayloads) == 1 { // Single payload will be sent directly using the request type of the payload mp := ss.metricPayloads[0] - payload.RequestType = "agent-metrics" - payload.Payload = payloadInfo{"agent-metrics", mp}.payload + payload.RequestType = "agent-metric-pipelines" + payload.Payload = payloadInfo{"agent-metric-pipelines", mp}.payload return payload } @@ -353,8 +353,8 @@ func (ss *senderSession) flush() Payload { for _, mp := range ss.metricPayloads { batch = append(batch, BatchPayloadWrapper{ - RequestType: "agent-metrics", - Payload: payloadInfo{"agent-metrics", mp}.payload, + RequestType: "agent-metric-pipelines", + Payload: payloadInfo{"agent-metric-pipelines", mp}.payload, }) } payload.RequestType = "message-batch" diff --git a/comp/dogstatsd/bundle.go b/comp/dogstatsd/bundle.go index be3a08cde19f8..b26bad1b522b4 100644 --- a/comp/dogstatsd/bundle.go +++ b/comp/dogstatsd/bundle.go @@ -14,7 +14,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/util/fxutil" ) -// team: agent-metrics +// team: agent-metric-pipelines // Bundle defines the fx options for this bundle. func Bundle(params server.Params) fxutil.BundleOptions { diff --git a/comp/dogstatsd/pidmap/component.go b/comp/dogstatsd/pidmap/component.go index 2e32cbaaa5dbb..e2096c6c1468f 100644 --- a/comp/dogstatsd/pidmap/component.go +++ b/comp/dogstatsd/pidmap/component.go @@ -6,7 +6,7 @@ // Package pidmap implements a component for tracking pid and containerID relations package pidmap -// team: agent-metrics +// team: agent-metric-pipelines // Component is the component type. type Component interface { diff --git a/comp/dogstatsd/replay/def/component.go b/comp/dogstatsd/replay/def/component.go index 18e969dc8539b..2582f2ecbf7dc 100644 --- a/comp/dogstatsd/replay/def/component.go +++ b/comp/dogstatsd/replay/def/component.go @@ -12,7 +12,7 @@ import ( "github.com/DataDog/datadog-agent/comp/dogstatsd/packets" ) -// team: agent-metrics +// team: agent-metric-pipelines // Component is the component type. type Component interface { diff --git a/comp/dogstatsd/replay/fx/fx.go b/comp/dogstatsd/replay/fx/fx.go index 667d2afdd8ec3..253c3eb9b8968 100644 --- a/comp/dogstatsd/replay/fx/fx.go +++ b/comp/dogstatsd/replay/fx/fx.go @@ -12,7 +12,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/util/fxutil" ) -// team: agent-metrics +// team: agent-metric-pipelines // Module defines the fx options for this component. func Module() fxutil.Module { diff --git a/comp/dogstatsd/server/component.go b/comp/dogstatsd/server/component.go index c223a3a7d51f2..ba3fba2df0dbe 100644 --- a/comp/dogstatsd/server/component.go +++ b/comp/dogstatsd/server/component.go @@ -13,7 +13,7 @@ import ( "go.uber.org/fx" ) -// team: agent-metrics +// team: agent-metric-pipelines // Component is the component type. type Component interface { diff --git a/comp/dogstatsd/server/serverless.go b/comp/dogstatsd/server/serverless.go index a04034c5426c6..ad06fd95e5722 100644 --- a/comp/dogstatsd/server/serverless.go +++ b/comp/dogstatsd/server/serverless.go @@ -20,7 +20,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/util/option" ) -// team: agent-metrics +// team: agent-metric-pipelines // ServerlessDogstatsd is the interface for the serverless dogstatsd server. type ServerlessDogstatsd interface { diff --git a/comp/dogstatsd/serverDebug/component.go b/comp/dogstatsd/serverDebug/component.go index 90935378bab55..9f1ad5a2e7444 100644 --- a/comp/dogstatsd/serverDebug/component.go +++ b/comp/dogstatsd/serverDebug/component.go @@ -10,7 +10,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/metrics" ) -// team: agent-metrics +// team: agent-metric-pipelines // Component is the component type. type Component interface { diff --git a/comp/dogstatsd/statsd/component.go b/comp/dogstatsd/statsd/component.go index f306d8aa7302a..7b5fc29440808 100644 --- a/comp/dogstatsd/statsd/component.go +++ b/comp/dogstatsd/statsd/component.go @@ -10,7 +10,7 @@ import ( ddgostatsd "github.com/DataDog/datadog-go/v5/statsd" ) -// team: agent-metrics +// team: agent-metric-pipelines // Component is the component type. type Component interface { diff --git a/comp/dogstatsd/status/component.go b/comp/dogstatsd/status/component.go index 12796891592f2..3ff339f38d36f 100644 --- a/comp/dogstatsd/status/component.go +++ b/comp/dogstatsd/status/component.go @@ -6,7 +6,7 @@ // Package status implements the core status component information provider interface package status -// team: agent-metrics +// team: agent-metric-pipelines // Component is the status interface. type Component interface { diff --git a/comp/forwarder/bundle.go b/comp/forwarder/bundle.go index 5ba4dff6940b9..a3656bb66f9ae 100644 --- a/comp/forwarder/bundle.go +++ b/comp/forwarder/bundle.go @@ -11,7 +11,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/util/fxutil" ) -// team: agent-metrics +// team: agent-metric-pipelines // Bundle defines the fx options for this bundle. func Bundle(params defaultforwarder.Params) fxutil.BundleOptions { diff --git a/comp/forwarder/defaultforwarder/component.go b/comp/forwarder/defaultforwarder/component.go index 36e6503c5ee8d..fe3dce24ea425 100644 --- a/comp/forwarder/defaultforwarder/component.go +++ b/comp/forwarder/defaultforwarder/component.go @@ -12,7 +12,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/util/fxutil" ) -// team: agent-metrics +// team: agent-metric-pipelines // Component is the component type. type Component interface { diff --git a/comp/forwarder/orchestrator/orchestratorinterface/component.go b/comp/forwarder/orchestrator/orchestratorinterface/component.go index 47b48290bbf4e..8903cb2be06ec 100644 --- a/comp/forwarder/orchestrator/orchestratorinterface/component.go +++ b/comp/forwarder/orchestrator/orchestratorinterface/component.go @@ -8,7 +8,7 @@ package orchestratorinterface import "github.com/DataDog/datadog-agent/comp/forwarder/defaultforwarder" -// team: agent-metrics +// team: agent-metric-pipelines // Component is the component type. // The main method of this component is `Get` which returns the forwarder instance only if it enabled. diff --git a/comp/serializer/metricscompression/def/component.go b/comp/serializer/metricscompression/def/component.go index 786bf91f2a2cd..8bc477a0bc664 100644 --- a/comp/serializer/metricscompression/def/component.go +++ b/comp/serializer/metricscompression/def/component.go @@ -6,7 +6,7 @@ // Package metricscompression provides the component for metrics compression package metricscompression -// team: agent-metrics +// team: agent-metric-pipelines import ( "github.com/DataDog/datadog-agent/pkg/util/compression" diff --git a/tasks/libs/issue/model/constants.py b/tasks/libs/issue/model/constants.py index 9b28d62458e18..2108fbbc5e1c4 100644 --- a/tasks/libs/issue/model/constants.py +++ b/tasks/libs/issue/model/constants.py @@ -28,8 +28,7 @@ 'agent-configuration', 'agent-runtimes', 'agent-integrations', - 'agent-metrics-logs', - 'agent-metrics', + 'agent-metric-pipelines', 'agent-log-pipelines', 'platform-integrations', 'agent-ci-experience', diff --git a/tasks/libs/pipeline/github_jira_map.yaml b/tasks/libs/pipeline/github_jira_map.yaml index 81e55c69bac11..ab720f4f04b40 100644 --- a/tasks/libs/pipeline/github_jira_map.yaml +++ b/tasks/libs/pipeline/github_jira_map.yaml @@ -13,7 +13,7 @@ '@datadog/ndm-integrations': NDINT '@datadog/container-intake': CTK '@datadog/agent-metrics-logs': AMLII -'@datadog/agent-metrics': AGTMETRICS +'@datadog/agent-metric-pipelines': AGTMETRICS '@datadog/agent-log-pipelines': AGNTLOG '@datadog/agent-runtimes': ARUN '@datadog/agent-configuration': ACFG diff --git a/tasks/libs/pipeline/github_slack_map.yaml b/tasks/libs/pipeline/github_slack_map.yaml index 1495f738812b9..fe10f048807f8 100644 --- a/tasks/libs/pipeline/github_slack_map.yaml +++ b/tasks/libs/pipeline/github_slack_map.yaml @@ -15,7 +15,7 @@ '@datadog/ndm-integrations': '#ndm-integrations' '@datadog/container-intake': '#process-agent-ops' '@datadog/agent-metrics-logs': '#agent-metrics-logs' -'@datadog/agent-metrics': '#agent-metrics' +'@datadog/agent-metric-pipelines': '#agent-metric-pipelines' '@datadog/agent-log-pipelines': '#agent-log-pipelines' '@datadog/agent-processing-and-routing': '#agent-processing-and-routing' '@datadog/agent-runtimes': '#agent-runtimes-ops' diff --git a/tasks/libs/pipeline/github_slack_review_map.yaml b/tasks/libs/pipeline/github_slack_review_map.yaml index c29d3fa892dca..9922b381d8c60 100644 --- a/tasks/libs/pipeline/github_slack_review_map.yaml +++ b/tasks/libs/pipeline/github_slack_review_map.yaml @@ -16,7 +16,7 @@ '@datadog/ndm-integrations': '#ndm-integrations' '@datadog/container-intake': '#process-agent-ops' '@datadog/agent-metrics-logs': '#agent-metrics-logs' -'@datadog/agent-metrics': '#agent-metrics' +'@datadog/agent-metric-pipelines': '#agent-metric-pipelines' '@datadog/agent-log-pipelines': '#agent-log-pipelines' '@datadog/agent-processing-and-routing': '#agent-processing-and-routing' '@datadog/agent-runtimes': '#agent-runtimes'