the-distro/infra
8
0
Fork 3
Code Issues 34 Pull requests 4 Packages Projects 1 Releases Wiki Activity

WIP: fix(alloy): unvendor async-profiler path #109

Draft
janik wants to merge 1 commit from alloy-patch into main
pull from: alloy-patch
merge into: the-distro:main
Conversation 1 Commits 1 Files changed 1 +30
janik commented 2024-09-06 09:33:42 +00:00
Owner
Copy link

I know the patch is quite ugly, but I just want to check if this fixes our vendor problem and I don't have the spoons to setup a alloy dev instance.
If the patch works I'll write something nicer, unvendoring as much as possible, and try to upstream it to grafana.

related to #108

I know the patch is quite ugly, but I just want to check if this fixes our vendor problem and I don't have the spoons to setup a alloy dev instance. If the patch works I'll write something nicer, unvendoring as much as possible, and try to upstream it to grafana. related to #108
janik added 1 commit 2024-09-06 09:33:54 +00:00
janik commented 2024-09-06 09:52:55 +00:00
Author
Owner
Copy link

Applying the patch causes:

sept. 06 09:49:14 gerrit systemd[1]: Started alloy.service.
sept. 06 09:49:15 gerrit alloy5[846714]: Unknown cmd run
sept. 06 09:49:15 gerrit alloy5[846714]: Unknown cmd /etc/alloy
sept. 06 09:49:15 gerrit alloy5[846714]: Unknown cmd --server.http.listen-addr=127.0.0.1:15555
sept. 06 09:49:15 gerrit alloy5[846714]: Usage: alloy [options] file ...
sept. 06 09:49:15 gerrit alloy5[846714]: // -d/--debug set debug mode
sept. 06 09:49:15 gerrit alloy5[846714]: -h/--help show this help
sept. 06 09:49:15 gerrit alloy5[846714]: -q/--quit do not continue with GUI
sept. 06 09:49:15 gerrit alloy5[846714]: -v/--version show version
sept. 06 09:49:16 gerrit alloy5[846714]: Exception: class java.awt.HeadlessException
sept. 06 09:49:16 gerrit alloy5[846714]: Message: java.awt.HeadlessException:
sept. 06 09:49:16 gerrit alloy5[846714]: No X11 DISPLAY variable was set,
sept. 06 09:49:16 gerrit alloy5[846714]: or no headful library support was found,
sept. 06 09:49:16 gerrit alloy5[846714]: but this program performed an operation which requires it,
sept. 06 09:49:16 gerrit alloy5[846714]: Stacktrace:
sept. 06 09:49:16 gerrit alloy5[846714]: class java.awt.HeadlessException:
sept. 06 09:49:16 gerrit alloy5[846714]: No X11 DISPLAY variable was set,
sept. 06 09:49:16 gerrit alloy5[846714]: or no headful library support was found,
sept. 06 09:49:16 gerrit alloy5[846714]: but this program performed an operation which requires it,
sept. 06 09:49:16 gerrit alloy5[846714]: java.desktop/sun.awt.HeadlessToolkit.getScreenSize(HeadlessToolkit.java:186)
sept. 06 09:49:16 gerrit alloy5[846714]: edu.mit.csail.sdg.alloy4.OurUtil.getScreenWidth(OurUtil.java:185)
sept. 06 09:49:16 gerrit alloy5[846714]: edu.mit.csail.sdg.alloy4whole.SimpleGUI.(SimpleGUI.java:1996)
sept. 06 09:49:16 gerrit alloy5[846714]: edu.mit.csail.sdg.alloy4whole.SimpleGUI.(SimpleGUI.java:1969)
sept. 06 09:49:16 gerrit alloy5[846714]: edu.mit.csail.sdg.alloy4whole.SimpleGUI$7.run(SimpleGUI.java:1951)
sept. 06 09:49:16 gerrit alloy5[846714]: java.desktop/java.awt.event.InvocationEvent.dispatch(InvocationEvent.java:318)
sept. 06 09:49:16 gerrit alloy5[846714]: java.desktop/java.awt.EventQueue.dispatchEventImpl(EventQueue.java:773)
sept. 06 09:49:16 gerrit alloy5[846714]: java.desktop/java.awt.EventQueue$4.run(EventQueue.java:720)
sept. 06 09:49:16 gerrit alloy5[846714]: java.desktop/java.awt.EventQueue$4.run(EventQueue.java:714)
sept. 06 09:49:16 gerrit alloy5[846714]: java.base/java.security.AccessController.doPrivileged(AccessController.java:400)
sept. 06 09:49:16 gerrit alloy5[846714]: java.base/java.security.ProtectionDomain$JavaSecurityAccessImpl.doIntersectionPrivilege(ProtectionDomain.java:87)
sept. 06 09:49:16 gerrit alloy5[846714]: java.desktop/java.awt.EventQueue.dispatchEvent(EventQueue.java:742)
sept. 06 09:49:16 gerrit alloy5[846714]: java.desktop/java.awt.EventDispatchThread.pumpOneEventForFilters(EventDispatchThread.java:203)
sept. 06 09:49:16 gerrit alloy5[846714]: java.desktop/java.awt.EventDispatchThread.pumpEventsForFilter(EventDispatchThread.java:124)
sept. 06 09:49:16 gerrit alloy5[846714]: java.desktop/java.awt.EventDispatchThread.pumpEventsForHierarchy(EventDispatchThread.java:113)
sept. 06 09:49:16 gerrit alloy5[846714]: java.desktop/java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:109)
sept. 06 09:49:16 gerrit alloy5[846714]: java.desktop/java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:101)
sept. 06 09:49:16 gerrit alloy5[846714]: java.desktop/java.awt.EventDispatchThread.run(EventDispatchThread.java:90)

