Re-enable datadog_otel_components_ocb_build with new rules

.gitlab-ci.yml

@@ -1058,6 +1058,16 @@ workflow:
       compare_to: $COMPARE_TO_BRANCH
     when: on_success
 
+.on_otel_components_changes:
+  - !reference [.except_mergequeue, .on_main]
+  - 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:

.gitlab/test/integration_test/otel.yml

@@ -58,28 +58,26 @@ 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
 
 # Test that the BYOC packages can be built with the existing Dockerfile
 ddot_byoc_package_build_test_rpm: