Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ updates:
- "/src/Instrumentation/Yii"
- "/src/Logs/Monolog"
- "/src/MetaPackages/opentelemetry"
- "/src/Propagation/CloudTrace"
- "/src/Propagation/Instana"
- "/src/Propagation/ServerTiming"
- "/src/Propagation/TraceResponse"
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ jobs:
'Instrumentation/Symfony',
'Instrumentation/Yii',
'Logs/Monolog',
'Propagation/CloudTrace',
'Propagation/Instana',
'Propagation/ServerTiming',
'Propagation/TraceResponse',
Expand Down
2 changes: 2 additions & 0 deletions .gitsplit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,8 @@ splits:
target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-logger-monolog.git"
- prefix: "src/MetaPackages/opentelemetry"
target: "https://${GH_TOKEN}@github.com/opentelemetry-php/opentelemetry-meta.git"
- prefix: "src/Propagation/CloudTrace"
target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-propagator-cloudtrace.git"
- prefix: "src/Propagation/Instana"
target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-propagator-instana.git"
- prefix: "src/Propagation/ServerTiming"
Expand Down
4 changes: 4 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
"OpenTelemetry\\Contrib\\Instrumentation\\Wordpress\\": "src/Instrumentation/Wordpress/src",
"OpenTelemetry\\Contrib\\Instrumentation\\Yii\\": "src/Instrumentation/Yii/src",
"OpenTelemetry\\Contrib\\Logs\\Monolog\\": "src/Logs/Monolog/src",
"OpenTelemetry\\Contrib\\Propagation\\CloudTrace\\": "src/Propagation/CloudTrace/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",
Expand Down Expand Up @@ -84,6 +85,7 @@
"src/Instrumentation/Symfony/_register.php",
"src/Instrumentation/Wordpress/_register.php",
"src/Instrumentation/Yii/_register.php",
"src/Propagation/CloudTrace/_register.php",
"src/Propagation/Instana/_register.php",
"src/ResourceDetectors/Azure/_register.php",
"src/ResourceDetectors/Container/_register.php",
Expand Down Expand Up @@ -117,6 +119,7 @@
"OpenTelemetry\\Tests\\Instrumentation\\Symfony\\tests\\": "src/Instrumentation/Symfony/tests",
"OpenTelemetry\\Tests\\Instrumentation\\Wordpress\\": "src/Instrumentation/Wordpress/tests",
"OpenTelemetry\\Tests\\Instrumentation\\Yii\\": "src/Instrumentation/Yii/tests",
"OpenTelemetry\\Tests\\Propagation\\CloudTrace\\": "src/Propagation/CloudTrace/tests",
"OpenTelemetry\\Tests\\Resource\\Detector\\Azure\\": "src/ResourceDetectors/Azure/tests",
"OpenTelemetry\\Contrib\\Resource\\Detector\\DigitalOcean\\": "src/ResourceDetectors/DigitalOcean/tests",
"OpenTelemetry\\Tests\\Contrib\\Symfony\\": "src/Symfony/tests",
Expand Down Expand Up @@ -160,6 +163,7 @@
"open-telemetry/opentelemetry-exporter-instana": "self.version",
"open-telemetry/opentelemetry-instrumentation-installer": "self.version",
"open-telemetry/opentelemetry-logger-monolog": "self.version",
"open-telemetry/opentelemetry-propagation-cloudtrace": "self.version",
"open-telemetry/opentelemetry-propagation-instana": "self.version",
"open-telemetry/opentelemetry-propagation-server-timing": "self.version",
"open-telemetry/opentelemetry-propagation-traceresponse": "self.version",
Expand Down
12 changes: 12 additions & 0 deletions src/Propagation/CloudTrace/.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/CloudTrace/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/vendor/
43 changes: 43 additions & 0 deletions src/Propagation/CloudTrace/.php-cs-fixer.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<?php
$finder = PhpCsFixer\Finder::create()
->exclude('vendor')
->exclude('var/cache')
->in(__DIR__);

$config = new PhpCsFixer\Config();
return $config->setRules([
'concat_space' => ['spacing' => 'one'],
'declare_equal_normalize' => ['space' => 'none'],
'is_null' => true,
'modernize_types_casting' => true,
'ordered_imports' => true,
'php_unit_construct' => true,
'single_line_comment_style' => true,
'yoda_style' => false,
'@PSR2' => true,
'array_syntax' => ['syntax' => 'short'],
'blank_line_after_opening_tag' => true,
'blank_line_before_statement' => true,
'cast_spaces' => true,
'declare_strict_types' => true,
'type_declaration_spaces' => true,
'include' => true,
'lowercase_cast' => true,
'new_with_parentheses' => true,
'no_extra_blank_lines' => true,
'no_leading_import_slash' => true,
'echo_tag_syntax' => true,
'no_unused_imports' => true,
'no_useless_else' => true,
'no_useless_return' => true,
'phpdoc_order' => true,
'phpdoc_scalar' => true,
'phpdoc_types' => true,
'short_scalar_cast' => true,
'blank_lines_before_namespace' => true,
'single_quote' => true,
'trailing_comma_in_multiline' => true,
])
->setRiskyAllowed(true)
->setFinder($finder);

35 changes: 35 additions & 0 deletions src/Propagation/CloudTrace/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
[![Releases](https://img.shields.io/badge/releases-purple)](https://github.com/opentelemetry-php/extension-propagator-cloudtrace/releases)
[![Issues](https://img.shields.io/badge/issues-pink)](https://github.com/open-telemetry/opentelemetry-php/issues)
[![Source](https://img.shields.io/badge/source-contrib-green)](https://github.com/open-telemetry/opentelemetry-php-contrib/tree/main/src/Propagation/CloudTrace)
[![Mirror](https://img.shields.io/badge/mirror-opentelemetry--php--contrib-blue)](https://github.com/opentelemetry-php/extension-propagator-cloudtrace)
[![Latest Version](http://poser.pugx.org/open-telemetry/extension-propagator-cloudtrace/v/unstable)](https://packagist.org/packages/open-telemetry/extension-propagator-cloudtrace/)
[![Stable](http://poser.pugx.org/open-telemetry/extension-propagator-cloudtrace/v/stable)](https://packagist.org/packages/open-telemetry/extension-propagator-cloudtrace/)

This is a read-only subtree split of https://github.com/open-telemetry/opentelemetry-php-contrib.

# OpenTelemetry CloudTrace Propagator

CloudTrace is a propagator that supports the specification for the header "x-cloud-trace-context" used for trace context propagation across
service boundaries. (https://cloud.google.com/trace/docs/setup#force-trace). OpenTelemetry PHP CloudTrace Propagator Extension provides
option to use it bi-directionally or one-way. One-way does not inject the header for downstream consumption, it only processes the incoming headers
and returns the correct span context. It only attaches to existing X-Cloud-Trace-Context traces and does not create downstream ones.

## Installation

```sh
composer require open-telemetry/extension-propagator-cloudtrace
```

## Usage

For one-way CloudTrace:

```
$propagator = CloudTracePropagator::getOneWayInstance();
```

For bi-directional CloudTrace:

```
$propagator = CloudTracePropagator::getInstance();
```
20 changes: 20 additions & 0 deletions src/Propagation/CloudTrace/_register.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?php

declare(strict_types=1);

use OpenTelemetry\Contrib\Propagation\CloudTrace\CloudTracePropagator;
use OpenTelemetry\SDK\Registry;

if (!class_exists(Registry::class)) {
return;
}

Registry::registerTextMapPropagator(
'cloudtrace',
CloudTracePropagator::getInstance()
);

Registry::registerTextMapPropagator(
'cloudtrace-oneway',
CloudTracePropagator::getOneWayInstance()
);
44 changes: 44 additions & 0 deletions src/Propagation/CloudTrace/composer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
{
"name": "open-telemetry/opentelemetry-propagation-cloudtrace",
"description": "CloudTraceContext propagator extension for OpenTelemetry PHP.",
"keywords": ["opentelemetry", "otel", "tracing", "apm", "extension", "propagator", "cloudtrace"],
"type": "library",
"readme": "./README.md",
"license": "Apache-2.0",
"minimum-stability": "dev",
"prefer-stable": true,
"require": {
"php": "^8.1",
"open-telemetry/api": "^1.0",
"open-telemetry/context": "^1.0"
},
"autoload": {
"psr-4":{
"OpenTelemetry\\Contrib\\Propagation\\CloudTrace\\": "src/"
},
"files":[
"_register.php"
]
},
"autoload-dev": {
"psr-4": {
"OpenTelemetry\\Tests\\Propagation\\CloudTrace\\": "tests/"
}
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^3",
"phan/phan": "^5.0",
"phpstan/phpstan": "^1.1",
"phpstan/phpstan-phpunit": "^1.0",
"psalm/plugin-phpunit": "^0.19.2",
"open-telemetry/sdk": "^1.0",
"phpunit/phpunit": "^9.5",
"vimeo/psalm": "^4|^5|^6"
},
"config": {
"allow-plugins": {
"php-http/discovery": true,
"tbachert/spi": true
}
}
}
9 changes: 9 additions & 0 deletions src/Propagation/CloudTrace/phpstan.neon.dist
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
includes:
- vendor/phpstan/phpstan-phpunit/extension.neon

parameters:
tmpDir: var/cache/phpstan
level: 5
paths:
- src
- tests
44 changes: 44 additions & 0 deletions src/Propagation/CloudTrace/phpunit.xml.dist
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<?xml version="1.0" encoding="UTF-8"?>

<phpunit
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.5/phpunit.xsd"
backupGlobals="false"
backupStaticAttributes="false"
cacheResult="false"
colors="false"
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"
convertWarningsToExceptions="true"
forceCoversAnnotation="false"
processIsolation="false"
stopOnError="false"
stopOnFailure="false"
stopOnIncomplete="false"
stopOnSkipped="false"
stopOnRisky="false"
timeoutForSmallTests="1"
timeoutForMediumTests="10"
timeoutForLargeTests="60"
verbose="true">

<coverage processUncoveredFiles="true" disableCodeCoverageIgnore="false">
<include>
<directory>src</directory>
</include>
</coverage>

<php>
<ini name="date.timezone" value="UTC" />
<ini name="display_errors" value="On" />
<ini name="display_startup_errors" value="On" />
<ini name="error_reporting" value="E_ALL" />
</php>

<testsuites>
<testsuite name="unit">
<directory>tests/Unit</directory>
</testsuite>
</testsuites>

</phpunit>
15 changes: 15 additions & 0 deletions src/Propagation/CloudTrace/psalm.xml.dist
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0"?>
<psalm
errorLevel="3"
cacheDirectory="var/cache/psalm"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="https://getpsalm.org/schema/config"
xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd">
<projectFiles>
<directory name="src"/>
<directory name="tests"/>
</projectFiles>
<plugins>
<pluginClass class="Psalm\PhpUnitPlugin\Plugin"/>
</plugins>
</psalm>
57 changes: 57 additions & 0 deletions src/Propagation/CloudTrace/src/CloudTraceFormatter.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
<?php

declare(strict_types=1);

namespace OpenTelemetry\Contrib\Propagation\CloudTrace;

use OpenTelemetry\API\Trace\SpanContext;
use OpenTelemetry\API\Trace\SpanContextInterface;

/**
* This format using a human readable string encoding to propagate SpanContext.
* The current format of the header is `<trace-id>[/<span-id>][;o=<options>]`.
* The options are a bitmask of options. Currently the only option is the
* least significant bit which signals whether the request was traced or not
* (1 = traced, 0 = not traced).
*/
final class CloudTraceFormatter
{
const CONTEXT_HEADER_FORMAT = '/([0-9a-fA-F]{32})(?:\/(\d+))?(?:;o=(\d+))?/';

/**
* Generate a SpanContext object from the Trace Context header
*/
public static function deserialize(string $header) : SpanContextInterface
{
$matched = preg_match(self::CONTEXT_HEADER_FORMAT, $header, $matches);

if (!$matched) {
return SpanContext::getInvalid();
}
if (!array_key_exists(2, $matches) || empty($matches[2])) {
return SpanContext::getInvalid();
}
if (!array_key_exists(3, $matches)) {
return SpanContext::getInvalid();
}

return SpanContext::createFromRemoteParent(
strtolower($matches[1]),
Utils::leftZeroPad(Utils::decToHex($matches[2])),
(int) ($matches[3] === '1')
);
}

/**
* Convert a SpanContextInterface to header string
*/
public static function serialize(SpanContextInterface $context) : string
{
$ret = $context->getTraceId();
if ($context->getSpanId()) {
$ret .= '/' . Utils::hexToDec($context->getSpanId());
}

return $ret . (';o=' . ($context->isSampled() ? '1' : '0'));
}
}
Loading
Loading