From 07ccb274d2d31383fdcbd12ed925da9515b4779f Mon Sep 17 00:00:00 2001
From: Tyler Yahn <codingalias@gmail.com>
Date: Fri, 29 May 2020 10:17:57 -0700
Subject: [PATCH] Update options

---
 exporters/otlp/options.go | 56 +++++++++++++++++++--------------------
 1 file changed, 27 insertions(+), 29 deletions(-)

diff --git a/exporters/otlp/options.go b/exporters/otlp/options.go
index 76648f9b5..a8d8b364a 100644
--- a/exporters/otlp/options.go
+++ b/exporters/otlp/options.go
@@ -31,36 +31,34 @@ const (
 	//
 	// For more info on the RetryableStatusCodes we allow here:
 	// https://github.com/open-telemetry/oteps/blob/be2a3fcbaa417ebbf5845cd485d34fdf0ab4a2a4/text/0035-opentelemetry-protocol.md#export-response
+	//
+	// Note: MaxAttempts > 5 are treated as 5. See
+	// https://github.com/grpc/proposal/blob/master/A6-client-retries.md#validation-of-retrypolicy
+	// for more details.
 	DefaultGRPCServiceConfig = `{
-   "methodConfig":[
-      {
-         "name":[
-            {
-               "service":"opentelemetry.proto.collector.metrics.v1.MetricsService"
-            },
-            {
-               "service":"opentelemetry.proto.collector.trace.v1.TraceService"
-            }
-         ],
-		 "waitForReady": true,
-         "retryPolicy":{
-            "MaxAttempts":4,
-            "InitialBackoff":".01s",
-            "MaxBackoff":"1.0s",
-            "BackoffMultiplier":1.0,
-            "RetryableStatusCodes":[
-               "UNAVAILABLE",
-			   "CANCELLED",
-               "DEADLINE_EXCEEDED",
-               "RESOURCE_EXHAUSTED",
-               "ABORTED",
-               "OUT_OF_RANGE",
-               "UNAVAILABLE",
-               "DATA_LOSS"
-            ]
-         }
-      }
-   ]
+	"methodConfig":[{
+		"name":[
+			{ "service":"opentelemetry.proto.collector.metrics.v1.MetricsService" },
+			{ "service":"opentelemetry.proto.collector.trace.v1.TraceService" }
+		],
+		"waitForReady": true,
+		"retryPolicy":{
+			"MaxAttempts":5,
+			"InitialBackoff":"0.3s",
+			"MaxBackoff":"5s",
+			"BackoffMultiplier":2,
+			"RetryableStatusCodes":[
+				"UNAVAILABLE",
+				"CANCELLED",
+				"DEADLINE_EXCEEDED",
+				"RESOURCE_EXHAUSTED",
+				"ABORTED",
+				"OUT_OF_RANGE",
+				"UNAVAILABLE",
+				"DATA_LOSS"
+			]
+		}
+	}]
 }`
 )