My best guess is that the nixpkgs asprof version is build in a way where it requires a desktop, but I didn't investigate it yet.

(ftr: I already rolled gerrit01 back to main)

Applying the patch causes: > sept. 06 09:49:14 gerrit systemd[1]: Started alloy.service. sept. 06 09:49:15 gerrit alloy5[846714]: Unknown cmd run sept. 06 09:49:15 gerrit alloy5[846714]: Unknown cmd /etc/alloy sept. 06 09:49:15 gerrit alloy5[846714]: Unknown cmd --server.http.listen-addr=127.0.0.1:15555 sept. 06 09:49:15 gerrit alloy5[846714]: Usage: alloy [options] file ... sept. 06 09:49:15 gerrit alloy5[846714]: // -d/--debug set debug mode sept. 06 09:49:15 gerrit alloy5[846714]: -h/--help show this help sept. 06 09:49:15 gerrit alloy5[846714]: -q/--quit do not continue with GUI sept. 06 09:49:15 gerrit alloy5[846714]: -v/--version show version sept. 06 09:49:16 gerrit alloy5[846714]: Exception: class java.awt.HeadlessException sept. 06 09:49:16 gerrit alloy5[846714]: Message: java.awt.HeadlessException: sept. 06 09:49:16 gerrit alloy5[846714]: No X11 DISPLAY variable was set, sept. 06 09:49:16 gerrit alloy5[846714]: or no headful library support was found, sept. 06 09:49:16 gerrit alloy5[846714]: but this program performed an operation which requires it, sept. 06 09:49:16 gerrit alloy5[846714]: Stacktrace: sept. 06 09:49:16 gerrit alloy5[846714]: class java.awt.HeadlessException: sept. 06 09:49:16 gerrit alloy5[846714]: No X11 DISPLAY variable was set, sept. 06 09:49:16 gerrit alloy5[846714]: or no headful library support was found, sept. 06 09:49:16 gerrit alloy5[846714]: but this program performed an operation which requires it, sept. 06 09:49:16 gerrit alloy5[846714]: java.desktop/sun.awt.HeadlessToolkit.getScreenSize(HeadlessToolkit.java:186) sept. 06 09:49:16 gerrit alloy5[846714]: edu.mit.csail.sdg.alloy4.OurUtil.getScreenWidth(OurUtil.java:185) sept. 06 09:49:16 gerrit alloy5[846714]: edu.mit.csail.sdg.alloy4whole.SimpleGUI.<init>(SimpleGUI.java:1996) sept. 06 09:49:16 gerrit alloy5[846714]: edu.mit.csail.sdg.alloy4whole.SimpleGUI.<init>(SimpleGUI.java:1969) sept. 06 09:49:16 gerrit alloy5[846714]: edu.mit.csail.sdg.alloy4whole.SimpleGUI$7.run(SimpleGUI.java:1951) sept. 06 09:49:16 gerrit alloy5[846714]: java.desktop/java.awt.event.InvocationEvent.dispatch(InvocationEvent.java:318) sept. 06 09:49:16 gerrit alloy5[846714]: java.desktop/java.awt.EventQueue.dispatchEventImpl(EventQueue.java:773) sept. 06 09:49:16 gerrit alloy5[846714]: java.desktop/java.awt.EventQueue$4.run(EventQueue.java:720) sept. 06 09:49:16 gerrit alloy5[846714]: java.desktop/java.awt.EventQueue$4.run(EventQueue.java:714) sept. 06 09:49:16 gerrit alloy5[846714]: java.base/java.security.AccessController.doPrivileged(AccessController.java:400) sept. 06 09:49:16 gerrit alloy5[846714]: java.base/java.security.ProtectionDomain$JavaSecurityAccessImpl.doIntersectionPrivilege(ProtectionDomain.java:87) sept. 06 09:49:16 gerrit alloy5[846714]: java.desktop/java.awt.EventQueue.dispatchEvent(EventQueue.java:742) sept. 06 09:49:16 gerrit alloy5[846714]: java.desktop/java.awt.EventDispatchThread.pumpOneEventForFilters(EventDispatchThread.java:203) sept. 06 09:49:16 gerrit alloy5[846714]: java.desktop/java.awt.EventDispatchThread.pumpEventsForFilter(EventDispatchThread.java:124) sept. 06 09:49:16 gerrit alloy5[846714]: java.desktop/java.awt.EventDispatchThread.pumpEventsForHierarchy(EventDispatchThread.java:113) sept. 06 09:49:16 gerrit alloy5[846714]: java.desktop/java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:109) sept. 06 09:49:16 gerrit alloy5[846714]: java.desktop/java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:101) sept. 06 09:49:16 gerrit alloy5[846714]: java.desktop/java.awt.EventDispatchThread.run(EventDispatchThread.java:90) My best guess is that the nixpkgs asprof version is build in a way where it requires a desktop, but I didn't investigate it yet. (ftr: I already rolled gerrit01 back to main)
janik changed title from fix(alloy): unvendor async-profiler path to WIP: fix(alloy): unvendor async-profiler path 2024-09-06 09:53:08 +00:00
This pull request is marked as a work in progress.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin alloy-patch:alloy-patch
git checkout alloy-patch

Merge

Merge the changes and update on Forgejo.
git checkout main
git merge --no-ff alloy-patch
git checkout main
git merge --ff-only alloy-patch
git checkout alloy-patch
git rebase main
git checkout main
git merge --no-ff alloy-patch
git checkout main
git merge --squash alloy-patch
git checkout main
git merge --ff-only alloy-patch
git checkout main
git merge alloy-patch
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No labels
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: the-distro/infra#109
No description provided.
Delete branch "alloy-patch"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?