Otlp http exporter: allow endpoint override

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

@@ -21,3 +21,5 @@ static OpenTelemetry.Trace.OtlpTraceExporterHelperExtensions.AddOtlpExporter(thi
 OpenTelemetry.Exporter.OtlpExportProtocol
 OpenTelemetry.Exporter.OtlpExportProtocol.Grpc = 0 -> OpenTelemetry.Exporter.OtlpExportProtocol
 OpenTelemetry.Exporter.OtlpExportProtocol.HttpProtobuf = 1 -> OpenTelemetry.Exporter.OtlpExportProtocol
+OpenTelemetry.Exporter.OtlpExporterOptions.TracesEndpoint.get -> System.Uri
+OpenTelemetry.Exporter.OtlpExporterOptions.MetricsEndpoint.get -> System.Uri

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

@@ -3,3 +3,5 @@ OpenTelemetry.Exporter.OtlpExporterOptions.Protocol.set -> void
 OpenTelemetry.Exporter.OtlpExportProtocol
 OpenTelemetry.Exporter.OtlpExportProtocol.Grpc = 0 -> OpenTelemetry.Exporter.OtlpExportProtocol
 OpenTelemetry.Exporter.OtlpExportProtocol.HttpProtobuf = 1 -> OpenTelemetry.Exporter.OtlpExportProtocol
+OpenTelemetry.Exporter.OtlpExporterOptions.TracesEndpoint.get -> System.Uri
+OpenTelemetry.Exporter.OtlpExporterOptions.MetricsEndpoint.get -> System.Uri

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

@@ -3,3 +3,5 @@ OpenTelemetry.Exporter.OtlpExporterOptions.Protocol.set -> void
 OpenTelemetry.Exporter.OtlpExportProtocol
 OpenTelemetry.Exporter.OtlpExportProtocol.Grpc = 0 -> OpenTelemetry.Exporter.OtlpExportProtocol
 OpenTelemetry.Exporter.OtlpExportProtocol.HttpProtobuf = 1 -> OpenTelemetry.Exporter.OtlpExportProtocol
+OpenTelemetry.Exporter.OtlpExporterOptions.TracesEndpoint.get -> System.Uri
+OpenTelemetry.Exporter.OtlpExporterOptions.MetricsEndpoint.get -> System.Uri

src/OpenTelemetry.Exporter.OpenTelemetryProtocol/Implementation/ExportClient/OtlpHttpTraceExportClient.cs

@@ -14,7 +14,6 @@
 // limitations under the License.
 // </copyright>
 
-using System;
 using System.IO;
 using System.Net;
 using System.Net.Http;
@@ -33,17 +32,15 @@ namespace OpenTelemetry.Exporter.OpenTelemetryProtocol.Implementation.ExportClie
     internal sealed class OtlpHttpTraceExportClient : BaseOtlpHttpExportClient<OtlpCollector.ExportTraceServiceRequest>
     {
         internal const string MediaContentType = "application/x-protobuf";
-        private readonly Uri exportTracesUri;
 
         public OtlpHttpTraceExportClient(OtlpExporterOptions options, HttpClient httpClient = null)
             : base(options, httpClient)
         {
-            this.exportTracesUri = this.Options.Endpoint.AppendPathIfNotPresent(OtlpExporterOptions.TracesExportPath);
         }
 
         protected override HttpRequestMessage CreateHttpRequest(OtlpCollector.ExportTraceServiceRequest exportRequest)
         {
-            var request = new HttpRequestMessage(HttpMethod.Post, this.exportTracesUri);
+            var request = new HttpRequestMessage(HttpMethod.Post, this.Options.TracesEndpoint);
             foreach (var header in this.Headers)
             {
                 request.Headers.Add(header.Key, header.Value);

src/OpenTelemetry.Exporter.OpenTelemetryProtocol/OtlpExporterOptions.cs

@@ -36,19 +36,46 @@ public class OtlpExporterOptions
         internal const string TracesExportPath = "v1/traces";
         internal const string MetricsExportPath = "v1/metrics";
 
+        private static readonly Uri DefaultEndpoint = new Uri("http://localhost:4317");
+
+        private Uri endpoint = DefaultEndpoint;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="OtlpExporterOptions"/> class.
         /// </summary>
         public OtlpExporterOptions()
         {
             try
             {
+                // Protocol initialization should come before the endpoint as endpoint's value may be adjusted according to the protocols value.
+                string protocolEnvVar = Environment.GetEnvironmentVariable(ProtocolEnvVarName);
+                if (!string.IsNullOrEmpty(protocolEnvVar))
+                {
+                    var protocol = protocolEnvVar.ToOtlpExportProtocol();
+                    if (protocol.HasValue)
+                    {
+                        this.Protocol = protocol.Value;
+                    }
+                    else
+                    {
+                        OpenTelemetryProtocolExporterEventSource.Log.UnsupportedProtocol(protocolEnvVar);
+                    }
+                }
+
                 string endpointEnvVar = Environment.GetEnvironmentVariable(EndpointEnvVarName);
                 if (!string.IsNullOrEmpty(endpointEnvVar))
                 {
                     if (Uri.TryCreate(endpointEnvVar, UriKind.Absolute, out var endpoint))
                     {
-                        this.Endpoint = endpoint;
+                        this.endpoint = endpoint;
+                        this.TracesEndpoint = endpoint;
+                        this.MetricsEndpoint = endpoint;
+
+                        if (this.Protocol == OtlpExportProtocol.HttpProtobuf)
+                        {
+                            this.TracesEndpoint = endpoint.AppendPathIfNotPresent(TracesExportPath);
+                            this.MetricsEndpoint = endpoint.AppendPathIfNotPresent(MetricsExportPath);
+                        }
                     }
                     else
                     {
@@ -74,20 +101,6 @@ public OtlpExporterOptions()
                         OpenTelemetryProtocolExporterEventSource.Log.FailedToParseEnvironmentVariable(TimeoutEnvVarName, timeoutEnvVar);
                     }
                 }
-
-                string protocolEnvVar = Environment.GetEnvironmentVariable(ProtocolEnvVarName);
-                if (!string.IsNullOrEmpty(protocolEnvVar))
-                {
-                    var protocol = protocolEnvVar.ToOtlpExportProtocol();
-                    if (protocol.HasValue)
-                    {
-                        this.Protocol = protocol.Value;
-                    }
-                    else
-                    {
-                        OpenTelemetryProtocolExporterEventSource.Log.UnsupportedProtocol(protocolEnvVar);
-                    }
-                }
             }
             catch (SecurityException ex)
             {
@@ -102,7 +115,36 @@ public OtlpExporterOptions()
         /// Must be a valid Uri with scheme (http or https) and host, and
         /// may contain a port and path. The default value is http://localhost:4317.
         /// </summary>
-        public Uri Endpoint { get; set; } = new Uri("http://localhost:4317");
+        public Uri Endpoint
+        {
+            get
+            {
+                return this.endpoint;
+            }
+
+            set
+            {
+                this.endpoint = value;
+                this.TracesEndpoint = value;
+                this.MetricsEndpoint = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the target to which the exporter is going to send traces. The default value is http://localhost:4317.
+        /// Initially, this property is derived from the OTEL_EXPORTER_OTLP_ENDPOINT environment variable and adjusted according to the specification:
+        /// https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/protocol/exporter.md#endpoint-urls-for-otlphttp.
+        /// If the <see cref="Endpoint"/> is set, then this property will be set with the same value.
+        /// </summary>
+        public Uri TracesEndpoint { get; private set; } = DefaultEndpoint;
+
+        /// <summary>
+        /// Gets the target to which the exporter is going to send metrics. The default value is http://localhost:4317.
+        /// Initially, this property is derived from the OTEL_EXPORTER_OTLP_ENDPOINT environment variable and adjusted according to the specification:
+        /// https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/protocol/exporter.md#endpoint-urls-for-otlphttp.
+        /// If the <see cref="Endpoint"/> is set, then this property will be set with the same value.
+        /// </summary>
+        public Uri MetricsEndpoint { get; private set; } = DefaultEndpoint;
 
         /// <summary>
         /// 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">

src/OpenTelemetry.Exporter.OpenTelemetryProtocol/README.md

@@ -27,6 +27,14 @@ setters take precedence over the environment variables.
 * `Endpoint`: Target to which the exporter is going to send traces or metrics.
   The endpoint must be a valid Uri with scheme (http or https) and host, and MAY
   contain a port and path.
+* `TracesEndpoint` (read only): Target to which the exporter is going to send
+  traces. Initially, the property is derived from the `OTEL_EXPORTER_OTLP_ENDPOINT`
+  environment variable and adjusted according to the specification.
+  If the Endpoint is set, then this property will be set with the same value.
+* `MetricsEndpoint` (read only): Target to which the exporter is going to send
+  metrics. Initially, this property is derived from the `OTEL_EXPORTER_OTLP_ENDPOINT`
+  environment variable and adjusted according to the specification.
+  If the Endpoint is set, then this property will be set with the same value.
 * `Headers`: Optional headers for the connection.
 * `TimeoutMilliseconds` : Max waiting time for the backend to process a batch.
 * `Protocol`: OTLP transport protocol. Supported values:

test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/OtlpExporterOptionsTests.cs

@@ -37,6 +37,8 @@ public void OtlpExporterOptions_Defaults()
             var options = new OtlpExporterOptions();
 
             Assert.Equal(new Uri("http://localhost:4317"), options.Endpoint);
+            Assert.Equal(new Uri("http://localhost:4317"), options.TracesEndpoint);
+            Assert.Equal(new Uri("http://localhost:4317"), options.MetricsEndpoint);
             Assert.Null(options.Headers);
             Assert.Equal(10000, options.TimeoutMilliseconds);
             Assert.Equal(OtlpExportProtocol.Grpc, options.Protocol);
@@ -53,6 +55,8 @@ public void OtlpExporterOptions_EnvironmentVariableOverride()
             var options = new OtlpExporterOptions();
 
             Assert.Equal(new Uri("http://test:8888"), options.Endpoint);
+            Assert.Equal(new Uri($"http://test:8888/{OtlpExporterOptions.TracesExportPath}"), options.TracesEndpoint);
+            Assert.Equal(new Uri($"http://test:8888/{OtlpExporterOptions.MetricsExportPath}"), options.MetricsEndpoint);
             Assert.Equal("A=2,B=3", options.Headers);
             Assert.Equal(2000, options.TimeoutMilliseconds);
             Assert.Equal(OtlpExportProtocol.HttpProtobuf, options.Protocol);
@@ -105,6 +109,8 @@ public void OtlpExporterOptions_SetterOverridesEnvironmentVariable()
             };
 
             Assert.Equal(new Uri("http://localhost:200"), options.Endpoint);
+            Assert.Equal(new Uri("http://localhost:200"), options.TracesEndpoint);
+            Assert.Equal(new Uri("http://localhost:200"), options.MetricsEndpoint);
             Assert.Equal("C=3", options.Headers);
             Assert.Equal(40000, options.TimeoutMilliseconds);
             Assert.Equal(OtlpExportProtocol.HttpProtobuf, options.Protocol);