config: enable HTTP/2 (#417)

Updates the standard configuration to send requests over HTTP/2 by default. Note that there are future improvements that should be made here to support negotiating between HTTP/1.1 and HTTP/2, being tracked in #502. More info on the config change: https://www.envoyproxy.io/docs/envoy/latest/api-v2/api/v2/cds.proto#envoy-api-msg-cluster Signed-off-by: Michael Rebello <[email protected]>
envoyproxy · Oct 14, 2019 · 604dbbc · 604dbbc
1 parent 03380bc
commit 604dbbc
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 12 deletions.
diff --git a/examples/java/hello_world/MainActivity.java b/examples/java/hello_world/MainActivity.java
@@ -30,9 +30,9 @@
 public class MainActivity extends Activity {
   private static final String REQUEST_HANDLER_THREAD_NAME = "hello_envoy_java";
   private static final String ENVOY_SERVER_HEADER = "server";
-  private static final String REQUEST_AUTHORITY = "s3.amazonaws.com";
-  private static final String REQUEST_PATH = "/api.lyft.com/static/demo/hello_world.txt";
-  private static final String REQUEST_SCHEME = "http";
+  private static final String REQUEST_AUTHORITY = "api.lyft.com";
+  private static final String REQUEST_PATH = "/ping";
+  private static final String REQUEST_SCHEME = "https";
 
   private Envoy envoy;
   private RecyclerView recyclerView;

diff --git a/examples/kotlin/hello_world/MainActivity.kt b/examples/kotlin/hello_world/MainActivity.kt
@@ -27,9 +27,9 @@ import java.util.concurrent.atomic.AtomicInteger
 
 private const val REQUEST_HANDLER_THREAD_NAME = "hello_envoy_kt"
 private const val ENVOY_SERVER_HEADER = "server"
-private const val REQUEST_AUTHORITY = "s3.amazonaws.com"
-private const val REQUEST_PATH = "/api.lyft.com/static/demo/hello_world.txt"
-private const val REQUEST_SCHEME = "http"
+private const val REQUEST_AUTHORITY = "api.lyft.com"
+private const val REQUEST_PATH = "/ping"
+private const val REQUEST_SCHEME = "https"
 
 class MainActivity : Activity() {
   private val thread = HandlerThread(REQUEST_HANDLER_THREAD_NAME)

diff --git a/examples/objective-c/hello_world/ViewController.m b/examples/objective-c/hello_world/ViewController.m
@@ -6,9 +6,9 @@
 #pragma mark - Constants
 
 NSString *_CELL_ID = @"cell-id";
-NSString *_REQUEST_AUTHORITY = @"s3.amazonaws.com";
-NSString *_REQUEST_PATH = @"/api.lyft.com/static/demo/hello_world.txt";
-NSString *_REQUEST_SCHEME = @"http";
+NSString *_REQUEST_AUTHORITY = @"api.lyft.com";
+NSString *_REQUEST_PATH = @"/ping";
+NSString *_REQUEST_SCHEME = @"https";
 
 #pragma mark - ViewController
 

diff --git a/examples/swift/hello_world/ViewController.swift b/examples/swift/hello_world/ViewController.swift
@@ -2,9 +2,9 @@ import Envoy
 import UIKit
 
 private let kCellID = "cell-id"
-private let kRequestAuthority = "s3.amazonaws.com"
-private let kRequestPath = "/api.lyft.com/static/demo/hello_world.txt"
-private let kRequestScheme = "http"
+private let kRequestAuthority = "api.lyft.com"
+private let kRequestPath = "/ping"
+private let kRequestScheme = "https"
 
 final class ViewController: UITableViewController {
   private var requestCount = 0

diff --git a/library/common/config_template.cc b/library/common/config_template.cc
@@ -8,6 +8,7 @@ const char* config_template = R"(
     connect_timeout: {{ connect_timeout_seconds }}s
     dns_refresh_rate: {{ dns_refresh_rate_seconds }}s
     dns_lookup_family: V4_ONLY
+    http2_protocol_options: {}
     lb_policy: ROUND_ROBIN
     load_assignment:
       cluster_name: base
@@ -32,6 +33,7 @@ R"(
     connect_timeout: {{ connect_timeout_seconds }}s
     dns_refresh_rate: {{ dns_refresh_rate_seconds }}s
     dns_lookup_family: V4_ONLY
+    http2_protocol_options: {}
     lb_policy: ROUND_ROBIN
     load_assignment:
       cluster_name: base_wlan
@@ -42,6 +44,7 @@ R"(
     connect_timeout: {{ connect_timeout_seconds }}s
     dns_refresh_rate: {{ dns_refresh_rate_seconds }}s
     dns_lookup_family: V4_ONLY
+    http2_protocol_options: {}
     lb_policy: ROUND_ROBIN
     load_assignment:
       cluster_name: base_wwan