Skip to content

Commit

Permalink
Add signalfx.tracing library/version tags, release 0.83.1-beta-sfx12 (#…
Browse files Browse the repository at this point in the history
…155)

* Add signalfx.tracing library/version tags

* Fix compilation for CI
  • Loading branch information
agoallikmaa authored Dec 12, 2023
1 parent 3426151 commit 096cc1e
Show file tree
Hide file tree
Showing 20 changed files with 152 additions and 119 deletions.
15 changes: 7 additions & 8 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1955,10 +1955,9 @@ workflows:
- "datadog/dd-trace-ci:alpine"
- "datadog/dd-trace-ci:buster"
cmake_version:
- "3.19.8"
- "3.21.4"
- "3.24.4"
catch2_version:
- "2.13.7"
- "2.13.10"

zend_abstract_interface:
jobs:
Expand All @@ -1980,10 +1979,9 @@ workflows:
- "8.1"
- "8.2"
cmake_version:
- "3.19.7"
- "3.20.1"
- "3.24.4"
catch2_version:
- "2.13.5"
- "2.13.10"

zend_abstract_interface_shared_exts:
jobs:
Expand Down Expand Up @@ -2735,7 +2733,8 @@ workflows:
- alpine:3.12
- alpine:3.15
- alpine:3.16
- alpine:latest
# SIGNALFX: latest breaks if dd install/verify is not kept up-to-date with upstream
#- alpine:latest
- verify_alpine:
requires: [ "package extension" ]
matrix:
Expand Down Expand Up @@ -3133,7 +3132,7 @@ workflows:
requires: [ 'Prepare Code' ]
name: "PHP 82 Xdebug tests"
docker_image: "datadog/dd-trace-ci:php-8.2_buster"
xdebug_version_one: "3.2.0RC1"
xdebug_version_one: "3.2.2"
- placeholder:
requires: [ 'Prepare Code' ]
name: Language tests
Expand Down
4 changes: 3 additions & 1 deletion dockerfiles/ci/buster/build-extensions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,10 @@ elif [[ $PHP_VERSION_ID -le 80 ]]; then
XDEBUG_VERSIONS=(-3.0.0)
elif [[ $PHP_VERSION_ID -le 81 ]]; then
XDEBUG_VERSIONS=(-3.1.0)
elif [[ $PHP_VERSION_ID -le 82 ]]; then
XDEBUG_VERSIONS=(-3.2.2)
else
XDEBUG_VERSIONS=(-3.2.0RC1)
XDEBUG_VERSIONS=(-3.3.0)
fi

MONGODB_VERSION=
Expand Down
8 changes: 6 additions & 2 deletions dockerfiles/ci/xfail_tests/7.0.list
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ ext/date/tests/date_timestamp_set_nullparam2.phpt
ext/date/tests/test-parse-from-format.phpt
ext/fileinfo/tests/finfo_open_error.phpt
ext/ftp/tests
ext/gd/tests/bug70976.phpt
ext/json/tests/bug45791.phpt
ext/json/tests/pass001.phpt
ext/mbstring/tests/zend_multibyte-01.phpt
Expand Down Expand Up @@ -146,14 +147,14 @@ ext/openssl/tests/streams_crypto_method.phpt
ext/openssl/tests/tlsv1.0_wrapper.phpt
ext/openssl/tests/tlsv1.1_wrapper.phpt
ext/openssl/tests/tlsv1.2_wrapper.phpt
ext/pdo/tests/pdo_023.phpt
ext/pdo/tests/pdo_030.phpt
ext/pdo_sqlite/tests/bug43831.phpt
ext/pdo_sqlite/tests/bug44327_2.phpt
ext/pdo_sqlite/tests/bug44327_3.phpt
ext/pdo_sqlite/tests/bug48773.phpt
ext/pdo_sqlite/tests/pdo_fetch_func_001.phpt
ext/pdo_sqlite/tests/pdo_sqlite_lastinsertid.phpt
ext/pdo/tests/pdo_023.phpt
ext/pdo/tests/pdo_030.phpt
ext/phar/tests/031.phpt
ext/phar/tests/032.phpt
ext/phar/tests/bug69720.phpt
Expand Down Expand Up @@ -191,9 +192,11 @@ ext/simplexml/tests/bug69491.phpt
ext/simplexml/tests/bug72971.phpt
ext/simplexml/tests/bug72971_2.phpt
ext/simplexml/tests/simplexml_load_file.phpt
ext/soap/tests/bugs/bug28751.phpt
ext/sockets/tests/socket_connect_params.phpt
ext/sockets/tests/socket_create_listen-nobind.phpt
ext/sockets/tests/socket_create_pair.phpt
ext/sockets/tests/socket_shutdown.phpt
ext/spl/tests/ArrayObject_clone_other_std_props.phpt
ext/spl/tests/ArrayObject_dump_during_sort.phpt
ext/spl/tests/ArrayObject_exchange_array_during_sorting.phpt
Expand Down Expand Up @@ -325,6 +328,7 @@ ext/standard/tests/serialize/bug70219_1.phpt
ext/standard/tests/serialize/serialization_objects_007.phpt
ext/standard/tests/streams/proc_open_bug69900.phpt
ext/standard/tests/strings/implode1.phpt
ext/xsl/tests/bug33853.phpt
ext/zip/tests/bug38943.phpt
ext/zip/tests/bug38943_2.phpt
sapi/cli/tests/upload_2G.phpt
Expand Down
8 changes: 6 additions & 2 deletions dockerfiles/ci/xfail_tests/7.1.list
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ ext/date/tests/date_timestamp_set_nullparam2.phpt
ext/date/tests/test-parse-from-format.phpt
ext/fileinfo/tests/finfo_open_error.phpt
ext/ftp/tests
ext/gd/tests/bug70976.phpt
ext/json/tests/bug45791.phpt
ext/json/tests/pass001.phpt
ext/mbstring/tests/zend_multibyte-01.phpt
Expand Down Expand Up @@ -158,14 +159,14 @@ ext/openssl/tests/streams_crypto_method.phpt
ext/openssl/tests/tlsv1.0_wrapper.phpt
ext/openssl/tests/tlsv1.1_wrapper.phpt
ext/openssl/tests/tlsv1.2_wrapper.phpt
ext/pdo/tests/pdo_023.phpt
ext/pdo/tests/pdo_030.phpt
ext/pdo_sqlite/tests/bug43831.phpt
ext/pdo_sqlite/tests/bug44327_2.phpt
ext/pdo_sqlite/tests/bug44327_3.phpt
ext/pdo_sqlite/tests/bug48773.phpt
ext/pdo_sqlite/tests/pdo_fetch_func_001.phpt
ext/pdo_sqlite/tests/pdo_sqlite_lastinsertid.phpt
ext/pdo/tests/pdo_023.phpt
ext/pdo/tests/pdo_030.phpt
ext/phar/tests/031.phpt
ext/phar/tests/032.phpt
ext/phar/tests/bug69720.phpt
Expand Down Expand Up @@ -204,6 +205,8 @@ ext/simplexml/tests/bug69491.phpt
ext/simplexml/tests/bug72971.phpt
ext/simplexml/tests/bug72971_2.phpt
ext/simplexml/tests/simplexml_load_file.phpt
ext/soap/tests/bugs/bug28751.phpt
ext/soap/tests/bugs/bug76348.phpt
ext/sockets/tests/socket_connect_params.phpt
ext/sockets/tests/socket_create_listen-nobind.phpt
ext/sockets/tests/socket_create_pair.phpt
Expand Down Expand Up @@ -340,6 +343,7 @@ ext/standard/tests/serialize/serialization_objects_007.phpt
ext/standard/tests/streams/proc_open_bug69900.phpt
ext/standard/tests/streams/stream_context_tcp_nodelay_fopen.phpt
ext/standard/tests/strings/implode1.phpt
ext/xsl/tests/bug33853.phpt
ext/zip/tests/bug38943.phpt
ext/zip/tests/bug38943_2.phpt
sapi/cli/tests/upload_2G.phpt
Expand Down
6 changes: 4 additions & 2 deletions dockerfiles/ci/xfail_tests/7.2.list
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ ext/date/tests/date_timestamp_set_nullparam2.phpt
ext/date/tests/test-parse-from-format.phpt
ext/fileinfo/tests/finfo_open_error.phpt
ext/ftp/tests
ext/gd/tests/bug70976.phpt
ext/json/tests/bug45791.phpt
ext/json/tests/bug77843.phpt
ext/json/tests/pass001.phpt
Expand Down Expand Up @@ -143,14 +144,14 @@ ext/openssl/tests/tls_wrapper.phpt
ext/openssl/tests/tlsv1.0_wrapper.phpt
ext/openssl/tests/tlsv1.1_wrapper.phpt
ext/openssl/tests/tlsv1.2_wrapper.phpt
ext/pdo/tests/pdo_023.phpt
ext/pdo/tests/pdo_030.phpt
ext/pdo_sqlite/tests/bug43831.phpt
ext/pdo_sqlite/tests/bug44327_2.phpt
ext/pdo_sqlite/tests/bug44327_3.phpt
ext/pdo_sqlite/tests/bug48773.phpt
ext/pdo_sqlite/tests/pdo_fetch_func_001.phpt
ext/pdo_sqlite/tests/pdo_sqlite_lastinsertid.phpt
ext/pdo/tests/pdo_023.phpt
ext/pdo/tests/pdo_030.phpt
ext/phar/tests/031.phpt
ext/phar/tests/032.phpt
ext/phar/tests/bug69720.phpt
Expand Down Expand Up @@ -189,6 +190,7 @@ ext/simplexml/tests/bug69491.phpt
ext/simplexml/tests/bug72971.phpt
ext/simplexml/tests/bug72971_2.phpt
ext/simplexml/tests/simplexml_load_file.phpt
ext/soap/tests/bugs/bug76348.phpt
ext/sockets/tests/socket_connect_params.phpt
ext/sockets/tests/socket_create_listen-nobind.phpt
ext/sockets/tests/socket_create_pair.phpt
Expand Down
5 changes: 3 additions & 2 deletions dockerfiles/ci/xfail_tests/7.3.list
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ ext/date/tests/date_timestamp_set_nullparam2.phpt
ext/date/tests/test-parse-from-format.phpt
ext/fileinfo/tests/finfo_open_error.phpt
ext/ftp/tests
ext/gd/tests/bug70976.phpt
ext/json/tests/bug45791.phpt
ext/json/tests/bug77843.phpt
ext/json/tests/json_decode_exceptions.phpt
Expand Down Expand Up @@ -154,14 +155,14 @@ ext/openssl/tests/tls_wrapper.phpt
ext/openssl/tests/tlsv1.0_wrapper.phpt
ext/openssl/tests/tlsv1.1_wrapper.phpt
ext/openssl/tests/tlsv1.2_wrapper.phpt
ext/pdo/tests/pdo_023.phpt
ext/pdo/tests/pdo_030.phpt
ext/pdo_sqlite/tests/bug43831.phpt
ext/pdo_sqlite/tests/bug44327_2.phpt
ext/pdo_sqlite/tests/bug44327_3.phpt
ext/pdo_sqlite/tests/bug48773.phpt
ext/pdo_sqlite/tests/pdo_fetch_func_001.phpt
ext/pdo_sqlite/tests/pdo_sqlite_lastinsertid.phpt
ext/pdo/tests/pdo_023.phpt
ext/pdo/tests/pdo_030.phpt
ext/phar/tests/031.phpt
ext/phar/tests/032.phpt
ext/phar/tests/bug69720.phpt
Expand Down
5 changes: 3 additions & 2 deletions dockerfiles/ci/xfail_tests/7.4.list
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,7 @@ ext/date/tests/date_timestamp_set_nullparam2.phpt
ext/date/tests/test-parse-from-format.phpt
ext/fileinfo/tests/finfo_open_error.phpt
ext/ftp/tests
ext/gd/tests/bug70976.phpt
ext/json/tests/bug45791.phpt
ext/json/tests/bug77843.phpt
ext/json/tests/json_decode_exceptions.phpt
Expand Down Expand Up @@ -211,14 +212,14 @@ ext/openssl/tests/tlsv1.2_wrapper.phpt
ext/openssl/tests/tlsv1.3_wrapper.phpt
ext/pcntl/tests/pcntl_unshare_01.phpt
ext/pcntl/tests/pcntl_unshare_03.phpt
ext/pdo/tests/pdo_023.phpt
ext/pdo/tests/pdo_030.phpt
ext/pdo_sqlite/tests/bug43831.phpt
ext/pdo_sqlite/tests/bug44327_2.phpt
ext/pdo_sqlite/tests/bug44327_3.phpt
ext/pdo_sqlite/tests/bug48773.phpt
ext/pdo_sqlite/tests/pdo_fetch_func_001.phpt
ext/pdo_sqlite/tests/pdo_sqlite_lastinsertid.phpt
ext/pdo/tests/pdo_023.phpt
ext/pdo/tests/pdo_030.phpt
ext/phar/tests/031.phpt
ext/phar/tests/032.phpt
ext/phar/tests/bug69720.phpt
Expand Down
5 changes: 2 additions & 3 deletions dockerfiles/ci/xfail_tests/8.0.list
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,6 @@ Zend/tests/weakrefs/weakrefs_001.phpt
ext/curl/tests/bug45161.phpt
ext/curl/tests/bug48514.phpt
ext/curl/tests/bug64267.phpt
ext/curl/tests/bug65458.phpt
ext/curl/tests/bug72202.phpt
ext/curl/tests/bug76675.phpt
ext/curl/tests/bug77535.phpt
Expand Down Expand Up @@ -256,14 +255,14 @@ ext/openssl/tests/tlsv1.3_wrapper.phpt
ext/pcntl/tests/pcntl_unshare_01.phpt
ext/pcntl/tests/pcntl_unshare_02.phpt
ext/pcntl/tests/pcntl_unshare_03.phpt
ext/pdo/tests/pdo_023.phpt
ext/pdo/tests/pdo_030.phpt
ext/pdo_sqlite/tests/bug43831.phpt
ext/pdo_sqlite/tests/bug44327_2.phpt
ext/pdo_sqlite/tests/bug44327_3.phpt
ext/pdo_sqlite/tests/bug48773.phpt
ext/pdo_sqlite/tests/pdo_fetch_func_001.phpt
ext/pdo_sqlite/tests/pdo_sqlite_lastinsertid.phpt
ext/pdo/tests/pdo_023.phpt
ext/pdo/tests/pdo_030.phpt
ext/phar/tests/031.phpt
ext/phar/tests/032.phpt
ext/phar/tests/bug69720.phpt
Expand Down
24 changes: 18 additions & 6 deletions dockerfiles/ci/xfail_tests/8.1.list
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
Zend/tests/fibers/out-of-memory-in-fiber.phpt
Zend/tests/fibers/out-of-memory-in-nested-fiber.phpt
Zend/tests/fibers/out-of-memory-in-recursive-fiber.phpt
Zend/tests/014.phpt
Zend/tests/arginfo_zpp_mismatch.phpt
Zend/tests/arginfo_zpp_mismatch_strict.phpt
Expand All @@ -16,20 +13,26 @@ Zend/tests/bug75921.phpt
Zend/tests/bug78182.phpt
Zend/tests/bug81104.phpt
Zend/tests/each_002.phpt
Zend/tests/fibers/gh10496-001.phpt
Zend/tests/fibers/out-of-memory-in-fiber.phpt
Zend/tests/fibers/out-of-memory-in-nested-fiber.phpt
Zend/tests/fibers/out-of-memory-in-recursive-fiber.phpt
Zend/tests/gc_031.phpt
Zend/tests/gc_037.phpt
Zend/tests/gc_045.phpt
Zend/tests/get_defined_functions_basic.phpt
Zend/tests/get_required_files.phpt
Zend/tests/gh7958.phpt
Zend/tests/gh11189.phpt
Zend/tests/gh11189_1.phpt
Zend/tests/list_keyed_conversions.phpt
Zend/tests/multibyte/multibyte_encoding_004.phpt
Zend/tests/object_gc_in_shutdown.phpt
Zend/tests/offset_array.phpt
Zend/tests/strict_001.phpt
Zend/tests/type_declarations/typed_properties_091.phpt
Zend/tests/type_declarations/scalar_return_basic_64bit.phpt
Zend/tests/type_declarations/scalar_strict_64bit.phpt
Zend/tests/type_declarations/typed_properties_091.phpt
Zend/tests/weakrefs/weakmap_basic_map_behavior.phpt
Zend/tests/weakrefs/weakmap_error_conditions.phpt
ext/curl/tests/bug45161.phpt
Expand All @@ -38,6 +41,7 @@ ext/curl/tests/bug76675.phpt
ext/curl/tests/bug77535.phpt
ext/curl/tests/bug79033.phpt
ext/curl/tests/curl_int_cast.phpt
ext/curl/tests/curl_setopt_CURLOPT_ACCEPT_ENCODING.phpt
ext/date/tests/bug52113.phpt
ext/fileinfo/tests/finfo_open_error.phpt
ext/mbstring/tests/zend_multibyte-01.phpt
Expand Down Expand Up @@ -84,14 +88,14 @@ ext/openssl/tests/tlsv1.3_wrapper.phpt
ext/pcntl/tests/pcntl_unshare_01.phpt
ext/pcntl/tests/pcntl_unshare_02.phpt
ext/pcntl/tests/pcntl_unshare_03.phpt
ext/pdo/tests/pdo_023.phpt
ext/pdo/tests/pdo_030.phpt
ext/pdo_sqlite/tests/bug43831.phpt
ext/pdo_sqlite/tests/bug44327_2.phpt
ext/pdo_sqlite/tests/bug44327_3.phpt
ext/pdo_sqlite/tests/bug48773.phpt
ext/pdo_sqlite/tests/pdo_fetch_func_001.phpt
ext/pdo_sqlite/tests/pdo_sqlite_lastinsertid.phpt
ext/pdo/tests/pdo_023.phpt
ext/pdo/tests/pdo_030.phpt
ext/phar/tests/031.phpt
ext/phar/tests/032.phpt
ext/phar/tests/fatal_error_webphar.phpt
Expand Down Expand Up @@ -124,8 +128,10 @@ ext/standard/tests/array/array_key_exists_object2.phpt
ext/standard/tests/array/array_map_variation4.phpt
ext/standard/tests/array/array_reverse_variation4.phpt
ext/standard/tests/array/array_unique_variation3.phpt
ext/standard/tests/file/bug52820.phpt
ext/standard/tests/file/disk_free_space_basic.phpt
ext/standard/tests/file/lstat_stat_variation10.phpt
ext/standard/tests/file/lstat_stat_variation15.phpt
ext/standard/tests/filters/bug54350.phpt
ext/standard/tests/general_functions/bug73973.phpt
ext/standard/tests/general_functions/floatval.phpt
Expand All @@ -143,14 +149,19 @@ ext/standard/tests/math/base_convert_variation1.phpt
ext/standard/tests/math/bindec_variation1_64bit.phpt
ext/standard/tests/math/hexdec_variation1_64bit.phpt
ext/standard/tests/math/octdec_variation1.phpt
ext/standard/tests/network/bug80067.phpt
ext/standard/tests/network/syslog_new_line.phpt
ext/standard/tests/network/syslog_null_byte.phpt
ext/standard/tests/serialize/005.phpt
ext/standard/tests/streams/bug78902.phpt
ext/standard/tests/streams/proc_open_bug69900.phpt
ext/standard/tests/streams/stream_context_tcp_nodelay_fopen.phpt
ext/standard/tests/strings/implode1.phpt
ext/standard/tests/strings/sprintf_variation54.phpt
ext/tokenizer/tests/PhpToken_getAll.phpt
ext/zend_test/tests/
ext/zip/tests/bug38943.phpt
sapi/cli/tests/bug80092.phpt
sapi/cli/tests/upload_2G.phpt
sapi/fpm/tests/log-bm-in-shutdown-fn.phpt
sapi/fpm/tests/log-bm-limit-1024-msg-80.phpt
Expand All @@ -172,3 +183,4 @@ sapi/phpdbg/tests/stepping_001.phpt
tests/classes/__call_007.phpt
tests/lang/bug45392.phpt
tests/output/ob_start_basic_002.phpt
Zend/tests/gh12073.phpt
Loading

0 comments on commit 096cc1e

Please sign in to comment.