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

Upgrade to use the latest version of nginx-opentracing. #1580

Merged
merged 1 commit into from
Oct 24, 2017

Conversation

rnburn
Copy link
Contributor

@rnburn rnburn commented Oct 24, 2017

This PR updates to build in the latest version of opentracing-contrib/nginx-opentracing, which switches to use dynamic-modules. This provides more isolation if opentracing is disabled and furthermore opens the door to supporting additional tracers in the future. (For example, Jaeger can be added in once their C++ tracer is available).

It also updates the example to demonstrate how traces can join together spans from separate services.

Additionally, it updates the zipkin library so that it can report traces to Jaeger; though propagation won't work out-of-the-box unless Jaeger clients are explicitly configured to work with zipkin.

@k8s-reviewable
Copy link

This change is Reviewable

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Oct 24, 2017
@coveralls
Copy link

Coverage Status

Coverage remained the same at 33.49% when pulling c26af26 on rnburn:master into 280ec72 on kubernetes:master.

@aledbf
Copy link
Member

aledbf commented Oct 24, 2017

@rnburn please squash the commits

@aledbf
Copy link
Member

aledbf commented Oct 24, 2017

@rnburn thank you for doing this 👍

@rnburn
Copy link
Contributor Author

rnburn commented Oct 24, 2017

Happy to squash the commits, but couldn't we just use Squash and merge.

@aledbf
Copy link
Member

aledbf commented Oct 24, 2017

@rnburn please squash, is not related to the merge but in case of rollback the change

--add-module=$BUILD_PATH/nginx-opentracing-$NGINX_OPENTRACING/opentracing \
--add-module=$BUILD_PATH/nginx-opentracing-$NGINX_OPENTRACING/zipkin"
--add-dynamic-module=$BUILD_PATH/nginx-opentracing-$NGINX_OPENTRACING_VERSION/opentracing
--add-dynamic-module=$BUILD_PATH/nginx-opentracing-$NGINX_OPENTRACING_VERSION/zipkin"
Copy link
Member

Choose a reason for hiding this comment

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

Copy link
Contributor Author

Choose a reason for hiding this comment

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

make install does copy the modules by default into whatever --modules-path is set to or /usr/share/nginx/modules by default.

If you want the modules installed to /etc/nginx/modules/, any reason you don't just set --with-modules-path=/etc/nginx/modules? If you look at the image, you can see you have ngx_http_modsecurity_module.so installed twice:

root@cb1282564228:/# ls /usr/share/nginx/modules/
ngx_http_modsecurity_module.so	ngx_http_opentracing_module.so	ngx_http_zipkin_module.so
root@cb1282564228:/# ls /etc/nginx/modules/
ngx_http_modsecurity_module.so

Copy link
Member

Choose a reason for hiding this comment

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

@rnburn you are right. Please change --with-modules-path=/etc/nginx/modules and remove the cp command

@rnburn
Copy link
Contributor Author

rnburn commented Oct 24, 2017

@aledbf I changed to use --with-modules-path=/etc/nginx/modules and squashed everything into a single commit.

@coveralls
Copy link

Coverage Status

Coverage remained the same at 33.49% when pulling 888375a on rnburn:master into d965ee8 on kubernetes:master.

@coveralls
Copy link

Coverage Status

Coverage remained the same at 33.49% when pulling 888375a on rnburn:master into d965ee8 on kubernetes:master.

@aledbf
Copy link
Member

aledbf commented Oct 24, 2017

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 24, 2017
@aledbf
Copy link
Member

aledbf commented Oct 24, 2017

@rnburn thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants