Skip to content

Re-enable datadog_otel_components_ocb_build with new rules #46641

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gh-worker-dd-mergequeue-cf854d merged 11 commits into from
Feb 23, 2026
Merged

Re-enable datadog_otel_components_ocb_build with new rules #46641

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
3f3a25a
[OTAGENT] Re-enable datadog_otel_components_ocb_build CI job
liustanley Feb 18, 2026
17aa1fb
test commit to trigger job
liustanley Feb 18, 2026
828f190
Merge branch 'main' into stanley.liu/edit-ocb-test
liustanley Feb 18, 2026
c6a757b
test commit to trigger job
liustanley Feb 18, 2026
64f2df5
Merge branch 'stanley.liu/edit-ocb-test' of github.com:DataDog/datado…
liustanley Feb 18, 2026
e65c05d
Fix gitlab reference
liustanley Feb 18, 2026
f31f1ca
Fix builder-config.yaml
liustanley Feb 18, 2026
d0616ab
Fix builder-config.yaml versions
liustanley Feb 18, 2026
d841f6b
Merge remote-tracking branch 'origin/stanley.liu/edit-ocb-test' into …
liustanley Feb 18, 2026
61f59c8
Remove test comments
liustanley Feb 19, 2026
1215311
Request higher resources for ocb build
liustanley Feb 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1058,6 +1058,17 @@ workflow:
compare_to: $COMPARE_TO_BRANCH
when: on_success

.on_otel_components_changes:
- !reference [.except_mergequeue]
- !reference [.on_main]
Copy link
Contributor

@Ishirui Ishirui Feb 20, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This means your jobs will only run on main (i.e. after the PR is merged). Is this expected, or do you want the build to run on PRs as well ?

Copy link
Contributor Author

@liustanley liustanley Feb 20, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes that's intended, we wanted this PR to mainly run on our team's PRs and also main to make sure that the state on main is good (context). I believe it will also run on PRs with the filepath changes, since it ran on this PR

- changes:
paths:
- cmd/otel-agent/**/*
- comp/otelcol/**/*
- test/otel/testdata/**/*
compare_to: $COMPARE_TO_BRANCH
when: on_success

.on_ssi_or_e2e_changes:
- !reference [.on_e2e_main_release_or_rc]
- changes:
Expand Down
46 changes: 24 additions & 22 deletions .gitlab/test/integration_test/otel.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,28 +58,30 @@ docker_image_build_otel:
- !reference [.except_mergequeue]
- when: on_success

# TODO(songy23): re-enable datadog_otel_components_ocb_build after OSS DD exporter adopts https://github.com/DataDog/datadog-agent/pull/42542
# datadog_otel_components_ocb_build:
# stage: integration_test
# image: registry.ddbuild.io/ci/datadog-agent-buildimages/linux$CI_IMAGE_LINUX_SUFFIX:$CI_IMAGE_LINUX
# tags: ["arch:amd64", "specific:true"]
# needs: ["go_deps"]
# artifacts:
# paths:
# - ocb-output.log
# - otelcol-custom.log
# - flare-info.log
# when: always
# before_script:
# - !reference [.retrieve_linux_go_deps]
# script:
# - echo "Building custom collector with datadog components"
# - test/otel/testdata/ocb_build_script.sh
# - echo "see artifacts for job logs"
# rules:
# - !reference [.except_mergequeue]
# - when: on_success
# timeout: 15 minutes
datadog_otel_components_ocb_build:
stage: integration_test
image: registry.ddbuild.io/ci/datadog-agent-buildimages/linux$CI_IMAGE_LINUX_SUFFIX:$CI_IMAGE_LINUX
tags: ["arch:amd64", "specific:true"]
needs: ["go_deps"]
artifacts:
paths:
- ocb-output.log
- otelcol-custom.log
- flare-info.log
when: always
before_script:
- !reference [.retrieve_linux_go_deps]
script:
- echo "Building custom collector with datadog components"
- test/otel/testdata/ocb_build_script.sh
- echo "see artifacts for job logs"
rules:
- !reference [.on_otel_components_changes]
timeout: 15 minutes
variables:
KUBERNETES_CPU_REQUEST: 16
KUBERNETES_MEMORY_REQUEST: 32Gi
KUBERNETES_MEMORY_LIMIT: 32Gi

# Test that the BYOC packages can be built with the existing Dockerfile
ddot_byoc_package_build_test_rpm:
Expand Down
8 changes: 4 additions & 4 deletions test/otel/testdata/builder-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ connectors:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector
v0.145.0
converters:
- gomod: github.com/DataDog/datadog-agent/comp/otelcol/converter/impl v0.64.3
- gomod: github.com/DataDog/datadog-agent/comp/otelcol/converter/impl v0.75.2
path: ./comp/otelcol/converter/impl
dist:
description: Basic OTel Collector distribution for Developers
Expand All @@ -22,10 +22,10 @@ exporters:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter
v0.145.0
- gomod: github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/exporter/serializerexporter
v0.64.3
v0.75.2
path: ./comp/otelcol/otlp/components/exporter/serializerexporter
extensions:
- gomod: github.com/DataDog/datadog-agent/comp/otelcol/ddflareextension/impl v0.64.3
- gomod: github.com/DataDog/datadog-agent/comp/otelcol/ddflareextension/impl v0.75.2
path: ./comp/otelcol/ddflareextension/impl
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.145.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension
Expand All @@ -42,7 +42,7 @@ extensions:
v0.145.0
processors:
- gomod: github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/processor/infraattributesprocessor
v0.64.3
v0.75.2
path: ./comp/otelcol/otlp/components/processor/infraattributesprocessor
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.145.0
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.145.0
Expand Down