Skip to content

Remove curl hooks from IO contrib package #441

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Sep 16, 2025
Merged

Remove curl hooks from IO contrib package #441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4c69a8d
chore: update dependabot configuration [skip ci]
github-actions[bot] Jul 30, 2025
5a54d90
Merge branch 'open-telemetry:main' into main
HeenaBansal20 Aug 5, 2025
8adab85
Merge branch 'open-telemetry:main' into main
HeenaBansal20 Aug 6, 2025
2221d62
chore: update dependabot configuration [skip ci]
github-actions[bot] Aug 6, 2025
fec51f9
Merge branch 'open-telemetry:main' into main
HeenaBansal20 Aug 26, 2025
edff1a8
Add Opache attributes to Rootspan
HeenaBansal20 Sep 16, 2025
4fcdd6f
Merge branch 'main' of github.com:HeenaBansal20/opentelemetry-php-con…
HeenaBansal20 Sep 16, 2025
2cfc7ef
Revert "Add Opache attributes to Rootspan"
HeenaBansal20 Sep 16, 2025
b10c398
Remove curl hooks from IO instrumentation
HeenaBansal20 Sep 16, 2025
2a7f185
Resolve conflicts
HeenaBansal20 Sep 16, 2025
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: 0 additions & 2 deletions src/Instrumentation/IO/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ following functions:
- `fread`
- `file_get_contents`
- `file_put_contents`
- `curl_init`
- `curl_exec`
- `ob_start`
- `ob_clean`
- `ob_flush`
Expand Down
6 changes: 0 additions & 6 deletions src/Instrumentation/IO/src/IOInstrumentation.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,6 @@ public static function register(): void
self::_hook($instrumentation, null, 'ob_flush', 'ob_flush');
self::_hook($instrumentation, null, 'flush', 'flush');

self::_hook($instrumentation, null, 'curl_init', 'curl_init');
self::_hook($instrumentation, null, 'curl_exec', 'curl_exec');
}

/**
Expand Down Expand Up @@ -102,10 +100,6 @@ private static function addParams(SpanBuilderInterface $builder, string $functio
return;
}
switch ($function) {
case 'curl_init':
isset($params[0]) && $builder->setAttribute('code.params.uri', $params[0]);

break;
case 'fopen':
$builder->setAttribute('code.params.filename', $params[0])
->setAttribute('code.params.mode', $params[1]);
Expand Down
12 changes: 0 additions & 12 deletions src/Instrumentation/IO/tests/Integration/IOInstrumentationTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
namespace OpenTelemetry\Tests\Instrumentation\IO\tests\Integration;

use ArrayObject;
use CurlHandle;
use OpenTelemetry\API\Instrumentation\Configurator;
use OpenTelemetry\Context\ScopeInterface;
use OpenTelemetry\SDK\Trace\ImmutableSpan;
Expand Down Expand Up @@ -75,17 +74,6 @@ public function test_io_calls(): void
$this->span = $this->storage->offsetGet(4);
$this->assertSame('fread', $this->span->getName());

$ch = curl_init('foo');
$this->assertInstanceOf(CurlHandle::class, $ch);
$this->assertCount(6, $this->storage);
$this->span = $this->storage->offsetGet(5);
$this->assertSame('curl_init', $this->span->getName());
$this->assertSame('foo', $this->span->getAttributes()->get('code.params.uri'));

curl_exec($ch);
$this->assertCount(7, $this->storage);
$this->span = $this->storage->offsetGet(6);
$this->assertSame('curl_exec', $this->span->getName());
}

public function test_output_buffer_calls(): void
Expand Down
Loading