Skip to content
Merged
Show file tree
Hide file tree
Changes from 7 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
1 change: 1 addition & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ updates:
- "/src/Instrumentation/ExtRdKafka"
- "/src/Instrumentation/Guzzle"
- "/src/Instrumentation/HttpAsyncClient"
- "/src/Instrumentation/HttpConfig"
- "/src/Instrumentation/IO"
- "/src/Instrumentation/Laravel"
- "/src/Instrumentation/MongoDB"
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ jobs:
'Instrumentation/ExtRdKafka',
'Instrumentation/Guzzle',
'Instrumentation/HttpAsyncClient',
'Instrumentation/HttpConfig',
'Instrumentation/IO',
'Instrumentation/Laravel',
'Instrumentation/MongoDB',
Expand Down
2 changes: 2 additions & 0 deletions .gitsplit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ splits:
target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-auto-guzzle.git"
- prefix: "src/Instrumentation/HttpAsyncClient"
target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-auto-http-async.git"
- prefix: "src/Instrumentation/HttpConfig"
target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-config-http.git"
- prefix: "src/Instrumentation/IO"
target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-auto-io.git"
- prefix: "src/Instrumentation/Laravel"
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ build: ## Build image
install: ## Install dependencies
$(DC_RUN_PHP) env XDEBUG_MODE=off composer install
update: ## Update dependencies
$(DC_RUN_PHP) env XDEBUG_MODE=off composer update --no-plugins
$(DC_RUN_PHP) env XDEBUG_MODE=off composer update --no-interaction
update-lowest: ## Update dependencies to lowest supported versions
$(DC_RUN_PHP) env XDEBUG_MODE=off composer update --no-plugins --prefer-lowest
$(DC_RUN_PHP) env XDEBUG_MODE=off composer update --no-interaction --prefer-lowest
test: ## Run all tests
$(DC_RUN_PHP) env XDEBUG_MODE=off vendor/bin/phpunit --testdox --colors=always
test-unit: ## Run unit tests
Expand Down
2 changes: 2 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
"OpenTelemetry\\Contrib\\Instrumentation\\ExtRdKafka\\": "src/Instrumentation/ExtRdKafka/src",
"OpenTelemetry\\Contrib\\Instrumentation\\Guzzle\\": "src/Instrumentation/Guzzle/src",
"OpenTelemetry\\Contrib\\Instrumentation\\HttpAsyncClient\\": "src/Instrumentation/HttpAsyncClient/src",
"OpenTelemetry\\Contrib\\Instrumentation\\HttpConfig\\": "src/Instrumentation/HttpConfig/src",
"OpenTelemetry\\Contrib\\Instrumentation\\IO\\": "src/Instrumentation/IO/src",
"OpenTelemetry\\Contrib\\Instrumentation\\Laravel\\": "src/Instrumentation/Laravel/src",
"OpenTelemetry\\Contrib\\Instrumentation\\MongoDB\\": "src/Instrumentation/MongoDB/src",
Expand Down Expand Up @@ -166,6 +167,7 @@
"open-telemetry/opentelemetry-auto-symfony": "self.version",
"open-telemetry/opentelemetry-auto-wordpress": "self.version",
"open-telemetry/opentelemetry-auto-yii": "self.version",
"open-telemetry/opentelemetry-config-http": "self.version",
"open-telemetry/opentelemetry-exporter-instana": "self.version",
"open-telemetry/opentelemetry-instrumentation-installer": "self.version",
"open-telemetry/opentelemetry-logger-monolog": "self.version",
Expand Down
12 changes: 12 additions & 0 deletions src/Instrumentation/HttpConfig/.gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
* text=auto

*.md diff=markdown
*.php diff=php

/.gitattributes export-ignore
/.gitignore export-ignore
/.php-cs-fixer.php export-ignore
/phpstan.neon.dist export-ignore
/phpunit.xml.dist export-ignore
/psalm.xml.dist export-ignore
/tests export-ignore
1 change: 1 addition & 0 deletions src/Instrumentation/HttpConfig/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/vendor/
Loading
Loading