Skip to content

Disable otel collector by default#67575

Merged
jscheffl merged 6 commits into
apache:mainfrom
Miretpl:disable-otel-default
May 27, 2026
Merged

Disable otel collector by default#67575
jscheffl merged 6 commits into
apache:mainfrom
Miretpl:disable-otel-default

Conversation

@Miretpl
Copy link
Copy Markdown
Contributor

@Miretpl Miretpl commented May 26, 2026

#64902 PR introduced Otel Collector in the Helm Chart in the main and 1.2x line. As far as it is ok for the main (2.0 version), it changed the default behaviour of the 1.2x line, as currently, both otel and statsd collectors will be deployed, which can be confusing to the users and can break the deployment pipelines. This PR makes the otel collector not deployed by default (it will be changed for the 2.0 version when statsd will be moved to Kustomize).

Also needed for 1.2x line - if auto backport will fail, I will make one manually.


Was generative AI tooling used to co-author this PR?
  • Yes (please specify the tool below)

  • Read the Pull Request Guidelines for more information. Note: commit author/co-author name and email in commits become permanently public when merged.
  • For fundamental code changes, an Airflow Improvement Proposal (AIP) is needed.
  • When adding dependency, check compliance with the ASF 3rd Party License Policy.
  • For significant user-facing changes create newsfragment: {pr_number}.significant.rst, in airflow-core/newsfragments. You can add this file in a follow-up commit after the PR is created so you know the PR number.

@boring-cyborg boring-cyborg Bot added the area:helm-chart Airflow Helm Chart label May 26, 2026
@Miretpl Miretpl force-pushed the disable-otel-default branch from fdc3ced to 350f979 Compare May 26, 2026 21:13
@Miretpl Miretpl marked this pull request as ready for review May 26, 2026 23:05
@jscheffl jscheffl added the backport-to-chart/v1-2x-test Automatic backport to chart 1.2x maintenance branch label May 27, 2026
Copy link
Copy Markdown
Contributor

@jscheffl jscheffl left a comment

Choose a reason for hiding this comment

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

Thanks for fixing the default!

@jscheffl jscheffl merged commit 27295a3 into apache:main May 27, 2026
127 of 134 checks passed
@github-actions
Copy link
Copy Markdown
Contributor

Backport failed to create: chart/v1-2x-test. View the failure log Run details

Note: As of Merging PRs targeted for Airflow 3.X
the committer who merges the PR is responsible for backporting the PRs that are bug fixes (generally speaking) to the maintenance branches.

In matter of doubt please ask in #release-management Slack channel.

Status Branch Result
chart/v1-2x-test Commit Link

You can attempt to backport this manually by running:

cherry_picker 27295a3 chart/v1-2x-test

This should apply the commit to the chart/v1-2x-test branch and leave the commit in conflict state marking
the files that need manual conflict resolution.

After you have resolved the conflicts, you can continue the backport process by running:

cherry_picker --continue

If you don't have cherry-picker installed, see the installation guide.

@jscheffl
Copy link
Copy Markdown
Contributor

@Miretpl can you back-port?

@Miretpl Miretpl deleted the disable-otel-default branch May 27, 2026 16:24
bugraoz93 pushed a commit that referenced this pull request May 27, 2026
* Disable otel collector by default

* Fix one test case in basic helm tests

* Remove redudant comments in tests

* Combine global vars

* Remove env helper functions

(cherry picked from commit 27295a3)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area:helm-chart Airflow Helm Chart backport-to-chart/v1-2x-test Automatic backport to chart 1.2x maintenance branch

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants