Skip to content

Commit 14cb0fe

Browse files
committed
move AWS examples to project directory and update namespace
1 parent 7d846fe commit 14cb0fe

File tree

8 files changed

+16
-12
lines changed

8 files changed

+16
-12
lines changed
File renamed without changes.

examples/aws/AwsClientApp/src/main.php renamed to src/Aws/examples/AwsClientApp/src/main.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/*
34
* Copyright The OpenTelemetry Authors
45
*
@@ -23,8 +24,8 @@
2324
use Aws\S3\S3Client;
2425
use GuzzleHttp\Client;
2526
use OpenTelemetry\API\Trace\SpanKind;
26-
use OpenTelemetry\Aws\Xray\IdGenerator;
27-
use OpenTelemetry\Aws\Xray\Propagator;
27+
use OpenTelemetry\Contrib\Aws\Xray\IdGenerator;
28+
use OpenTelemetry\Contrib\Aws\Xray\Propagator;
2829
use OpenTelemetry\Contrib\OtlpGrpc\Exporter as OTLPExporter;
2930
use OpenTelemetry\SDK\Trace\SpanProcessor\SimpleSpanProcessor;
3031
use OpenTelemetry\SDK\Trace\TracerProvider;
File renamed without changes.

examples/aws/sampleApp2/SampleApp2.php renamed to src/Aws/examples/sampleApp2/SampleApp2.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/*
34
* Copyright The OpenTelemetry Authors
45
*
@@ -21,8 +22,8 @@
2122

2223
require __DIR__ . '/../../../vendor/autoload.php';
2324

24-
use OpenTelemetry\Aws\Xray\IdGenerator;
25-
use OpenTelemetry\Aws\Xray\Propagator;
25+
use OpenTelemetry\Contrib\Aws\Xray\IdGenerator;
26+
use OpenTelemetry\Contrib\Aws\Xray\Propagator;
2627
use OpenTelemetry\Contrib\OtlpGrpc\Exporter as OTLPExporter;
2728
use OpenTelemetry\SDK\Trace\PropagationMap;
2829
use OpenTelemetry\SDK\Trace\SpanProcessor\SimpleSpanProcessor;
Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/*
34
* Copyright The OpenTelemetry Authors
45
*
@@ -21,8 +22,8 @@
2122

2223
require __DIR__ . '/../../../vendor/autoload.php';
2324

24-
use OpenTelemetry\Aws\Xray\IdGenerator;
25-
use OpenTelemetry\Aws\Xray\Propagator;
25+
use OpenTelemetry\Contrib\Aws\Xray\IdGenerator;
26+
use OpenTelemetry\Contrib\Aws\Xray\Propagator;
2627
use OpenTelemetry\Contrib\OtlpGrpc\Exporter as OTLPExporter;
2728
use OpenTelemetry\SDK\Trace\PropagationMap;
2829
use OpenTelemetry\SDK\Trace\SpanProcessor\SimpleSpanProcessor;
@@ -45,13 +46,13 @@ public function useService()
4546
{
4647
$Exporter = new OTLPExporter();
4748
$map = new PropagationMap();
48-
49+
4950
// Create a tracer object that uses the AWS X-Ray ID Generator to
5051
// generate trace IDs in the correct format
5152
$tracer = (new TracerProvider(null, null, new IdGenerator()))
5253
->addSpanProcessor(new SimpleSpanProcessor($Exporter))
5354
->getTracer('io.opentelemetry.contrib.php');
54-
55+
5556
// Extract the SpanContext from the carrier
5657
$spanContext = Propagator::extract($this->carrier, $map);
5758

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/*
34
* Copyright The OpenTelemetry Authors
45
*
@@ -21,8 +22,8 @@
2122

2223
require __DIR__ . '/../../../vendor/autoload.php';
2324

24-
use OpenTelemetry\Aws\Xray\IdGenerator;
25-
use OpenTelemetry\Aws\Xray\Propagator;
25+
use OpenTelemetry\Contrib\Aws\Xray\IdGenerator;
26+
use OpenTelemetry\Contrib\Aws\Xray\Propagator;
2627
use OpenTelemetry\Contrib\OtlpGrpc\Exporter as OTLPExporter;
2728
use OpenTelemetry\SDK\Trace\PropagationMap;
2829
use OpenTelemetry\SDK\Trace\SpanProcessor\SimpleSpanProcessor;
@@ -45,13 +46,13 @@ public function useService()
4546
{
4647
$Exporter = new OTLPExporter();
4748
$map = new PropagationMap();
48-
49+
4950
// Create a tracer object that uses the AWS X-Ray ID Generator to
5051
// generate trace IDs in the correct format
5152
$tracer = (new TracerProvider(null, null, new IdGenerator()))
5253
->addSpanProcessor(new SimpleSpanProcessor($Exporter))
5354
->getTracer('io.opentelemetry.contrib.php');
54-
55+
5556
// Extract the SpanContext from the carrier
5657
$spanContext = Propagator::extract($this->carrier, $map);
5758

0 commit comments

Comments
 (0)