Adding proxy functionality

open-telemetry · Feb 7, 2024 · db4da92 · db4da92
1 parent 3e7302e
commit db4da92
Show file tree

Hide file tree

Showing 34 changed files with 206 additions and 11 deletions.
diff --git a/...ers/common/src/main/java/io/opentelemetry/exporter/internal/grpc/GrpcExporterBuilder.java b/...ers/common/src/main/java/io/opentelemetry/exporter/internal/grpc/GrpcExporterBuilder.java
@@ -52,6 +52,8 @@ public class GrpcExporterBuilder<T extends Marshaler> {
       grpcStubFactory;
 
   private long timeoutNanos;
+  @Nullable private String proxyHost;
+  @Nullable private Integer proxyPort;
   private URI endpoint;
   @Nullable private Compressor compressor;
   private final Map<String, String> constantHeaders = new HashMap<>();
@@ -92,6 +94,12 @@ public GrpcExporterBuilder<T> setTimeout(Duration timeout) {
     return setTimeout(timeout.toNanos(), TimeUnit.NANOSECONDS);
   }
 
+  public GrpcExporterBuilder<T> setProxy(String proxyHost, Integer proxyPort) {
+    this.proxyHost = proxyHost;
+    this.proxyPort = proxyPort;
+    return this;
+  }
+
   public GrpcExporterBuilder<T> setEndpoint(String endpoint) {
     this.endpoint = ExporterBuilderUtil.validateEndpoint(endpoint);
     return this;
@@ -194,6 +202,8 @@ public GrpcExporter<T> build() {
             compressor,
             timeoutNanos,
             headerSupplier,
+            proxyHost,
+            proxyPort,
             grpcChannel,
             grpcStubFactory,
             retryPolicy,
@@ -214,6 +224,8 @@ public String toString(boolean includePrefixAndSuffix) {
     joiner.add("endpoint=" + endpoint.toString());
     joiner.add("endpointPath=" + grpcEndpointPath);
     joiner.add("timeoutNanos=" + timeoutNanos);
+    joiner.add("proxyHost=" + proxyHost);
+    joiner.add("proxyPort=" + proxyPort);
     joiner.add(
         "compressorEncoding="
             + Optional.ofNullable(compressor).map(Compressor::getEncoding).orElse(null));

diff --git a/...ters/common/src/main/java/io/opentelemetry/exporter/internal/grpc/GrpcSenderProvider.java b/...ters/common/src/main/java/io/opentelemetry/exporter/internal/grpc/GrpcSenderProvider.java
@@ -35,6 +35,8 @@ <T extends Marshaler> GrpcSender<T> createSender(
       @Nullable Compressor compressor,
       long timeoutNanos,
       Supplier<Map<String, List<String>>> headersSupplier,
+      @Nullable String proxyHost,
+      @Nullable Integer proxyPort,
       @Nullable Object managedChannel,
       Supplier<BiFunction<Channel, String, MarshalerServiceStub<T, ?, ?>>> stubFactory,
       @Nullable RetryPolicy retryPolicy,

diff --git a/...ers/common/src/main/java/io/opentelemetry/exporter/internal/http/HttpExporterBuilder.java b/...ers/common/src/main/java/io/opentelemetry/exporter/internal/http/HttpExporterBuilder.java
@@ -52,6 +52,10 @@ public final class HttpExporterBuilder<T extends Marshaler> {
   private long timeoutNanos = TimeUnit.SECONDS.toNanos(DEFAULT_TIMEOUT_SECS);
   @Nullable private Compressor compressor;
   private long connectTimeoutNanos = TimeUnit.SECONDS.toNanos(DEFAULT_CONNECT_TIMEOUT_SECS);
+  @Nullable
+  private String proxyHost;
+  @Nullable
+  private Integer proxyPort;
   private boolean exportAsJson = false;
   private final Map<String, String> constantHeaders = new HashMap<>();
   private Supplier<Map<String, String>> headerSupplier = Collections::emptyMap;
@@ -131,6 +135,12 @@ public HttpExporterBuilder<T> setRetryPolicy(RetryPolicy retryPolicy) {
     return this;
   }
 
+  public HttpExporterBuilder<T> setProxy(String host, int port) {
+    this.proxyHost = host;
+    this.proxyPort = port;
+    return this;
+  }
+
   public HttpExporterBuilder<T> exportAsJson() {
     this.exportAsJson = true;
     return this;
@@ -187,6 +197,8 @@ public HttpExporter<T> build() {
             timeoutNanos,
             connectTimeoutNanos,
             headerSupplier,
+            proxyHost,
+            proxyPort,
             authenticator,
             retryPolicy,
             tlsConfigHelper.getSslContext(),

diff --git a/...ters/common/src/main/java/io/opentelemetry/exporter/internal/http/HttpSenderProvider.java b/...ters/common/src/main/java/io/opentelemetry/exporter/internal/http/HttpSenderProvider.java
@@ -34,6 +34,8 @@ HttpSender createSender(
       long timeoutNanos,
       long connectTimeout,
       Supplier<Map<String, List<String>>> headerSupplier,
+      @Nullable String proxyHost,
+      @Nullable Integer proxyPort,
       @Nullable Authenticator authenticator,
       @Nullable RetryPolicy retryPolicy,
       @Nullable SSLContext sslContext,

diff --git a/...ers/otlp/all/src/jmh/java/io/opentelemetry/exporter/otlp/trace/OltpExporterBenchmark.java b/...ers/otlp/all/src/jmh/java/io/opentelemetry/exporter/otlp/trace/OltpExporterBenchmark.java
@@ -103,6 +103,8 @@ public void setUp() {
                 Collections::emptyMap,
                 null,
                 null,
+                null,
+                null,
                 null),
             MeterProvider::noop);
 

diff --git a/.../main/java/io/opentelemetry/exporter/otlp/http/logs/OtlpHttpLogRecordExporterBuilder.java b/.../main/java/io/opentelemetry/exporter/otlp/http/logs/OtlpHttpLogRecordExporterBuilder.java
@@ -171,6 +171,15 @@ public OtlpHttpLogRecordExporterBuilder setRetryPolicy(RetryPolicy retryPolicy)
     return this;
   }
 
+  /**
+   * Sets the proxy to be used.
+   */
+  public OtlpHttpLogRecordExporterBuilder setProxy(String proxyHost, int proxyPort) {
+    requireNonNull(proxyHost, "proxyHost");
+    delegate.setProxy(proxyHost, proxyPort);
+    return this;
+  }
+
   /**
    * Sets the {@link MeterProvider} to use to collect metrics related to export. If not set, uses
    * {@link GlobalOpenTelemetry#getMeterProvider()}.

diff --git a/.../main/java/io/opentelemetry/exporter/otlp/http/metrics/OtlpHttpMetricExporterBuilder.java b/.../main/java/io/opentelemetry/exporter/otlp/http/metrics/OtlpHttpMetricExporterBuilder.java
@@ -215,6 +215,15 @@ public OtlpHttpMetricExporterBuilder setRetryPolicy(RetryPolicy retryPolicy) {
     return this;
   }
 
+  /**
+   * Sets the proxy to be used.
+   */
+  public OtlpHttpMetricExporterBuilder setProxy(String proxyHost, int proxyPort) {
+    requireNonNull(proxyHost, "proxyHost");
+    delegate.setProxy(proxyHost, proxyPort);
+    return this;
+  }
+
   OtlpHttpMetricExporterBuilder exportAsJson() {
     delegate.exportAsJson();
     return this;

diff --git a/.../src/main/java/io/opentelemetry/exporter/otlp/http/trace/OtlpHttpSpanExporterBuilder.java b/.../src/main/java/io/opentelemetry/exporter/otlp/http/trace/OtlpHttpSpanExporterBuilder.java
@@ -172,6 +172,15 @@ public OtlpHttpSpanExporterBuilder setRetryPolicy(RetryPolicy retryPolicy) {
     return this;
   }
 
+  /**
+   * Sets the proxy to be used.
+   */
+  public OtlpHttpSpanExporterBuilder setProxy(String proxyHost, int proxyPort) {
+    requireNonNull(proxyHost, "proxyHost");
+    delegate.setProxy(proxyHost, proxyPort);
+    return this;
+  }
+
   /**
    * Sets the {@link MeterProvider} to use to collect metrics related to export. If not set, uses
    * {@link GlobalOpenTelemetry#getMeterProvider()}.

diff --git a/exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/internal/OtlpConfigUtil.java b/exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/internal/OtlpConfigUtil.java
@@ -53,6 +53,7 @@ public static String getOtlpProtocol(String dataType, ConfigProperties config) {
   }
 
   /** Invoke the setters with the OTLP configuration for the {@code dataType}. */
+  @SuppressWarnings("TooManyParameters")
   public static void configureOtlpExporterBuilder(
       String dataType,
       ConfigProperties config,
@@ -62,7 +63,8 @@ public static void configureOtlpExporterBuilder(
       Consumer<Duration> setTimeout,
       Consumer<byte[]> setTrustedCertificates,
       BiConsumer<byte[], byte[]> setClientTls,
-      Consumer<RetryPolicy> setRetryPolicy) {
+      Consumer<RetryPolicy> setRetryPolicy,
+      BiConsumer<String,Integer> setProxy) {
     String protocol = getOtlpProtocol(dataType, config);
     boolean isHttpProtobuf = protocol.equals(PROTOCOL_HTTP_PROTOBUF);
     URL endpoint =
@@ -152,6 +154,12 @@ public static void configureOtlpExporterBuilder(
     if (retryEnabled) {
       setRetryPolicy.accept(RetryPolicy.getDefault());
     }
+
+    String proxyHost = config.getString("otel.exporter.otlp." + dataType + ".proxy.host");
+    Integer proxyPort = config.getInt("otel.exporter.otlp." + dataType + ".proxy.port");
+    if (proxyHost != null && proxyPort != null) {
+      setProxy.accept(proxyHost, proxyPort);
+    }
   }
 
   /**

diff --git a/.../src/main/java/io/opentelemetry/exporter/otlp/internal/OtlpLogRecordExporterProvider.java b/.../src/main/java/io/opentelemetry/exporter/otlp/internal/OtlpLogRecordExporterProvider.java
@@ -51,7 +51,8 @@ public LogRecordExporter createExporter(ConfigProperties config) {
           builder::setTimeout,
           builder::setTrustedCertificates,
           builder::setClientTls,
-          builder::setRetryPolicy);
+          builder::setRetryPolicy,
+          builder::setProxy);
       builder.setMeterProvider(meterProviderRef::get);
 
       return builder.build();
@@ -67,7 +68,8 @@ public LogRecordExporter createExporter(ConfigProperties config) {
           builder::setTimeout,
           builder::setTrustedCertificates,
           builder::setClientTls,
-          builder::setRetryPolicy);
+          builder::setRetryPolicy,
+          builder::setProxy);
       builder.setMeterProvider(meterProviderRef::get);
 
       return builder.build();

diff --git a/...all/src/main/java/io/opentelemetry/exporter/otlp/internal/OtlpMetricExporterProvider.java b/...all/src/main/java/io/opentelemetry/exporter/otlp/internal/OtlpMetricExporterProvider.java
@@ -43,7 +43,8 @@ public MetricExporter createExporter(ConfigProperties config) {
           builder::setTimeout,
           builder::setTrustedCertificates,
           builder::setClientTls,
-          builder::setRetryPolicy);
+          builder::setRetryPolicy,
+          builder::setProxy);
       OtlpConfigUtil.configureOtlpAggregationTemporality(
           config, builder::setAggregationTemporalitySelector);
       OtlpConfigUtil.configureOtlpHistogramDefaultAggregation(
@@ -62,7 +63,8 @@ public MetricExporter createExporter(ConfigProperties config) {
           builder::setTimeout,
           builder::setTrustedCertificates,
           builder::setClientTls,
-          builder::setRetryPolicy);
+          builder::setRetryPolicy,
+          builder::setProxy);
       OtlpConfigUtil.configureOtlpAggregationTemporality(
           config, builder::setAggregationTemporalitySelector);
       OtlpConfigUtil.configureOtlpHistogramDefaultAggregation(

diff --git a/...p/all/src/main/java/io/opentelemetry/exporter/otlp/internal/OtlpSpanExporterProvider.java b/...p/all/src/main/java/io/opentelemetry/exporter/otlp/internal/OtlpSpanExporterProvider.java
@@ -50,7 +50,8 @@ public SpanExporter createExporter(ConfigProperties config) {
           builder::setTimeout,
           builder::setTrustedCertificates,
           builder::setClientTls,
-          builder::setRetryPolicy);
+          builder::setRetryPolicy,
+          builder::setProxy);
       builder.setMeterProvider(meterProviderRef::get);
 
       return builder.build();
@@ -66,7 +67,8 @@ public SpanExporter createExporter(ConfigProperties config) {
           builder::setTimeout,
           builder::setTrustedCertificates,
           builder::setClientTls,
-          builder::setRetryPolicy);
+          builder::setRetryPolicy,
+          builder::setProxy);
       builder.setMeterProvider(meterProviderRef::get);
 
       return builder.build();

diff --git a/...l/src/main/java/io/opentelemetry/exporter/otlp/logs/OtlpGrpcLogRecordExporterBuilder.java b/...l/src/main/java/io/opentelemetry/exporter/otlp/logs/OtlpGrpcLogRecordExporterBuilder.java
@@ -191,6 +191,16 @@ public OtlpGrpcLogRecordExporterBuilder setRetryPolicy(RetryPolicy retryPolicy)
     return this;
   }
 
+  /**
+   * Sets the proxy to be used.
+   */
+  public OtlpGrpcLogRecordExporterBuilder setProxy(String proxyHost, Integer proxyPort) {
+    requireNonNull(proxyHost, "proxyHost");
+    requireNonNull(proxyPort, "proxyPort");
+    delegate.setProxy(proxyHost, proxyPort);
+    return this;
+  }
+
   /**
    * Sets the {@link MeterProvider} to use to collect metrics related to export. If not set, uses
    * {@link GlobalOpenTelemetry#getMeterProvider()}.

diff --git a/...l/src/main/java/io/opentelemetry/exporter/otlp/metrics/OtlpGrpcMetricExporterBuilder.java b/...l/src/main/java/io/opentelemetry/exporter/otlp/metrics/OtlpGrpcMetricExporterBuilder.java
@@ -235,6 +235,16 @@ public OtlpGrpcMetricExporterBuilder setRetryPolicy(RetryPolicy retryPolicy) {
     return this;
   }
 
+  /**
+   * Sets the proxy to be used.
+   */
+  public OtlpGrpcMetricExporterBuilder setProxy(String proxyHost, Integer proxyPort) {
+    requireNonNull(proxyHost, "proxyHost");
+    requireNonNull(proxyPort, "proxyPort");
+    delegate.setProxy(proxyHost, proxyPort);
+    return this;
+  }
+
   /**
    * Constructs a new instance of the exporter based on the builder's values.
    *

diff --git a/...p/all/src/main/java/io/opentelemetry/exporter/otlp/trace/OtlpGrpcSpanExporterBuilder.java b/...p/all/src/main/java/io/opentelemetry/exporter/otlp/trace/OtlpGrpcSpanExporterBuilder.java
@@ -188,6 +188,16 @@ public OtlpGrpcSpanExporterBuilder setRetryPolicy(RetryPolicy retryPolicy) {
     return this;
   }
 
+  /**
+   * Sets the proxy to be used.
+   */
+  public OtlpGrpcSpanExporterBuilder setProxy(String proxyHost, Integer proxyPort) {
+    requireNonNull(proxyHost, "proxyHost");
+    requireNonNull(proxyPort, "proxyPort");
+    delegate.setProxy(proxyHost, proxyPort);
+    return this;
+  }
+
   /**
    * Sets the {@link MeterProvider} to use to collect metrics related to export. If not set, uses
    * {@link GlobalOpenTelemetry#getMeterProvider()}.

diff --git a/...rs/otlp/all/src/test/java/io/opentelemetry/exporter/otlp/internal/OtlpConfigUtilTest.java b/...rs/otlp/all/src/test/java/io/opentelemetry/exporter/otlp/internal/OtlpConfigUtilTest.java
@@ -325,7 +325,8 @@ private static String configureEndpoint(String dataType, Map<String, String> pro
         value -> {},
         value -> {},
         (value1, value2) -> {},
-        value -> {});
+        value -> {},
+        (value1, value2) -> {});
 
     return endpoint.get();
   }

diff --git a/.../io/opentelemetry/exporter/otlp/testing/internal/GrpcLogRecordExporterBuilderWrapper.java b/.../io/opentelemetry/exporter/otlp/testing/internal/GrpcLogRecordExporterBuilderWrapper.java
@@ -102,6 +102,12 @@ public TelemetryExporterBuilder<LogRecordData> setRetryPolicy(RetryPolicy retryP
     return this;
   }
 
+  @Override
+  public TelemetryExporterBuilder<LogRecordData> setProxy(String proxyHost, int proxyPort) {
+    builder.setProxy(proxyHost, proxyPort);
+    return this;
+  }
+
   @Override
   @SuppressWarnings("deprecation") // testing deprecated functionality
   public TelemetryExporterBuilder<LogRecordData> setChannel(Object channel) {

diff --git a/...ava/io/opentelemetry/exporter/otlp/testing/internal/GrpcMetricExporterBuilderWrapper.java b/...ava/io/opentelemetry/exporter/otlp/testing/internal/GrpcMetricExporterBuilderWrapper.java
@@ -102,6 +102,12 @@ public TelemetryExporterBuilder<MetricData> setRetryPolicy(RetryPolicy retryPoli
     return this;
   }
 
+  @Override
+  public TelemetryExporterBuilder<MetricData> setProxy(String proxyHost, int proxyPort) {
+    builder.setProxy(proxyHost, proxyPort);
+    return this;
+  }
+
   @Override
   @SuppressWarnings("deprecation") // testing deprecated functionality
   public TelemetryExporterBuilder<MetricData> setChannel(Object channel) {

diff --git a/.../java/io/opentelemetry/exporter/otlp/testing/internal/GrpcSpanExporterBuilderWrapper.java b/.../java/io/opentelemetry/exporter/otlp/testing/internal/GrpcSpanExporterBuilderWrapper.java
@@ -103,6 +103,12 @@ public TelemetryExporterBuilder<SpanData> setRetryPolicy(RetryPolicy retryPolicy
     return this;
   }
 
+  @Override
+  public TelemetryExporterBuilder<SpanData> setProxy(String proxyHost, int proxyPort) {
+    builder.setProxy(proxyHost, proxyPort);
+    return this;
+  }
+
   @Override
   @SuppressWarnings("deprecation") // testing deprecated functionality
   public TelemetryExporterBuilder<SpanData> setChannel(Object channel) {

diff --git a/.../io/opentelemetry/exporter/otlp/testing/internal/HttpLogRecordExporterBuilderWrapper.java b/.../io/opentelemetry/exporter/otlp/testing/internal/HttpLogRecordExporterBuilderWrapper.java
@@ -106,6 +106,12 @@ public TelemetryExporterBuilder<LogRecordData> setRetryPolicy(RetryPolicy retryP
     return this;
   }
 
+  @Override
+  public TelemetryExporterBuilder<LogRecordData> setProxy(String proxyHost, int proxyPort) {
+    builder.setProxy(proxyHost, proxyPort);
+    return this;
+  }
+
   @Override
   public TelemetryExporterBuilder<LogRecordData> setChannel(Object channel) {
     throw new UnsupportedOperationException("Not implemented");

diff --git a/...ava/io/opentelemetry/exporter/otlp/testing/internal/HttpMetricExporterBuilderWrapper.java b/...ava/io/opentelemetry/exporter/otlp/testing/internal/HttpMetricExporterBuilderWrapper.java
@@ -105,6 +105,12 @@ public TelemetryExporterBuilder<MetricData> setRetryPolicy(RetryPolicy retryPoli
     return this;
   }
 
+  @Override
+  public TelemetryExporterBuilder<MetricData> setProxy(String proxyHost, int proxyPort) {
+    builder.setProxy(proxyHost, proxyPort);
+    return this;
+  }
+
   @Override
   public TelemetryExporterBuilder<MetricData> setChannel(Object channel) {
     throw new UnsupportedOperationException("Not implemented");

diff --git a/.../java/io/opentelemetry/exporter/otlp/testing/internal/HttpSpanExporterBuilderWrapper.java b/.../java/io/opentelemetry/exporter/otlp/testing/internal/HttpSpanExporterBuilderWrapper.java
@@ -105,6 +105,12 @@ public TelemetryExporterBuilder<SpanData> setRetryPolicy(RetryPolicy retryPolicy
     return this;
   }
 
+  @Override
+  public TelemetryExporterBuilder<SpanData> setProxy(String proxyHost, int proxyPort) {
+    builder.setProxy(proxyHost, proxyPort);
+    return this;
+  }
+
   @Override
   public TelemetryExporterBuilder<SpanData> setChannel(Object channel) {
     throw new UnsupportedOperationException("Not implemented");

diff --git a/.../opentelemetry/exporter/otlp/testing/internal/ManagedChannelTelemetryExporterBuilder.java b/.../opentelemetry/exporter/otlp/testing/internal/ManagedChannelTelemetryExporterBuilder.java
@@ -151,6 +151,12 @@ public TelemetryExporterBuilder<T> setRetryPolicy(RetryPolicy retryPolicy) {
     return this;
   }
 
+  @Override
+  public TelemetryExporterBuilder<T> setProxy(String proxyHost, int proxyPort) {
+    delegate.setProxy(proxyHost, proxyPort);
+    return this;
+  }
+
   @Override
   public TelemetryExporterBuilder<T> setChannel(Object channel) {
     throw new UnsupportedOperationException();

diff --git a/...c/main/java/io/opentelemetry/exporter/otlp/testing/internal/TelemetryExporterBuilder.java b/...c/main/java/io/opentelemetry/exporter/otlp/testing/internal/TelemetryExporterBuilder.java
@@ -60,6 +60,8 @@ static TelemetryExporterBuilder<LogRecordData> wrap(OtlpGrpcLogRecordExporterBui
 
   TelemetryExporterBuilder<T> setRetryPolicy(RetryPolicy retryPolicy);
 
+  TelemetryExporterBuilder<T> setProxy(String proxyHost, int proxyPort);
+
   TelemetryExporterBuilder<T> setChannel(Object channel);
 
   TelemetryExporter<T> build();
-Original file line number
+Diff line change
@@ Expand Up / @@ -103,6 +103,8 @@ public void setUp() { @@
                     Collections::emptyMap,
                     null,
                     null,
+                    null,
+                    null,
                     null),
                 MeterProvider::noop);
@@ Expand Down @@