Skip to content

Conversation

@BFergerson
Copy link
Contributor

No description provided.

# Conflicts:
#	monitor/src/main/kotlin/spp/jetbrains/monitor/skywalking/SkywalkingExtensions.kt
#	plugin/src/main/java/spp/jetbrains/sourcemarker/status/BreakpointStatusBar.java
#	plugin/src/main/java/spp/jetbrains/sourcemarker/status/LiveMeterStatusPanel.java
#	plugin/src/main/java/spp/jetbrains/sourcemarker/status/LogStatusBar.java
#	plugin/src/main/java/spp/jetbrains/sourcemarker/status/MeterStatusBar.java
#	plugin/src/main/java/spp/jetbrains/sourcemarker/status/SpanStatusBar.java
#	plugin/src/main/kotlin/spp/jetbrains/sourcemarker/SourceMarkerPlugin.kt
#	plugin/src/main/kotlin/spp/jetbrains/sourcemarker/listeners/PortalEventListener.kt
#	plugin/src/main/kotlin/spp/jetbrains/sourcemarker/mark/SourceMarkKeys.kt
#	plugin/src/main/kotlin/spp/jetbrains/sourcemarker/service/LiveViewManager.kt
#	plugin/src/main/kotlin/spp/jetbrains/sourcemarker/service/LogCountIndicators.kt
@BFergerson BFergerson merged commit a346a73 into dev Feb 28, 2022
@BFergerson BFergerson deleted the watch-hack branch February 28, 2022 11:54
BFergerson added a commit that referenced this pull request Mar 14, 2022
* protocol update

* bump

* refactor

* refactor

* refactor

* temp version

* refactor

* refactor

* refactor

* clean

* organize imports

* refactor

* refactor

* bump

* bump

* refactor

* validate marker auth over tcp

* refactor

* bump

* refactor

* bump

* bump

* backwards compatibility issues

* bump

* bump

* bump

* moved packages

* refactor

* better error message

* bump

* bump

* use official lib

* Update build.gradle.kts

* Update build.gradle.kts

* Update build.gradle.kts

* Update build.gradle.kts

* Update build.gradle.kts

* bump

* Update build.gradle.kts

* bump

* fixes #658

* refactor

* remove globalscope

* fixes #666

* refactor

* formatting

* fix log pattern ordering

* bump

* live variable presentation

* refactor

* use protocol marshaller

* require input

* skip if no pattern

* bump

* clean

* Watch log command (#673)

* watch log

* unused

* refactor

* refactor

* moved portal only code to portal

* protocol update

* clean

* watch log command

* bump

* refactor

* format

* remove subscription on mark remove

* move package

* move test

* bump

* remove mapper

* remove mapper

* unused

* remove unused

* remove unused

* remove portal tests

* exclude gen

* use protocol type

* start from current service

* remove portal config from status bars

* translations

* skywalking reroute

* skywalking reroute

* bump

* remove hardcoded config

* view event listener
merged instrument id source keys

* remove portal

* bump

* bump

* use marshaller

* use marshaller

* use marshaller

* re-impl portal

* refactor

* refactor

* bump

* refactor

* reimpl portal

* move portal code

* license

* sw live service

* bump

* move packages

* MARK_USER_DATA_UPDATED event

* bump

* activity quick stats

* clean

* createMethodInlayMark

* increase visibility

* formatting

* bump

* more logging

* import organizing

* remove specific subs instead of clearing all

* fix dupe quick stat inlays

* bump

* remove mapper

* reset

* Update ViewEventListener.kt

* merge refactor

* Update build.gradle.kts

* remove mapper

* compatibility

* overview wip

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants