Update OtlpExporter options

src/OpenTelemetry.Exporter.OpenTelemetryProtocol/.publicApi/net452/PublicAPI.Unshipped.txt

@@ -14,8 +14,8 @@ OpenTelemetry.Exporter.OtlpExporterOptions.ExportProcessorType.set -> void
 OpenTelemetry.Exporter.OtlpExporterOptions.Headers.get -> string
 OpenTelemetry.Exporter.OtlpExporterOptions.Headers.set -> void
 OpenTelemetry.Exporter.OtlpExporterOptions.OtlpExporterOptions() -> void
-OpenTelemetry.Exporter.OtlpExporterOptions.TimeOut.get -> int?
-OpenTelemetry.Exporter.OtlpExporterOptions.TimeOut.set -> void
+OpenTelemetry.Exporter.OtlpExporterOptions.TimeoutMilliseconds.get -> int?
+OpenTelemetry.Exporter.OtlpExporterOptions.TimeoutMilliseconds.set -> void
 OpenTelemetry.Trace.OtlpTraceExporterHelperExtensions
 override OpenTelemetry.Exporter.OtlpTraceExporter.Export(in OpenTelemetry.Batch<System.Diagnostics.Activity> activityBatch) -> OpenTelemetry.ExportResult
 override OpenTelemetry.Exporter.OtlpTraceExporter.OnShutdown(int timeoutMilliseconds) -> bool

src/OpenTelemetry.Exporter.OpenTelemetryProtocol/.publicApi/net46/PublicAPI.Unshipped.txt

@@ -14,8 +14,8 @@ OpenTelemetry.Exporter.OtlpExporterOptions.ExportProcessorType.set -> void
 OpenTelemetry.Exporter.OtlpExporterOptions.Headers.get -> string
 OpenTelemetry.Exporter.OtlpExporterOptions.Headers.set -> void
 OpenTelemetry.Exporter.OtlpExporterOptions.OtlpExporterOptions() -> void
-OpenTelemetry.Exporter.OtlpExporterOptions.TimeOut.get -> int?
-OpenTelemetry.Exporter.OtlpExporterOptions.TimeOut.set -> void
+OpenTelemetry.Exporter.OtlpExporterOptions.TimeoutMilliseconds.get -> int?
+OpenTelemetry.Exporter.OtlpExporterOptions.TimeoutMilliseconds.set -> void
 OpenTelemetry.Trace.OtlpTraceExporterHelperExtensions
 override OpenTelemetry.Exporter.OtlpTraceExporter.Export(in OpenTelemetry.Batch<System.Diagnostics.Activity> activityBatch) -> OpenTelemetry.ExportResult
 override OpenTelemetry.Exporter.OtlpTraceExporter.OnShutdown(int timeoutMilliseconds) -> bool

src/OpenTelemetry.Exporter.OpenTelemetryProtocol/.publicApi/netstandard2.0/PublicAPI.Unshipped.txt

@@ -14,8 +14,8 @@ OpenTelemetry.Exporter.OtlpExporterOptions.ExportProcessorType.set -> void
 OpenTelemetry.Exporter.OtlpExporterOptions.Headers.get -> string
 OpenTelemetry.Exporter.OtlpExporterOptions.Headers.set -> void
 OpenTelemetry.Exporter.OtlpExporterOptions.OtlpExporterOptions() -> void
-OpenTelemetry.Exporter.OtlpExporterOptions.TimeOut.get -> int?
-OpenTelemetry.Exporter.OtlpExporterOptions.TimeOut.set -> void
+OpenTelemetry.Exporter.OtlpExporterOptions.TimeoutMilliseconds.get -> int?
+OpenTelemetry.Exporter.OtlpExporterOptions.TimeoutMilliseconds.set -> void
 OpenTelemetry.Trace.OtlpTraceExporterHelperExtensions
 override OpenTelemetry.Exporter.OtlpTraceExporter.Export(in OpenTelemetry.Batch<System.Diagnostics.Activity> activityBatch) -> OpenTelemetry.ExportResult
 override OpenTelemetry.Exporter.OtlpTraceExporter.OnShutdown(int timeoutMilliseconds) -> bool

src/OpenTelemetry.Exporter.OpenTelemetryProtocol/.publicApi/netstandard2.1/PublicAPI.Unshipped.txt

@@ -12,8 +12,8 @@ OpenTelemetry.Exporter.OtlpExporterOptions.ExportProcessorType.set -> void
 OpenTelemetry.Exporter.OtlpExporterOptions.Headers.get -> string
 OpenTelemetry.Exporter.OtlpExporterOptions.Headers.set -> void
 OpenTelemetry.Exporter.OtlpExporterOptions.OtlpExporterOptions() -> void
