feat: add support for DeleteExporter request handling in broker (#35324) #36516

giampa91 · 2025-08-06T21:17:47Z

Description

Implemented broker-side request handling for deleteExporter API
Updated PartitionConfigurationManager and ZeebePartition to support exporter deletion

Checklist

Related issues

giampa91 · 2025-08-06T21:20:43Z

I noticed that I had to duplicate some logic between the disableExporter and deleteExporter paths.
If the current logic looks correct to you, I’d be happy to refactor it in a follow-up to make the implementation more DRY and reduce redundancy.

deepthidevaki

Great 🚀 Some smaller suggestions

❌ We should also handle concurrent deletion of exporters and transition of ExporterDirection. It looks like the existing code already covers this case. However, to ensure please add a test in ExporterDirectorPartitionTransisitionStepTest for concurrently deleted exporters. You can refer shouldDisableExporterIfConfigChangedConcurrently for inspiration.
🔧 You can simplify most of the the assert statements as I suggested. For future ~~you can follow this suggestion shared in the slack.~~ you can make use of this plugin, if you are an intellij user.

deepthidevaki · 2025-08-11T12:37:48Z

zeebe/broker/src/main/java/io/camunda/zeebe/broker/exporter/stream/ExporterDirector.java

+  public ActorFuture<Void> deleteExporter(final String exporterId) {
+    return callRemoveExporter(exporterId);
+  }


We can merge this with the disableExporter method.

I call inside the deleteExporter -> disableExporter, is that's what you mean?

We can just have one public method "removeExporter" in ExporterDirector that is used for disabling and deleting.

...c/test/java/io/camunda/zeebe/broker/system/partitions/PartitionConfigurationManagerTest.java

deepthidevaki · 2025-08-13T12:43:11Z

zeebe/broker/src/test/java/io/camunda/zeebe/broker/exporter/stream/ExporterDeleteTest.java

+import org.junit.Rule;
+import org.junit.Test;
+
+public class ExporterDeleteTest {


When we have just one method "removeExporter", there is no need for this test because it will be a duplicate of ExporterDisableTest.

…nda#35324) - Implemented broker-side request handling for deleteExporter API - Updated PartitionConfigurationManager and ZeebePartition to support exporter deletion closes camunda#35324

update method to deleteOrDisableOrEnableExportersIfConfigChanged in order to handle delete and not just disable or enable. Test updated

deepthidevaki · 2025-08-18T08:09:15Z

...munda/zeebe/broker/system/partitions/impl/steps/ExporterDirectorPartitionTransitionStep.java

+        context.getExporterDirector().removeExporter(exporter.getId());
+      } else if (!currentEnabledExporters.containsKey(exporter)) {
+        // Exporter present but disabled → disable it
+        context.getExporterDirector().removeExporter(exporter.getId());


❓ Is this change necessary? The previous code already handles the deleted exporters right?

deepthidevaki · 2025-08-19T12:25:07Z

@giampa91 Would you have time to finish up this PR? If not I'm happy to take over and get it merged.

I would like to complete this feature by end of this week because I want to include this feature in the upcoming alpha release scheduled for next week. For the feature, we have to merge this PR and work on the one remaining issue to expose the endpoints. So I would like to merge this by EOD tomorrow at the latest. Please let me know if you have time to answer my question above and make changes if necessary. If not, I will take over and merge your PR with minor changes if necessary.

Thanks a lot for your contribution. 🚀

giampa91 · 2025-08-19T12:37:19Z

@deepthidevaki Sorry for the late! I’m quite busy at the moment and won’t be able to take a look before tomorrow evening at the earliest 😅.

From what I can see (please correct me if I’m wrong), the feature is pretty much done and just needs some cleanup.

Please feel free to take it over of course

I’m happy to contribute 😃!

deepthidevaki · 2025-08-19T13:59:57Z

@giampa91 Thanks for your reply. Then I will take over this PR and merge it.

deepthidevaki · 2025-08-20T07:48:12Z

I opened a new PR #36986 with the following changes.

Reverted the changes in ExporterDirectorPartitionTransitionStep.java. Concurrent changes are handled already by the existing code.
Squashed all commits into one.

@giampa91

## Description When exporter is deleted, it is removed from the runtime state by the ExporterDirector. Concurrent changes during transition are handled by ExporterDirectorTransitionStep already. Since disable and delete behaves similar with in ExporterDirector, the method is renamed to "removeExporter". The original PR for this feature is #36516 by @giampa91 ## Checklist  - [ ] Enable backports when necessary (fex. [for bug fixes](https://github.com/camunda/camunda/blob/main/CONTRIBUTING.md#backporting-changes) or [for CI changes](https://github.com/camunda/camunda/wiki/CI-&-Automation#when-to-backport-ci-changes)). ## Related issues closes #35324 closes #35323

deepthidevaki · 2025-08-20T13:10:16Z

The changes in this PR are merged via #36986

…ntime in broker (#37440) # Description Backport of #36986 to `stable/8.7`. relates to #36516 #35324 #35323

giampa91 requested a review from a team as a code owner August 6, 2025 21:17

giampa91 requested review from deepthidevaki and removed request for a team August 6, 2025 21:17

github-actions bot added the component/zeebe Related to the Zeebe component/team label Aug 6, 2025

giampa91 force-pushed the feat/deleteExporterInBroker branch from 17ecb7e to 30ee4e6 Compare August 8, 2025 11:04

deepthidevaki requested changes Aug 11, 2025

View reviewed changes

giampa91 force-pushed the feat/deleteExporterInBroker branch from 30ee4e6 to 98627d0 Compare August 12, 2025 22:24

deepthidevaki reviewed Aug 13, 2025

View reviewed changes

giampa91 force-pushed the feat/deleteExporterInBroker branch 2 times, most recently from 34bf07c to c7f51f1 Compare August 13, 2025 22:50

giampa91 added 3 commits August 14, 2025 12:32

feat: add support for DeleteExporter request handling in broker (camu…

edb386d

…nda#35324) - Implemented broker-side request handling for deleteExporter API - Updated PartitionConfigurationManager and ZeebePartition to support exporter deletion closes camunda#35324

fix: adapt ExporterDirectorPartitionTransitionStep

f4904ea

update method to deleteOrDisableOrEnableExportersIfConfigChanged in order to handle delete and not just disable or enable. Test updated

refactor: use removeExporter in ExporterDirector

01a843c

giampa91 force-pushed the feat/deleteExporterInBroker branch from c7f51f1 to 01a843c Compare August 14, 2025 10:32

deepthidevaki reviewed Aug 18, 2025

View reviewed changes

deepthidevaki mentioned this pull request Aug 20, 2025

feat: add support for deleting exporter from runtime in broker #36986

Merged

1 task

deepthidevaki closed this Aug 20, 2025

backport-action mentioned this pull request Sep 1, 2025

[Backport stable/8.7] feat: add support for deleting exporter from runtime in broker #37440

Merged

github-merge-queue bot pushed a commit that referenced this pull request Sep 1, 2025

[Backport stable/8.7] feat: add support for deleting exporter from ru…

7a29b40

…ntime in broker (#37440) # Description Backport of #36986 to `stable/8.7`. relates to #36516 #35324 #35323

github-actions bot added the version:8.7.12 label Sep 2, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

feat: add support for DeleteExporter request handling in broker (#35324) #36516

feat: add support for DeleteExporter request handling in broker (#35324) #36516

Uh oh!

giampa91 commented Aug 6, 2025

Uh oh!

giampa91 commented Aug 6, 2025

Uh oh!

deepthidevaki left a comment •

edited

Loading

Uh oh!

deepthidevaki Aug 11, 2025

Uh oh!

giampa91 Aug 12, 2025 •

edited

Loading

Uh oh!

deepthidevaki Aug 13, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

deepthidevaki Aug 13, 2025

Uh oh!

deepthidevaki Aug 18, 2025

Uh oh!

deepthidevaki commented Aug 19, 2025

Uh oh!

giampa91 commented Aug 19, 2025 •

edited

Loading

Uh oh!

deepthidevaki commented Aug 19, 2025

Uh oh!

deepthidevaki commented Aug 20, 2025

Uh oh!

deepthidevaki commented Aug 20, 2025

Uh oh!

Uh oh!

feat: add support for DeleteExporter request handling in broker (#35324) #36516

feat: add support for DeleteExporter request handling in broker (#35324) #36516

Uh oh!

Conversation

giampa91 commented Aug 6, 2025

Description

Checklist

Related issues

Uh oh!

giampa91 commented Aug 6, 2025

Uh oh!

deepthidevaki left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

deepthidevaki Aug 11, 2025

Choose a reason for hiding this comment

Uh oh!

giampa91 Aug 12, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

deepthidevaki Aug 13, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

deepthidevaki Aug 13, 2025

Choose a reason for hiding this comment

Uh oh!

deepthidevaki Aug 18, 2025

Choose a reason for hiding this comment

Uh oh!

deepthidevaki commented Aug 19, 2025

Uh oh!

giampa91 commented Aug 19, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

deepthidevaki commented Aug 19, 2025

Uh oh!

deepthidevaki commented Aug 20, 2025

Uh oh!

deepthidevaki commented Aug 20, 2025

Uh oh!

Uh oh!

deepthidevaki left a comment •

edited

Loading

giampa91 Aug 12, 2025 •

edited

Loading

giampa91 commented Aug 19, 2025 •

edited

Loading