Skip to content

Commit 6466a69

Browse files
committed
Revert "Add Opache attributes to Rootspan"
This reverts commit edff1a8.
1 parent 459befd commit 6466a69

18 files changed

+1
-766
lines changed

.github/workflows/php.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ jobs:
4141
'Instrumentation/MySqli',
4242
'Instrumentation/OpenAIPHP',
4343
'Instrumentation/PDO',
44-
'Instrumentation/PhpOpcache',
4544
'Instrumentation/PostgreSql',
4645
# Sort PSRs numerically.
4746
'Instrumentation/Psr3',
@@ -83,8 +82,6 @@ jobs:
8382
php-version: 8.1
8483
- project: 'Instrumentation/PostgreSql'
8584
php-version: 8.1
86-
- project: 'Instrumentation/PhpOpcache'
87-
php-version: 8.1
8885
steps:
8986
- uses: actions/checkout@v4
9087

.gitsplit.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@ splits:
4444
target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-auto-openai.git"
4545
- prefix: "src/Instrumentation/PDO"
4646
target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-auto-pdo.git"
47-
- prefix: "src/Instrumentation/PhpOpcache"
48-
target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-auto-opcache.git"
4947
- prefix: "src/Instrumentation/PostgreSql"
5048
target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-auto-postgresql.git"
5149
- prefix: "src/Instrumentation/Psr3"

composer.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
"OpenTelemetry\\Contrib\\Instrumentation\\MySqli\\": "src/Instrumentation/MySqli/src",
3434
"OpenTelemetry\\Contrib\\Instrumentation\\OpenAIPHP\\": "src/Instrumentation/OpenAIPHP/src",
3535
"OpenTelemetry\\Contrib\\Instrumentation\\PDO\\": "src/Instrumentation/PDO/src",
36-
"OpenTelemetry\\Contrib\\Instrumentation\\PhpOpcache\\": "src/Instrumentation/PhpOpcache/src",
3736
"OpenTelemetry\\Contrib\\Instrumentation\\Psr3\\": "src/Instrumentation/Psr3/src",
3837
"OpenTelemetry\\Contrib\\Instrumentation\\Psr6\\": "src/Instrumentation/Psr6/src",
3938
"OpenTelemetry\\Contrib\\Instrumentation\\Psr14\\": "src/Instrumentation/Psr14/src",
@@ -75,7 +74,6 @@
7574
"src/Instrumentation/MySqli/_register.php",
7675
"src/Instrumentation/OpenAIPHP/_register.php",
7776
"src/Instrumentation/PDO/_register.php",
78-
"src/Instrumentation/phpOpcache/_register.php",
7977
"src/Instrumentation/Psr3/_register.php",
8078
"src/Instrumentation/Psr6/_register.php",
8179
"src/Instrumentation/Psr14/_register.php",
@@ -113,7 +111,6 @@
113111
"OpenTelemetry\\Tests\\Instrumentation\\MySqli\\": "src/Instrumentation/MySqli/tests",
114112
"OpenTelemetry\\Contrib\\Instrumentation\\OpenAIPHP\\Tests\\": "src/Instrumentation/OpenAIPHP/tests",
115113
"OpenTelemetry\\Tests\\Instrumentation\\PDO\\": "src/Instrumentation/PDO/tests",
116-
"OpenTelemetry\\Tests\\Instrumentation\\PhpOpcache\\": "src/Instrumentation/PhpOpcache/tests",
117114
"OpenTelemetry\\Tests\\Instrumentation\\Psr6\\": "src/Instrumentation/Psr6/tests",
118115
"OpenTelemetry\\Instrumentation\\Psr14\\Tests\\": "src/Instrumentation/Psr14/tests",
119116
"OpenTelemetry\\Tests\\Instrumentation\\Psr16\\": "src/Instrumentation/Psr16/tests",
@@ -152,7 +149,6 @@
152149
"open-telemetry/opentelemetry-auto-mysqli": "self.version",
153150
"open-telemetry/opentelemetry-auto-openai-php": "self.version",
154151
"open-telemetry/opentelemetry-auto-pdo": "self.version",
155-
"open-telemetry/opentelemetry-auto-phpOpcache": "self.version",
156152
"open-telemetry/opentelemetry-auto-psr3": "self.version",
157153
"open-telemetry/opentelemetry-auto-psr6": "self.version",
158154
"open-telemetry/opentelemetry-auto-psr14": "self.version",

docker-compose.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
services:
22
php:
33
# the developer image comes from opentelemetry-php (the core repository), and is built by github actions
4-
image: ghcr.io/open-telemetry/opentelemetry-php/opentelemetry-php-base:8.3
4+
image: ghcr.io/open-telemetry/opentelemetry-php/opentelemetry-php-base:${PHP_VERSION}
55
volumes:
66
- ./:/usr/src/myapp
7-
- ./docker/opcache/opcache.ini:/etc/php/8.3/cli/conf.d/opcache.ini
87
user: "${PHP_USER}:root"
98
environment:
109
XDEBUG_MODE: ${XDEBUG_MODE:-off}

docker/opcache/opcache.ini

Lines changed: 0 additions & 11 deletions
This file was deleted.
-12 KB
Binary file not shown.

src/Instrumentation/PhpOpcache/.gitattributes

Lines changed: 0 additions & 12 deletions
This file was deleted.

src/Instrumentation/PhpOpcache/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/Instrumentation/PhpOpcache/.php-cs-fixer.php

Lines changed: 0 additions & 43 deletions
This file was deleted.

src/Instrumentation/PhpOpcache/README.md

Lines changed: 0 additions & 78 deletions
This file was deleted.

0 commit comments

Comments
 (0)