Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true

[*.{nix,yml,yaml,yml.dist,md}]
[*.{yml,yaml,yml.dist,md}]
indent_size = 2

[*.neon]
Expand Down
10 changes: 0 additions & 10 deletions .envrc

This file was deleted.

78 changes: 16 additions & 62 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,26 +7,8 @@ on:
concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
cancel-in-progress: true
# TODO: Add PHP 8.5 to the matrix once ext-grpc is compatible with it
jobs:
flake-check:
name: Flake check
runs-on: ubuntu-latest
timeout-minutes: 20
steps:
- name: Checkout
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- name: Install Nix
uses: DeterminateSystems/nix-installer-action@ef8a148080ab6020fd15196c2084a2eea5ff2d25 # v22
- name: Setup Cachix
uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
with:
name: opentelemetry
extraPullNames: nix-shell, php-src-nix
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
- name: Setup Nix magic cache
uses: DeterminateSystems/magic-nix-cache-action@565684385bcd71bad329742eefe8d12f2e765b39 # v13
- name: Run Nix Flake check
run: nix flake check
php-cs-fixer:
name: PHP CS Fixer (PHP ${{ matrix.php }})
runs-on: ubuntu-latest
Expand All @@ -37,23 +19,16 @@ jobs:
- '8.2'
- '8.3'
- '8.4'
- '8.5'
fail-fast: false
steps:
- name: Checkout
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- name: Install Nix
uses: DeterminateSystems/nix-installer-action@ef8a148080ab6020fd15196c2084a2eea5ff2d25 # v22
- name: Setup Cachix
uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
- name: Setup PHP
uses: shivammathur/setup-php@fcafdd6392932010c2bd5094439b8e33be2a8a09 # v2.37.0
with:
name: opentelemetry
extraPullNames: nix-shell, php-src-nix
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
- name: Setup Nix magic cache
uses: DeterminateSystems/magic-nix-cache-action@565684385bcd71bad329742eefe8d12f2e765b39 # v13
- name: Instantiate Nix develop
uses: nicknovitski/nix-develop@9be7cfb4b10451d3390a75dc18ad0465bed4932a # v1.2.1
php-version: ${{ matrix.php }}
extensions: mbstring
coverage: none
- name: Get composer cache directory
id: composercache
run: echo "dir=$(composer config cache-files-dir)" >> "$GITHUB_OUTPUT"
Expand All @@ -63,8 +38,6 @@ jobs:
path: ${{ steps.composercache.outputs.dir }}
key: ${{ runner.os }}-composer-tools-php-cs-fixer-${{ hashFiles('**/composer.json') }}
restore-keys: ${{ runner.os }}-composer-tools-php-cs-fixer
- name: List PHP installed extensions
run: php -m
- name: Install PHP CS Fixer dependencies
run: cd tools/php-cs-fixer && composer update --no-interaction --no-progress --ansi
- name: Run PHP-CS-Fixer fix
Expand All @@ -79,23 +52,16 @@ jobs:
- '8.2'
- '8.3'
- '8.4'
- '8.5'
fail-fast: false
steps:
- name: Checkout
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- name: Install Nix
uses: DeterminateSystems/nix-installer-action@ef8a148080ab6020fd15196c2084a2eea5ff2d25 # v22
- name: Setup Cachix
uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
- name: Setup PHP
uses: shivammathur/setup-php@fcafdd6392932010c2bd5094439b8e33be2a8a09 # v2.37.0
with:
name: opentelemetry
extraPullNames: nix-shell, php-src-nix
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
- name: Setup Nix magic cache
uses: DeterminateSystems/magic-nix-cache-action@565684385bcd71bad329742eefe8d12f2e765b39 # v13
- name: Instantiate Nix develop
uses: nicknovitski/nix-develop@9be7cfb4b10451d3390a75dc18ad0465bed4932a # v1.2.1
php-version: ${{ matrix.php }}
extensions: grpc, mbstring, opentelemetry, pdo, pdo_sqlite
coverage: xdebug
- name: Get composer cache directory
id: composercache
run: echo "dir=$(composer config cache-files-dir)" >> "$GITHUB_OUTPUT"
Expand All @@ -105,8 +71,6 @@ jobs:
path: ${{ steps.composercache.outputs.dir }}
key: ${{ runner.os }}-composer-tools-phpstan-${{ hashFiles('**/composer.json') }}
restore-keys: ${{ runner.os }}-composer-tools-phpstan
- name: List PHP installed extensions
run: php -m
- name: Install PHPStan dependencies
run: |
composer update --no-interaction --no-progress --ansi
Expand Down Expand Up @@ -134,13 +98,9 @@ jobs:
- '8.2'
- '8.3'
- '8.4'
- '8.5'
dependencies:
- 'highest'
include:
- php: '8.5'
dependencies: 'highest'
coverage: true
- php: '8.4'
dependencies: 'highest'
coverage: true
Expand All @@ -154,18 +114,12 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- name: Install Nix
uses: DeterminateSystems/nix-installer-action@ef8a148080ab6020fd15196c2084a2eea5ff2d25 # v22
- name: Setup Cachix
uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
- name: Setup PHP
uses: shivammathur/setup-php@fcafdd6392932010c2bd5094439b8e33be2a8a09 # v2.37.0
with:
name: opentelemetry
extraPullNames: nix-shell, php-src-nix
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
- name: Setup Nix magic cache
uses: DeterminateSystems/magic-nix-cache-action@565684385bcd71bad329742eefe8d12f2e765b39 # v13
- name: Instantiate Nix develop
uses: nicknovitski/nix-develop@9be7cfb4b10451d3390a75dc18ad0465bed4932a # v1.2.1
php-version: ${{ matrix.php }}
extensions: grpc, mbstring, opentelemetry, pdo, pdo_sqlite
coverage: xdebug
- name: Get composer cache directory
id: composercache
run: echo "dir=$(composer config cache-files-dir)" >> "$GITHUB_OUTPUT"
Expand Down
16 changes: 5 additions & 11 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,12 @@ jobs:
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
with:
fetch-depth: 0
- name: Install Nix
uses: DeterminateSystems/nix-installer-action@ef8a148080ab6020fd15196c2084a2eea5ff2d25 # v22
- name: Setup Cachix
uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
- name: Setup PHP
uses: shivammathur/setup-php@fcafdd6392932010c2bd5094439b8e33be2a8a09 # v2.37.0
with:
name: opentelemetry
extraPullNames: nix-shell, php-src-nix
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
- name: Setup Nix magic cache
uses: DeterminateSystems/magic-nix-cache-action@565684385bcd71bad329742eefe8d12f2e765b39 # v13
- name: Instantiate Nix develop
uses: nicknovitski/nix-develop@9be7cfb4b10451d3390a75dc18ad0465bed4932a # v1.2.1
php-version: '8.4'
extensions: mbstring, pdo, pdo_sqlite
coverage: none
- name: Get composer cache directory
id: composercache
run: echo "dir=$(composer config cache-files-dir)" >> "$GITHUB_OUTPUT"
Expand Down
16 changes: 5 additions & 11 deletions .github/workflows/fossa-scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,12 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- name: Install Nix
uses: DeterminateSystems/nix-installer-action@ef8a148080ab6020fd15196c2084a2eea5ff2d25 # v22
- name: Setup Cachix
uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
- name: Setup PHP
uses: shivammathur/setup-php@fcafdd6392932010c2bd5094439b8e33be2a8a09 # v2.37.0
with:
name: opentelemetry
extraPullNames: nix-shell, php-src-nix
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
- name: Setup Nix magic cache
uses: DeterminateSystems/magic-nix-cache-action@565684385bcd71bad329742eefe8d12f2e765b39 # v13
- name: Instantiate Nix develop
uses: nicknovitski/nix-develop@9be7cfb4b10451d3390a75dc18ad0465bed4932a # v1.2.1
php-version: '8.4'
extensions: grpc, mbstring, opentelemetry, pdo, pdo_sqlite
coverage: xdebug
- name: Get composer cache directory
id: composercache
run: echo "dir=$(composer config cache-files-dir)" >> "$GITHUB_OUTPUT"
Expand Down
20 changes: 0 additions & 20 deletions .github/workflows/update-flake-lock.yml

