Skip to content

Commit 4d13696

Browse files
authored
Add http configuration package (#383)
* Add http configuration package * Use correct `open-telemetry/sdk-configuration` version * Add `Override` attribute * Allow plugins * Remove unnecessary '->addDefaultsIfNotSet()' * Update tests for sdk config ^0.5 * Remove no longer needed psalm/phpstan suppressions * Move `open-telemetry/api` from dev to require
1 parent a3c02c8 commit 4d13696

34 files changed

+1442
-2
lines changed

.github/dependabot.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ updates:
7272
- "/src/Instrumentation/ExtRdKafka"
7373
- "/src/Instrumentation/Guzzle"
7474
- "/src/Instrumentation/HttpAsyncClient"
75+
- "/src/Instrumentation/HttpConfig"
7576
- "/src/Instrumentation/IO"
7677
- "/src/Instrumentation/Laravel"
7778
- "/src/Instrumentation/MongoDB"

.github/workflows/php.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ jobs:
3535
'Instrumentation/ExtRdKafka',
3636
'Instrumentation/Guzzle',
3737
'Instrumentation/HttpAsyncClient',
38+
'Instrumentation/HttpConfig',
3839
'Instrumentation/IO',
3940
'Instrumentation/Laravel',
4041
'Instrumentation/MongoDB',

.gitsplit.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ splits:
3232
target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-auto-guzzle.git"
3333
- prefix: "src/Instrumentation/HttpAsyncClient"
3434
target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-auto-http-async.git"
35+
- prefix: "src/Instrumentation/HttpConfig"
36+
target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-config-http.git"
3537
- prefix: "src/Instrumentation/IO"
3638
target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-auto-io.git"
3739
- prefix: "src/Instrumentation/Laravel"

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ build: ## Build image
1919
install: ## Install dependencies
2020
$(DC_RUN_PHP) env XDEBUG_MODE=off composer install
2121
update: ## Update dependencies
22-
$(DC_RUN_PHP) env XDEBUG_MODE=off composer update --no-plugins
22+
$(DC_RUN_PHP) env XDEBUG_MODE=off composer update --no-interaction
2323
update-lowest: ## Update dependencies to lowest supported versions
24-
$(DC_RUN_PHP) env XDEBUG_MODE=off composer update --no-plugins --prefer-lowest
24+
$(DC_RUN_PHP) env XDEBUG_MODE=off composer update --no-interaction --prefer-lowest
2525
test: ## Run all tests
2626
$(DC_RUN_PHP) env XDEBUG_MODE=off vendor/bin/phpunit --testdox --colors=always
2727
test-unit: ## Run unit tests

composer.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
"OpenTelemetry\\Contrib\\Instrumentation\\ExtRdKafka\\": "src/Instrumentation/ExtRdKafka/src",
2828
"OpenTelemetry\\Contrib\\Instrumentation\\Guzzle\\": "src/Instrumentation/Guzzle/src",
2929
"OpenTelemetry\\Contrib\\Instrumentation\\HttpAsyncClient\\": "src/Instrumentation/HttpAsyncClient/src",
30+
"OpenTelemetry\\Contrib\\Instrumentation\\HttpConfig\\": "src/Instrumentation/HttpConfig/src",
3031
"OpenTelemetry\\Contrib\\Instrumentation\\IO\\": "src/Instrumentation/IO/src",
3132
"OpenTelemetry\\Contrib\\Instrumentation\\Laravel\\": "src/Instrumentation/Laravel/src",
3233
"OpenTelemetry\\Contrib\\Instrumentation\\MongoDB\\": "src/Instrumentation/MongoDB/src",
@@ -166,6 +167,7 @@
166167
"open-telemetry/opentelemetry-auto-symfony": "self.version",
167168
"open-telemetry/opentelemetry-auto-wordpress": "self.version",
168169
"open-telemetry/opentelemetry-auto-yii": "self.version",
170+
"open-telemetry/opentelemetry-config-http": "self.version",
169171
"open-telemetry/opentelemetry-exporter-instana": "self.version",
170172
"open-telemetry/opentelemetry-instrumentation-installer": "self.version",
171173
"open-telemetry/opentelemetry-logger-monolog": "self.version",
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
* text=auto
2+
3+
*.md diff=markdown
4+
*.php diff=php
5+
6+
/.gitattributes export-ignore
7+
/.gitignore export-ignore
8+
/.php-cs-fixer.php export-ignore
9+
/phpstan.neon.dist export-ignore
10+
/phpunit.xml.dist export-ignore
11+
/psalm.xml.dist export-ignore
12+
/tests export-ignore
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/vendor/

0 commit comments

Comments
 (0)