From b73958472569d891432be47b65e8cdf7dac323a3 Mon Sep 17 00:00:00 2001 From: Jaime Fullaondo Date: Fri, 14 Feb 2025 17:00:38 +0100 Subject: [PATCH 1/3] [codeowners] remove the opentelemeetry team --- .github/CODEOWNERS | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 69f2c0531f49a..7dedf029f62a0 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -62,7 +62,7 @@ /.github/workflows/go-update-commenter.yml @DataDog/agent-runtimes /.github/workflows/update_dependencies.yml @DataDog/agent-runtimes /.github/workflows/buildimages-update.yml @DataDog/agent-delivery @DataDog/agent-runtimes -/.github/workflows/collector-generate-and-update.yml @DataDog/opentelemetry @DataDog/opentelemetry-agent +/.github/workflows/collector-generate-and-update.yml @DataDog/opentelemetry-agent /.run @DataDog/agent-devx-loops /.run/docker/ @DataDog/container-integrations @DataDog/container-platform @@ -102,7 +102,7 @@ /.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 +/.gitlab/integration_test/otel.yml @DataDog/agent-devx-infra @DataDog/opentelemetry-agent /.gitlab/internal_image_deploy/internal_image_deploy.yml @DataDog/agent-delivery /.gitlab/internal_kubernetes_deploy/include.yml @DataDog/agent-devx-infra /.gitlab/internal_kubernetes_deploy/internal_kubernetes_deploy.yml @DataDog/agent-delivery @@ -119,7 +119,7 @@ /.gitlab/binary_build/cluster_agent_cloudfoundry.yml @DataDog/agent-integrations @DataDog/agent-delivery /.gitlab/binary_build/cluster_agent.yml @DataDog/container-integrations @DataDog/agent-delivery /.gitlab/binary_build/fakeintake.yml @DataDog/agent-devx-loops -/.gitlab/binary_build/otel_agent.yml @DataDog/opentelemetry @DataDog/opentelemetry-agent @DataDog/agent-delivery +/.gitlab/binary_build/otel_agent.yml @DataDog/opentelemetry-agent @DataDog/agent-delivery /.gitlab/binary_build/serverless.yml @DataDog/serverless @Datadog/serverless-aws @DataDog/agent-delivery /.gitlab/binary_build/system_probe.yml @DataDog/ebpf-platform @DataDog/agent-delivery /.gitlab/binary_build/windows.yml @DataDog/agent-delivery @DataDog/windows-agent @@ -226,7 +226,7 @@ /cmd/cluster-agent/api/v1/cloudfoundry_metadata.go @DataDog/agent-integrations /cmd/cws-instrumentation/ @DataDog/agent-security /cmd/dogstatsd/ @DataDog/agent-metric-pipelines -/cmd/otel-agent/ @DataDog/opentelemetry @DataDog/opentelemetry-agent +/cmd/otel-agent/ @DataDog/opentelemetry-agent /cmd/process-agent/ @DataDog/container-intake /cmd/serverless/ @DataDog/serverless @Datadog/serverless-aws /cmd/serverless-init/ @DataDog/serverless @@ -258,7 +258,7 @@ /Dockerfiles/agent/entrypoint.d.windows/ @DataDog/container-integrations @DataDog/windows-agent /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-ot @DataDog/opentelemetry-agent /Dockerfiles/agent/bouncycastle-fips @DataDog/agent-metric-pipelines /docs/ @DataDog/agent-devx-loops @@ -307,7 +307,7 @@ /comp/ndmtmp @DataDog/ndm-core /comp/netflow @DataDog/ndm-integrations /comp/networkpath @DataDog/Networks -/comp/otelcol @DataDog/opentelemetry @DataDog/opentelemetry-agent +/comp/otelcol @DataDog/opentelemetry-agent /comp/process @DataDog/container-intake /comp/remote-config @DataDog/remote-config /comp/snmptraps @DataDog/ndm-core @@ -384,11 +384,11 @@ /pkg/version/ @DataDog/agent-runtimes /pkg/obfuscate/ @DataDog/agent-apm /pkg/trace/ @DataDog/agent-apm -/pkg/trace/api/otlp*.go @DataDog/opentelemetry @DataDog/opentelemetry-agent -/pkg/trace/traceutil/otel*.go @DataDog/opentelemetry @DataDog/opentelemetry-agent -/pkg/trace/stats/ @DataDog/agent-apm @DataDog/opentelemetry @DataDog/opentelemetry-agent +/pkg/trace/api/otlp*.go @DataDog/opentelemetry-agent +/pkg/trace/traceutil/otel*.go @DataDog/opentelemetry-agent +/pkg/trace/stats/ @DataDog/agent-apm @DataDog/opentelemetry-agent /pkg/trace/telemetry/ @DataDog/apm-trace-storage -/pkg/trace/transform/ @DataDog/opentelemetry @DataDog/opentelemetry-agent +/pkg/trace/transform/ @DataDog/opentelemetry-agent /comp/core/autodiscovery/listeners/ @DataDog/container-platform /comp/core/autodiscovery/listeners/cloudfoundry*.go @DataDog/agent-integrations /comp/core/autodiscovery/listeners/snmp*.go @DataDog/ndm-core @@ -609,7 +609,7 @@ /tasks/winbuildscripts/ @DataDog/windows-agent /tasks/winbuild.py @DataDog/windows-agent /tasks/windows_resources.py @DataDog/windows-agent -/tasks/collector.py @DataDog/opentelemetry @DataDog/opentelemetry-agent +/tasks/collector.py @DataDog/opentelemetry-agent /tasks/components.py @DataDog/agent-runtimes /tasks/components_templates @DataDog/agent-runtimes /tasks/libs/ciproviders/ @DataDog/agent-devx-infra @@ -624,7 +624,7 @@ /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 +/test/integration/docker/otel_agent_build_tests.py @DataDog/opentelemetry-agent /test/integration/serverless @DataDog/serverless @Datadog/serverless-aws /test/integration/serverless_perf @DataDog/serverless @Datadog/serverless-aws /test/fakeintake/ @DataDog/agent-e2e-testing @DataDog/agent-devx-loops @@ -654,7 +654,7 @@ /test/new-e2e/tests/npm @DataDog/Networks /test/new-e2e/tests/npm/ec2_1host_wkit_test.go @DataDog/Networks @DataDog/windows-kernel-integrations /test/new-e2e/tests/orchestrator @DataDog/container-app -/test/new-e2e/tests/otel @DataDog/opentelemetry @DataDog/opentelemetry-agent +/test/new-e2e/tests/otel @DataDog/opentelemetry-agent /test/new-e2e/tests/process @DataDog/container-intake /test/new-e2e/tests/sysprobe-functional @DataDog/windows-kernel-integrations /test/new-e2e/tests/security-agent-functional @DataDog/windows-kernel-integrations @DataDog/agent-security @@ -666,7 +666,7 @@ /test/new-e2e/tests/installer @DataDog/fleet @DataDog/windows-agent /test/new-e2e/tests/installer/script @DataDog/fleet @DataDog/data-jobs-monitoring /test/new-e2e/tests/gpu @Datadog/ebpf-platform -/test/otel/ @DataDog/opentelemetry @DataDog/opentelemetry-agent +/test/otel/ @DataDog/opentelemetry-agent /test/static/ @DataDog/agent-delivery /test/system/ @DataDog/agent-runtimes /test/system/dogstatsd/ @DataDog/agent-metric-pipelines From 015068705ff6a55aefeda793c86807bae8f7a905 Mon Sep 17 00:00:00 2001 From: Jaime Fullaondo Date: Thu, 27 Feb 2025 12:52:50 +0100 Subject: [PATCH 2/3] Team OpenTelemetry Agent update JIRA map --- tasks/libs/pipeline/github_jira_map.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/tasks/libs/pipeline/github_jira_map.yaml b/tasks/libs/pipeline/github_jira_map.yaml index fbd1c5da99fba..f8e037373aa00 100644 --- a/tasks/libs/pipeline/github_jira_map.yaml +++ b/tasks/libs/pipeline/github_jira_map.yaml @@ -29,6 +29,7 @@ '@datadog/windows-agent': WINA '@datadog/windows-kernel-integrations': WKINT '@datadog/opentelemetry': OTAGENT +'@datadog/opentelemetry-agent': OTAGENT '@datadog/agent-e2e-testing': ADXT '@datadog/sdlc-security': SINT '@datadog/single-machine-performance': SMP From 6345ee96185967a3fe6dc4a68f9fda42eb1943d7 Mon Sep 17 00:00:00 2001 From: Jaime Fullaondo Date: Thu, 27 Feb 2025 13:10:21 +0100 Subject: [PATCH 3/3] [comp] otelcol: cleanup ownership references --- comp/README.md | 2 +- comp/otelcol/bundle.go | 2 +- comp/otelcol/collector-contrib/def/component.go | 2 +- comp/otelcol/collector/def/component.go | 2 +- comp/otelcol/collector/fx-pipeline/fx.go | 2 +- comp/otelcol/collector/fx/fx.go | 2 +- comp/otelcol/converter/def/component.go | 2 +- comp/otelcol/ddflareextension/def/component.go | 2 +- comp/otelcol/ddprofilingextension/def/component.go | 2 +- comp/otelcol/ddprofilingextension/fx/fx.go | 2 +- comp/otelcol/logsagentpipeline/component.go | 2 +- comp/otelcol/status/def/component.go | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/comp/README.md b/comp/README.md index 05df7626f4e59..12ac7cfc24cb2 100644 --- a/comp/README.md +++ b/comp/README.md @@ -409,7 +409,7 @@ Package npcollector used to manage network paths ## [comp/otelcol](https://pkg.go.dev/github.com/DataDog/datadog-agent/comp/otelcol) (Component Bundle) -*Datadog Team*: opentelemetry opentelemetry-agent +*Datadog Team*: opentelemetry-agent Package otelcol contains the OTLP ingest bundle pipeline to be included into the agent components. diff --git a/comp/otelcol/bundle.go b/comp/otelcol/bundle.go index 5ac73dff0c477..95ad161cf12f9 100644 --- a/comp/otelcol/bundle.go +++ b/comp/otelcol/bundle.go @@ -12,7 +12,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/util/fxutil" ) -// team: opentelemetry opentelemetry-agent +// team: opentelemetry-agent // Bundle specifies the bundle for the OTLP ingest pipeline. func Bundle() fxutil.BundleOptions { diff --git a/comp/otelcol/collector-contrib/def/component.go b/comp/otelcol/collector-contrib/def/component.go index f906a86e43687..307bd9ce6aa74 100644 --- a/comp/otelcol/collector-contrib/def/component.go +++ b/comp/otelcol/collector-contrib/def/component.go @@ -10,7 +10,7 @@ import ( "go.opentelemetry.io/collector/otelcol" ) -// team: opentelemetry opentelemetry-agent +// team: opentelemetry-agent // Component is the interface for the collector-contrib type Component interface { diff --git a/comp/otelcol/collector/def/component.go b/comp/otelcol/collector/def/component.go index 6f02df0b93928..2871dcd2da17b 100644 --- a/comp/otelcol/collector/def/component.go +++ b/comp/otelcol/collector/def/component.go @@ -10,7 +10,7 @@ import ( "github.com/DataDog/datadog-agent/comp/otelcol/otlp/datatype" ) -// team: opentelemetry opentelemetry-agent +// team: opentelemetry-agent // Component specifies the interface implemented by the collector module. type Component interface { diff --git a/comp/otelcol/collector/fx-pipeline/fx.go b/comp/otelcol/collector/fx-pipeline/fx.go index d744a7d179739..c32bf9b6cfdb7 100644 --- a/comp/otelcol/collector/fx-pipeline/fx.go +++ b/comp/otelcol/collector/fx-pipeline/fx.go @@ -12,7 +12,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/util/fxutil" ) -// team: opentelemetry opentelemetry-agent +// team: opentelemetry-agent // Module for OTel Agent func Module() fxutil.Module { diff --git a/comp/otelcol/collector/fx/fx.go b/comp/otelcol/collector/fx/fx.go index f42588437506f..03c7ce9ebb77a 100644 --- a/comp/otelcol/collector/fx/fx.go +++ b/comp/otelcol/collector/fx/fx.go @@ -14,7 +14,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/util/fxutil" ) -// team: opentelemetry opentelemetry-agent +// team: opentelemetry-agent // Module for OTel Agent func Module() fxutil.Module { diff --git a/comp/otelcol/converter/def/component.go b/comp/otelcol/converter/def/component.go index 4837df3327a35..7cdcb797dde80 100644 --- a/comp/otelcol/converter/def/component.go +++ b/comp/otelcol/converter/def/component.go @@ -10,7 +10,7 @@ import ( "go.opentelemetry.io/collector/confmap" ) -// team: opentelemetry opentelemetry-agent +// team: opentelemetry-agent // Component implements the confmap.Converter interface. type Component interface { diff --git a/comp/otelcol/ddflareextension/def/component.go b/comp/otelcol/ddflareextension/def/component.go index f7bfaab5f9be7..bddee5556608c 100644 --- a/comp/otelcol/ddflareextension/def/component.go +++ b/comp/otelcol/ddflareextension/def/component.go @@ -12,7 +12,7 @@ import ( "go.opentelemetry.io/collector/extension" ) -// team: opentelemetry opentelemetry-agent +// team: opentelemetry-agent // Component specifies the interface implemented by the extension module. type Component interface { diff --git a/comp/otelcol/ddprofilingextension/def/component.go b/comp/otelcol/ddprofilingextension/def/component.go index 681528f3fa437..fda5eb12f0303 100644 --- a/comp/otelcol/ddprofilingextension/def/component.go +++ b/comp/otelcol/ddprofilingextension/def/component.go @@ -8,7 +8,7 @@ package ddprofilingextension import "go.opentelemetry.io/collector/extension" -// team: opentelemetry opentelemetry-agent +// team: opentelemetry-agent // Component implements the component.Component interface. type Component interface { diff --git a/comp/otelcol/ddprofilingextension/fx/fx.go b/comp/otelcol/ddprofilingextension/fx/fx.go index 01a49962807b6..6e9339d6b41cc 100644 --- a/comp/otelcol/ddprofilingextension/fx/fx.go +++ b/comp/otelcol/ddprofilingextension/fx/fx.go @@ -12,7 +12,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/util/fxutil" ) -// team: opentelemetry opentelemetry-agent +// team: opentelemetry-agent // Module defines the fx options for this component. func Module() fxutil.Module { diff --git a/comp/otelcol/logsagentpipeline/component.go b/comp/otelcol/logsagentpipeline/component.go index 659fb8764ec1f..c815f33ae1681 100644 --- a/comp/otelcol/logsagentpipeline/component.go +++ b/comp/otelcol/logsagentpipeline/component.go @@ -12,7 +12,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/logs/pipeline" ) -// team: opentelemetry opentelemetry-agent +// team: opentelemetry-agent // Component is the component type. type Component interface { diff --git a/comp/otelcol/status/def/component.go b/comp/otelcol/status/def/component.go index 27197534d3605..2d8339fc60db4 100644 --- a/comp/otelcol/status/def/component.go +++ b/comp/otelcol/status/def/component.go @@ -6,7 +6,7 @@ // Package status implements the core status component information provider interface package status -// team: opentelemetry opentelemetry-agent +// team: opentelemetry-agent // Component is the status interface. type Component interface {