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

Restore Zipkin receiver based on new core #1932

Merged
merged 7 commits into from
Nov 18, 2018
Merged

Conversation

wu-sheng
Copy link
Member

This PR includes old codes at 5.x. I just add Zipkin format supported back and make it passed. Also I add new document for new receiver. Simply, you could open Zipkin reciever by this

receiver_zipkin:
  default:
    host: 0.0.0.0
    port: 9411
    contextPath: /

Zipkin receiver wouldn't use core HTTP port/ip to listen, to avoid an unexpected situation.
FYI @adriancole

…eceiver

# Conflicts:
#	oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/module/TraceModule.java
#	oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/TraceModuleProvider.java
@wu-sheng wu-sheng added documentation Provide documents related issue or pull request only. backend OAP backend related. feature New feature labels Nov 18, 2018
@wu-sheng wu-sheng added this to the 6.0.0-beta milestone Nov 18, 2018
@coveralls
Copy link

Coverage Status

Coverage increased (+0.5%) to 13.24% when pulling ae4d4ed on zipkin-receiver into afd6164 on master.

@peng-yongsheng peng-yongsheng merged commit 6b35113 into master Nov 18, 2018
@wu-sheng wu-sheng deleted the zipkin-receiver branch November 18, 2018 14:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backend OAP backend related. documentation Provide documents related issue or pull request only. feature New feature
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants