Skip to content
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

[anonymizer] Save trace in UI format #2629

Merged
merged 16 commits into from
Nov 17, 2020

Conversation

yurishkuro
Copy link
Member

@yurishkuro yurishkuro commented Nov 13, 2020

Resolves #2556

cc @Ashmita152

Signed-off-by: Yuri Shkuro <github@ysh.us>
Signed-off-by: Yuri Shkuro <github@ysh.us>
Spans: spans,
Processes: make(map[uimodel.ProcessID]uimodel.Process),
}
for i := range spans {
Copy link
Member Author

Choose a reason for hiding this comment

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

The Process section is not exactly correct because it does not dedupe them, but I don't think it affects the UI.

@yurishkuro
Copy link
Member Author

@Ashmita152 this will likely fail the CI because of testing coverage, would you be interested to complete it?

@Ashmita152
Copy link
Contributor

Hello @yurishkuro

Thank you so much for the implementation. Yes, I am interested to add the unit tests for them.

Signed-off-by: Yuri Shkuro <github@ysh.us>
@yurishkuro
Copy link
Member Author

@Ashmita152 sounds great, feel free to base another PR on top of these changes.

Tip: using GH command line util is the easiest way to pull PRs locally.

@codecov
Copy link

codecov bot commented Nov 13, 2020

Codecov Report

Merging #2629 (4add027) into master (72b9a06) will increase coverage by 0.01%.
The diff coverage is 97.56%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2629      +/-   ##
==========================================
+ Coverage   95.06%   95.08%   +0.01%     
==========================================
  Files         210      213       +3     
  Lines        9410     9492      +82     
==========================================
+ Hits         8946     9025      +79     
- Misses        387      390       +3     
  Partials       77       77              
Impacted Files Coverage Δ
cmd/anonymizer/app/uiconv/extractor.go 94.87% <94.87%> (ø)
cmd/anonymizer/app/uiconv/module.go 100.00% <100.00%> (ø)
cmd/anonymizer/app/uiconv/reader.go 100.00% <100.00%> (ø)
...lugin/sampling/strategystore/adaptive/processor.go 99.07% <0.00%> (-0.93%) ⬇️
plugin/storage/integration/integration.go 77.34% <0.00%> (-0.56%) ⬇️
cmd/query/app/server.go 90.16% <0.00%> (+1.63%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 72b9a06...4add027. Read the comment docs.

Signed-off-by: Ashmita Bohara <ashmita.bohara152@gmail.com>
Signed-off-by: Ashmita Bohara <ashmita.bohara152@gmail.com>
…ge above 95%

Signed-off-by: Ashmita Bohara <ashmita.bohara152@gmail.com>
@Ashmita152
Copy link
Contributor

Hi @yurishkuro

I have opened this https://github.com/yurishkuro/jaeger/pull/2/files adding test cases. I made sure that the test coverage for uiconv package is above 95%. Regards.

Ashmita152 and others added 7 commits November 17, 2020 12:39
Signed-off-by: Ashmita Bohara <ashmita.bohara152@gmail.com>
Signed-off-by: Ashmita Bohara <ashmita.bohara152@gmail.com>
Signed-off-by: Ashmita Bohara <ashmita.bohara152@gmail.com>
Signed-off-by: Ashmita Bohara <ashmita.bohara152@gmail.com>
Signed-off-by: Ashmita Bohara <ashmita.bohara152@gmail.com>
@yurishkuro
Copy link
Member Author

@Ashmita152 thanks! Looks like the overall PR is still under 95% (your PRs would be counted differently).

@Ashmita152
Copy link
Contributor

Hi @yurishkuro thank you for merging it, let me look into areas where I can improve the code coverage further.

Signed-off-by: Ashmita Bohara <ashmita.bohara152@gmail.com>
@Ashmita152
Copy link
Contributor

Hi @yurishkuro Hopefully this PR yurishkuro#3 will help us cross 95%

Ashmita152 and others added 2 commits November 18, 2020 00:34
Signed-off-by: Ashmita Bohara <ashmita.bohara152@gmail.com>
Improve code coverage for uiconv package
@yurishkuro
Copy link
Member Author

97.56% of diff hit (target 95.00%)

@Ashmita152 ^^^ 🎉 🎉 🎉

@yurishkuro yurishkuro merged commit 008772e into jaegertracing:master Nov 17, 2020
@yurishkuro yurishkuro deleted the fix-2556 branch November 17, 2020 17:30
@yurishkuro
Copy link
Member Author

@Ashmita152 thanks for your help!

One last thing that would be good to do is to add some documentation to the docs website describing the new utility and how to use it (including loading into the UI). That same documentation could also turn into a blog post. In fact, it might be sufficient just to mention the utility in the docs website and point to the blog post for example on how to use it.

@Ashmita152
Copy link
Contributor

Thank you @yurishkuro It was my pleasure.

Sure I will work on documentation and blog-post next.

quinniup pushed a commit to k8battleship/jaeger that referenced this pull request Nov 23, 2020
quinniup added a commit to k8battleship/jaeger that referenced this pull request Nov 23, 2020
* Bump opentelemetry-collector to v0.14.0 (jaegertracing#2617)

* bump opentelemetry-collector to v0.14.0

Signed-off-by: Pavel Kositsyn <kositsyn.pa@phystech.edu>

* initialize traceid and spanid explicitly

Signed-off-by: Pavel Kositsyn <kositsyn.pa@phystech.edu>

* fix comments and empty parent span check

Signed-off-by: Pavel Kositsyn <kositsyn.pa@phystech.edu>

* fasten convert traceID/spanID

Signed-off-by: Pavel Kositsyn <kositsyn.pa@phystech.edu>

* fix convertTraceID + fix tests

Signed-off-by: Pavel Kositsyn <kositsyn.pa@phystech.edu>

* Update CodeQL to latest best practices (jaegertracing#2615)

This will parallelize your analysis and speed things up a bunch.

Signed-off-by: jhutchings1 <jhutchings1@users.noreply.github.com>

Co-authored-by: Juraci Paixão Kröhling <juraci@kroehling.de>

* Fix flaky TestReload (jaegertracing#2624)

Signed-off-by: albertteoh <albert.teoh@logz.io>

* Update x/text to v0.3.4 (jaegertracing#2625)

Signed-off-by: Gary Brown <gary@brownuk.com>

* Bump to latest UI for snapshot builds (jaegertracing#2626)

Signed-off-by: Yuri Shkuro <github@ysh.us>

* Implement anonymizer's main program (jaegertracing#2621)

* Preparing release 1.21.0 (jaegertracing#2630)

* updated changelog

Signed-off-by: Joe Elliott <number101010@gmail.com>

* Added ui changelog

Signed-off-by: Joe Elliott <number101010@gmail.com>

* Fixed UI changelog to point to 1.12.0

Signed-off-by: Joe Elliott <number101010@gmail.com>

* Updated jaeger-ui to v1.12.0

Signed-off-by: Joe Elliott <number101010@gmail.com>

* Resolving concerns

Signed-off-by: Joe Elliott <number101010@gmail.com>

* [anonymizer] Save trace in UI format (jaegertracing#2629)

* Use fossa-contrib/fossa-action instead (jaegertracing#2571)

* Use fossa-contrib/fossa-action instead

Signed-off-by: Sora Morimoto <sora@morimoto.io>

* Make step name clearer

Signed-off-by: Sora Morimoto <sora@morimoto.io>

Co-authored-by: Yuri Shkuro <yurishkuro@users.noreply.github.com>

* Update Makefile and Dockerfile for anonymizer (jaegertracing#2632)

Signed-off-by: Ashmita Bohara <ashmita.bohara152@gmail.com>

* Fix listen IP in unit test (jaegertracing#2636)

Signed-off-by: zouyu <zouy.fnst@cn.fujitsu.com>

* Bump opentelemetry to v0.15.0 (jaegertracing#2634)

* Bump opentelemetry to v0.15.0

Signed-off-by: Pavel Kositsyn <kositsyn.pa@phystech.edu>

* add default value instead of nil value for jaegerreceiver config

Signed-off-by: Pavel Kositsyn <kositsyn.pa@phystech.edu>

* make lint

Signed-off-by: Pavel Kositsyn <kositsyn.pa@phystech.edu>

Co-authored-by: Kositsyn Pavel <vemmy124@gmail.com>
Co-authored-by: Justin Hutchings <jhutchings1@users.noreply.github.com>
Co-authored-by: Juraci Paixão Kröhling <juraci@kroehling.de>
Co-authored-by: Albert <26584478+albertteoh@users.noreply.github.com>
Co-authored-by: Gary Brown <gary.pi4tech@gmail.com>
Co-authored-by: Yuri Shkuro <yurishkuro@users.noreply.github.com>
Co-authored-by: Ashmita <ashmita.bohara152@gmail.com>
Co-authored-by: Joe Elliott <number101010@gmail.com>
Co-authored-by: Sora Morimoto <sora@morimoto.io>
Co-authored-by: ZouYu <zouy.fnst@cn.fujitsu.com>
Co-authored-by: Kositsyn Pavel <kositsyn.pa@phystech.edu>
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.

Finish implementing trace anonymizer
2 participants