review updates

Author: smaddock

src/Instrumentation/ReactHttp/README.md

@@ -1,3 +1,5 @@
+This is a read-only subtree split of https://github.com/open-telemetry/opentelemetry-php-contrib.
+
 # OpenTelemetry ReactPHP HTTP Browser auto-instrumentation
 
 Please read https://opentelemetry.io/docs/instrumentation/php/automatic/ for instructions on how to
@@ -18,9 +20,15 @@ The extension can be disabled via [runtime configuration](https://opentelemetry.
 OTEL_PHP_DISABLED_INSTRUMENTATIONS=react-http
 ```
 
-Request and/or response headers can be added as span attributes by adding to the `php.ini`:
+Custom HTTP methods can replace the known methods via environment variables, e.g.:
+
+```shell
+OTEL_INSTRUMENTATION_HTTP_KNOWN_METHODS="GET,HEAD,POST,PUT,DELETE,CONNECT,OPTIONS,TRACE,PATCH,MyCustomMethod"
+```
+
+Request and/or response headers can be added as span attributes via environment variables, e.g.:
 
-```ini
-otel.instrumentation.http.request_headers[]="Accept"
-otel.instrumentation.http.response_headers[]="Content-Type"
+```shell
+OTEL_INSTRUMENTATION_HTTP_REQUEST_HEADERS=Accept
+OTEL_INSTRUMENTATION_HTTP_RESPONSE_HEADERS="Content-Length,Content-Type"
 ```

src/Instrumentation/ReactHttp/examples/README.md

@@ -1,8 +1,6 @@
 # OpenTelemetry ReactPHP HTTP Browser Examples
 
-These examples are all valid and working; they just show different ways of calling the ReactPHP HTTP Browser, following some of the examples in the [ReactPHP HTTP documentation](https://reactphp.org/http/).
+These examples show two different ways of using the [ReactPHP HTTP](https://reactphp.org/http/) Browser.
 
 - [http_only.php](http_only.php) - a “pure” example using only the ReactPHP HTTP library.
-- [http_only_promises.php](http_only_promises.php) - same as above but with the [Promises](https://reactphp.org/http/#promises) handled in a separate loop.
-- [http+async_blocking.php](http+async_blocking.php) - uses the [ReactPHP Async library](https://reactphp.org/async/) to achieve a more [traditional blocking](https://reactphp.org/http/#blocking) request.
-- [http+async_nonblocking.php](http+async_nonblocking.php) - uses the [ReactPHP Async library](https://reactphp.org/async/) as intended, to make asynchronous HTTP requests while abstracting away the callables of Promises by taking advantage of PHP fibers.
+- [http_with_async.php](http_with_async.php) - uses the [ReactPHP Async library](https://reactphp.org/async/), to make asynchronous HTTP requests while abstracting away the callables of Promises by taking advantage of PHP fibers.

src/Instrumentation/ReactHttp/examples/http+async_blocking.php

@@ -12,9 +12,9 @@
 use OpenTelemetry\SDK\Trace\SpanProcessor\BatchSpanProcessor;
 use OpenTelemetry\SDK\Trace\TracerProvider;
 use Psr\Http\Message\ResponseInterface;
-use React\EventLoop\Loop;
 use React\Http\Browser;
 use React\Http\Message\Request;
+use React\Http\Message\ResponseException;
 
 require_once dirname(__DIR__) . '/vendor/autoload.php';
 
@@ -34,32 +34,59 @@
     ->buildAndRegisterGlobal();
 
 $root = $tracerProvider->getTracer('react-http-demo')->spanBuilder('root')->startSpan();
+$rootScope = $root->activate();
 
-Loop::futureTick(static function () use ($root) {
-    $rootScope = $root->activate();
+try {
+    $browser = new Browser();
 
-    try {
-        $browser = new Browser();
+    $requests = [
+        //[HTTP/1.1 200 OK] https://postman:[email protected]/get?q=query-example#fragment-example
+        new Request('GET', 'https://postman:[email protected]/get?q=query-example#fragment-example'),
+        //[HTTP/1.1 200 OK] https://postman-echo.com/post
+        new Request('POST', 'https://postman-echo.com/post', ['Content-Type' => 'application/json'], '{}'),
+        //[400: HTTP status code 400 (Bad Request)] http://postman-echo.com:443/get
+        new Request('CUSTOM', 'http://postman-echo.com:443/get'),
+        //[0: Invalid request URL given] unknown://postman-echo.com/get
+        new Request('GET', 'unknown://postman-echo.com/get'),
+        //[HTTP/1.1 200 OK] https://postman-echo.com/delay/5
+        new Request('GET', 'https://postman-echo.com/delay/5'),
+    ];
 
-        $requests = [
-            new Request('GET', 'https://postman-echo.com/get'),
-            new Request('POST', 'https://postman-echo.com/post'),
-            new Request('GET', 'https://httpbin.org/does-not-exist'),
-            new Request('GET', 'https://httpbin.org/get'),
-            new Request('PUT', 'localhost:2222/not-found'),
-        ];
-
-        foreach ($requests as $request) {
-            $browser
-                ->request($request->getMethod(), $request->getUri())
-                ->then(function (ResponseInterface $response) {
-                    echo sprintf('[%d] ', $response->getStatusCode()) . json_decode($response->getBody()->getContents())->url . PHP_EOL;
-                }, function (Throwable $t) {
-                    var_dump($t->getMessage());
-                });
-        }
-    } finally {
-        $rootScope->detach();
-        $root->end();
+    foreach ($requests as $request) {
+        $browser
+            ->request($request->getMethod(), $request->getUri())
+            ->then(function (ResponseInterface $response) use ($request) {
+                echo sprintf(
+                    '[HTTP/%s %d %s] %s%s',
+                    $response->getProtocolVersion(),
+                    $response->getStatusCode(),
+                    $response->getReasonPhrase(),
+                    $request->getUri(),
+                    PHP_EOL
+                );
+            }, function (Throwable $t) use ($request) {
+                if (is_a($t, ResponseException::class)) {
+                    $response = $t->getResponse();
+                    echo sprintf(
+                        '[HTTP/%s %d %s] %s%s',
+                        $response->getProtocolVersion(),
+                        $response->getStatusCode(),
+                        $response->getReasonPhrase(),
+                        $request->getUri(),
+                        PHP_EOL
+                    );
+                } else {
+                    echo sprintf(
+                        '[%d: %s] %s%s',
+                        $t->getCode(),
+                        $t->getMessage(),
+                        $request->getUri(),
+                        PHP_EOL
+                    );
+                }
+            });
     }
-});
+} finally {
+    $rootScope->detach();
+    $root->end();
+}