From 3e571dfad04bf8122c038bc4e95a8cd55cac871b Mon Sep 17 00:00:00 2001
From: Michael N <michael.nikitochkin@gmx.net>
Date: Tue, 20 Feb 2024 11:24:15 +0100
Subject: [PATCH 1/2] Support nginx-opentracing v0.34.0

---
 test/integration/nginx/Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/integration/nginx/Dockerfile b/test/integration/nginx/Dockerfile
index 2881e16c..9f92ee64 100644
--- a/test/integration/nginx/Dockerfile
+++ b/test/integration/nginx/Dockerfile
@@ -17,7 +17,7 @@ RUN wget https://repo1.maven.org/maven2/com/github/tomakehurst/wiremock-standalo
 RUN printf '#!/bin/bash\nset -x\njava -jar '"$(pwd)/wiremock-standalone-2.18.0.jar \"\$@\"\n" > /usr/local/bin/wiremock && \
   chmod a+x /usr/local/bin/wiremock
 
-ARG NGINX_VERSION
+ARG NGINX_VERSION=0.34.0
 
 # Install nginx
 RUN CODENAME=$(lsb_release -s -c) && \
@@ -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${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

From c408b1977196cc9fbb02c49595002fbb469956d0 Mon Sep 17 00:00:00 2001
From: Michael N <michael.nikitochkin@gmx.net>
Date: Tue, 20 Feb 2024 11:28:50 +0100
Subject: [PATCH 2/2] Use nginx opentracing module version

---
 test/integration/nginx/Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/integration/nginx/Dockerfile b/test/integration/nginx/Dockerfile
index 9f92ee64..2b9661f3 100644
--- a/test/integration/nginx/Dockerfile
+++ b/test/integration/nginx/Dockerfile
@@ -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
@@ -17,7 +17,7 @@ RUN wget https://repo1.maven.org/maven2/com/github/tomakehurst/wiremock-standalo
 RUN printf '#!/bin/bash\nset -x\njava -jar '"$(pwd)/wiremock-standalone-2.18.0.jar \"\$@\"\n" > /usr/local/bin/wiremock && \
   chmod a+x /usr/local/bin/wiremock
 
-ARG NGINX_VERSION=0.34.0
+ARG NGINX_VERSION
 
 # Install nginx
 RUN CODENAME=$(lsb_release -s -c) && \
@@ -30,7 +30,7 @@ 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${NGINX_VERSION}/linux-amd64-nginx-${NGINX_VERSION}-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}-ngx_http_module.so.tgz -C "${NGINX_MODULES}"