Skip to content

Conversation

@dividedmind
Copy link
Contributor

Let's package up the recent changes.

(BTW, is there a sane and easy way to make it so the plugin version in develop is current? It's still stuck at 0.67.1.)

jansorg and others added 22 commits October 9, 2025 20:02
Support building against the current 2025.3 EAP
…metry reporters to forcefully enable telemetry.

Only the Splunk telemetry reporter overrides the telemetry user setting.
@jansorg
Copy link
Collaborator

jansorg commented Oct 22, 2025

@dividedmind The change to the version is only committed to main. If you sync the changes only made to main into develop, then things should be fine.

Copy link
Collaborator

@jansorg jansorg left a comment

Choose a reason for hiding this comment

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

If this is just a merge of develop into main without further changes, then this is fine.
I briefly looked at the changes, but did not check all the changes.

@dividedmind
Copy link
Contributor Author

@dividedmind The change to the version is only committed to main. If you sync the changes only made to main into develop, then things should be fine.

Yeah, but this cumbersome and leads to those ugly back and forth merges. I just wonder if there is a better way.

@jansorg
Copy link
Collaborator

jansorg commented Oct 23, 2025

@dividedmind The change to the version is only committed to main. If you sync the changes only made to main into develop, then things should be fine.

Yeah, but this cumbersome and leads to those ugly back and forth merges. I just wonder if there is a better way.

Well, we could drop develop and always merge into main. I don't think that we need develop anymore.

@dividedmind
Copy link
Contributor Author

@dividedmind The change to the version is only committed to main. If you sync the changes only made to main into develop, then things should be fine.

Yeah, but this cumbersome and leads to those ugly back and forth merges. I just wonder if there is a better way.

Well, we could drop develop and always merge into main. I don't think that we need develop anymore.

Yeah, maybe that's a good idea. It might lead to a bit of a version churn, but I think that's okay. appmap-js has more churn and it releases directly — even to external repositories, unlike here where the marketplace releases are manual.

@hleb-rubanau can you take a look and do sanity check whether there's anything we need to do besides just starting to merge to main instead of develop?

@hleb-rubanau
Copy link
Contributor

@hleb-rubanau can you take a look and do sanity check whether there's anything we need to do besides just starting to merge to main instead of develop?

I think that’s absolutely fine, especially since publishing is handled manually.

The only thing worth keeping in mind is tracking published stable versions, and being ready (if development ever becomes nonlinear) to branch off dedicated “stable” lines for hotfixes. For example, if you need to patch an already released version while main has moved far ahead.

Copy link
Contributor

@hleb-rubanau hleb-rubanau left a comment

Choose a reason for hiding this comment

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

@dividedmind from my side I don’t see any obstacles to approval, as long as you can confirm that hardcoding the instrumentation key is acceptable.

@dividedmind
Copy link
Contributor Author

@hleb-rubanau can you take a look and do sanity check whether there's anything we need to do besides just starting to merge to main instead of develop?

I think that’s absolutely fine, especially since publishing is handled manually.

The only thing worth keeping in mind is tracking published stable versions, and being ready (if development ever becomes nonlinear) to branch off dedicated “stable” lines for hotfixes. For example, if you need to patch an already released version while main has moved far ahead.

Ok, I'm going to merge this to main and then let's merge any future changes directly there.

@dividedmind dividedmind merged commit caf3e27 into main Oct 28, 2025
10 checks passed
@appland-release
Copy link
Contributor

🎉 This PR is included in version 0.81.0 🎉

The release is available on:

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants