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

Adaptation enhancements for various features in v3 #3573

Merged
merged 4 commits into from
Oct 10, 2023

Conversation

mrproliu
Copy link
Contributor

In this Pull Request, I have made several adaptation enhancements for the following features in the v3:

  1. Adapt the data format consistency for the Collector Sample Rate ratio configuration.
  2. Introduced a configuration for Strict Trace ID during queries.
  3. Adapted the log format (although some colors could not be matched) and the Banner.
  4. Exposed Health-related interfaces in HTTP Server queries.

@mrproliu mrproliu added this to the 3.0.0 milestone Oct 10, 2023
Comment on lines 20 to 24
private String restHost;
private int restPort;
private String restContextPath;
private int restMaxThreads = 200;
private long restIdleTimeOut = 30000;
Copy link
Member

Choose a reason for hiding this comment

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

What does this removing mean? Could you explain the diff between receiver-zipkin-http and http-query-plugin. They seem to be consufed.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

First, in the v2 version of Zipkin, they share the same HTTP port when receiver and query. So I moved the HTTP configuration in the HTTP Receiver and Querier into the core.
The receiver is used to collect spans from agents, and the Query is used to query the span for UI.

Copy link
Member

Choose a reason for hiding this comment

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

I think that is how sharing server works. The receiver is still able to work on the separate port, especially query port is exposed for the internet, I assume a separate port is better.
Could you check the OAP sharing server and take a reference to optimize the receiver?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I have separated the export ports for the receiver and querier modules (query span and health). Now, they can utilize the default HTTP server in the core module if the port is defined as -1. Otherwise, the module will start a new HTTP server and use it.

@@ -0,0 +1,19 @@
#
# Licensed to the Apache Software Foundation (ASF) under one or more
Copy link
Member

Choose a reason for hiding this comment

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

The header is somehow wrong, please fix it. And consider skywalking-eyes to verify headers. Notice, I am not sure year range is supported or not.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The header is somehow wrong, please fix it. And consider skywalking-eyes to verify headers.

I will create another PR to fix all the files that I created.

Notice, I am not sure year range is supported or not.

I remember It's not supported, as JC says, we don't need to align the year, so, we don't need to check the year. Alternatively, maybe we can only check the files involved in the Pull Request. However, I'm not sure if this is possible.

Copy link
Member

Choose a reason for hiding this comment

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

I remember It's not supported, as #3567 (comment), we don't need to align the year,

Not that. I mean I don't know whether skywalking-eyes support to check various start-end year range in all file headers.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Got it, The eyes could verify the header by regex, Therefore, I believe it is capable of verifying the year range.

@wu-sheng wu-sheng merged commit a6f354c into openzipkin:zipkin-v3 Oct 10, 2023
6 checks passed
@mrproliu mrproliu deleted the feature-adapt branch October 10, 2023 12:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants