-
Notifications
You must be signed in to change notification settings - Fork 8.3k
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
fix: Use the correct opentracing plugin for Jaeger #2744
Conversation
/assign @aledbf |
I've built this locally and was able to run the controller with Jaeger enabled without it crashing. Haven't tested it more extensively than that |
Makefile
Outdated
@@ -59,7 +59,7 @@ IMAGE = $(REGISTRY)/$(IMGNAME) | |||
MULTI_ARCH_IMG = $(IMAGE)-$(ARCH) | |||
|
|||
# Set default base image dynamically for each arch | |||
BASEIMAGE?=quay.io/kubernetes-ingress-controller/nginx-$(ARCH):0.53 | |||
BASEIMAGE?=quay.io/kubernetes-ingress-controller/nginx-$(ARCH):0.54 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please leave this as 0.53. First, we need to merge the change in the nginx image, publish and then open a PR to update the version (we don't merge PRs failing CI)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sure, done
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
(And updated the description, as now this PR won't fix the issue, the next one will)
Codecov Report
@@ Coverage Diff @@
## master #2744 +/- ##
=======================================
Coverage 40.91% 40.91%
=======================================
Files 73 73
Lines 5101 5101
=======================================
Hits 2087 2087
Misses 2725 2725
Partials 289 289
Continue to review full report at Codecov.
|
cd "$BUILD_PATH/jaeger-client-cpp-$JAEGER_VERSION" | ||
sed -i 's/-Werror//' CMakeLists.txt | ||
mkdir .build | ||
cd .build | ||
cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=1 -DBUILD_TESTING=OFF -DJAEGERTRACING_WITH_YAML_CPP=OFF -DJAEGERTRACING_BUILD_EXAMPLES=OFF .. | ||
# Taken from https://github.com/jaegertracing/jaeger-client-cpp/blob/v0.4.1/scripts/build-plugin.sh |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@rnburn is this ok? I was using the same steps in your repository https://github.com/opentracing-contrib/nginx-opentracing/blob/master/Dockerfile#L65
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That looks good.
Jaeger needs the JAEGERTRACING_WITH_YAML_CPP
option enabled to be able to load a JSON configuration, which was probably what was causing trouble.
But BTW - since Jaeger links in everything statically, you should be able to remove the _3rdParty/Hunter/
directory when you're finished. It would make your image smaller.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@mikebryant can you implement what @rnburn mentioned?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@mikebryant last change and we are ready to merge
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@aledbf Isn't that already taken care of by the rm -rf "$BUILD_PATH"
line later in the script, that cleans up all of the build stuff?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe most of it's taken care of, but you can delete this line
cp $HUNTER_INSTALL_DIR/lib/libthrift* /usr/local/lib
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah, I see, sure
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done :)
images/nginx/build.sh
Outdated
local: *; | ||
}; | ||
EOF | ||
cmake -DCMAKE_BUILD_TYPE=Release -DJAEGERTRACING_PLUGIN=ON -DBUILD_TESTING=OFF -DJAEGERTRACING_BUILD_EXAMPLES=OFF -DHUNTER_CONFIGURATION_TYPES=Release .. | ||
make | ||
make install |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Also, you shouldn't need make install
here
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks, done :)
/lgtm |
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: aledbf, mikebryant The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
@mikebryant I'll let you know when the image is available |
I built a image from master and seems like the issue wasn't fixed.
|
@gianrubio See #2748 And hmm, oops, it looks like I shouldn't have had the changes to use the new plugin in this MR, they should have been kept back till #2748 since it's not going to work without that change as well.. |
What this PR does / why we need it: Uses the correct opentracing plugin for Jaeger - without this there is a regression and that feature doesn't work in 0.16.2
Which issue this PR fixes (optional, in
fixes #<issue number>(, fixes #<issue_number>, ...)
format, will close that issue when PR gets merged): part of #2738Special notes for your reviewer: