[8.19] (backport #13623) [edot] add suppress_conflict_errors to exporter

[mergify]

What does this PR do?

This PR pulls in suppress_conflict_errors from open-telemetry/opentelemetry-collector-contrib#47309 to avoid logging errors for 409 status code. This PR also pins the exporter version to open-telemetry/opentelemetry-collector-contrib@ffa805c to pull in changes. Once the versions are bumped, we can remove the replace directive.

Why is it important?

Beats elasticsearch output ignores 409 status code and doesn't log the error. This PR is needed to achieve parity between hybrid mode and standalone mode.

Checklist

• I have read and understood the pull request guidelines of this project.
• My code follows the style guidelines of this project
• I have commented my code, particularly in hard-to-understand areas
• I have made corresponding changes to the documentation
• I have made corresponding change to the default configuration files
• I have added tests that prove my fix is effective or that my feature works
• I have added an entry in ./changelog/fragments using the changelog tool
• I have added an integration test or an E2E test

Related issues

• Closes [beats receivers] Suppress 409 Conflict errors in translated Elasticsearch exporter configurations #13521

---

This is an automatic backport of pull request #13623 done by [Mergify](https://mergify.com).

[mergify]

Cherry-pick of 0409211 has failed:

On branch mergify/bp/8.19/pr-13623
Your branch is up to date with 'origin/8.19'.

You are currently cherry-picking commit 040921166.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   .golangci.yml
	new file:   changelog/fragments/1776160579-esexporter-supress-409.yaml
	modified:   internal/pkg/otel/translate/otelconfig_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   NOTICE-fips.txt
	both modified:   NOTICE.txt
	both modified:   go.mod
	both modified:   go.sum
	both modified:   internal/edot/go.mod
	both modified:   internal/edot/go.sum
	both modified:   internal/pkg/otel/README.md
	both modified:   internal/pkg/otel/translate/output_elasticsearch.go
	both modified:   internal/pkg/otel/translate/output_elasticsearch_test.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

[elasticmachine]

Pinging @elastic/elastic-agent-control-plane (Team:Elastic-Agent-Control-Plane)

[github-actions]

TL;DR

The pre-commit workflow run failed in the check-merge-conflict hook because unresolved merge conflict markers were committed in this backport branch. Resolve the conflict markers in the listed files and push an updated commit.

Remediation

• Open and resolve the conflict markers (<<<<<<<, =======, >>>>>>>) in:
  • internal/pkg/otel/translate/output_elasticsearch.go
  • internal/pkg/otel/README.md
  • internal/pkg/otel/translate/output_elasticsearch_test.go
• Re-run local checks before pushing (at minimum pre-commit run -a or equivalent repo pre-commit target) to confirm no conflict markers remain.

Investigation details

Root Cause

The GitHub Actions job pre-commit failed at the step Run elastic/oblt-actions/pre-commit@v1 because the check-merge-conflict hook detected unresolved merge markers in tracked files.

Evidence

• Workflow: https://github.com/elastic/elastic-agent/actions/runs/24531453268
• Job/step: pre-commit → Run elastic/oblt-actions/pre-commit@v1 → hook check-merge-conflict
• Key log excerpt:
  • internal/pkg/otel/translate/output_elasticsearch.go:158: Merge conflict string '<<<<<<<' found
  • internal/pkg/otel/README.md:50: Merge conflict string '<<<<<<<' found
  • internal/pkg/otel/translate/output_elasticsearch_test.go:161: Merge conflict string '<<<<<<<' found
  • ##[error]Process completed with exit code 1.

Validation

• Not run locally (this workflow is read-only; diagnosis based on workflow job logs).

Follow-up

• After resolving markers, re-run the PR checks to verify the pre-commit job passes.

---

What is this? | From workflow: PR Actions Detective

Give us feedback! React with 🚀 if perfect, 👍 if helpful, 👎 if not.

[macroscopeapp]

🔴 Critical translate/output_elasticsearch.go:158

Unresolved Git merge conflict markers (<<<<<<< HEAD, =======, >>>>>>> 040921166) are present at lines 158-164, which causes a compilation error. The merge conflict needs to be resolved by choosing between the HEAD version (empty) or the incoming version that adds logs_dynamic_id, include_source_on_error, retry, and suppress_conflict_errors fields.

Also found in 1 other location(s)

internal/pkg/otel/translate/output_elasticsearch_test.go:161

Unresolved git merge conflict markers (<<<<<<< HEAD, =======, >>>>>>> 040921166) left in the test file at lines 161-230. These are not valid Go syntax and will cause a compilation error.

🚀 Reply "fix it for me" or copy this AI Prompt for your agent:

In file internal/pkg/otel/translate/output_elasticsearch.go around line 158:

Unresolved Git merge conflict markers (`<<<<<<< HEAD`, `=======`, `>>>>>>> 040921166`) are present at lines 158-164, which causes a compilation error. The merge conflict needs to be resolved by choosing between the HEAD version (empty) or the incoming version that adds `logs_dynamic_id`, `include_source_on_error`, `retry`, and `suppress_conflict_errors` fields.

Evidence trail:
internal/pkg/otel/translate/output_elasticsearch.go lines 150-175 at REVIEWED_COMMIT. The merge conflict markers `<<<<<<< HEAD`, `=======`, and `>>>>>>> 040921166` are clearly visible at lines 158-164.

Also found in 1 other location(s):
- internal/pkg/otel/translate/output_elasticsearch_test.go:161 -- Unresolved git merge conflict markers (`<<<<<<< HEAD`, `=======`, `>>>>>>> 040921166`) left in the test file at lines 161-230. These are not valid Go syntax and will cause a compilation error.

[elasticmachine]

💔 Build Failed

• Buildkite Build
• Commit: 4bf5e2a

Failed CI Steps

• check-ci
• Unit tests - Ubuntu 22.04
• Unit tests - Ubuntu 22.04
• Unit tests - Ubuntu 22.04 with requirefips build tag
• Unit tests - Ubuntu 22.04 with requirefips build tag
• Unit tests - fips140=only Ubuntu 22.04
• Unit tests - fips140=only Ubuntu 22.04
• Unit tests - Ubuntu 22.04 ARM64
• Unit tests - Ubuntu 22.04 ARM64
• Unit tests - Windows 2022
• Unit tests - Windows 2022
• Unit tests - Windows 2016
• Unit tests - Windows 2016
• Unit tests - macOS 15 ARM
• Unit tests - macOS 15 ARM
• Unit tests - Windows 11
• Unit tests - Windows 11
• :junit: Junit annotate
• 📦 amd64: zip,tar.gz,rpm,deb
• 📦 amd64: zip,tar.gz,rpm,deb
• 📦 amd64: OTEL_COMPONENT zip,tar.gz,rpm,deb
• 📦 amd64: OTEL_COMPONENT zip,tar.gz,rpm,deb
• 📦 amd64: FIPS tar.gz
• 📦 amd64: FIPS tar.gz
• 📦 arm64: zip,tar.gz
• 📦 arm64: zip,tar.gz
• 📦 arm64: OTEL_COMPONENT zip,tar.gz
• 📦 arm64: OTEL_COMPONENT zip,tar.gz
• 📦 arm64: FIPS tar.gz
• 📦 arm64: FIPS tar.gz
• 📦 amd64: Containers
• 📦 arm64: Containers
• 📦 amd64: FIPS Containers
• 📦 arm64: FIPS Containers
• 📦 amd64: OTEL_COMPONENT Containers
• 📦 arm64: OTEL_COMPONENT Containers
• Aggregate test reports
• ESS FIPS stack cleanup
• Aggregate test reports

History

• 💔 Build #37363 failed ca66684

cc @VihasMakwana

[lucabelluccini]

Hello, this merge failed - is it expected?

[cmacknz]

Beats receivers is not enabled by default anywhere in 8.19. The option on the exporter itself will become available through the separate updates of the OpenTelemetry component dependencies for those using EDOT collector directly in 8.19.