Skip to content

Commit cd48d9f

Browse files
authored
Re-enable datadog_otel_components_ocb_build with new rules (#46641)
### What does this PR do? - Re-enables the `datadog_otel_components_ocb_build` integration test job that was previously disabled - Adds a new `.on_otel_components_changes` rule anchor that runs the job on main merges and on changes to `cmd/otel-agent/**/*`, `comp/otelcol/**/*`, or `test/otel/testdata/**/*` - Requests higher resources for ocb build to pass reliably (from #46176) ### Motivation ### Describe how you validated your changes ### Additional Notes Co-authored-by: stanley.liu <stanley.liu@datadoghq.com>
1 parent 2d33331 commit cd48d9f

File tree

3 files changed

+39
-26
lines changed

3 files changed

+39
-26
lines changed

.gitlab-ci.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1056,6 +1056,17 @@ workflow:
10561056
compare_to: $COMPARE_TO_BRANCH
10571057
when: on_success
10581058

1059+
.on_otel_components_changes:
1060+
- !reference [.except_mergequeue]
1061+
- !reference [.on_main]
1062+
- changes:
1063+
paths:
1064+
- cmd/otel-agent/**/*
1065+
- comp/otelcol/**/*
1066+
- test/otel/testdata/**/*
1067+
compare_to: $COMPARE_TO_BRANCH
1068+
when: on_success
1069+
10591070
.on_ssi_or_e2e_changes:
10601071
- !reference [.on_e2e_main_release_or_rc]
10611072
- changes:

.gitlab/test/integration_test/otel.yml

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -62,28 +62,30 @@ docker_image_build_otel:
6262
- !reference [.except_mergequeue]
6363
- when: on_success
6464

65-
# TODO(songy23): re-enable datadog_otel_components_ocb_build after OSS DD exporter adopts https://github.com/DataDog/datadog-agent/pull/42542
66-
# datadog_otel_components_ocb_build:
67-
# stage: integration_test
68-
# image: registry.ddbuild.io/ci/datadog-agent-buildimages/linux$CI_IMAGE_LINUX_SUFFIX:$CI_IMAGE_LINUX
69-
# tags: ["arch:amd64", "specific:true"]
70-
# needs: ["go_deps"]
71-
# artifacts:
72-
# paths:
73-
# - ocb-output.log
74-
# - otelcol-custom.log
75-
# - flare-info.log
76-
# when: always
77-
# before_script:
78-
# - !reference [.retrieve_linux_go_deps]
79-
# script:
80-
# - echo "Building custom collector with datadog components"
81-
# - test/otel/testdata/ocb_build_script.sh
82-
# - echo "see artifacts for job logs"
83-
# rules:
84-
# - !reference [.except_mergequeue]
85-
# - when: on_success
86-
# timeout: 15 minutes
65+
datadog_otel_components_ocb_build:
66+
stage: integration_test
67+
image: registry.ddbuild.io/ci/datadog-agent-buildimages/linux$CI_IMAGE_LINUX_SUFFIX:$CI_IMAGE_LINUX
68+
tags: ["arch:amd64", "specific:true"]
69+
needs: ["go_deps"]
70+
artifacts:
71+
paths:
72+
- ocb-output.log
73+
- otelcol-custom.log
74+
- flare-info.log
75+
when: always
76+
before_script:
77+
- !reference [.retrieve_linux_go_deps]
78+
script:
79+
- echo "Building custom collector with datadog components"
80+
- test/otel/testdata/ocb_build_script.sh
81+
- echo "see artifacts for job logs"
82+
rules:
83+
- !reference [.on_otel_components_changes]
84+
timeout: 15 minutes
85+
variables:
86+
KUBERNETES_CPU_REQUEST: 16
87+
KUBERNETES_MEMORY_REQUEST: 32Gi
88+
KUBERNETES_MEMORY_LIMIT: 32Gi
8789

8890
# Test that the BYOC packages can be built with the existing Dockerfile
8991
ddot_byoc_package_build_test_rpm:

test/otel/testdata/builder-config.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ connectors:
66
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector
77
v0.145.0
88
converters:
9-
- gomod: github.com/DataDog/datadog-agent/comp/otelcol/converter/impl v0.64.3
9+
- gomod: github.com/DataDog/datadog-agent/comp/otelcol/converter/impl v0.75.2
1010
path: ./comp/otelcol/converter/impl
1111
dist:
1212
description: Basic OTel Collector distribution for Developers
@@ -22,10 +22,10 @@ exporters:
2222
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter
2323
v0.145.0
2424
- gomod: github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/exporter/serializerexporter
25-
v0.64.3
25+
v0.75.2
2626
path: ./comp/otelcol/otlp/components/exporter/serializerexporter
2727
extensions:
28-
- gomod: github.com/DataDog/datadog-agent/comp/otelcol/ddflareextension/impl v0.64.3
28+
- gomod: github.com/DataDog/datadog-agent/comp/otelcol/ddflareextension/impl v0.75.2
2929
path: ./comp/otelcol/ddflareextension/impl
3030
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.145.0
3131
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension
@@ -42,7 +42,7 @@ extensions:
4242
v0.145.0
4343
processors:
4444
- gomod: github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/processor/infraattributesprocessor
45-
v0.64.3
45+
v0.75.2
4646
path: ./comp/otelcol/otlp/components/processor/infraattributesprocessor
4747
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.145.0
4848
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.145.0

0 commit comments

Comments
 (0)