Merge branch 'main' into 2.x

Author: brettmc

.github/workflows/ossf-scorecard.yml

@@ -42,6 +42,6 @@ jobs:
       # Upload the results to GitHub's code scanning dashboard (optional).
       # Commenting out will disable upload of results to your repo's Code Scanning dashboard
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
+        uses: github/codeql-action/upload-sarif@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
         with:
           sarif_file: results.sarif

.github/workflows/php.yml

@@ -6,6 +6,9 @@ on:
   pull_request:
     branches: [ main, 1.x, 2.x ]
 
+permissions:
+  contents: read
+
 jobs:
   php:
     runs-on: ubuntu-latest

.github/workflows/phpdoc-to-github-pages.yml

@@ -6,14 +6,14 @@ on:
       - "main"
   workflow_dispatch:
 
-# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
 permissions:
   contents: read
-  pages: write
-  id-token: write
 
 jobs:
   documentation:
+    permissions:
+      pages: write # required for GitHub Pages deployment
+      id-token: write # required for GitHub Pages deployment
     name: "Documentation"
     runs-on: "ubuntu-latest"
     steps:

.github/workflows/publish-otel-php-base-docker-image.yml

@@ -11,12 +11,14 @@ on:
     paths:
       - docker/Dockerfile
       - .github/workflows/publish-otel-php-base-docker-image.yml
+permissions:
+  contents: read
 jobs:
   push_to_registry:
     name: OpenTelemetry PHP base docker image creation
     strategy:
       matrix:
-        php-version: ['8.0', '8.1', '8.2', '8.3', '8.4']
+        php-version: ['8.1', '8.2', '8.3', '8.4']
     runs-on: ubuntu-latest
     permissions:
       packages: write
@@ -45,7 +47,6 @@ jobs:
           file: docker/Dockerfile
           build-args: PHP_VERSION=${{ matrix.php-version }}
           platforms: linux/amd64,linux/arm/v8,linux/arm64
-          tags: ghcr.io/open-telemetry/opentelemetry-php/opentelemetry-php-base:${{ matrix.php-version }}
 
       - name: Build and push ${{ matrix.php-version }} to ghcr.io
         uses: docker/build-push-action@v6

.github/workflows/shellcheck.yml

@@ -6,6 +6,9 @@ on:
   pull_request:
     branches: [ main, 1.x, 2.x ]
 
+permissions:
+  contents: read
+
 jobs:
   shellcheck:
     runs-on: ubuntu-latest

.github/workflows/split-monorepo.yaml

@@ -9,6 +9,9 @@ on:
   create:
   workflow_dispatch:
 
+permissions:
+  contents: read
+
 jobs:
   gitsplit:
     runs-on: ubuntu-latest

CONTRIBUTING.md

@@ -271,40 +271,35 @@ make phpdoc-preview
 This will start a HTTP server running at <http://localhost:8080> serving the updated documentation files.
 
 ## Maintainers
