diff --git a/example/otel-collector/go.sum b/example/otel-collector/go.sum index 7f08f906d..9df9798c7 100644 --- a/example/otel-collector/go.sum +++ b/example/otel-collector/go.sum @@ -414,7 +414,6 @@ github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5y github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= -github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= github.com/golang/protobuf v1.3.5 h1:F768QJ1E9tib+q5Sc8MkdJi1RxLTbRcTf8LJV56aRls= github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= diff --git a/exporters/otlp/README.md b/exporters/otlp/README.md index 7310ea93d..d9d86b52e 100644 --- a/exporters/otlp/README.md +++ b/exporters/otlp/README.md @@ -56,7 +56,7 @@ func main() { ## Configuration -Configuratin options can be specified when creating a new exporter (`NewExporter`). +Configurations options can be specified when creating a new exporter (`NewExporter`). ### `WorkerCount(n uint)` diff --git a/exporters/otlp/options.go b/exporters/otlp/options.go index a8d8b364a..6f2702bed 100644 --- a/exporters/otlp/options.go +++ b/exporters/otlp/options.go @@ -35,13 +35,15 @@ const ( // 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. + // + // The following is to ensure CANCELLED is not corrected to CANCELED. + // nolint DefaultGRPCServiceConfig = `{ "methodConfig":[{ "name":[ { "service":"opentelemetry.proto.collector.metrics.v1.MetricsService" }, { "service":"opentelemetry.proto.collector.trace.v1.TraceService" } ], - "waitForReady": true, "retryPolicy":{ "MaxAttempts":5, "InitialBackoff":"0.3s",