Skip to content

Commit

Permalink
Merge branch 'main' into extend-stack
Browse files Browse the repository at this point in the history
  • Loading branch information
brettmc authored Feb 5, 2024
2 parents 57b1539 + 7010de9 commit 19d19f6
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 10 deletions.
32 changes: 23 additions & 9 deletions ext/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,18 @@
<email>[email protected]</email>
<active>yes</active>
</lead>
<date>2024-01-27</date>
<time>21:38:56</time>
<date>2024-02-04</date>
<time>23:00:16</time>
<version>
<release>1.0.1beta2</release>
<release>1.0.1</release>
<api>1.0</api>
</version>
<stability>
<release>beta</release>
<release>stable</release>
<api>stable</api>
</stability>
<license uri="https://opensource.org/license/apache-2-0/" filesource="LICENSE">Apache 2.0</license>
<notes>opentelemetry 1.0.1beta2
* Fix exception raised by `php_error_docref` that hangs the process in hook (#127)
* clang format (#126)
* Fix build warnings (#125)
</notes>
<notes>See https://github.com/open-telemetry/opentelemetry-php-instrumentation/releases/tag/1.0.1</notes>
<contents>
<dir baseinstalldir="/" name="/">
<file baseinstalldir="/" name=".clang-format" role="src"/>
Expand Down Expand Up @@ -332,5 +328,23 @@
* add pear to build (#108)
</notes>
</release>
<release>
<date>2024-01-27</date>
<time>21:38:56</time>
<version>
<release>1.0.1beta2</release>
<api>1.0</api>
</version>
<stability>
<release>beta</release>
<api>stable</api>
</stability>
<license>Apache 2.0</license>
<notes>opentelemetry 1.0.1beta2
* Fix exception raised by `php_error_docref` that hangs the process in hook (#127)
* clang format (#126)
* Fix build warnings (#125)
</notes>
</release>
</changelog>
</package>
2 changes: 1 addition & 1 deletion ext/php_opentelemetry.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ ZEND_EXTERN_MODULE_GLOBALS(opentelemetry)

#define OTEL_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(opentelemetry, v)

#define PHP_OPENTELEMETRY_VERSION "1.0.1beta2"
#define PHP_OPENTELEMETRY_VERSION "1.0.1"

#if defined(ZTS) && defined(COMPILE_DL_OPENTELEMETRY)
ZEND_TSRMLS_CACHE_EXTERN()
Expand Down

0 comments on commit 19d19f6

Please sign in to comment.