-[@open-telemetry/php-maintainers](https://github.com/orgs/open-telemetry/teams/php-maintainers)
 
-- [Bob Strecansky](https://github.com/bobstrecansky)
+- [Bob Strecansky](https://github.com/bobstrecansky), Intuit
 - [Brett McBride](https://github.com/brettmc/), Deakin University
 
-Find more about the maintainer role in [community repository](https://github.com/open-telemetry/community/blob/master/community-membership.md#maintainer)
+For more information about the maintainer role, see the [community repository](https://github.com/open-telemetry/community/blob/main/community-membership.md#maintainer).
 
 ## Approvers
-[@open-telemetry/php-approvers](https://github.com/orgs/open-telemetry/teams/php-approvers)
 
-Find more information about the approver role in the [community repository](https://github.com/open-telemetry/community/blob/master/community-membership.md#approver)
+- [Ago Allikmaa](https://github.com/agoallikmaa)
+- [Cedriz Ziel](https://github.com/cedricziel)
+- [Chris Lightfoot-Wild](https://github.com/ChrisLightfootWild)
 
-## Triagers
-[@open-telemetry/php-triagers](https://github.com/orgs/open-telemetry/teams/php-triagers)
-
-Find more information about the triager role in the [community repository](https://github.com/open-telemetry/community/blob/master/community-membership.md#triager)
-
-## Members
+For more information about the approver role, see the [community repository](https://github.com/open-telemetry/community/blob/main/community-membership.md#approver).
 
-- [Kishan Sangani](https://github.com/kishannsangani)
+## Triagers
 
-Find more information about the member role in the [community repository](https://github.com/open-telemetry/community/blob/master/community-membership.md#member)
+For more information about the triager role, see the [community repository](https://github.com/open-telemetry/community/blob/main/community-membership.md#triagers).
 
 ## Emeritus maintainers/approvers/triagers
 
-- [Timo Michna](https://github.com/tidal/)
+- [Amber Zsistla](https://github.com/zsistla)
 - [Beniamin Calota](https://github.com/beniamin)
 - [Fahmy Mohammed](https://github.com/Fahmy-Mohammed)
-- [Levi Morrison](https://github.com/morrisonlevi)
-- [Amber Zsistla](https://github.com/zsistla)
 - [Jodee Varney](https://github.com/jodeev)
-- [Przemek Delewski](https://github.com/pdelewski), Sumo Logic
+- [Levi Morrison](https://github.com/morrisonlevi)
+- [Przemek Delewski](https://github.com/pdelewski)
+- [Timo Michna](https://github.com/tidal/)
 
-Find more about emeritus roles in the [community repository](https://github.com/open-telemetry/community/blob/main/community-membership.md#emeritus-maintainerapprovertriager)
+For more information about the emeritus role, see the [community repository](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#emeritus-maintainerapprovertriager).
 
 ## Further Help
 

docker/Dockerfile

@@ -1,43 +1,45 @@
-ARG PHP_VERSION=8.0
-
-FROM php:8.0.30-cli-alpine AS php-8.0-cli-alpine
-FROM php:8.1.32-cli-alpine AS php-8.1-cli-alpine
-FROM php:8.2.28-cli-alpine AS php-8.2-cli-alpine
-FROM php:8.3.20-cli-alpine AS php-8.3-cli-alpine
-FROM php:8.4.8-cli-alpine AS php-8.4-cli-alpine
-
-FROM php-${PHP_VERSION}-cli-alpine
-
-ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
-
-RUN chmod +x /usr/local/bin/install-php-extensions \
-    && apk add binutils \
-    && install-php-extensions \
-        @composer \
-        ast \
-        grpc \
-        intl\
-        opcache \
-        opentelemetry \
-        pcntl \
-        protobuf \
-        sockets \
-        xdebug \
-        zip \
-    && find /usr/local/lib/php/extensions -name "*.so" -exec strip --strip-debug {} \;
-
-RUN  echo "grpc.enable_fork_support = 1" > $(php-config --ini-dir)/grpc.ini \
-  && echo "grpc.poll_strategy = epoll1" >> $(php-config --ini-dir)/grpc.ini
-
+FROM composer:2 AS composer
+FROM debian:bullseye
 WORKDIR /usr/src/myapp
 
-RUN   apk add --no-cache bash git; \
-      find /usr/local/lib/php/extensions -type d -exec chmod +x -R {} \;; \
-      addgroup -g "1000" -S php; \
-      adduser --system \
-        --gecos "" \
-        --ingroup "php" \
-        --uid "1000" \
-        "php";
+RUN apt-get update  \
+    && apt-get install -y --no-install-recommends git wget gnupg2 \
+    && rm -rf /var/lib/apt/lists/* \
+    && groupadd --gid 1000 php \
+    && useradd --system --uid 1000 --gid php --shell /bin/bash --create-home php
+
+RUN apt-get update && apt-get install -y lsb-release apt-transport-https ca-certificates \
+  && echo "deb https://packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list \
+  && wget -qO - https://packages.sury.org/php/apt.gpg | apt-key add - \
+  && apt-get update
+
+ARG PHP_VERSION=8.3
+
+RUN apt-get install -y \
+    php${PHP_VERSION}-ast \
+    php${PHP_VERSION}-cli \
+    php${PHP_VERSION}-curl \
+    php${PHP_VERSION}-dev \
+    php${PHP_VERSION}-grpc \
+    php${PHP_VERSION}-intl \
+    php${PHP_VERSION}-mbstring \
+    php${PHP_VERSION}-opcache \
+    php${PHP_VERSION}-opentelemetry \
+    php${PHP_VERSION}-protobuf \
+    php${PHP_VERSION}-simplexml \
+    php${PHP_VERSION}-sockets \
+    php${PHP_VERSION}-xdebug \
+    php${PHP_VERSION}-zip \
+    php${PHP_VERSION}-mongodb \
+    php${PHP_VERSION}-amqp \
+    php${PHP_VERSION}-rdkafka \
+    php${PHP_VERSION}-mysqli \
+    unzip
+
+COPY --from=composer /usr/bin/composer /usr/local/bin/composer
+
+RUN echo ";grpc.enable_fork_support = 1" > $(php-config --ini-dir)/40-otel-dev.ini \
+  && echo "grpc.poll_strategy = epoll1" >> $(php-config --ini-dir)/40-otel-dev.ini \
+  && echo "zend.assertions = 1" >> $(php-config --ini-dir)/40-otel-dev.ini
 
 USER php