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

Use Yaml instead of JSON between six and the agent #3468

Merged
merged 1 commit into from
May 20, 2019
Merged

Use Yaml instead of JSON between six and the agent #3468

merged 1 commit into from
May 20, 2019

Conversation

hush-hush
Copy link
Member

What does this PR do?

JSON return unicode strings under Python2, even if this is a better
behavior it would be a breaking change compare to the previous version
of the Agent not using this lib to embed Python. Yaml returns bytes
under Python2 and Unicode under Python3.

@hush-hush hush-hush added [deprecated] team/agent-core Deprecated. Use metrics-logs / shared-components labels instead.. changelog/no-changelog labels May 15, 2019
@hush-hush hush-hush added this to the 6.12.0 milestone May 15, 2019
@hush-hush hush-hush requested a review from a team as a code owner May 15, 2019 01:25
@hush-hush hush-hush mentioned this pull request May 15, 2019
Closed
@hush-hush hush-hush force-pushed the maxime/use-yaml-instead-of-json-everywhere branch 2 times, most recently from 64376d8 to 78b0bd2 Compare May 15, 2019 01:49
arbll
arbll reviewed May 16, 2019
View reviewed changes
Copy link
Member

@arbll arbll left a comment

Choose a reason for hiding this comment

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

I am still seeing a few JSON stuff in six/text
ex

datadog-agent/six/test/datadog_agent/datadog_agent.go

Line 138 in 78b0bd2

retval, _ := json.Marshal(h)

@hush-hush hush-hush force-pushed the maxime/use-yaml-instead-of-json-everywhere branch from 78b0bd2 to 2158d4e Compare May 17, 2019 22:08
@hush-hush
Use Yaml instead of JSON between six and the agent
533d595 
JSON return unicode strings under Python2, even if this is a better
behavior it would be a breaking change compare to the previous version
of the Agent not using this lib to embed Python. Yaml returns bytes
under Python2 and Unicode under Python3.
@hush-hush hush-hush force-pushed the maxime/use-yaml-instead-of-json-everywhere branch from 2158d4e to 533d595 Compare May 17, 2019 22:11
@hush-hush hush-hush merged commit 0319574 into master May 20, 2019
@hush-hush hush-hush deleted the maxime/use-yaml-instead-of-json-everywhere branch May 20, 2019 19:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@arbll arbll arbll approved these changes

Assignees
No one assigned
Labels
changelog/no-changelog [deprecated] team/agent-core Deprecated. Use metrics-logs / shared-components labels instead..
Projects
None yet
Milestone
6.12.0
Development

Successfully merging this pull request may close these issues.
2 participants
@hush-hush @arbll