-OpenTelemetry.Exporter.OtlpExporterOptions.TimeOut.get -> int?
-OpenTelemetry.Exporter.OtlpExporterOptions.TimeOut.set -> void
+OpenTelemetry.Exporter.OtlpExporterOptions.TimeoutMilliseconds.get -> int?
+OpenTelemetry.Exporter.OtlpExporterOptions.TimeoutMilliseconds.set -> void
 OpenTelemetry.Trace.OtlpTraceExporterHelperExtensions
 override OpenTelemetry.Exporter.OtlpTraceExporter.Export(in OpenTelemetry.Batch<System.Diagnostics.Activity> activityBatch) -> OpenTelemetry.ExportResult
 override OpenTelemetry.Exporter.OtlpTraceExporter.OnShutdown(int timeoutMilliseconds) -> bool

src/OpenTelemetry.Exporter.OpenTelemetryProtocol/CHANGELOG.md

@@ -10,8 +10,8 @@
   GetDefaultResource().
 * Modified the data type of Headers option to string; Added a private method
   GetMetadataFromHeaders to create a metadata object from the headers passed as
-  a string in the options; Added a new option called TimeOut for computing the
-  `deadline` to be used by gRPC client for `Export`
+  a string in the options; Added a new option called TimeoutMilliseconds for
+  computing the `deadline` to be used by gRPC client for `Export`
   ([#1781](https://github.com/open-telemetry/opentelemetry-dotnet/pull/1781))
 
 ## 1.0.0-rc2

src/OpenTelemetry.Exporter.OpenTelemetryProtocol/OtlpExporterOptions.cs

@@ -62,14 +62,15 @@ public class OtlpExporterOptions
 #endif
 
         /// <summary>
-        /// Gets or sets optional headers for the connection.
+        /// Gets or sets optional headers for the connection. Refer to the <a href="https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/protocol/exporter.md#specifying-headers-via-environment-variables">
+        /// specification</a> for information on the expected format for Headers.
         /// </summary>
         public string Headers { get; set; }
 
         /// <summary>
         /// Gets or sets the max waiting time (in milliseconds) for the backend to process each span.
         /// </summary>
-        public int? TimeOut { get; set; }
+        public int? TimeoutMilliseconds { get; set; }
 
         /// <summary>
         /// Gets or sets the export processor type to be used with the OpenTelemetry Protocol Exporter.

src/OpenTelemetry.Exporter.OpenTelemetryProtocol/OtlpTraceExporter.cs

@@ -45,7 +45,7 @@ public class OtlpTraceExporter : BaseExporter<Activity>
 #endif
         private readonly OtlpCollector.TraceService.ITraceServiceClient traceClient;
         private readonly Metadata headers;
-        private readonly DateTime? deadline;
+        private DateTime? deadline;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="OtlpTraceExporter"/> class.
@@ -65,19 +65,6 @@ internal OtlpTraceExporter(OtlpExporterOptions options, OtlpCollector.TraceServi
         {
             this.options = options ?? throw new ArgumentNullException(nameof(options));
             this.headers = GetMetadataFromHeaders(options.Headers);
-
-            if (options.TimeOut.HasValue)
-            {
-                if (options.TimeOut.Value <= 0)
-                {
-                    throw new ArgumentException("TimeOut vaue provided is not a positive numbe", nameof(options.TimeOut));
-                }
-                else
-                {
-                    this.deadline = DateTime.UtcNow.AddMilliseconds(options.TimeOut.Value);
-                }
-            }
-
             if (traceServiceClient != null)
             {
                 this.traceClient = traceServiceClient;
@@ -112,6 +99,18 @@ public override ExportResult Export(in Batch<Activity> activityBatch)
 
             request.AddBatch(this.ProcessResource, activityBatch);
 
+            if (this.options.TimeoutMilliseconds.HasValue)
+            {
+                if (this.options.TimeoutMilliseconds.Value <= 0)
+                {
+                    throw new ArgumentException("Timeout value provided is not a positive number.", nameof(this.options.TimeoutMilliseconds));
+                }
+                else
+                {
+                    this.deadline = DateTime.UtcNow.AddMilliseconds(this.options.TimeoutMilliseconds.Value);
+                }
+            }
+
             try
             {
                 this.traceClient.Export(request, headers: this.headers, deadline: this.deadline);