Skip to content

add collector endpoint version for zipkin#18592

Merged
istio-testing merged 4 commits intoistio:masterfrom
ramaraochavali:fix/zipkin_ep_version
Nov 6, 2019
Merged

add collector endpoint version for zipkin#18592
istio-testing merged 4 commits intoistio:masterfrom
ramaraochavali:fix/zipkin_ep_version

Conversation

@ramaraochavali
Copy link
Copy Markdown
Contributor

@ramaraochavali ramaraochavali commented Nov 4, 2019

Envoy now expects the collector endpoint version to be set correctly (not use the default) https://github.com/envoyproxy/envoy/blob/master/api/envoy/config/trace/v2/trace.proto#L76. This PR sets the collector endpoint version in the template

Signed-off-by: Rama Chavali <rama.rao@salesforce.com>
@ramaraochavali ramaraochavali requested review from a team as code owners November 4, 2019 09:20
@googlebot googlebot added the cla: yes Set by the Google CLA bot to indicate the author of a PR has signed the Google CLA. label Nov 4, 2019
@istio-testing istio-testing added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Nov 4, 2019
Signed-off-by: Rama Chavali <rama.rao@salesforce.com>
Signed-off-by: Rama Chavali <rama.rao@salesforce.com>
Signed-off-by: Rama Chavali <rama.rao@salesforce.com>
@istio-testing istio-testing added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Nov 4, 2019
"config": {
"collector_cluster": "zipkin",
"collector_endpoint": "/api/v1/spans",
"collector_endpoint": "/api/v2/spans",
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

not sure if this causes any backward compatible issues? If so, I can close this PR

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

this applies only to the newer proxies. Older ones still have the older bootstrap

@ramaraochavali
Copy link
Copy Markdown
Contributor Author

@howardjohn Can you PTAL?

@istio-testing istio-testing merged commit c700e80 into istio:master Nov 6, 2019
@ramaraochavali ramaraochavali deleted the fix/zipkin_ep_version branch November 6, 2019 05:10
sdake pushed a commit to sdake/istio that referenced this pull request Dec 1, 2019
* add collector endpoint version for zipkin

Signed-off-by: Rama Chavali <rama.rao@salesforce.com>

* change api in tests

Signed-off-by: Rama Chavali <rama.rao@salesforce.com>

* change back api in tests

Signed-off-by: Rama Chavali <rama.rao@salesforce.com>

* move to v2 spans

Signed-off-by: Rama Chavali <rama.rao@salesforce.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/networking cla: yes Set by the Google CLA bot to indicate the author of a PR has signed the Google CLA. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants