From 4576d09b978bd9e5df468721d5d4b6c8ffafd9af Mon Sep 17 00:00:00 2001
From: mackjmr <mackenzie.jomard@datadoghq.com>
Date: Wed, 31 Jul 2024 13:54:20 +0200
Subject: [PATCH 01/21] Add converged agent deployment

---
 .gitlab-ci.yml                          |  12 ++
 ci/converged-agent-values/values.yaml   | 153 ++++++++++++++++++++++++
 ci/scripts/ci-deploy-converged-agent.sh |  36 ++++++
 3 files changed, 201 insertions(+)
 create mode 100644 ci/converged-agent-values/values.yaml
 create mode 100644 ci/scripts/ci-deploy-converged-agent.sh

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c9c4e85c51..91625f38db 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -320,3 +320,15 @@ staging-deploy-dd-ingest-agent-eks:
     REGION: us-east-1
     RELEASE_NAME: datadog-agent-dd
     NODE_GROUP: ng-7
+
+# Agent env:converged-agent-staging
+staging-deploy-converged-agent-staging-eks:
+  !!merge <<: *staging-deploy
+  variables:
+    NAMESPACE: converged-agent-staging
+    SCRIPT: ./ci/scripts/ci-deploy-agent.sh
+    CLUSTER_NAME: dd-otel
+    CLUSTER_ARN: "arn:aws:eks:us-east-1:601427279990:cluster/dd-otel"
+    REGION: us-east-1
+    RELEASE_NAME: converged-agent-staging
+    NODE_GROUP: ng-8
diff --git a/ci/converged-agent-values/values.yaml b/ci/converged-agent-values/values.yaml
new file mode 100644
index 0000000000..8440d4236f
--- /dev/null
+++ b/ci/converged-agent-values/values.yaml
@@ -0,0 +1,153 @@
+agents:
+  image:
+    tag: 7.55.0
+    tagSuffix: jmx
+datadog:
+  apiKeyExistingSecret: datadog-secrets
+  otelCollector:
+    enabled: true
+    config: |
+    receivers:
+      otlp:
+        protocols:
+          grpc:
+            endpoint: 0.0.0.0:4317
+          http:
+            endpoint: 0.0.0.0:4318
+    exporters:
+      debug:
+        verbosity: detailed
+      datadog:
+        host_metadata:
+          tags: ['env:${env:OTEL_K8S_NAMESPACE}']
+        metrics:
+          resource_attributes_as_tags: true
+          histograms:
+            mode: counters
+            send_count_sum_metrics: true
+        traces:
+          span_name_as_resource_name: true
+          compute_stats_by_span_kind: true
+          peer_service_aggregation: true
+          trace_buffer: 1000
+        api:
+          key: "$DD_API_KEY"
+    processors:
+      resourcedetection:
+        # ensures host.name and other important resource tags
+        # get picked up
+        detectors: [env, gcp, ecs, ec2, azure, system]
+        timeout: 5s
+        override: false
+        system:
+          # Enable optional system attributes
+          resource_attributes:
+            os.type:
+              enabled: true
+            os.description:
+              enabled: true
+            host.ip:
+              enabled: true
+            host.mac:
+              enabled: true
+            host.arch:
+              enabled: true
+            host.cpu.vendor.id:
+              enabled: true
+            host.cpu.model.name:
+              enabled: true
+            host.cpu.family:
+              enabled: true
+            host.cpu.model.id:
+              enabled: true
+            host.cpu.stepping:
+              enabled: true
+            host.cpu.cache.l2.size:
+              enabled: true
+            host.id:
+              enabled: false
+      # adds various tags related to k8s
+      # adds various tags related to k8s
+      k8sattributes:
+        passthrough: false
+        auth_type: "serviceAccount"
+        pod_association:
+          - sources:
+              - from: resource_attribute
+                name: k8s.pod.ip
+        extract:
+          metadata:
+            - k8s.pod.name
+            - k8s.pod.uid
+            - k8s.deployment.name
+            - k8s.node.name
+            - k8s.namespace.name
+            - k8s.pod.start_time
+            - k8s.replicaset.name
+            - k8s.replicaset.uid
+            - k8s.daemonset.name
+            - k8s.daemonset.uid
+            - k8s.job.name
+            - k8s.job.uid
+            - k8s.cronjob.name
+            - k8s.statefulset.name
+            - k8s.statefulset.uid
+            - container.image.name
+            - container.image.tag
+            - container.id
+            - k8s.container.name
+            - container.image.name
+            - container.image.tag
+            - container.id
+          labels:
+            - tag_name: kube_app_name
+              key: app.kubernetes.io/name
+              from: pod
+            - tag_name: kube_app_instance
+              key: app.kubernetes.io/instance
+              from: pod
+            - tag_name: kube_app_version
+              key: app.kubernetes.io/version
+              from: pod
+            - tag_name: kube_app_component
+              key: app.kubernetes.io/component
+              from: pod
+            - tag_name: kube_app_part_of
+              key: app.kubernetes.io/part-of
+              from: pod
+            - tag_name: kube_app_managed_by
+              key: app.kubernetes.io/managed-by
+              from: pod
+      batch:
+        send_batch_max_size: 1000
+        send_batch_size: 100
+        timeout: 10s
+      probabilistic_sampler:
+        hash_seed: 22
+        sampling_percentage: 15.3
+    connectors:
+      datadog/connector:
+        traces:
+          span_name_as_resource_name: true
+    service:
+      telemetry:
+        logs:
+          encoding: "json"
+          initial_fields:
+            - service: "otel-collector"
+      pipelines:
+        metrics:
+          receivers: [otlp, datadog/connector]
+          processors: [resourcedetection, k8sattributes, batch]
+          exporters: [datadog]
+        traces:
+          receivers: [otlp]
+          processors: [resourcedetection, k8sattributes, batch]
+          exporters: [datadog/connector]
+        traces/sampled:
+          receivers: [datadog/connector]
+          processors: [probabilistic_sampler, batch]
+          exporters: [datadog]
+        logs:
+          processors: [resourcedetection, k8sattributes, batch]
+          exporters: [datadog]
diff --git a/ci/scripts/ci-deploy-converged-agent.sh b/ci/scripts/ci-deploy-converged-agent.sh
new file mode 100644
index 0000000000..60f58c0c5b
--- /dev/null
+++ b/ci/scripts/ci-deploy-converged-agent.sh
@@ -0,0 +1,36 @@
+#!/usr/bin/env bash
+
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
+# This script is used to deploy collector on demo account cluster
+
+set -euo pipefail
+IFS=$'\n\t'
+
+clusterName=$CLUSTER_NAME
+clusterArn=$CLUSTER_ARN
+region=$REGION
+namespace=$NAMESPACE
+releaseName=$RELEASE_NAME
+nodegroup=$NODE_GROUP
+
+install_agent() {
+  # if repo already exists, helm 3+ will skip
+  helm repo add datadog https://helm.datadoghq.com
+
+  # --install will run `helm install` if not already present.
+  helm_cmd="helm --debug upgrade "${releaseName}" -n "${namespace}" datadog/datadog --install \
+    -f ./ci/converged-agent-values/values.yaml \
+    --set datadog.tags=env:"${namespace}" \
+    --set agents.nodeSelector.\"alpha\\.eksctl\\.io/nodegroup-name\"=${nodegroup}"
+
+  eval $helm_cmd
+}
+
+###########################################################################################################
+
+aws eks --region "${region}" update-kubeconfig --name "${clusterName}"
+kubectl config use-context "${clusterArn}"
+
+install_agent

From d1dae1ee778e8d08adbd9e894fca2c1b92017691 Mon Sep 17 00:00:00 2001
From: mackjmr <mackenzie.jomard@datadoghq.com>
Date: Wed, 31 Jul 2024 14:12:33 +0200
Subject: [PATCH 02/21] fix

---
 .gitlab-ci.yml | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 91625f38db..ed7f332f99 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -297,6 +297,21 @@ staging-deploy-dd-ingest-demo-eks:
     ORDERPRODUCER_DEPLOYMENT: deployment-staging.yaml
     REGISTRY: $BUILD_SANDBOX_REGISTRY
 
+# Demo env:converged-agent-staging
+staging-deploy-dd-ingest-demo-eks:
+  !!merge <<: *staging-deploy
+  variables:
+    NAMESPACE: converged-agent-staging
+    VALUES: 
+    NODE_GROUP: ng-8
+    SCRIPT: ./ci/scripts/ci-deploy-demo.sh
+    CLUSTER_NAME: dd-otel
+    CLUSTER_ARN: "arn:aws:eks:us-east-1:601427279990:cluster/dd-otel"
+    REGION: us-east-1
+    ZOOKEEPER_DEPLOYMENT: deployment-staging.yaml
+    ORDERPRODUCER_DEPLOYMENT: deployment-staging.yaml
+    REGISTRY: $BUILD_SANDBOX_REGISTRY
+
 # Agent env:otel-ingest-staging
 staging-deploy-otel-ingest-agent-eks:
   !!merge <<: *staging-deploy
@@ -326,7 +341,7 @@ staging-deploy-converged-agent-staging-eks:
   !!merge <<: *staging-deploy
   variables:
     NAMESPACE: converged-agent-staging
-    SCRIPT: ./ci/scripts/ci-deploy-agent.sh
+    SCRIPT: ./ci/scripts/ci-deploy-converged-agent.sh
     CLUSTER_NAME: dd-otel
     CLUSTER_ARN: "arn:aws:eks:us-east-1:601427279990:cluster/dd-otel"
     REGION: us-east-1

From ae5bb7e6eb2d8f3ba72c4d485aa93e381ce0c47b Mon Sep 17 00:00:00 2001
From: mackjmr <mackenzie.jomard@datadoghq.com>
Date: Wed, 31 Jul 2024 14:19:13 +0200
Subject: [PATCH 03/21] fix

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ed7f332f99..d5f0aed301 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -298,7 +298,7 @@ staging-deploy-dd-ingest-demo-eks:
     REGISTRY: $BUILD_SANDBOX_REGISTRY
 
 # Demo env:converged-agent-staging
-staging-deploy-dd-ingest-demo-eks:
+staging-deploy-converged-agent-demo-eks:
   !!merge <<: *staging-deploy
   variables:
     NAMESPACE: converged-agent-staging

From ea0cb05e97066b5bac1ca460fb1f00c6d7d59a93 Mon Sep 17 00:00:00 2001
From: mackjmr <mackenzie.jomard@datadoghq.com>
Date: Wed, 31 Jul 2024 14:33:28 +0200
Subject: [PATCH 04/21] temp

---
 ci/scripts/ci-deploy-demo.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/scripts/ci-deploy-demo.sh b/ci/scripts/ci-deploy-demo.sh
