Skip to content

Commit 2ad3cbd

Browse files
committed
Addressed review comments around formatting
1 parent 7ee4376 commit 2ad3cbd

File tree

7 files changed

+9
-14
lines changed

7 files changed

+9
-14
lines changed

src/Exporter/Instana/.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@
1010
/phpunit.xml.dist export-ignore
1111
/psalm.xml.dist export-ignore
1212
/tests export-ignore
13+
/.phan/ export-ignore

src/Exporter/Instana/_register.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?php
22

33
declare(strict_types=1);
4+
45
use OpenTelemetry\Contrib\Exporter\Instana\SpanExporterFactory;
56
use OpenTelemetry\SDK\Registry;
67

src/Exporter/Instana/composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"name": "open-telemetry/opentelemetry-exporter-instana",
33
"description": "Instana exporter implementation for OpenTelemetry PHP.",
44
"type": "library",
5+
"license": "Apache-2.0",
56
"support": {
67
"issues": "https://www.ibm.com/support/pages/instana-support",
78
"source": "https://github.com/open-telemetry/opentelemetry-php-contrib/main/src/Exporter/Instana",
@@ -50,4 +51,4 @@
5051
"tbachert/spi": true
5152
}
5253
}
53-
}
54+
}

src/Exporter/Instana/src/InstanaTransport.php

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,10 @@
1010
use GuzzleHttp\Psr7\Request;
1111
use GuzzleHttp\Psr7\Uri;
1212
use OpenTelemetry\API\Behavior\LogsMessagesTrait;
13-
1413
use OpenTelemetry\SDK\Common\Export\TransportInterface;
1514
use OpenTelemetry\SDK\Common\Future\CancellationInterface;
1615
use OpenTelemetry\SDK\Common\Future\CompletedFuture;
17-
1816
use OpenTelemetry\SDK\Common\Future\ErrorFuture;
19-
2017
use OpenTelemetry\SDK\Common\Future\FutureInterface;
2118
use Psr\Http\Message\ResponseInterface;
2219

@@ -28,17 +25,16 @@
2825
class InstanaTransport implements TransportInterface
2926
{
3027
use LogsMessagesTrait;
28+
3129
const CONTENT_TYPE = 'application/json';
3230

3331
private Client $client;
3432
private ?string $agent_uuid = null;
3533
private ?int $pid = null;
36-
3734
// @phpstan-ignore property.onlyWritten
3835
private array $secrets = [];
3936
// @phpstan-ignore property.onlyWritten
4037
private array $tracing = [];
41-
4238
private bool $closed = true;
4339
private array $headers = [];
4440

@@ -151,7 +147,7 @@ private function performAnnounce(): bool
151147
$msg = $response->getBody()->getContents();
152148

153149
if ($code != 200 && !array_key_exists('version', json_decode($msg, true))) {
154-
self::LogError('Failed to lookup host. Received code ' . (string) $code . ' with message: ' . $msg);
150+
self::logError('Failed to lookup host. Received code ' . (string) $code . ' with message: ' . $msg);
155151
$this->closed = true;
156152

157153
return false;
@@ -175,15 +171,15 @@ private function performAnnounce(): bool
175171
self::logDebug('Phase 2 announcement response code ' . (string) $code);
176172

177173
if ($code < 200 || $code >= 300) {
178-
self::LogError('Failed announcement. Received code ' . (string) $code . ' with message: ' . $msg);
174+
self::logError('Failed announcement. Received code ' . (string) $code . ' with message: ' . $msg);
179175
$this->closed = true;
180176

181177
return false;
182178
}
183179

184180
$content = json_decode($msg, true);
185181
if (!array_key_exists('pid', $content)) {
186-
self::LogError('Failed to receive a pid from agent');
182+
self::logError('Failed to receive a pid from agent');
187183
$this->closed = true;
188184

189185
return false;

src/Exporter/Instana/src/SpanConverter.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,8 @@
1313
use OpenTelemetry\SDK\Common\Configuration\Configuration;
1414
use OpenTelemetry\SDK\Resource\ResourceInfoFactory;
1515
use OpenTelemetry\SDK\Trace\EventInterface;
16-
1716
use OpenTelemetry\SDK\Trace\SpanConverterInterface;
1817
use OpenTelemetry\SDK\Trace\SpanDataInterface;
19-
2018
use OpenTelemetry\SemConv\ResourceAttributes;
2119

2220
class SpanConverter implements SpanConverterInterface
@@ -28,6 +26,7 @@ class SpanConverter implements SpanConverterInterface
2826
const OTEL_KEY_DROPPED_ATTRIBUTES_COUNT = 'dropped_attributes_count';
2927
const OTEL_KEY_DROPPED_EVENTS_COUNT = 'dropped_events_count';
3028
const OTEL_KEY_DROPPED_LINKS_COUNT = 'dropped_links_count';
29+
3130
private readonly string $defaultServiceName;
3231

3332
public function __construct(

src/Exporter/Instana/tests/Unit/SpanConverterTest.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
use OpenTelemetry\API\Trace\SpanContext;
88
use OpenTelemetry\API\Trace\SpanKind as OtelSpanKind;
99
use OpenTelemetry\API\Trace\StatusCode;
10-
1110
use OpenTelemetry\Contrib\Exporter\Instana\SpanConverter;
1211
use OpenTelemetry\Contrib\Exporter\Instana\SpanKind;
1312
use OpenTelemetry\SDK\Common\Attribute\Attributes;
@@ -16,7 +15,6 @@
1615
use OpenTelemetry\SDK\Resource\ResourceInfo;
1716
use OpenTelemetry\SDK\Trace\SpanDataInterface;
1817
use OpenTelemetry\SDK\Trace\StatusData;
19-
2018
use PHPUnit\Framework\TestCase;
2119

2220
class SpanConverterTest extends TestCase

src/Exporter/Instana/tests/Unit/SpanExporterTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
use OpenTelemetry\Contrib\Exporter\Instana\SpanExporter;
99
use OpenTelemetry\SDK\Common\Export\TransportInterface;
1010
use OpenTelemetry\SDK\Common\Future\CompletedFuture;
11-
1211
use PHPUnit\Framework\TestCase;
1312

1413
class SpanExporterTest extends TestCase

0 commit comments

Comments
 (0)