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.

Sign up for GitHub

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

Jump to bottom

Add Zipkin plugin #3080

Merged
merged 162 commits into from
Aug 3, 2017
Merged

Add Zipkin plugin #3080

merged 162 commits into from
Aug 3, 2017

Conversation

danielnelson
Copy link
Contributor

@danielnelson danielnelson commented Aug 1, 2017 •
edited
Loading

Required for all PRs:

  • Signed CLA.
  • Associated README.md updated.
  • Has appropriate unit tests.

Adam Perlin and others added 30 commits July 24, 2017 14:50
Add inital skeleton for zipkin input plugin
56c714b
Add concurrent zipkin http server to zipkin plugin for data fetching
ae65f10
Add new skeleton for telegraf.ServiceInput to zipkin plugin
83ff0e7
Add simple test program for zipkin http server to zipkin plugin
4d74b4d
Add Godoc comments to zipkin_server.go in zipkin input plugin
bba8922
Update directory structure in zipkin plugin
89c471a
Rename zipkin_server.go to server.go
72668e9
Add TODO comments to server.go in zipkin plugin
158e13c
Fix import path in main.go in zipkin plugin
f7acf33 
Signed-off-by: Adam Perlin <adamperlin@seattleacademy.org>
Fix handler in server.go so that it returns correct http status in zi…
8a858d9 
…pkin plugin
Add test for zipkin http server
6ecefac 
Signed-off-by: Ayrdrie Palmer <ayrdriepalmer@gmail.com>
Modify internal http server in zipkin plugin to use go 1.8 features f…
898b3b6 
…or graceful

Refactor serve and shutdown methods
Remove unused channel
Update main.go to use new methods in zipkin server
157b200
Update server_test.go to call zipkin server constructor with the corr…
b3dda37 
…ect arguments
Add TODO comment to server.go in zipkin plugin
b6ebe5c
Update Godeps
1147bcf
Begin to add interfaces to zipkin plugin
53eaa02
Update zipkin.go to include server and and interfaces/method implemen…
76d4979 
…tations necessary to unmarshal zipkin data
Add test for new unmarshalling features added to zipkin.go
b8697b4
Rename main struct in server.go to avoidpackage level naming conflict…
bec51bf 
… in zipking plugin
fix formatting directive in new_server_test.go in zipking plugin
3882050
Enable zipkin plugin in all.go
1c799cc
Delete outdated main.go file in zipkin plugin
5a1d7ad
Remove redeclared constant in server.go in zipkin plugin
9575625
Finish interface implementations in main zipkin plugin file
4672463
Rename test data directory
438e710
Re-order method and type declaration in zipkin.go and add Godoc comments
9239d64
Update data file path in new_server_test.go
e96bfba
Add todo comments to zipkin.go in zipkin plugin
f2adbe9
Disable server_test.go for current testing in zipkin plugin
4ee9246
@adamperlin adamperlin mentioned this pull request Aug 1, 2017
Merged
@adamperlin adamperlin mentioned this pull request Aug 2, 2017
Merged
Change default hostname value when no endpoint is provided in zipkin …
c03e54d 
…plugin

Meant to prevent an empty string from being added as part of a metric
@adamperlin adamperlin mentioned this pull request Aug 2, 2017
Merged
Change default service name when no endpoint is provided
7f991fd 
Empty strings should not be added to telegraf's internal metrics
@adamperlin adamperlin mentioned this pull request Aug 2, 2017
Merged
Adam Perlin and others added 13 commits August 1, 2017 17:55
Add explanatory comment to cmd/stress_test_write/stress_test_write.go
19ba03e
Remove unused struct from zipkin integration table test
17e2b6b
Update LICENSE_OF_DEPENDENCIES.md for zipkin plugin
b1ec4bd
@goller
Merge pull request #3085 from influxdata/zipkin-span-hostname-fix
355c65e 
Change default hostname value when no endpoint is provided in zipkin plugin
@goller
Merge pull request #3086 from influxdata/zipkin-default-hostname-fix
5ff0519 
Change default service name when no endpoint is provided
@goller
Merge pull request #3084 from influxdata/zipkin-service-fixes
4313cc2 
Zipkin service fixes
@goller
Merge pull request #3082 from influxdata/zipkin-thrift-cli-tool
4bdbc75 
Zipkin thrift cli tool refactor
Remove unused log statement and notes file
eb0f8cc
Merge branch 'zipkin' of https://github.com/influxdata/telegraf into …
729fdbe 
…zipkin

Conflicts:
	plugins/inputs/zipkin/zipkin.go
	plugins/inputs/zipkin/zipkin_test.go
Fix linter error in zipkin plugin
079b8b7
Update zipkin integration test so that a random port is chosen
0c23e19
Add experimental disclaimer to README.md
d9e4057
Merge branch 'master' of github.com:influxdata/telegraf into zipkin
bbe13d8
@danielnelson danielnelson merged commit 137b312 into master Aug 3, 2017
@danielnelson danielnelson deleted the zipkin branch August 3, 2017 18:54
@codefromthecrypt
Copy link

This looks cool! Do I get this right, that this is a zipkin http listener (ex that users can point existing apps at)? PS we just released our first major data model change (which sits alongside the other). openzipkin/zipkin-api#33

@danielnelson
Copy link
Contributor Author

Do I get this right, that this is a zipkin http listener (ex that users can point existing apps at)?

Yes

we just released our first major data model change

Thanks for the update, we should add support for the v2 api as well @goller

maxunt pushed a commit that referenced this pull request Jun 26, 2018
@danielnelson
Add Zipkin input plugin (#3080)
7611b40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@danielnelson @codefromthecrypt @goller