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

feat(skywalking): allow destory and configure report interval for rep… #3925

Merged
merged 4 commits into from
Mar 30, 2021

Conversation

spacewander
Copy link
Member

…orter

Fix #2895

Signed-off-by: spacewander spacewanderlzx@gmail.com

What this PR does / why we need it:

Pre-submission checklist:

  • Did you explain what problem does this PR solve? Or what new features have been added?
  • Have you added corresponding test cases?
  • Have you modified the corresponding document?
  • Is this PR backward compatible? If it is not backward compatible, please discuss on the mailing list first

…orter

Fix apache#2895

Signed-off-by: spacewander <spacewanderlzx@gmail.com>
@spacewander spacewander marked this pull request as ready for review March 29, 2021 03:44
@@ -92,6 +92,7 @@ We can set the endpoint by specified the configuration in `conf/config.yaml`.
| service_name | string | "APISIX" | service name for skywalking reporter |
|service_instance_name|string|"APISIX Instance Name" | service instance name for skywalking reporter |
| endpoint | string | "http://127.0.0.1:12800" | the http endpoint of Skywalking, for example: http://127.0.0.1:12800 |
Copy link
Contributor

@Firstsawyou Firstsawyou Mar 29, 2021

Choose a reason for hiding this comment

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

Suggested change
| endpoint | string | "http://127.0.0.1:12800" | the http endpoint of Skywalking, for example: http://127.0.0.1:12800 |
| endpoint_addr | string | "http://127.0.0.1:12800" | the http endpoint of Skywalking, for example: http://127.0.0.1:12800 |

The endpoint field name is typo, we should fix it by the way?

@@ -96,6 +96,7 @@ curl http://127.0.0.1:9080/apisix/admin/routes/1 -H 'X-API-KEY: edd1c9f034335f1
| service_name | string | "APISIX" | skywalking 上报的 service 名称 |
|service_instance_name|string| "APISIX Instance Name" | skywalking 上报的 service 实例名 |
| endpoint | string | "http://127.0.0.1:12800" | Skywalking 的 HTTP endpoint 地址,例如:http://127.0.0.1:12800 |
Copy link
Contributor

Choose a reason for hiding this comment

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

ditto.

Copy link
Member Author

Choose a reason for hiding this comment

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

@Firstsawyou
Updated.

Signed-off-by: spacewander <spacewanderlzx@gmail.com>
Copy link
Member

@membphis membphis left a comment

Choose a reason for hiding this comment

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

LGTM

sk_cli:startBackendTimer(local_plugin_info.endpoint_addr)
end


function _M.destroy()
if process.type() ~= "worker" and process.type() ~= "single" then
Copy link
Member

Choose a reason for hiding this comment

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

we can remove process.type() ~= "single", right?

@@ -91,7 +91,8 @@ We can set the endpoint by specified the configuration in `conf/config.yaml`.
| ------------ | ------ | -------- | -------------------------------------------------------------------- |
| service_name | string | "APISIX" | service name for skywalking reporter |
|service_instance_name|string|"APISIX Instance Name" | service instance name for skywalking reporter |
| endpoint | string | "http://127.0.0.1:12800" | the http endpoint of Skywalking, for example: http://127.0.0.1:12800 |
| endpoint_addr| string | "http://127.0.0.1:12800" | the http endpoint of Skywalking, for example: http://127.0.0.1:12800 |
Copy link
Member

Choose a reason for hiding this comment

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

nice catch!!

Signed-off-by: spacewander <spacewanderlzx@gmail.com>
Signed-off-by: spacewander <spacewanderlzx@gmail.com>
@spacewander spacewander merged commit 7c976b5 into apache:master Mar 30, 2021
defp pushed a commit to defp/apisix that referenced this pull request Apr 3, 2021
…orter (apache#3925)

Fix apache#2895

Signed-off-by: spacewander <spacewanderlzx@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Can't disable skywalking plugin on the fly
4 participants