Support the http_connect_timeout and http_timeout options config …

…options (#593)

Co-authored-by: Stefano Arlandini <[email protected]>

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## Unreleased
 
 - Add `TracingDriverConnectionInterface::getNativeConnection()` method to get the original driver connection (#597)
+- Add `options.http_timeout` and `options.http_connect_timeout` configuration options (#593)
 
 ## 4.2.10 (2022-05-17)
 

src/DependencyInjection/Configuration.php

@@ -116,6 +116,14 @@ public function getConfigTreeBuilder(): TreeBuilder
  ->booleanNode('send_default_pii')->end()
  ->integerNode('max_value_length')->min(0)->end()
  ->scalarNode('http_proxy')->end()
+ ->integerNode('http_connect_timeout')
+ ->min(0)
+ ->info('The maximum number of seconds to wait while trying to connect to a server. It works only when using the default transport.')
+ ->end()
+ ->integerNode('http_timeout')
+ ->min(0)
+ ->info('The maximum execution time for the request+response as a whole. It works only when using the default transport.')
+ ->end()
  ->booleanNode('capture_silenced_errors')->end()
  ->enumNode('max_request_body_size')
  ->values([

src/Resources/config/schema/sentry-1.0.xsd

@@ -49,6 +49,8 @@
  <xsd:attribute name="send-default-pii" type="xsd:boolean" />
  <xsd:attribute name="max-value-length" type="xsd:integer" />
  <xsd:attribute name="http-proxy" type="xsd:string" />
+ <xsd:attribute name="http-timeout" type="xsd:integer" />
+ <xsd:attribute name="http-connect-timeout" type="xsd:integer" />
  <xsd:attribute name="capture-silenced-errors" type="xsd:boolean" />
  <xsd:attribute name="max-request-body-size" type="max-request-body-size" />
  </xsd:complexType>

tests/DependencyInjection/Fixtures/php/full.php

@@ -36,6 +36,8 @@
  'send_default_pii' => true,
  'max_value_length' => 255,
  'http_proxy' => 'proxy.example.com:8080',
+ 'http_timeout' => 10,
+ 'http_connect_timeout' => 15,
  'capture_silenced_errors' => true,
  'max_request_body_size' => 'none',
  'class_serializers' => ['App\\FooClass' => 'App\\Sentry\\Serializer\\FooClassSerializer'],

tests/DependencyInjection/Fixtures/xml/full.xml

@@ -30,6 +30,8 @@
  send-default-pii="true"
  max-value-length="255"
  http-proxy="proxy.example.com:8080"
+ http-timeout="10"
+ http-connect-timeout="15"
  capture-silenced-errors="true"
  max-request-body-size="none"
  >

tests/DependencyInjection/Fixtures/yml/full.yml

@@ -32,6 +32,8 @@ sentry:
  send_default_pii: true
  max_value_length: 255
  http_proxy: proxy.example.com:8080
+ http_timeout: 10
+ http_connect_timeout: 15
  capture_silenced_errors: true
  max_request_body_size: 'none'
  class_serializers:

tests/DependencyInjection/SentryExtensionTest.php

@@ -219,6 +219,8 @@ public function testClientIsCreatedFromOptions(): void
  'send_default_pii' => true,
  'max_value_length' => 255,
  'http_proxy' => 'proxy.example.com:8080',
+ 'http_timeout' => 10,
+ 'http_connect_timeout' => 15,
  'capture_silenced_errors' => true,
  'max_request_body_size' => 'none',
  'class_serializers' => [