index 82a3f2b1bb..45b118a83f 100644
--- a/ci/scripts/ci-deploy-demo.sh
+++ b/ci/scripts/ci-deploy-demo.sh
@@ -22,7 +22,7 @@ registry=$REGISTRY
 install_demo() {
   release_name="opentelemetry-demo"
 
-  helm uninstall ${release_name} -n ${namespace}
+  # helm uninstall ${release_name} -n ${namespace}
   
   # HELM COMMAND
   helm_cmd="helm --debug upgrade ${release_name} -n ${namespace} open-telemetry/opentelemetry-demo --install \

From d1b85149a93127ea19e5aa2d59103afe075f54ec Mon Sep 17 00:00:00 2001
From: mackjmr <mackenzie.jomard@datadoghq.com>
Date: Wed, 31 Jul 2024 15:04:08 +0200
Subject: [PATCH 05/21] remove temp

---
 ci/scripts/ci-deploy-demo.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/scripts/ci-deploy-demo.sh b/ci/scripts/ci-deploy-demo.sh
index 45b118a83f..82a3f2b1bb 100644
--- a/ci/scripts/ci-deploy-demo.sh
+++ b/ci/scripts/ci-deploy-demo.sh
@@ -22,7 +22,7 @@ registry=$REGISTRY
 install_demo() {
   release_name="opentelemetry-demo"
 
-  # helm uninstall ${release_name} -n ${namespace}
+  helm uninstall ${release_name} -n ${namespace}
   
   # HELM COMMAND
   helm_cmd="helm --debug upgrade ${release_name} -n ${namespace} open-telemetry/opentelemetry-demo --install \

From 82ae4b0d8fadd7719c369973bddf44668c2f279d Mon Sep 17 00:00:00 2001
From: mackjmr <mackenzie.jomard@datadoghq.com>
Date: Wed, 31 Jul 2024 15:31:28 +0200
Subject: [PATCH 06/21] change release name because of char limit

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d5f0aed301..0402b1280a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -345,5 +345,5 @@ staging-deploy-converged-agent-staging-eks:
     CLUSTER_NAME: dd-otel
     CLUSTER_ARN: "arn:aws:eks:us-east-1:601427279990:cluster/dd-otel"
     REGION: us-east-1
-    RELEASE_NAME: converged-agent-staging
+    RELEASE_NAME: converged-agent
     NODE_GROUP: ng-8

From 0c2ffe0ffb1e5a036eebe2b96bf238a497d39a99 Mon Sep 17 00:00:00 2001
From: mackjmr <mackenzie.jomard@datadoghq.com>
Date: Wed, 31 Jul 2024 16:01:25 +0200
Subject: [PATCH 07/21] Empty-Commit


From e148bd76875be4fb8d6353a9f35b63b0cfcab0ca Mon Sep 17 00:00:00 2001
From: mackjmr <mackenzie.jomard@datadoghq.com>
Date: Wed, 31 Jul 2024 16:10:28 +0200
Subject: [PATCH 08/21] update

---
 ci/converged-agent-values/values.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ci/converged-agent-values/values.yaml b/ci/converged-agent-values/values.yaml
index 8440d4236f..35051acc68 100644
--- a/ci/converged-agent-values/values.yaml
+++ b/ci/converged-agent-values/values.yaml
@@ -1,6 +1,6 @@
 agents:
   image:
-    tag: 7.55.0
+    tag: 7.55.2
     tagSuffix: jmx
 datadog:
   apiKeyExistingSecret: datadog-secrets
@@ -134,7 +134,7 @@ datadog:
         logs:
           encoding: "json"
           initial_fields:
-            - service: "otel-collector"
+            - service: "converged-agent"
       pipelines:
         metrics:
           receivers: [otlp, datadog/connector]

From 599ebc2c25880a36c1cc8a79e92213b0878d31e1 Mon Sep 17 00:00:00 2001
From: mackjmr <mackenzie.jomard@datadoghq.com>
Date: Wed, 31 Jul 2024 16:25:27 +0200
Subject: [PATCH 09/21] update image

---
 ci/converged-agent-values/values.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/converged-agent-values/values.yaml b/ci/converged-agent-values/values.yaml
index 35051acc68..e7b1a6fa9b 100644
--- a/ci/converged-agent-values/values.yaml
+++ b/ci/converged-agent-values/values.yaml
@@ -1,6 +1,6 @@
 agents:
   image:
-    tag: 7.55.2
+    tag: 7-ot-beta
     tagSuffix: jmx
 datadog:
   apiKeyExistingSecret: datadog-secrets

From a1f8365f8fd0b9d47c5daf91d9a5952d507982cc Mon Sep 17 00:00:00 2001
From: mackjmr <mackenzie.jomard@datadoghq.com>
Date: Wed, 31 Jul 2024 16:44:25 +0200
Subject: [PATCH 10/21] do not check tag

---
 ci/scripts/ci-deploy-converged-agent.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ci/scripts/ci-deploy-converged-agent.sh b/ci/scripts/ci-deploy-converged-agent.sh
index 60f58c0c5b..b8e28ac187 100644
--- a/ci/scripts/ci-deploy-converged-agent.sh
+++ b/ci/scripts/ci-deploy-converged-agent.sh
@@ -23,7 +23,8 @@ install_agent() {
   helm_cmd="helm --debug upgrade "${releaseName}" -n "${namespace}" datadog/datadog --install \
     -f ./ci/converged-agent-values/values.yaml \
     --set datadog.tags=env:"${namespace}" \
-    --set agents.nodeSelector.\"alpha\\.eksctl\\.io/nodegroup-name\"=${nodegroup}"
+    --set agents.nodeSelector.\"alpha\\.eksctl\\.io/nodegroup-name\"=${nodegroup} \
+    --set agents.image.doNotCheckTag=true"
 
   eval $helm_cmd
 }

From b16cc89134a2c6896dd18e6ec064afc87ea8d320 Mon Sep 17 00:00:00 2001
From: mackjmr <mackenzie.jomard@datadoghq.com>
Date: Wed, 31 Jul 2024 17:32:45 +0200
Subject: [PATCH 11/21] enable debug

---
 ci/converged-agent-values/values.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/converged-agent-values/values.yaml b/ci/converged-agent-values/values.yaml
index e7b1a6fa9b..d46694b0e9 100644
--- a/ci/converged-agent-values/values.yaml
+++ b/ci/converged-agent-values/values.yaml
@@ -143,7 +143,7 @@ datadog:
         traces:
           receivers: [otlp]
           processors: [resourcedetection, k8sattributes, batch]
-          exporters: [datadog/connector]
+          exporters: [datadog/connector, debug]
         traces/sampled:
           receivers: [datadog/connector]
           processors: [probabilistic_sampler, batch]

From f4839728cf6cc8b3c62ef3fafc5851dbbf098a37 Mon Sep 17 00:00:00 2001
From: mackjmr <mackenzie.jomard@datadoghq.com>
Date: Wed, 31 Jul 2024 17:36:12 +0200
Subject: [PATCH 12/21] update img

---
 ci/converged-agent-values/values.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/converged-agent-values/values.yaml b/ci/converged-agent-values/values.yaml
index d46694b0e9..cd41da727d 100644
--- a/ci/converged-agent-values/values.yaml
+++ b/ci/converged-agent-values/values.yaml
@@ -1,6 +1,6 @@
 agents:
   image:
-    tag: 7-ot-beta
+    tag: nightly-ot-beta-main-jmx
     tagSuffix: jmx
 datadog:
   apiKeyExistingSecret: datadog-secrets

From d45d163a225f75356753af366e1ddbfb2493708e Mon Sep 17 00:00:00 2001
From: mackjmr <mackenzie.jomard@datadoghq.com>
Date: Wed, 31 Jul 2024 17:46:44 +0200
Subject: [PATCH 13/21] change agent repo

---
 ci/converged-agent-values/values.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ci/converged-agent-values/values.yaml b/ci/converged-agent-values/values.yaml
index cd41da727d..fef6739671 100644
--- a/ci/converged-agent-values/values.yaml
+++ b/ci/converged-agent-values/values.yaml
@@ -1,5 +1,6 @@
 agents:
   image:
+    repository: datadog/agent-dev
     tag: nightly-ot-beta-main-jmx
     tagSuffix: jmx
 datadog:

From 3e296c209cb6205a1e3e9c1c2760e94f6f4f72a9 Mon Sep 17 00:00:00 2001
From: mackjmr <mackenzie.jomard@datadoghq.com>
Date: Thu, 1 Aug 2024 11:39:29 +0200
Subject: [PATCH 14/21] update registry

---
 ci/converged-agent-values/values.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ci/converged-agent-values/values.yaml b/ci/converged-agent-values/values.yaml
index fef6739671..aa0e4d895e 100644
--- a/ci/converged-agent-values/values.yaml
+++ b/ci/converged-agent-values/values.yaml
@@ -1,3 +1,4 @@
+registry: docker.io/datadog
 agents:
   image:
     repository: datadog/agent-dev

From 240f55be036687886aef4f5ca180b5e128c714c2 Mon Sep 17 00:00:00 2001
From: mackjmr <mackenzie.jomard@datadoghq.com>
Date: Thu, 1 Aug 2024 12:01:55 +0200
Subject: [PATCH 15/21] fix

---
 ci/converged-agent-values/values.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ci/converged-agent-values/values.yaml b/ci/converged-agent-values/values.yaml
index aa0e4d895e..55764788f5 100644
--- a/ci/converged-agent-values/values.yaml
+++ b/ci/converged-agent-values/values.yaml
@@ -3,7 +3,6 @@ agents:
   image:
     repository: datadog/agent-dev
     tag: nightly-ot-beta-main-jmx
-    tagSuffix: jmx
 datadog:
   apiKeyExistingSecret: datadog-secrets
   otelCollector:

From 05243d06ea993dad336917490ddf71ed3e63d59b Mon Sep 17 00:00:00 2001
From: mackjmr <mackenzie.jomard@datadoghq.com>
Date: Thu, 1 Aug 2024 13:34:48 +0200
Subject: [PATCH 16/21] ports

---
 ci/converged-agent-values/values.yaml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ci/converged-agent-values/values.yaml b/ci/converged-agent-values/values.yaml
index 55764788f5..e8572bca41 100644
--- a/ci/converged-agent-values/values.yaml
+++ b/ci/converged-agent-values/values.yaml
@@ -1,5 +1,10 @@
 registry: docker.io/datadog
 agents:
+  containers: 
+    otelAgent: 
+      ports:
+        - hostPort: 4317
+        - hostPort: 4318
   image:
     repository: datadog/agent-dev
     tag: nightly-ot-beta-main-jmx

From 9d6b9d15ad0b0d4ef8eec2724809f005822ea266 Mon Sep 17 00:00:00 2001
From: mackjmr <mackenzie.jomard@datadoghq.com>
Date: Thu, 1 Aug 2024 13:45:44 +0200
Subject: [PATCH 17/21] fix

---
 ci/converged-agent-values/values.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ci/converged-agent-values/values.yaml b/ci/converged-agent-values/values.yaml
index e8572bca41..8a84a36a88 100644
--- a/ci/converged-agent-values/values.yaml
+++ b/ci/converged-agent-values/values.yaml
@@ -3,8 +3,8 @@ agents:
   containers: 
     otelAgent: 
       ports:
-        - hostPort: 4317
-        - hostPort: 4318
+      - hostPort: 4317
+      - hostPort: 4318
   image:
     repository: datadog/agent-dev
     tag: nightly-ot-beta-main-jmx

From 452f9e0323d7ca4b1f7a527f07be301197f9a3f2 Mon Sep 17 00:00:00 2001
From: mackjmr <mackenzie.jomard@datadoghq.com>
Date: Thu, 1 Aug 2024 14:02:55 +0200
Subject: [PATCH 18/21] ports

---
 ci/converged-agent-values/values.yaml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/ci/converged-agent-values/values.yaml b/ci/converged-agent-values/values.yaml
index 8a84a36a88..7434e2eaee 100644
--- a/ci/converged-agent-values/values.yaml
+++ b/ci/converged-agent-values/values.yaml
@@ -3,8 +3,14 @@ agents:
   containers: 
     otelAgent: 
       ports:
-      - hostPort: 4317
-      - hostPort: 4318
+        - containerPort: 4317
+          hostPort: 4317
+          name: grpcport
+          protocol: UDP
+        - containerPort: 4318
+          hostPort: 4318
+          name: httpport
+          protocol: UDP
   image:
     repository: datadog/agent-dev
     tag: nightly-ot-beta-main-jmx

From cef78ebd17158c4ef1867c9cbcff6c2472ee028f Mon Sep 17 00:00:00 2001
From: mackjmr <mackenzie.jomard@datadoghq.com>
Date: Thu, 1 Aug 2024 14:10:53 +0200
Subject: [PATCH 19/21] fix

---
 ci/converged-agent-values/values.yaml | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/ci/converged-agent-values/values.yaml b/ci/converged-agent-values/values.yaml
index 7434e2eaee..794852dce7 100644
--- a/ci/converged-agent-values/values.yaml
+++ b/ci/converged-agent-values/values.yaml
@@ -1,22 +1,12 @@
 registry: docker.io/datadog
 agents:
-  containers: 
-    otelAgent: 
-      ports:
-        - containerPort: 4317
-          hostPort: 4317
-          name: grpcport
-          protocol: UDP
-        - containerPort: 4318
-          hostPort: 4318
-          name: httpport
-          protocol: UDP
   image:
     repository: datadog/agent-dev
     tag: nightly-ot-beta-main-jmx
 datadog:
   apiKeyExistingSecret: datadog-secrets
   otelCollector:
+    ports: `[{"containerPort":"4317", "hostPort":"4317", "name":"otel-grpc"},{"containerPort":"4318", "hostPort":"4318", "name":"otel-http"}]`
     enabled: true
     config: |
     receivers:

From eb1dee98452a0fcc253304a33163684ba77d2054 Mon Sep 17 00:00:00 2001
From: mackjmr <mackenzie.jomard@datadoghq.com>
Date: Thu, 1 Aug 2024 15:04:46 +0200
Subject: [PATCH 20/21] ports

---
 ci/converged-agent-values/values.yaml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/ci/converged-agent-values/values.yaml b/ci/converged-agent-values/values.yaml
index 794852dce7..199a0a8a3b 100644
--- a/ci/converged-agent-values/values.yaml
+++ b/ci/converged-agent-values/values.yaml
@@ -6,7 +6,15 @@ agents:
 datadog:
   apiKeyExistingSecret: datadog-secrets
   otelCollector:
-    ports: `[{"containerPort":"4317", "hostPort":"4317", "name":"otel-grpc"},{"containerPort":"4318", "hostPort":"4318", "name":"otel-http"}]`
+    ports:
+      - containerPort: 4317
+        hostPort: 4317
+        name: grpcport
+        protocol: UDP
+      - containerPort: 4318
+        hostPort: 4318
+        name: httpport
+        protocol: UDP
     enabled: true
     config: |
     receivers:

From e4341f8fa321eac4bd25b755ad213f78ab1b89c3 Mon Sep 17 00:00:00 2001
From: mackjmr <mackenzie.jomard@datadoghq.com>
Date: Thu, 1 Aug 2024 15:18:16 +0200
Subject: [PATCH 21/21] fix ports

---
 ci/converged-agent-values/values.yaml | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/ci/converged-agent-values/values.yaml b/ci/converged-agent-values/values.yaml
index 199a0a8a3b..e4569a49e8 100644
--- a/ci/converged-agent-values/values.yaml
+++ b/ci/converged-agent-values/values.yaml
@@ -6,15 +6,7 @@ agents:
 datadog:
   apiKeyExistingSecret: datadog-secrets
   otelCollector:
-    ports:
-      - containerPort: 4317
-        hostPort: 4317
-        name: grpcport
-        protocol: UDP
-      - containerPort: 4318
-        hostPort: 4318
-        name: httpport
-        protocol: UDP
+    ports: [{"containerPort":"4317", "hostPort":"4317" ,"name":"otel-grpc"},{"containerPort":"4318", "hostPort":"4318" ,"name":"otel-http"}]
     enabled: true
     config: |
     receivers: