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/workflows/php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ jobs:
'Instrumentation/Symfony',
'Instrumentation/Yii',
'Logs/Monolog',
'Propagation/Instana',
'Propagation/ServerTiming',
'Propagation/TraceResponse',
'ResourceDetectors/Azure',
Expand Down
2 changes: 2 additions & 0 deletions .gitsplit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@ splits:
target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-instrumentation-installer.git"
- prefix: "src/Logs/Monolog"
target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-logger-monolog.git"
- prefix: "src/Propagation/Instana"
target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-propagator-instana.git"
- prefix: "src/Propagation/ServerTiming"
target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-propagator-server-timing.git"
- prefix: "src/Propagation/TraceResponse"
Expand Down
2 changes: 2 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
"OpenTelemetry\\Contrib\\Instrumentation\\Wordpress\\": "src/Instrumentation/Wordpress/src",
"OpenTelemetry\\Contrib\\Instrumentation\\CakePHP\\": "src/Instrumentation/CakePHP/src",
"OpenTelemetry\\Contrib\\Logs\\Monolog\\": "src/Logs/Monolog/src",
"OpenTelemetry\\Contrib\\Propagation\\Instana\\": "src/Propagation/Instana/src",
"OpenTelemetry\\Contrib\\Propagation\\ServerTiming\\": "src/Propagation/ServerTiming/src",
"OpenTelemetry\\Contrib\\Propagation\\TraceResponse\\": "src/Propagation/TraceResponse/src",
"OpenTelemetry\\Contrib\\Resource\\Detector\\Container\\": "src/ResourceDetectors/Container/src",
Expand Down Expand Up @@ -82,6 +83,7 @@
"open-telemetry/opentelemetry-auto-slim": "self.version",
"open-telemetry/opentelemetry-auto-symfony": "self.version",
"open-telemetry/opentelemetry-auto-wordpress": "self.version",
"open-telemetry/opentelemetry-propagation-instana": "self.version",
"open-telemetry/opentelemetry-propagation-server-timing": "self.version",
"open-telemetry/opentelemetry-propagation-traceresponse": "self.version",
"open-telemetry/opentelemetry-logger-monolog": "self.version",
Expand Down
12 changes: 12 additions & 0 deletions src/Propagation/Instana/.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/Propagation/Instana/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/vendor/
Loading