otel-webserver support for arm64

open-telemetry · Mar 19, 2024 · c604772 · c604772
1 parent a02e005
commit c604772
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/instrumentation/otel-webserver-module/build.gradle b/instrumentation/otel-webserver-module/build.gradle
@@ -23,7 +23,7 @@ project.ext {
 
     ansdkOsName = osName
     ansdkArch = (osArch == 'x86' ? 'i686' : osArch)
-    gccArchFlag = (osArch == 'x86' ? '-m32' : '-m64')
+    gccArchFlag = (osArch == 'x86' ? '-m32' : (osArch == 'aarch64' ? '-march=armv8-a' : '-m64'))
     headSHA1 = "<dev>"
 
     try {

diff --git a/instrumentation/otel-webserver-module/docker-compose.yml b/instrumentation/otel-webserver-module/docker-compose.yml
@@ -7,6 +7,9 @@ services:
         build:
             context: .
             dockerfile: Dockerfile
+            platforms:
+                - "linux/amd64"
+                - "linux/arm64"
         image: apache_centos
         profiles:
             - default
@@ -19,6 +22,9 @@ services:
         build:
             context: .
             dockerfile: docker/centos7/Dockerfile
+            platforms:
+                - "linux/amd64"
+                - "linux/arm64"
         image: apache_centos7
         hostname: webserver
         container_name: webserver_centos7
@@ -33,6 +39,9 @@ services:
         build:
             context: .
             dockerfile: docker/ubuntu20.04/Dockerfile
+            platforms:
+                - "linux/amd64"
+                - "linux/arm64"
         image: apache_ubuntu
         hostname: webserver
         container_name: webserver_ubuntu
@@ -47,6 +56,9 @@ services:
         build:
             context: .
             dockerfile: Dockerfile
+            platforms:
+                - "linux/amd64"
+                - "linux/arm64"
         image: nginx_centos
         hostname: webserver
         container_name: nginx_centos
@@ -61,6 +73,9 @@ services:
         build:
             context: .
             dockerfile: docker/centos7/Dockerfile
+            platforms:
+                - "linux/amd64"
+                - "linux/arm64"
         image: nginx_centos7
         hostname: webserver
         container_name: nginx_centos7
@@ -75,6 +90,9 @@ services:
         build:
             context: .
             dockerfile: docker/ubuntu20.04/Dockerfile
+            platforms:
+                - "linux/amd64"
+                - "linux/arm64"
         image: nginx_ubuntu
         hostname: webserver
         container_name: nginx_ubuntu

diff --git a/instrumentation/otel-webserver-module/docker/ubuntu20.04/Dockerfile b/instrumentation/otel-webserver-module/docker/ubuntu20.04/Dockerfile
@@ -201,7 +201,7 @@ RUN cp -r /dependencies /otel-webserver-module/ \
     && ./gradlew assembleWebServerModule -DtargetSystem=ubuntu
 
 RUN cd /otel-webserver-module/build \
-    && tar -xf opentelemetry-webserver-sdk-x64-linux.tgz \
+    && tar -xf opentelemetry-webserver-sdk-*-linux.tgz \
     && mv -f opentelemetry-webserver-sdk /opt/ \
     && cd ../ \
     && cp opentelemetry_module.conf /etc/apache2/opentelemetry_module.conf \