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

pkg/config/legacy: add missing trace agent properties to legacy config converter. #2698

Merged
merged 7 commits into from
Nov 23, 2018

Conversation

gbbr
Copy link
Contributor

@gbbr gbbr commented Nov 20, 2018

Adds missing trace agent properties to legacy config converter. As a follow-up to #2678

@gbbr gbbr added this to the 6.8.0 milestone Nov 20, 2018
@gbbr gbbr requested a review from a team as a code owner November 20, 2018 15:46
@mfpierre mfpierre requested a review from a team November 20, 2018 15:57
@codecov-io
Copy link

codecov-io commented Nov 21, 2018

Codecov Report

Merging #2698 into master will increase coverage by 0.59%.
The diff coverage is 95.37%.

@@            Coverage Diff             @@
##           master    #2698      +/-   ##
==========================================
+ Coverage   56.67%   57.26%   +0.59%     
==========================================
  Files         380      380              
  Lines       24123    24238     +115     
==========================================
+ Hits        13671    13881     +210     
+ Misses       9537     9469      -68     
+ Partials      915      888      -27
Impacted Files Coverage Δ
pkg/config/legacy/importer.go 85.18% <90.9%> (+17.1%) ⬆️
pkg/config/legacy/converter.go 92.79% <96.51%> (+29.73%) ⬆️
pkg/forwarder/worker.go 92.5% <0%> (-1.25%) ⬇️
pkg/config/config.go 82.29% <0%> (-0.49%) ⬇️
pkg/logs/agent.go 100% <0%> (ø) ⬆️
pkg/logs/input/docker/tailer.go 16.39% <0%> (+4.79%) ⬆️
pkg/logs/config/config.go 90.9% <0%> (+7.83%) ⬆️

@gbbr
Copy link
Contributor Author

gbbr commented Nov 21, 2018

@olivielpeau can you PTAL if this is more along the lines of what you meant in #2678 (comment)? If yes, I will test this PR directly in trace and potentially merge it if afterwards if all is well with you too and the team.

@gbbr gbbr force-pushed the gbbr/trace-config branch 3 times, most recently from 85c3f5e to c70dab8 Compare November 21, 2018 13:25
@gbbr gbbr force-pushed the gbbr/trace-config branch from c70dab8 to a33c06c Compare November 21, 2018 13:29
olivielpeau
olivielpeau previously approved these changes Nov 21, 2018
Copy link
Member

@olivielpeau olivielpeau left a comment

Choose a reason for hiding this comment

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

Left a few comments, overall LGTM 👍

I'm interested in how you'll be using this in the trace-agent, please ping me when those are ready :)

pkg/config/legacy/converter.go Outdated Show resolved Hide resolved
pkg/config/legacy/converter.go Show resolved Hide resolved
pkg/config/legacy/converter.go Outdated Show resolved Hide resolved
@gbbr
Copy link
Contributor Author

gbbr commented Nov 22, 2018

Thanks for looking. I'm going to try it out in trace agent and see if anything is missing. Will ping you on both PRs.

@gbbr
Copy link
Contributor Author

gbbr commented Nov 22, 2018

@olivielpeau PTAL. Addressed your comments and submitted another minor fix. Also tried it out on trace agent. Will open PR soon once this gets merged (so I can vendor the commit inside trace-agent).

Copy link
Member

@olivielpeau olivielpeau left a comment

Choose a reason for hiding this comment

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

LGTM! 👍

I'll let you get approval from the Agent guild as well ;)

Had a cursory look at the trace-agent PR as well and it also looks good to me

Copy link
Contributor

@mfpierre mfpierre left a comment

Choose a reason for hiding this comment

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

LGTM 👍

@gbbr gbbr merged commit 6e61253 into master Nov 23, 2018
@gbbr gbbr deleted the gbbr/trace-config branch November 23, 2018 13:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants