Skip to content

feat: add zipkin variable#10361

Merged
juststillthinking merged 7 commits into
apache:masterfrom
wizhuo:feat_zipkin_variables
Oct 27, 2023
Merged

feat: add zipkin variable#10361
juststillthinking merged 7 commits into
apache:masterfrom
wizhuo:feat_zipkin_variables

Conversation

@wizhuo

@wizhuo wizhuo commented Oct 19, 2023

Copy link
Copy Markdown
Contributor

Description

I would like to expose the zipkin span information during the rewrite phase so that it can be used in other plugins and scenarios. For example, it would be useful to include the trace ID when printing logs.

Fixes # (issue)

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)

@wizhuo wizhuo changed the title feat:add zipkin variable feat: add zipkin variable Oct 19, 2023
Comment thread apisix/plugins/zipkin.lua Outdated
Comment thread t/plugin/zipkin3.t Outdated
Comment thread apisix/plugins/zipkin.lua Outdated
Comment thread t/cli/test_zipkin_set_ngx_var.sh
@juststillthinking

Copy link
Copy Markdown
Contributor

Good job! Please make the ci pass

@juststillthinking juststillthinking added the wait for update wait for the author's response in this issue/PR label Oct 20, 2023
@wizhuo

wizhuo commented Oct 20, 2023

Copy link
Copy Markdown
Contributor Author

Good job! Please make the ci pass

I have already updated, please check

Comment thread apisix/cli/ops.lua
@juststillthinking

Copy link
Copy Markdown
Contributor

@wizhuo please check the ci error

@wizhuo

wizhuo commented Oct 20, 2023

Copy link
Copy Markdown
Contributor Author

@wizhuo please check the ci error

Please advise on how to resolve the following issue

Error: nginx: [error] open() "/home/runner/work/apisix/apisix/logs/nginx.pid" failed (2: No such file or directory)
[ info ] stop -> [ Done ]

  • git checkout conf/config.yaml
    Updated 0 paths from the index
  • for f in ./t/cli/test_*.sh
  • PATH=/usr/local/openresty-debug/nginx/sbin:/usr/local/openresty-debug/luajit/bin:/usr/local/openresty-debug/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin
  • ./t/cli/test_zipkin_set_ngx_var.sh
    ./ci/linux_apisix_current_luarocks_runner.sh: line 74: ./t/cli/test_zipkin_set_ngx_var.sh: Permission denied
    Error: Process completed with exit code 126.

@juststillthinking

Copy link
Copy Markdown
Contributor

@wizhuo you can test in your private repository with the following configuration

  - name: Run debugger
    if: ${{ failure() }}
    uses: mxschmitt/action-tmate@v3
    timeout-minutes: 15

@juststillthinking

Copy link
Copy Markdown
Contributor

@wizhuo Nice job!

@juststillthinking juststillthinking added approved and removed wait for update wait for the author's response in this issue/PR labels Oct 26, 2023
@juststillthinking
juststillthinking merged commit 595672c into apache:master Oct 27, 2023
hongbinhsu pushed a commit to fitphp/apix that referenced this pull request Nov 1, 2023
* upstream/master: (83 commits)
  fix: make install failed on mac (apache#10403)
  feat(zipkin): add variable (apache#10361)
  test(clickhouse-logger): to show that different endpoints will be chosen randomly (apache#8777)
  chore(deps): bump actions/setup-node from 3.8.1 to 4.0.0 (apache#10381)
  ci: fix the grpc test error (apache#10388)
  ci: trigger ci when doc-lint.yml changes (apache#10382)
  docs: fix usage of incorrect default admin api port (apache#10391)
  feat: Add authorization params to openid-connect plugin (apache#10058)
  feat: integrate authz-keycloak with secrets resource (apache#10353)
  fix(traffic-split): post_arg match fails because content-type contains charset (apache#10372)
  fix(consul): worker will not exit while reload or quit (apache#10342)
  chore: update rules for unresponded issues (apache#10354)
  docs: Update APISIX usecases in README (apache#10358)
  test: use http2 to test limit-req plugin (apache#10334)
  test: use http2 to test limit-conn plugin (apache#10332)
  chore: remove stream_proxy.only in config-default.yaml (apache#10337)
  docs: update underscore to hyphen in HTTP headers in `response-rewrite` plugin (apache#10347)
  fix: typos in comments (apache#10330)
  feat: support config stream_route upstream in service (apache#10298)
  fix: keep healthcheck target state when upstream changes (apache#10312)
  ...
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.

3 participants