Skip to content

chore: add missing report_interval option for skywalking plugin in config-default.yaml#9662

Merged
juststillthinking merged 2 commits into
apache:masterfrom
kayx23:patch-4
Jun 27, 2023
Merged

chore: add missing report_interval option for skywalking plugin in config-default.yaml#9662
juststillthinking merged 2 commits into
apache:masterfrom
kayx23:patch-4

Conversation

@kayx23

@kayx23 kayx23 commented Jun 14, 2023

Copy link
Copy Markdown
Member

Description

report_interval was documented in docs but not documented as a configuration option in config-default.yaml.

This PR adds it.

Test

apisix/t/admin/plugins-reload.t

Lines 294 to 299 in 7ec3c0f

plugin_attr:
skywalking:
service_name: APISIX
service_instance_name: "APISIX Instance Name"
endpoint_addr: http://127.0.0.1:12801
report_interval: 1

Checklist

  • I have explained the need for this PR and the problem it solves
  • I have explained the changes or the new features added to this PR
  • I have added tests corresponding to this change
  • I have updated the documentation to reflect this change
  • I have verified that this change is backward compatible (If not, please discuss on the APISIX mailing list first)

@kayx23 kayx23 mentioned this pull request Jun 14, 2023
Merged
5 tasks
@juststillthinking juststillthinking changed the title fix: add missing report_interval option for skywalking plugin in config-default.yaml chore: add missing report_interval option for skywalking plugin in config-default.yaml Jun 15, 2023
leslie-tsang
leslie-tsang reviewed Jun 25, 2023
View reviewed changes

@leslie-tsang leslie-tsang left a comment

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.

I wonder if it is necessary to upload once every 1 second.

@kayx23

kayx23 commented Jun 26, 2023

Copy link
Copy Markdown
Member Author

I wonder if it is necessary to upload once every 1 second.

If this needs to be changed, maybe it could be in a different PR as it's somewhat of a functional change? This PR only adds the configuration option so that it's visible. It is 1 second by default and therefore isn't a functional change.

@leslie-tsang

leslie-tsang commented Jun 27, 2023

Copy link
Copy Markdown
Member

I wonder if it is necessary to upload once every 1 second.

If this needs to be changed, maybe it could be in a different PR as it's somewhat of a functional change? This PR only adds the configuration option so that it's visible. It is 1 second by default and therefore isn't a functional change.

Cloud u please tell me where this 1s comes from?

After reviewing the code, I found that it should actually be 3 seconds. Please correct me if I'm wrong.

References:

@juststillthinking
juststillthinking merged commit acffe99 into apache:master Jun 27, 2023
hongbinhsu added a commit to fitphp/apix that referenced this pull request Jul 8, 2023
@hongbinhsu
Merge branch 'upstream/master' into github/master
2cda009 
* upstream/master: (70 commits)
  fix(workflow): enhance schema check (apache#9782)
  docs: add chinese documentation for loki-logger (apache#9687)
  chore(update): stand-alone text (apache#9736)
  docs: add Secret chinese document to Admin API (apache#9522)
  fix(log-rotate): can not keep max files when using custom name (apache#9749)
  docs: fix typo and added useful information (apache#8900)
  docs: explain in more details for the batch-requests plugin (apache#9629)
  docs: update `apisix` section in `config-default.yaml` (apache#9611)
  chore: add missing `report_interval` option for `skywalking` plugin in `config-default.yaml` (apache#9662)
  refactor(jwt-auth): remove unused parameter (apache#9716)
  change(request-id): remove snowflake algorithm (apache#9715)
  fix test case (apache#9706)
  docs: add correct link for openresty arm64 repo (apache#9713)
  fix: get the correct revision (apache#9635)
  fix(body-transformer): xml2lua: replace empty table with empty string (apache#9669)
  feat(prometheus): allow user configure DEFAULT_BUCKETS (apache#9673)
  docs: add example for timeout (apache#9708)
  docs: replace some urls that point to github with relative paths (apache#9684)
  docs: update Debian Installation Guide (apache#9680)
  docs: update how to install apisix on debian (apache#9693)
  ...
@kayx23
kayx23 deleted the patch-4 branch August 25, 2023 05:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@leslie-tsang leslie-tsang leslie-tsang approved these changes
@guoqqqi guoqqqi Awaiting requested review from guoqqqi
+1 more reviewer
@juststillthinking juststillthinking juststillthinking approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@kayx23 @leslie-tsang @juststillthinking