Remove jaeger exporter support (#1342)

* remove jaeger exporters * remove jaeger smoke test
signalfx · Jun 23, 2023 · 5858373 · 5858373
1 parent fe0e8a4
commit 5858373
Show file tree

Hide file tree

Showing 15 changed files with 60 additions and 1,080 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,8 @@ and this repository adheres to [Semantic Versioning](https://semver.org/spec/v2.
 
 ## Unreleased
 
+- Remove deprecated Jaeger exporter support.
+
 ## v1.25.0 - 2023-06-15
 
 ### General

diff --git a/custom/build.gradle.kts b/custom/build.gradle.kts
@@ -14,18 +14,6 @@ dependencies {
 
   implementation("io.opentelemetry.contrib:opentelemetry-samplers")
   implementation("io.opentelemetry.contrib:opentelemetry-resource-providers")
-  implementation("io.opentelemetry:opentelemetry-exporter-jaeger-thrift") {
-    exclude("io.opentelemetry", "opentelemetry-sdk")
-    // exclude unwanted dependency
-    // https://issues.apache.org/jira/browse/THRIFT-5375
-    exclude("org.apache.tomcat.embed", "tomcat-embed-core")
-  }
-  implementation("io.jaegertracing:jaeger-client") {
-    // exclude unwanted dependency
-    // https://issues.apache.org/jira/browse/THRIFT-5375
-    exclude("org.apache.tomcat.embed", "tomcat-embed-core")
-    exclude("com.google.code.gson", "gson")
-  }
 
   compileOnly("io.micrometer:micrometer-core")
   implementation("io.micrometer:micrometer-registry-signalfx") {

diff --git a/custom/src/main/java/com/splunk/opentelemetry/SplunkConfiguration.java b/custom/src/main/java/com/splunk/opentelemetry/SplunkConfiguration.java
@@ -31,7 +31,6 @@ public class SplunkConfiguration implements AutoConfigurationCustomizerProvider
   private static final Logger logger = Logger.getLogger(SplunkConfiguration.class.getName());
 
   public static final String SPLUNK_ACCESS_TOKEN = "splunk.access.token";
-  public static final String OTEL_EXPORTER_JAEGER_ENDPOINT = "otel.exporter.jaeger.endpoint";
   public static final String PROFILER_ENABLED_PROPERTY = "splunk.profiler.enabled";
   public static final String PROFILER_MEMORY_ENABLED_PROPERTY = "splunk.profiler.memory.enabled";
   public static final String SPLUNK_REALM_PROPERTY = "splunk.realm";
@@ -160,20 +159,12 @@ Map<String, String> customize(ConfigProperties config) {
     }
 
     String realm = config.getString(SPLUNK_REALM_PROPERTY, SPLUNK_REALM_NONE);
-    if (SPLUNK_REALM_NONE.equals(realm)) {
-      addIfAbsent(
-          customized, config, OTEL_EXPORTER_JAEGER_ENDPOINT, "http://localhost:9080/v1/trace");
-    } else {
+    if (!SPLUNK_REALM_NONE.equals(realm)) {
       addIfAbsent(
           customized,
           config,
           "otel.exporter.otlp.endpoint",
           "https://ingest." + realm + ".signalfx.com");
-      addIfAbsent(
-          customized,
-          config,
-          OTEL_EXPORTER_JAEGER_ENDPOINT,
-          "https://ingest." + realm + ".signalfx.com/v2/trace");
 
       // metrics ingest doesn't currently accept grpc
       addIfAbsent(customized, config, "otel.exporter.otlp.metrics.protocol", "http/protobuf");

diff --git a/custom/src/main/java/com/splunk/opentelemetry/jaeger/AuthTokenInterceptor.java b/custom/src/main/java/com/splunk/opentelemetry/jaeger/AuthTokenInterceptor.java
diff --git a/custom/src/main/java/com/splunk/opentelemetry/jaeger/JaegerThriftSpanExporterFactory.java b/custom/src/main/java/com/splunk/opentelemetry/jaeger/JaegerThriftSpanExporterFactory.java
diff --git a/custom/src/test/java/com/splunk/opentelemetry/SplunkConfigurationTest.java b/custom/src/test/java/com/splunk/opentelemetry/SplunkConfigurationTest.java
@@ -18,7 +18,6 @@
 
 import static com.splunk.opentelemetry.SplunkConfiguration.METRICS_ENABLED_PROPERTY;
 import static com.splunk.opentelemetry.SplunkConfiguration.METRICS_IMPLEMENTATION;
-import static com.splunk.opentelemetry.SplunkConfiguration.OTEL_EXPORTER_JAEGER_ENDPOINT;
 import static com.splunk.opentelemetry.SplunkConfiguration.PROFILER_MEMORY_ENABLED_PROPERTY;
 import static com.splunk.opentelemetry.SplunkConfiguration.SPLUNK_REALM_NONE;
 import static java.util.Arrays.asList;
@@ -38,8 +37,6 @@ class SplunkConfigurationTest {
   void usesLocalIngestIfNoRealmIsConfigured() {
     ConfigProperties config = configuration();
 
-    assertThat(config.getString(OTEL_EXPORTER_JAEGER_ENDPOINT))
-        .isEqualTo("http://localhost:9080/v1/trace");
     assertThat(config.getString(OTLP_ENDPOINT)).isNull();
   }
 
@@ -48,17 +45,13 @@ void usesLocalIngestIfRealmIsNone() {
     ConfigProperties config =
         configuration(() -> Map.of(SplunkConfiguration.SPLUNK_REALM_PROPERTY, SPLUNK_REALM_NONE));
 
-    assertThat(config.getString(OTEL_EXPORTER_JAEGER_ENDPOINT))
-        .isEqualTo("http://localhost:9080/v1/trace");
     assertThat(config.getString(OTLP_ENDPOINT)).isNull();
   }
 
   @Test
   void realmIsNotHardcoded() {
     var config = configuration(() -> Map.of(SplunkConfiguration.SPLUNK_REALM_PROPERTY, "test1"));
 
-    assertThat(config.getString(OTEL_EXPORTER_JAEGER_ENDPOINT))
-        .isEqualTo("https://ingest.test1.signalfx.com/v2/trace");
     assertThat(config.getString(OTLP_ENDPOINT)).isEqualTo("https://ingest.test1.signalfx.com");
   }
 

diff --git a/custom/src/test/java/com/splunk/opentelemetry/jaeger/AuthTokenInterceptorTest.java b/custom/src/test/java/com/splunk/opentelemetry/jaeger/AuthTokenInterceptorTest.java
diff --git a/...om/src/test/java/com/splunk/opentelemetry/jaeger/JaegerThriftSpanExporterFactoryTest.java b/...om/src/test/java/com/splunk/opentelemetry/jaeger/JaegerThriftSpanExporterFactoryTest.java