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

Add Zipkin OTEL receiver #2247

Merged
merged 3 commits into from
May 18, 2020
Merged

Conversation

pavolloffay
Copy link
Member

Related to #2241 (comment)

Zipkin receiver is configurable via Jaeger flag collector.zipkin.host-port, hence to follow the same approach as for Jaeger receiver we should provide a wrapper that configures the endpoint every time the receiver is used.

Signed-off-by: Pavol Loffay <[email protected]>
@pavolloffay pavolloffay requested a review from objectiser May 15, 2020 15:02
@pavolloffay pavolloffay requested a review from a team as a code owner May 15, 2020 15:02
Signed-off-by: Pavol Loffay <[email protected]>
flags.String(CollectorHTTPHostPort, ports.PortToHostPort(ports.CollectorHTTP), "The host:port (e.g. 127.0.0.1:5555 or :5555) of the collector's HTTP server")
flags.String(CollectorGRPCHostPort, ports.PortToHostPort(ports.CollectorGRPC), "The host:port (e.g. 127.0.0.1:5555 or :5555) of the collector's GRPC server")
tlsFlagsConfig.AddFlags(flags)
}

// AddOTELZipkinFlags adds flag that are exposed by OTEL Zipkin receiver
func AddOTELZipkinFlags(flags *flag.FlagSet) {
flags.String(CollectorZipkinHTTPHostPort, ports.PortToHostPort(0), "The host:port (e.g. 127.0.0.1:5555 or :5555) of the collector's Zipkin server")
Copy link
Contributor

Choose a reason for hiding this comment

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

nit: may be could use the 9411 port number for these messages?

@codecov
Copy link

codecov bot commented May 15, 2020

Codecov Report

Merging #2247 into master will increase coverage by 0.00%.
The diff coverage is 100.00%.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #2247   +/-   ##
=======================================
  Coverage   96.16%   96.16%           
=======================================
  Files         219      219           
  Lines       10648    10650    +2     
=======================================
+ Hits        10240    10242    +2     
- Misses        352      353    +1     
+ Partials       56       55    -1     
Impacted Files Coverage Δ
cmd/collector/app/builder_flags.go 100.00% <100.00%> (ø)
...lugin/sampling/strategystore/adaptive/processor.go 99.20% <0.00%> (-0.80%) ⬇️
cmd/query/app/server.go 94.52% <0.00%> (+2.73%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 75a1d93...fd853fc. Read the comment docs.

Signed-off-by: Pavol Loffay <[email protected]>
@pavolloffay pavolloffay merged commit 3022a51 into jaegertracing:master May 18, 2020
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.

2 participants