From c56c355fe0f0d69ab64d16f43db05bae820e0358 Mon Sep 17 00:00:00 2001 From: alexanderM91 Date: Tue, 17 Dec 2024 05:00:48 +0100 Subject: [PATCH] Test Otel --- alpine/3.20/8.3/Dockerfile | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/alpine/3.20/8.3/Dockerfile b/alpine/3.20/8.3/Dockerfile index 0e77bfb3..91b1428d 100644 --- a/alpine/3.20/8.3/Dockerfile +++ b/alpine/3.20/8.3/Dockerfile @@ -27,8 +27,6 @@ ARG PHP_RUN_DEPS="\ libxpm \ libxslt \ libzip \ - protobuf \ - grpc \ rabbitmq-c" ARG PHP_BUILD_DEPS="\ @@ -69,15 +67,15 @@ ARG PHP_EXTENSIONS="\ ARG PHP_PECL_EXTENSIONS="\ apcu \ + opentelemetry \ + protobuf \ + grpc \ redis" ARG ADDITIONAL_PHP_PECL_EXTENSIONS="\ pcov \ xdebug \ xhprof \ - opentelemetry \ - protobuf \ - grpc \ amqp" ARG GRAPHVIZ_BUILD_DEPS="\ @@ -117,7 +115,7 @@ RUN apk update \ --with-webp=/usr \ --with-xpm=/usr \ && docker-php-ext-install -j5 ${PHP_EXTENSIONS} \ - && pecl install -o -f ${PHP_PECL_EXTENSIONS} ${ADDITIONAL_PHP_PECL_EXTENSIONS} \ + && MAKEFLAGS="-j$(nproc)" pecl install -o -f ${PHP_PECL_EXTENSIONS} ${ADDITIONAL_PHP_PECL_EXTENSIONS} \ && rm -rf /tmp/pear \ && docker-php-ext-enable ${PHP_EXTENSIONS} ${PHP_PECL_EXTENSIONS} \ && apk del --no-cache .php-build-deps @@ -191,6 +189,15 @@ COPY context/php/conf.d/90-opcache.ini /usr/local/etc/php/conf.d/ COPY context/php/conf.d/92-session.ini /usr/local/etc/php/conf.d/ COPY context/php/disabled /usr/local/etc/php/disabled +#OTEL: disable code instrumentattion by default +ENV OTEL_SDK_DISABLED=true +ENV OTEL_PHP_DISABLED_INSTRUMENTATIONS="all" + +#OTEL: Disable OTEL related extensions and keep original configs. +RUN mv /usr/local/etc/php/conf.d/docker-php-ext-opentelemetry.ini /usr/local/etc/php/disabled/opentelemetry.ini +RUN mv /usr/local/etc/php/conf.d/docker-php-ext-protobuf.ini /usr/local/etc/php/disabled/protobuf.ini +RUN mv /usr/local/etc/php/conf.d/docker-php-ext-grpc.ini /usr/local/etc/php/disabled/grpc.ini + WORKDIR /data # Install composer @@ -206,4 +213,4 @@ ENV COMPOSER_MEMORY_LIMIT=-1 RUN mkdir -p /home/spryker/.composer RUN bash -c '[[ $COMPOSER_VERSION == "1"* ]] && composer global require hirak/prestissimo && rm -rf /home/spryker/.composer/cache || true' -USER root +USER root \ No newline at end of file