Skip to content

Commit

Permalink
Add the grpc extension for the google spanner integration (#2944)
Browse files Browse the repository at this point in the history
* Add grpc to the docker image

Signed-off-by: Bob Weinand <bob.weinand@datadoghq.com>

* Don't enable grpc by default

Signed-off-by: Bob Weinand <bob.weinand@datadoghq.com>

---------

Signed-off-by: Bob Weinand <bob.weinand@datadoghq.com>
  • Loading branch information
bwoebi authored Nov 13, 2024
1 parent 49b3dc0 commit e2b0a15
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 0 deletions.
2 changes: 2 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -1269,7 +1269,9 @@ test_integrations_frankenphp: global_test_run_dependencies
test_integrations_roadrunner: global_test_run_dependencies tests/Frameworks/Roadrunner/Version_2/composer.lock-php$(PHP_MAJOR_MINOR)
$(call run_tests_debug,tests/Integrations/Roadrunner/V2)
test_integrations_googlespanner: global_test_run_dependencies tests/Integrations/GoogleSpanner/composer.lock-php$(PHP_MAJOR_MINOR)
$(eval TEST_EXTRA_INI=-d extension=grpc.so)
$(call run_tests_debug,tests/Integrations/GoogleSpanner)
$(eval TEST_EXTRA_INI=)
test_integrations_sqlsrv: global_test_run_dependencies
$(eval TEST_EXTRA_INI=-d extension=sqlsrv.so)
$(call run_tests_debug,tests/Integrations/SQLSRV)
Expand Down
6 changes: 6 additions & 0 deletions dockerfiles/ci/buster/build-extensions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,12 @@ else
popd
fi

# ext-grpc is needed for google spanner
if [[ $PHP_VERSION_ID -ge 80 ]]; then
pecl install grpc;
# avoid installing it by default, it seems to stall some testsuites.
fi

# We don't install any redis.so to inis, but allow selection at runtime.
if [[ $PHP_VERSION_ID -lt 80 ]]; then
pecl install redis-3.1.6
Expand Down

0 comments on commit e2b0a15

Please sign in to comment.