This file was deleted.

14 changes: 10 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
vendor
composer.lock
.direnv
.idea
.DS_Store

.phpstan

Expand All @@ -14,9 +14,15 @@ coverage

var

.pre-commit-config.yaml

docs/node_modules
docs/src/.vuepress/dist
docs/src/reference.yaml
/tests/Functional/Application/config/reference.php

tests/Functional/Application/config/reference.php

AGENTS.md
CLAUDE.md
.claude
GEMINI.md
.gemini

3 changes: 0 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
[![Codecov: Coverage][codecov-badge]][codecov-page]
[![Coveralls: Coverage][coveralls-badge]][coveralls-page]
[![Project stage: Development][project-stage-badge]][project-stage-page]
[![Built with Nix][build-with-nix-badge]][build-with-nix-page]
[![FOSSA Status][fossa-status-badge]][fossa-status-page]
[![Packagist Version][packagist-version-badge]][packagist-page]
[![Packagist Downloads][packagist-downloads-badge]][packagist-page]
Expand Down Expand Up @@ -100,8 +99,6 @@ All the code in this repository is released under the MIT License, for more info
[codecov-page]: https://codecov.io/gh/FriendsOfOpenTelemetry/opentelemetry-bundle
[coveralls-badge]: https://img.shields.io/coverallsCoverage/github/FriendsOfOpenTelemetry/opentelemetry-bundle?logo=coveralls&label=coveralls
[coveralls-page]: https://coveralls.io/github/FriendsOfOpenTelemetry/opentelemetry-bundle
[build-with-nix-badge]: https://img.shields.io/badge/Built_With-Nix-5277C3.svg?logo=nixos
[build-with-nix-page]: https://builtwithnix.org/
[project-stage-badge]: https://img.shields.io/badge/Project_Stage-Development-yellowgreen.svg
[project-stage-page]: https://blog.pother.ca/project-stages/
[fossa-status-badge]: https://app.fossa.com/api/projects/custom%2B42279%2Fgithub.com%2FFriendsOfOpenTelemetry%2Fopentelemetry-bundle.svg?type=shield
Expand Down
Loading
Loading