-
Notifications
You must be signed in to change notification settings - Fork 11.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Tracing: Move upload trace to button #69402
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
joey-grafana
approved these changes
Jun 23, 2023
LudoVio
pushed a commit
that referenced
this pull request
Jun 26, 2023
* Tempo: Move upload trace to its own button * Zipkin: Move upload trace to its own button * Jaeger: Move upload trace to its own button * Fix test * Remove extra upload section from editor body --------- Co-authored-by: Joey Tawadrous <joey.tawadrous@grafana.com>
harisrozajac
pushed a commit
that referenced
this pull request
Jun 29, 2023
* Tempo: Move upload trace to its own button * Zipkin: Move upload trace to its own button * Jaeger: Move upload trace to its own button * Fix test * Remove extra upload section from editor body --------- Co-authored-by: Joey Tawadrous <joey.tawadrous@grafana.com>
harisrozajac
pushed a commit
that referenced
this pull request
Jun 30, 2023
* Tempo: Move upload trace to its own button * Zipkin: Move upload trace to its own button * Jaeger: Move upload trace to its own button * Fix test * Remove extra upload section from editor body --------- Co-authored-by: Joey Tawadrous <joey.tawadrous@grafana.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
add to changelog
area/datasource/frontend
area/frontend
datasource/Tempo
datasource/Zipkin
no-backport
Skip backport of PR
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What is this feature?
In an effort to simplify Tempo's query editor types, this PR moves the upload trace functionality to it's own button, which opens a modal that users can interact with to upload the trace.
The PR reuses some code from #61237, which can be closed since the branch is outdated and we won't be including the other changes until the TraceQL query editor is fully implemented and it's possible to move between the Ui editor and the code editor and keep the query, just like for LogQL and PromQL.
Related to #57407
Tempo
![image](https://private-user-images.githubusercontent.com/4313971/242659000-9396762b-e2b7-4ebe-84e4-1e7960066603.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MjIxODkwMDMsIm5iZiI6MTcyMjE4ODcwMywicGF0aCI6Ii80MzEzOTcxLzI0MjY1OTAwMC05Mzk2NzYyYi1lMmI3LTRlYmUtODRlNC0xZTc5NjAwNjY2MDMucG5nP1gtQW16LUFsZ29yaXRobT1BV1M0LUhNQUMtU0hBMjU2JlgtQW16LUNyZWRlbnRpYWw9QUtJQVZDT0RZTFNBNTNQUUs0WkElMkYyMDI0MDcyOCUyRnVzLWVhc3QtMSUyRnMzJTJGYXdzNF9yZXF1ZXN0JlgtQW16LURhdGU9MjAyNDA3MjhUMTc0NTAzWiZYLUFtei1FeHBpcmVzPTMwMCZYLUFtei1TaWduYXR1cmU9NTVmMTIzY2I1NWRlNjU1ZTQ4NmQwNmJmZWE3ZDRmNzU3MWY3YWQ1NzdlZTUxNGQxOWIwMjYxMmQ3NmI2NDNkNSZYLUFtei1TaWduZWRIZWFkZXJzPWhvc3QmYWN0b3JfaWQ9MCZrZXlfaWQ9MCZyZXBvX2lkPTAifQ.9c3kxBx1BQqSZ4KzmKOqnj7qAQC-he6TlIEdkV7UmRs)
Jaeger
![image](https://private-user-images.githubusercontent.com/4313971/242658857-0143cbd4-71ba-4b62-bc55-2d4bfb841de6.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MjIxODkwMDMsIm5iZiI6MTcyMjE4ODcwMywicGF0aCI6Ii80MzEzOTcxLzI0MjY1ODg1Ny0wMTQzY2JkNC03MWJhLTRiNjItYmM1NS0yZDRiZmI4NDFkZTYucG5nP1gtQW16LUFsZ29yaXRobT1BV1M0LUhNQUMtU0hBMjU2JlgtQW16LUNyZWRlbnRpYWw9QUtJQVZDT0RZTFNBNTNQUUs0WkElMkYyMDI0MDcyOCUyRnVzLWVhc3QtMSUyRnMzJTJGYXdzNF9yZXF1ZXN0JlgtQW16LURhdGU9MjAyNDA3MjhUMTc0NTAzWiZYLUFtei1FeHBpcmVzPTMwMCZYLUFtei1TaWduYXR1cmU9NzY4OGQyNjJlM2E1MDVjZTg1OGYyOTFhMTQ3OGEzMjljYzY0ODJkMGIwNjFhMjhjMzFjZjdmZDViNTM2ZTRjOCZYLUFtei1TaWduZWRIZWFkZXJzPWhvc3QmYWN0b3JfaWQ9MCZrZXlfaWQ9MCZyZXBvX2lkPTAifQ.zjltWebskzQzA6rlHRx7dPR95d-YcRUlw7u4xSpF5ug)
Zipkin
![image](https://private-user-images.githubusercontent.com/4313971/242664266-c2e456d0-1f7e-4234-be84-7d79897c5fd7.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MjIxODkwMDMsIm5iZiI6MTcyMjE4ODcwMywicGF0aCI6Ii80MzEzOTcxLzI0MjY2NDI2Ni1jMmU0NTZkMC0xZjdlLTQyMzQtYmU4NC03ZDc5ODk3YzVmZDcucG5nP1gtQW16LUFsZ29yaXRobT1BV1M0LUhNQUMtU0hBMjU2JlgtQW16LUNyZWRlbnRpYWw9QUtJQVZDT0RZTFNBNTNQUUs0WkElMkYyMDI0MDcyOCUyRnVzLWVhc3QtMSUyRnMzJTJGYXdzNF9yZXF1ZXN0JlgtQW16LURhdGU9MjAyNDA3MjhUMTc0NTAzWiZYLUFtei1FeHBpcmVzPTMwMCZYLUFtei1TaWduYXR1cmU9ZTE0YTkzYjc4NjEyNWIxMGI2OWE3NmEwYzE2NWRkYjAxOGI1NGYwNjJlMDY1NTRiNWM3YTFhMzBjMzQ4M2U0MCZYLUFtei1TaWduZWRIZWFkZXJzPWhvc3QmYWN0b3JfaWQ9MCZrZXlfaWQ9MCZyZXBvX2lkPTAifQ.qRxBf66UdqCCP_iiWq6sBglzAaD8kKg5zsrBcbH41-g)
Modal that opens after clicking "Import Trace"
![image](https://private-user-images.githubusercontent.com/4313971/242664159-9cca7090-6197-461a-a892-dd62d8d15634.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MjIxODkwMDMsIm5iZiI6MTcyMjE4ODcwMywicGF0aCI6Ii80MzEzOTcxLzI0MjY2NDE1OS05Y2NhNzA5MC02MTk3LTQ2MWEtYTg5Mi1kZDYyZDhkMTU2MzQucG5nP1gtQW16LUFsZ29yaXRobT1BV1M0LUhNQUMtU0hBMjU2JlgtQW16LUNyZWRlbnRpYWw9QUtJQVZDT0RZTFNBNTNQUUs0WkElMkYyMDI0MDcyOCUyRnVzLWVhc3QtMSUyRnMzJTJGYXdzNF9yZXF1ZXN0JlgtQW16LURhdGU9MjAyNDA3MjhUMTc0NTAzWiZYLUFtei1FeHBpcmVzPTMwMCZYLUFtei1TaWduYXR1cmU9ZGJiZWI2MjI3YjZlNWQzOThkM2Y3YmQ4OGY4MWIyODU3YzY0MDdlMTIxNWU2NzFlYjc1NjUzYTljZjgzZWE2NiZYLUFtei1TaWduZWRIZWFkZXJzPWhvc3QmYWN0b3JfaWQ9MCZrZXlfaWQ9MCZyZXBvX2lkPTAifQ.4JoZltMYFQbnlfYRiGQq_Jgen8R2nH4qEyjS9lAYBl8)
Who is this feature for?
Users of the Tempo, Zipkin and Jaeger datasources.
Special notes for your reviewer:
Please check that: