From 1674b46d4a373f862f0e51085c799feec95bea18 Mon Sep 17 00:00:00 2001
From: Sergei Malafeev <sergei@malafeev.org>
Date: Tue, 20 Oct 2020 19:51:07 +0800
Subject: [PATCH] fix finding SpanExporterFactory by exporterName with
 underscore e.g. "otlp_span" (#1404)

* #1401 fix finding SpanExporterFactory by exporterName with underscore e.g. "otlp_span"

Signed-off-by: Sergei Malafeev <sergei@malafeev.org>

* #1401 change exporterName of "otlp_span" and "otlp_metric" only

Signed-off-by: Sergei Malafeev <sergei@malafeev.org>
---
 .../javaagent/tooling/TracerInstaller.java          | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/TracerInstaller.java b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/TracerInstaller.java
index 610a423171..bd6bcd6a04 100644
--- a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/TracerInstaller.java
+++ b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/TracerInstaller.java
@@ -93,9 +93,8 @@ public class TracerInstaller {
       if (metricExporterFactory
           .getClass()
           .getSimpleName()
-          .replace("_", "")
           .toLowerCase()
-          .startsWith(exporterName.toLowerCase())) {
+          .startsWith(exporterName(exporterName).toLowerCase())) {
         return metricExporterFactory;
       }
     }
@@ -110,9 +109,8 @@ public class TracerInstaller {
       if (metricServer
           .getClass()
           .getSimpleName()
-          .replace("_", "")
           .toLowerCase()
-          .startsWith(exporterName.toLowerCase())) {
+          .startsWith(exporterName(exporterName).toLowerCase())) {
         return metricServer;
       }
     }
@@ -127,15 +125,18 @@ public class TracerInstaller {
       if (spanExporterFactory
           .getClass()
           .getSimpleName()
-          .replace("_", "")
           .toLowerCase()
-          .startsWith(exporterName.toLowerCase())) {
+          .startsWith(exporterName(exporterName).toLowerCase())) {
         return spanExporterFactory;
       }
     }
     return null;
   }
 
+  private static String exporterName(String exporterName) {
+    return exporterName.replace("otlp_span", "otlpspan").replace("otlp_metric", "otlpmetric");
+  }
+
   private static synchronized void installExportersFromJar(String exporterJar, Properties config) {
     URL url;
     try {