Change the default port that the OTLP exporters point to. (#2113)

* Change the default port that the OTLP exporters point to. * extract constants for the export metrics labels
open-telemetry · Nov 23, 2020 · e599d0e · e599d0e
1 parent 4897f4c
commit e599d0e
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 15 deletions.
diff --git a/exporters/otlp/src/main/java/io/opentelemetry/exporter/otlp/OtlpGrpcMetricExporter.java b/exporters/otlp/src/main/java/io/opentelemetry/exporter/otlp/OtlpGrpcMetricExporter.java
@@ -65,7 +65,7 @@
  */
 @ThreadSafe
 public final class OtlpGrpcMetricExporter implements MetricExporter {
-  public static final String DEFAULT_ENDPOINT = "localhost:55680";
+  public static final String DEFAULT_ENDPOINT = "localhost:4317";
   public static final long DEFAULT_DEADLINE_MS = TimeUnit.SECONDS.toMillis(1);
   private static final boolean DEFAULT_USE_TLS = false;
 
@@ -206,7 +206,7 @@ public Builder setDeadlineMs(long deadlineMs) {
     }
 
     /**
-     * Sets the OTLP endpoint to connect to. Optional, defaults to "localhost:55680".
+     * Sets the OTLP endpoint to connect to. Optional, defaults to "localhost:4317".
      *
      * @param endpoint endpoint to connect to
      * @return this builder's instance

diff --git a/exporters/otlp/src/main/java/io/opentelemetry/exporter/otlp/OtlpGrpcSpanExporter.java b/exporters/otlp/src/main/java/io/opentelemetry/exporter/otlp/OtlpGrpcSpanExporter.java
@@ -70,11 +70,18 @@
 @ThreadSafe
 public final class OtlpGrpcSpanExporter implements SpanExporter {
 
-  public static final String DEFAULT_ENDPOINT = "localhost:55680";
+  public static final String DEFAULT_ENDPOINT = "localhost:4317";
   public static final long DEFAULT_DEADLINE_MS = TimeUnit.SECONDS.toMillis(1);
 
   private static final Logger logger = Logger.getLogger(OtlpGrpcSpanExporter.class.getName());
   private static final boolean DEFAULT_USE_TLS = false;
+  private static final String EXPORTER_NAME = OtlpGrpcSpanExporter.class.getSimpleName();
+
+  private static final Labels EXPORTER_NAME_LABELS = Labels.of("exporter", EXPORTER_NAME);
+  private static final Labels EXPORT_SUCCESS_LABELS =
+      Labels.of("exporter", EXPORTER_NAME, "success", "true");
+  private static final Labels EXPORT_FAILURE_LABELS =
+      Labels.of("exporter", EXPORTER_NAME, "success", "false");
 
   private final TraceServiceFutureStub traceService;
   private final ManagedChannel managedChannel;
@@ -111,8 +118,7 @@ private OtlpGrpcSpanExporter(ManagedChannel channel, long deadlineMs) {
    */
   @Override
   public CompletableResultCode export(Collection<SpanData> spans) {
-    spansSeen.add(
-        spans.size(), Labels.of("exporter", OtlpGrpcMetricExporter.class.getSimpleName()));
+    spansSeen.add(spans.size(), EXPORTER_NAME_LABELS);
     ExportTraceServiceRequest exportTraceServiceRequest =
         ExportTraceServiceRequest.newBuilder()
             .addAllResourceSpans(SpanAdapter.toProtoResourceSpans(spans))
@@ -132,19 +138,13 @@ public CompletableResultCode export(Collection<SpanData> spans) {
         new FutureCallback<ExportTraceServiceResponse>() {
           @Override
           public void onSuccess(@Nullable ExportTraceServiceResponse response) {
-            spansExported.add(
-                spans.size(),
-                Labels.of(
-                    "exporter", OtlpGrpcMetricExporter.class.getSimpleName(), "success", "true"));
+            spansExported.add(spans.size(), EXPORT_SUCCESS_LABELS);
             result.succeed();
           }
 
           @Override
           public void onFailure(Throwable t) {
-            spansExported.add(
-                spans.size(),
-                Labels.of(
-                    "exporter", OtlpGrpcMetricExporter.class.getSimpleName(), "success", "false"));
+            spansExported.add(spans.size(), EXPORT_FAILURE_LABELS);
             logger.log(Level.WARNING, "Failed to export spans. Error message: " + t.getMessage());
             logger.log(Level.FINEST, "Failed to export spans. Details follow: " + t);
             result.fail();
@@ -240,7 +240,7 @@ public Builder setDeadlineMs(long deadlineMs) {
     }
 
     /**
-     * Sets the OTLP endpoint to connect to. Optional, defaults to "localhost:55680".
+     * Sets the OTLP endpoint to connect to. Optional, defaults to "localhost:4317".
      *
      * @param endpoint endpoint to connect to
      * @return this builder's instance

diff --git a/perf-harness/src/test/java/io/opentelemetry/perf/OtlpPipelineStressTest.java b/perf-harness/src/test/java/io/opentelemetry/perf/OtlpPipelineStressTest.java
@@ -51,7 +51,8 @@
 @SuppressWarnings({"FutureReturnValueIgnored", "CatchAndPrintStackTrace"})
 public class OtlpPipelineStressTest {
 
-  public static final int OTLP_RECEIVER_PORT = 55680;
+  public static final int OTLP_RECEIVER_PORT =
+      55680; // todo: switch to 4317 when that port makes it into the collector docker image.
   public static final int COLLECTOR_PROXY_PORT = 44444;
   public static final int TOXIPROXY_CONTROL_PORT = 8474;
   public static Network network = Network.newNetwork();