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.

Sign up for GitHub

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

Jump to bottom

Support nginx-opentracing v0.34.0 #276

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Support nginx-opentracing v0.34.0 #276

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e571df
Support nginx-opentracing v0.34.0
miry Feb 20, 2024
c408b19
Use nginx opentracing module version
miry Feb 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions test/integration/nginx/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Creates an image with nginx and the Datadog OpenTracing nginx module installed.
# Runs a simple integration test.
ARG NGINX_VERSION=1.18.0
ARG OPENTRACING_NGINX_VERSION=0.16.0
ARG OPENTRACING_NGINX_VERSION=0.34.0

# The nginx testbed. Build this image first since we don't want it rebuilt if just the code changes.
FROM ubuntu:20.04 as nginx-testbed
Expand Down Expand Up @@ -30,9 +30,9 @@ RUN CODENAME=$(lsb_release -s -c) && \

# Install nginx-opentracing
ARG OPENTRACING_NGINX_VERSION
RUN wget https://github.com/opentracing-contrib/nginx-opentracing/releases/download/v${OPENTRACING_NGINX_VERSION}/linux-amd64-nginx-${NGINX_VERSION}-ot16-ngx_http_module.so.tgz && \
RUN wget https://github.com/opentracing-contrib/nginx-opentracing/releases/download/v${OPENTRACING_NGINX_VERSION}/linux-amd64-nginx-${NGINX_VERSION}-ngx_http_module.so.tgz && \
NGINX_MODULES=$(nginx -V 2>&1 | grep "configure arguments" | sed -n 's/.*--modules-path=\([^ ]*\).*/\1/p') && \
tar zxvf linux-amd64-nginx-${NGINX_VERSION}-ot16-ngx_http_module.so.tgz -C "${NGINX_MODULES}"
tar zxvf linux-amd64-nginx-${NGINX_VERSION}-ngx_http_module.so.tgz -C "${NGINX_MODULES}"

# Build the Datadog nginx module.
FROM ubuntu:20.04 as build
Expand Down