From 6cb9d91e4b2707cbd7c7a1f283d7cc14d3b5f3fe Mon Sep 17 00:00:00 2001 From: Weslen Teche Date: Sun, 3 Aug 2025 11:47:03 -0300 Subject: [PATCH] migrate/remove cloudtrace propagator --- .gitsplit.yml | 2 - composer.json | 2 - deptrac.baseline.yaml | 2 - .../CloudTrace/CloudTraceFormatter.php | 57 ------ .../CloudTrace/CloudTracePropagator.php | 99 ---------- src/Extension/Propagator/CloudTrace/README.md | 28 --- src/Extension/Propagator/CloudTrace/Utils.php | 122 ------------ .../Propagator/CloudTrace/_register.php | 20 -- .../Propagator/CloudTrace/composer.json | 37 ---- src/SDK/Common/Configuration/KnownValues.php | 4 - .../CloudTrace/CloudTraceFormatterTest.php | 49 ----- .../CloudTracePropagatorOneWayTest.php | 163 ---------------- .../CloudTrace/CloudTracePropagatorTest.php | 175 ------------------ .../Propagator/CloudTrace/UtilsTest.php | 115 ------------ tests/Unit/SDK/FactoryRegistryTest.php | 2 - .../SDK/Propagation/PropagatorFactoryTest.php | 3 - 16 files changed, 880 deletions(-) delete mode 100644 src/Extension/Propagator/CloudTrace/CloudTraceFormatter.php delete mode 100644 src/Extension/Propagator/CloudTrace/CloudTracePropagator.php delete mode 100644 src/Extension/Propagator/CloudTrace/README.md delete mode 100644 src/Extension/Propagator/CloudTrace/Utils.php delete mode 100644 src/Extension/Propagator/CloudTrace/_register.php delete mode 100644 src/Extension/Propagator/CloudTrace/composer.json delete mode 100644 tests/Unit/Extension/Propagator/CloudTrace/CloudTraceFormatterTest.php delete mode 100644 tests/Unit/Extension/Propagator/CloudTrace/CloudTracePropagatorOneWayTest.php delete mode 100644 tests/Unit/Extension/Propagator/CloudTrace/CloudTracePropagatorTest.php delete mode 100644 tests/Unit/Extension/Propagator/CloudTrace/UtilsTest.php diff --git a/.gitsplit.yml b/.gitsplit.yml index 9f7eb8289..d71dbf24c 100644 --- a/.gitsplit.yml +++ b/.gitsplit.yml @@ -26,8 +26,6 @@ splits: target: "https://${GH_TOKEN}@github.com/opentelemetry-php/exporter-zipkin.git" - prefix: "src/Extension/Propagator/B3" target: "https://${GH_TOKEN}@github.com/opentelemetry-php/extension-propagator-b3.git" - - prefix: "src/Extension/Propagator/CloudTrace" - target: "https://${GH_TOKEN}@github.com/opentelemetry-php/extension-propagator-cloudtrace.git" - prefix: "src/Extension/Propagator/Jaeger" target: "https://${GH_TOKEN}@github.com/opentelemetry-php/extension-propagator-jaeger.git" diff --git a/composer.json b/composer.json index ce0bbf139..aad612bb4 100644 --- a/composer.json +++ b/composer.json @@ -46,7 +46,6 @@ "open-telemetry/exporter-otlp": "1.0.x-dev", "open-telemetry/exporter-zipkin": "1.0.x-dev", "open-telemetry/extension-propagator-b3": "1.0.x-dev", - "open-telemetry/extension-propagator-cloudtrace": "1.0.x-dev", "open-telemetry/extension-propagator-jaeger": "0.0.2", "open-telemetry/gen-otlp-protobuf": "1.0.x-dev", "open-telemetry/sdk": "1.0.x-dev", @@ -68,7 +67,6 @@ "src/Contrib/Grpc/_register.php", "src/Contrib/Zipkin/_register.php", "src/Extension/Propagator/B3/_register.php", - "src/Extension/Propagator/CloudTrace/_register.php", "src/Extension/Propagator/Jaeger/_register.php", "src/SDK/Logs/Exporter/_register.php", "src/SDK/Metrics/MetricExporter/_register.php", diff --git a/deptrac.baseline.yaml b/deptrac.baseline.yaml index e3fa01b34..dd15c0bf1 100644 --- a/deptrac.baseline.yaml +++ b/deptrac.baseline.yaml @@ -2,8 +2,6 @@ deptrac: skip_violations: /src/Extension/Propagator/B3/_register.php: - OpenTelemetry\SDK\Registry - /src/Extension/Propagator/CloudTrace/_register.php: - - OpenTelemetry\SDK\Registry /src/Extension/Propagator/Jaeger/_register.php: - OpenTelemetry\SDK\Registry OpenTelemetry\API\Configuration\Config\ComponentProvider: diff --git a/src/Extension/Propagator/CloudTrace/CloudTraceFormatter.php b/src/Extension/Propagator/CloudTrace/CloudTraceFormatter.php deleted file mode 100644 index f64d32e7d..000000000 --- a/src/Extension/Propagator/CloudTrace/CloudTraceFormatter.php +++ /dev/null @@ -1,57 +0,0 @@ -[/][;o=]`. - * 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')); - } -} diff --git a/src/Extension/Propagator/CloudTrace/CloudTracePropagator.php b/src/Extension/Propagator/CloudTrace/CloudTracePropagator.php deleted file mode 100644 index 8b1bc7b1c..000000000 --- a/src/Extension/Propagator/CloudTrace/CloudTracePropagator.php +++ /dev/null @@ -1,99 +0,0 @@ -oneWay) { - return; - } - - $setter ??= ArrayAccessGetterSetter::getInstance(); - $context ??= Context::getCurrent(); - $spanContext = Span::fromContext($context)->getContext(); - - if (!$spanContext->isValid()) { - return; - } - - $headerValue = CloudTraceFormatter::serialize($spanContext); - $setter->set($carrier, self::XCLOUD, $headerValue); - } - - /** {@inheritdoc} */ - #[\Override] - public function extract($carrier, ?PropagationGetterInterface $getter = null, ?ContextInterface $context = null): ContextInterface - { - $getter ??= ArrayAccessGetterSetter::getInstance(); - $context ??= Context::getCurrent(); - - $headerValue = $getter->get($carrier, self::XCLOUD); - if ($headerValue === null) { - return $context; - } - - $spanContext = CloudTraceFormatter::deserialize($headerValue); - if (!$spanContext->isValid()) { - return $context; - } - - return $context->withContextValue(Span::wrap($spanContext)); - } -} diff --git a/src/Extension/Propagator/CloudTrace/README.md b/src/Extension/Propagator/CloudTrace/README.md deleted file mode 100644 index 169d6c211..000000000 --- a/src/Extension/Propagator/CloudTrace/README.md +++ /dev/null @@ -1,28 +0,0 @@ -[![Releases](https://img.shields.io/badge/releases-purple)](https://github.com/opentelemetry-php/extension-propagator-cloudtrace/releases) -[![Source](https://img.shields.io/badge/source-extension--propagator--cloudtrace-green)](https://github.com/open-telemetry/opentelemetry-php/tree/main/src/Extension/Propagator/CloudTrace) -[![Mirror](https://img.shields.io/badge/mirror-opentelemetry--php:extension--propagator--cloudtrace-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/) - -# OpenTelemetry Extension -### 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. - -For one-way CloudTrace: -```text -CloudTracePropagator::getOneWayInstance() -``` - -For bi-directional CloudTrace: -```text -CloudTracePropagator::getInstance() -``` - -## Contributing - -This repository is a read-only git subtree split. -To contribute, please see the main [OpenTelemetry PHP monorepo](https://github.com/open-telemetry/opentelemetry-php). diff --git a/src/Extension/Propagator/CloudTrace/Utils.php b/src/Extension/Propagator/CloudTrace/Utils.php deleted file mode 100644 index 250186266..000000000 --- a/src/Extension/Propagator/CloudTrace/Utils.php +++ /dev/null @@ -1,122 +0,0 @@ -= and no >, because this function is used in context of what method to use - * to convert to some base (in our case hex to octal and vice versa). - * So it's ok if we use >=, because it means that only for MAX_INT we will use the slower baseConvert - * method. - * - * @param int|float $number The number to test. - * @return bool Whether it was bigger or not than the max. - */ - public static function isBigNum($number) : bool - { - return $number >= PHP_INT_MAX; - } - - /** - * Custom function to convert a number in string format from one base to another. - * Built-in functions, specifically for hex, do not work well in PHP under - * all versions (32/64-bit) or if the number only fits into an unsigned long. - * PHP does not have unsigned longs, so this function is necessary. - * - * @param string $num The number to convert (in some base). - * @param int $fromBase The base to convert from. - * @param int $toBase The base to convert to. - * @return string Converted number in the new base. - */ - public static function baseConvert(string $num, int $fromBase, int $toBase) : string - { - $num = strtolower($num); - $chars = '0123456789abcdefghijklmnopqrstuvwxyz'; - $newstring = substr($chars, 0, $toBase); - - $length = strlen($num); - $result = ''; - - $number = []; - for ($i = 0; $i < $length; $i++) { - $number[$i] = strpos($chars, $num[$i]); - } - - do { - $divide = 0; - $newlen = 0; - for ($i = 0; $i < $length; $i++) { - if (!isset($number[$i]) || $number[$i] === false) { - return ''; - } - $divide = $divide * $fromBase + $number[$i]; - if ($divide >= $toBase) { - $number[$newlen++] = (int) ($divide / $toBase); - $divide %= $toBase; - } elseif ($newlen > 0) { - $number[$newlen++] = 0; - } - } - $length = $newlen; - $result = $newstring[$divide] . $result; - } while ($newlen != 0); - - return $result; - } -} diff --git a/src/Extension/Propagator/CloudTrace/_register.php b/src/Extension/Propagator/CloudTrace/_register.php deleted file mode 100644 index 5fcac7243..000000000 --- a/src/Extension/Propagator/CloudTrace/_register.php +++ /dev/null @@ -1,20 +0,0 @@ -assertEquals($result->getTraceId(), $traceId, "Given deserialize($header), traceId != $traceId (result={$result->getTraceId()}"); - $this->assertEquals($result->getSpanId(), $spanId, "Given deserialize($header), spanId != $spanId (result={$result->getSpanId()}"); - $this->assertEquals($result->getTraceFlags(), $sample, "Given deserialize($header), traceFlags != $sample (result={$result->getTraceFlags()}"); - } - - public static function for_test_deserialize() : array - { - return [ - ['00000000000000000000000000000001/1;o=0', '00000000000000000000000000000001', '0000000000000001', 0], - ['10000000000000000000000000000001/10;o=1', '10000000000000000000000000000001', '000000000000000a', 1], - ]; - } - - #[DataProvider('for_test_serialize')] - public function test_serialize(SpanContextInterface $span, string $header) : void - { - $result = CloudTraceFormatter::serialize($span); - $this->assertEquals($result, $header, "Given serialize(header), result != $header (result=$result"); - } - - public static function for_test_serialize() : array - { - return [ - [SpanContext::createFromRemoteParent('00000000000000000000000000000001', '0000000000000001', TraceFlags::DEFAULT), '00000000000000000000000000000001/1;o=0'], - [SpanContext::createFromRemoteParent('00000000000000000000000000000001', '000000000000000a', TraceFlags::SAMPLED), '00000000000000000000000000000001/10;o=1'], - ]; - } -} diff --git a/tests/Unit/Extension/Propagator/CloudTrace/CloudTracePropagatorOneWayTest.php b/tests/Unit/Extension/Propagator/CloudTrace/CloudTracePropagatorOneWayTest.php deleted file mode 100644 index 5d5388e12..000000000 --- a/tests/Unit/Extension/Propagator/CloudTrace/CloudTracePropagatorOneWayTest.php +++ /dev/null @@ -1,163 +0,0 @@ -cloudTracePropagator = CloudTracePropagator::getOneWayInstance(); - [$this->xcloud] = $this->cloudTracePropagator->fields(); - } - - public function test_fields(): void - { - $this->assertSame( - ['x-cloud-trace-context'], - $this->cloudTracePropagator->fields() - ); - } - - public function test_inject_invalid_context(): void - { - $carrier = []; - $this - ->cloudTracePropagator - ->inject( - $carrier, - null, - $this->withSpanContext( - SpanContext::create( - SpanContextValidator::INVALID_TRACE, - SpanContextValidator::INVALID_SPAN, - TraceFlags::SAMPLED - ), - Context::getCurrent() - ) - ); - $this->assertEmpty($carrier); - } - - public function test_inject_sampled_context(): void - { - $carrier = []; - $this - ->cloudTracePropagator - ->inject( - $carrier, - null, - $this->withSpanContext( - SpanContext::create(self::TRACE_ID_BASE16, self::SPAN_ID_BASE16, TraceFlags::SAMPLED), - Context::getCurrent() - ) - ); - $this->assertEmpty($carrier); - } - - public function test_inject_non_sampled_context(): void - { - $carrier = []; - $this - ->cloudTracePropagator - ->inject( - $carrier, - null, - $this->withSpanContext( - SpanContext::create(self::TRACE_ID_BASE16, self::SPAN_ID_BASE16, TraceFlags::DEFAULT), - Context::getCurrent() - ) - ); - $this->assertEmpty($carrier); - } - - public function test_inject_non_sampled_default_context(): void - { - $carrier = []; - $this - ->cloudTracePropagator - ->inject( - $carrier, - null, - $this->withSpanContext( - SpanContext::create(self::TRACE_ID_BASE16, self::SPAN_ID_BASE16), - Context::getCurrent() - ) - ); - $this->assertEmpty($carrier); - } - - public function test_extract_nothing(): void - { - $this->assertSame( - Context::getCurrent(), - $this->cloudTracePropagator->extract([]) - ); - } - - public function test_extract_sampled_context(): void - { - $carrier = [ - $this->xcloud => self::TRACE_ID_BASE16 . '/' . self::SPAN_ID_BASE10 . ';o=' . self::TRACE_ENABLED, - ]; - - $context = $this->cloudTracePropagator->extract($carrier); - - $this->assertEquals( - SpanContext::createFromRemoteParent(self::TRACE_ID_BASE16, self::SPAN_ID_BASE16, TraceFlags::SAMPLED), - $this->getSpanContext($context) - ); - } - - public function test_extract_non_sampled_context(): void - { - $carrier = [ - $this->xcloud => self::TRACE_ID_BASE16 . '/' . self::SPAN_ID_BASE10 . ';o=' . self::TRACE_DISABLED, - ]; - - $context = $this->cloudTracePropagator->extract($carrier); - - $this->assertEquals( - SpanContext::createFromRemoteParent(self::TRACE_ID_BASE16, self::SPAN_ID_BASE16, TraceFlags::DEFAULT), - $this->getSpanContext($context) - ); - } - - private function getSpanContext(ContextInterface $context): SpanContextInterface - { - return Span::fromContext($context)->getContext(); - } - - private function withSpanContext(SpanContextInterface $spanContext, ContextInterface $context): ContextInterface - { - return $context->withContextValue(Span::wrap($spanContext)); - } -} diff --git a/tests/Unit/Extension/Propagator/CloudTrace/CloudTracePropagatorTest.php b/tests/Unit/Extension/Propagator/CloudTrace/CloudTracePropagatorTest.php deleted file mode 100644 index 5397cda23..000000000 --- a/tests/Unit/Extension/Propagator/CloudTrace/CloudTracePropagatorTest.php +++ /dev/null @@ -1,175 +0,0 @@ -cloudTracePropagator = CloudTracePropagator::getInstance(); - [$this->xcloud] = $this->cloudTracePropagator->fields(); - } - - public function test_fields(): void - { - $this->assertSame( - ['x-cloud-trace-context'], - $this->cloudTracePropagator->fields() - ); - } - - public function test_inject_invalid_context(): void - { - $carrier = []; - $this - ->cloudTracePropagator - ->inject( - $carrier, - null, - $this->withSpanContext( - SpanContext::create( - SpanContextValidator::INVALID_TRACE, - SpanContextValidator::INVALID_SPAN, - TraceFlags::SAMPLED - ), - Context::getCurrent() - ) - ); - $this->assertEmpty($carrier); - } - - public function test_inject_sampled_context(): void - { - $carrier = []; - $this - ->cloudTracePropagator - ->inject( - $carrier, - null, - $this->withSpanContext( - SpanContext::create(self::TRACE_ID_BASE16, self::SPAN_ID_BASE16, TraceFlags::SAMPLED), - Context::getCurrent() - ) - ); - - $this->assertSame( - [$this->xcloud => self::TRACE_ID_BASE16 . '/' . self::SPAN_ID_BASE10 . ';o=' . self::TRACE_ENABLED], - $carrier - ); - } - - public function test_inject_non_sampled_context(): void - { - $carrier = []; - $this - ->cloudTracePropagator - ->inject( - $carrier, - null, - $this->withSpanContext( - SpanContext::create(self::TRACE_ID_BASE16, self::SPAN_ID_BASE16, TraceFlags::DEFAULT), - Context::getCurrent() - ) - ); - - $this->assertSame( - [$this->xcloud => self::TRACE_ID_BASE16 . '/' . self::SPAN_ID_BASE10 . ';o=' . self::TRACE_DISABLED], - $carrier - ); - } - - public function test_inject_non_sampled_default_context(): void - { - $carrier = []; - $this - ->cloudTracePropagator - ->inject( - $carrier, - null, - $this->withSpanContext( - SpanContext::create(self::TRACE_ID_BASE16, self::SPAN_ID_BASE16), - Context::getCurrent() - ) - ); - - $this->assertSame( - [$this->xcloud => self::TRACE_ID_BASE16 . '/' . self::SPAN_ID_BASE10 . ';o=' . self::TRACE_DISABLED], - $carrier - ); - } - - public function test_extract_nothing(): void - { - $this->assertSame( - Context::getCurrent(), - $this->cloudTracePropagator->extract([]) - ); - } - - public function test_extract_sampled_context(): void - { - $carrier = [ - $this->xcloud => self::TRACE_ID_BASE16 . '/' . self::SPAN_ID_BASE10 . ';o=' . self::TRACE_ENABLED, - ]; - - $context = $this->cloudTracePropagator->extract($carrier); - - $this->assertEquals( - SpanContext::createFromRemoteParent(self::TRACE_ID_BASE16, self::SPAN_ID_BASE16, TraceFlags::SAMPLED), - $this->getSpanContext($context) - ); - } - - public function test_extract_non_sampled_context(): void - { - $carrier = [ - $this->xcloud => self::TRACE_ID_BASE16 . '/' . self::SPAN_ID_BASE10 . ';o=' . self::TRACE_DISABLED, - ]; - - $context = $this->cloudTracePropagator->extract($carrier); - - $this->assertEquals( - SpanContext::createFromRemoteParent(self::TRACE_ID_BASE16, self::SPAN_ID_BASE16, TraceFlags::DEFAULT), - $this->getSpanContext($context) - ); - } - - private function getSpanContext(ContextInterface $context): SpanContextInterface - { - return Span::fromContext($context)->getContext(); - } - - private function withSpanContext(SpanContextInterface $spanContext, ContextInterface $context): ContextInterface - { - return $context->withContextValue(Span::wrap($spanContext)); - } -} diff --git a/tests/Unit/Extension/Propagator/CloudTrace/UtilsTest.php b/tests/Unit/Extension/Propagator/CloudTrace/UtilsTest.php deleted file mode 100644 index 4b08aa2c5..000000000 --- a/tests/Unit/Extension/Propagator/CloudTrace/UtilsTest.php +++ /dev/null @@ -1,115 +0,0 @@ -assertEquals(Utils::leftZeroPad($pad, $howMuch), $equalsTo, "Given leftZeroPad($pad, $howMuch) != $equalsTo"); - } - - public static function for_test_left_zero_pad() : array - { - return [ - ['a', 3, '00a'], - ['aaa', 3, 'aaa'], - ['aaa', 16, '0000000000000aaa'], - ['', 1, '0'], - ]; - } - - #[DataProvider('for_test_dec_to_hex')] - public function test_dec_to_hex(string $decNum, string $equalsTo) : void - { - $this->assertEquals(Utils::decToHex($decNum), $equalsTo, "Given decToHex($decNum) != $equalsTo"); - } - - public static function for_test_dec_to_hex() : array - { - return [ - ['10', 'a'], - ['1', '1'], - ['9223372036854775807', '7fffffffffffffff'], - ['18446744073709551615', 'ffffffffffffffff'], - ['28446744073709551615', '18ac7230489e7ffff'], - ]; - } - - #[DataProvider('for_test_hex_to_dec')] - public function test_hex_to_dec(string $hexNum, string $equalsTo) : void - { - $this->assertEquals(Utils::hexToDec($hexNum), $equalsTo, "Given hexToDec($hexNum) != $equalsTo"); - } - - public static function for_test_hex_to_dec() : array - { - return [ - ['a', '10'], - ['B', '11'], - ['0xc', '12'], - ['1', '1'], - ['7fffffffffffffff', '9223372036854775807'], - ['1ffffffffffffffA', '2305843009213693946'], - ['1fffffffffffffff', '2305843009213693951'], - ['8fffffffffffffff', '10376293541461622783'], - ['7fffffffffffffff', '9223372036854775807'], - ['8000000000000000', '9223372036854775808'], - ['ffffffffffffffff', '18446744073709551615'], - ['18ac7230489e7ffff', '28446744073709551615'], - ]; - } - - #[DataProvider('for_test_is_big_num')] - public function test_is_big_num($num, bool $equalsTo) : void - { - $this->assertEquals(Utils::isBigNum($num), $equalsTo, "Given isBigNum($num) != $equalsTo"); - } - - public static function for_test_is_big_num() : array - { - return [ - [-100.5, false], - [-1, false], - [1, false], - [100.5, false], - [9223372036854775806, false], - [9223372036854775807, true], - [9223372036854775808, true], - [18446744073709551615, true], - [28446744073709551615, true], - ]; - } - - #[DataProvider('for_test_base_convert')] - public function test_base_convert(string $num, int $fromBase, int $toBase, string $equalsTo) : void - { - $result = Utils::baseConvert($num, $fromBase, $toBase); - $this->assertEquals($result, $equalsTo, "Given baseConvert($num, $fromBase, $toBase) != $equalsTo (result=$result)"); - } - - public static function for_test_base_convert() : array - { - return [ - ['b', 16, 10, '11'], - ['c', 16, 10, '12'], - ['fffffffffffff', 16, 10, '4503599627370495'], - ['7fffffff', 16, 10, '2147483647'], - ['7ffffffffffffffe', 16, 10, '9223372036854775806'], - ['7fffffffffffffff', 16, 10, '9223372036854775807'], - ['8000000000000000', 16, 10, '9223372036854775808'], // bigger than signed int max 64 bit - ['18ac7230489e7ffff', 16, 10, '28446744073709551615'], - ['28446744073709551615', 10, 16, '18ac7230489e7ffff'], - ['10', 10, 16, 'a'], - ]; - } -} diff --git a/tests/Unit/SDK/FactoryRegistryTest.php b/tests/Unit/SDK/FactoryRegistryTest.php index d58842375..4d2e90ed1 100644 --- a/tests/Unit/SDK/FactoryRegistryTest.php +++ b/tests/Unit/SDK/FactoryRegistryTest.php @@ -99,8 +99,6 @@ public static function textMapPropagator(): array ['baggage'], ['b3'], ['b3multi'], - ['cloudtrace'], - ['cloudtrace-oneway'], ['jaeger'], ['jaeger-baggage'], ]; diff --git a/tests/Unit/SDK/Propagation/PropagatorFactoryTest.php b/tests/Unit/SDK/Propagation/PropagatorFactoryTest.php index 489163e59..3eb00b2e7 100644 --- a/tests/Unit/SDK/Propagation/PropagatorFactoryTest.php +++ b/tests/Unit/SDK/Propagation/PropagatorFactoryTest.php @@ -11,7 +11,6 @@ use OpenTelemetry\Context\Propagation\MultiTextMapPropagator; use OpenTelemetry\Context\Propagation\NoopTextMapPropagator; use OpenTelemetry\Extension\Propagator\B3\B3Propagator; -use OpenTelemetry\Extension\Propagator\CloudTrace\CloudTracePropagator; use OpenTelemetry\Extension\Propagator\Jaeger\JaegerBaggagePropagator; use OpenTelemetry\Extension\Propagator\Jaeger\JaegerPropagator; use OpenTelemetry\SDK\Common\Configuration\KnownValues; @@ -51,8 +50,6 @@ public static function propagatorsProvider(): array [KnownValues::VALUE_BAGGAGE, BaggagePropagator::class], [KnownValues::VALUE_TRACECONTEXT, TraceContextPropagator::class], [KnownValues::VALUE_B3, B3Propagator::class], - [KnownValues::VALUE_CLOUD_TRACE, CloudTracePropagator::class], - [KnownValues::VALUE_CLOUD_TRACE_ONEWAY, CloudTracePropagator::class], [KnownValues::VALUE_JAEGER, JaegerPropagator::class], [KnownValues::VALUE_JAEGER_BAGGAGE, JaegerBaggagePropagator::class], [KnownValues::VALUE_B3_MULTI, B3Propagator::class],