From 1087c3ea9ea5583648e2434c971e902c8d812f8b Mon Sep 17 00:00:00 2001 From: Heena Bansal Date: Wed, 21 May 2025 09:42:44 -0700 Subject: [PATCH 1/3] Minor typo fixes for Instana propagator --- src/Propagation/Instana/.phan/config.php | 2 +- src/Propagation/Instana/README.md | 2 +- src/Propagation/Instana/composer.json | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/Propagation/Instana/.phan/config.php b/src/Propagation/Instana/.phan/config.php index da2ac2d99..6473a9aa8 100644 --- a/src/Propagation/Instana/.phan/config.php +++ b/src/Propagation/Instana/.phan/config.php @@ -42,7 +42,7 @@ // // Note that the **only** effect of choosing `'5.6'` is to infer that functions removed in php 7.0 exist. // (See `backward_compatibility_checks` for additional options) - 'target_php_version' => '8.0', + 'target_php_version' => '8.1', // If enabled, missing properties will be created when // they are first seen. If false, we'll report an diff --git a/src/Propagation/Instana/README.md b/src/Propagation/Instana/README.md index 1ba3ade4b..fabd93948 100644 --- a/src/Propagation/Instana/README.md +++ b/src/Propagation/Instana/README.md @@ -31,7 +31,7 @@ Both of the above have extract and inject methods available to extract and injec For Baggage propagation, use opentelemetry's MultiTextMapPropagator, and pass the array list of propagators i.e Instana and Baggage propagator as below. ``` -$propagator = new MultiTextMapPropagator(InstantPropagator::getInstance(), BaggagePropagator::getInstance()); +$propagator = new MultiTextMapPropagator(InstanaPropagator::getInstance(), BaggagePropagator::getInstance()); ``` ## Propagator Details diff --git a/src/Propagation/Instana/composer.json b/src/Propagation/Instana/composer.json index ed5cbd154..e77a029a6 100644 --- a/src/Propagation/Instana/composer.json +++ b/src/Propagation/Instana/composer.json @@ -5,7 +5,6 @@ "keywords": ["opentelemetry", "otel", "open-telemetry", "propagator", "instana"], "type": "library", "readme": "./README.md", - "license": "Apache-2.0", "minimum-stability": "dev", "prefer-stable": true, "require": { From 9fd6c4ae8e3cde3d0b410215e89ab3964c3d14c0 Mon Sep 17 00:00:00 2001 From: Heena Bansal Date: Wed, 21 May 2025 12:08:07 -0700 Subject: [PATCH 2/3] Reverted composer.json change --- src/Propagation/Instana/composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Propagation/Instana/composer.json b/src/Propagation/Instana/composer.json index e77a029a6..ed5cbd154 100644 --- a/src/Propagation/Instana/composer.json +++ b/src/Propagation/Instana/composer.json @@ -5,6 +5,7 @@ "keywords": ["opentelemetry", "otel", "open-telemetry", "propagator", "instana"], "type": "library", "readme": "./README.md", + "license": "Apache-2.0", "minimum-stability": "dev", "prefer-stable": true, "require": { From 2cc8875033c0131c1bc21cacd832d7ac520589fa Mon Sep 17 00:00:00 2001 From: Brett McBride Date: Thu, 22 May 2025 14:09:59 +1000 Subject: [PATCH 3/3] Update src/Propagation/Instana/README.md --- src/Propagation/Instana/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Propagation/Instana/README.md b/src/Propagation/Instana/README.md index fabd93948..c09778bc1 100644 --- a/src/Propagation/Instana/README.md +++ b/src/Propagation/Instana/README.md @@ -31,7 +31,7 @@ Both of the above have extract and inject methods available to extract and injec For Baggage propagation, use opentelemetry's MultiTextMapPropagator, and pass the array list of propagators i.e Instana and Baggage propagator as below. ``` -$propagator = new MultiTextMapPropagator(InstanaPropagator::getInstance(), BaggagePropagator::getInstance()); +$propagator = new MultiTextMapPropagator([InstanaPropagator::getInstance(), BaggagePropagator::getInstance()]); ``` ## Propagator Details