Remove jaeger-thrift from agent distribution (open-telemetry#2073)

* Remove jaeger-thrift from agent distribution * Update test
malafeev · Jan 19, 2021 · 97b8712 · 97b8712
1 parent 7c3b183
commit 97b8712
Show file tree

Hide file tree

Showing 9 changed files with 1 addition and 135 deletions.
diff --git a/README.md b/README.md
@@ -121,16 +121,6 @@ A simple wrapper for the Jaeger exporter of opentelemetry-java. This exporter us
 | otel.exporter.jaeger.endpoint     | OTEL_EXPORTER_JAEGER_ENDPOINT     | The Jaeger gRPC endpoint to connect to. Default is `localhost:14250`.                              |
 | otel.exporter.jaeger.service.name | OTEL_EXPORTER_JAEGER_SERVICE_NAME | The service name of this JVM instance. Default is `unknown`.                                       |
 
-##### Jaeger Thrift over HTTP exporter
-
-A simple wrapper for the Jaeger exporter, but using Thrift encoded payloads over HTTP.
-
-| System property                   | Environment variable              | Description                                                                                        |
-|-----------------------------------|-----------------------------------|----------------------------------------------------------------------------------------------------|
-| otel.exporter=jaeger-thrift       | OTEL_EXPORTER=jaeger-thrift       | Select the Jaeger HTTP Thrift exporter                                                             |
-| otel.exporter.jaeger.endpoint     | OTEL_EXPORTER_JAEGER_ENDPOINT     | The Jaeger HTTP endpoint to send thrift data to.  Default is `http://localhost:14268/api/traces`.  |
-| otel.exporter.jaeger.service.name | OTEL_EXPORTER_JAEGER_SERVICE_NAME | The service name of this JVM instance. Default is `unknown`.                                       |
-
 ##### Zipkin exporter
 A simple wrapper for the Zipkin exporter of opentelemetry-java. It sends JSON in [Zipkin format](https://zipkin.io/zipkin-api/#/default/post_spans) to a specified HTTP URL.
 

diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
@@ -43,7 +43,6 @@ ext {
     opentelemetrySdk           : dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-sdk', version: versions.opentelemetry),
     opentelemetrySdkMetrics    : dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-sdk-metrics', version: versions.opentelemetryAlpha),
     opentelemetryJaeger        : dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-exporter-jaeger', version: versions.opentelemetry),
-    opentelemetryJaegerThrift  : dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-exporter-jaeger-thrift', version: versions.opentelemetry),
     opentelemetryOtlp          : dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-exporter-otlp', version: versions.opentelemetry),
     opentelemetryOtlpMetrics   : dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-exporter-otlp-metrics', version: versions.opentelemetryAlpha),
     opentelemetryZipkin        : dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-exporter-zipkin', version: versions.opentelemetry),

diff --git a/javaagent-exporters/jaeger-thrift/jaeger-thrift.gradle b/javaagent-exporters/jaeger-thrift/jaeger-thrift.gradle
diff --git a/...rc/main/java/io/opentelemetry/javaagent/exporters/jaeger/JaegerThriftExporterFactory.java b/...rc/main/java/io/opentelemetry/javaagent/exporters/jaeger/JaegerThriftExporterFactory.java
diff --git a/javaagent-exporters/javaagent-exporters.gradle b/javaagent-exporters/javaagent-exporters.gradle
@@ -14,7 +14,6 @@ dependencies {
 
   testImplementation project(':javaagent-exporters:otlp')
   testImplementation project(':javaagent-exporters:jaeger')
-  testImplementation project(':javaagent-exporters:jaeger-thrift')
   testImplementation project(':javaagent-exporters:logging')
   testImplementation project(':javaagent-exporters:zipkin')
   testImplementation project(':javaagent-exporters:prometheus')
@@ -23,7 +22,6 @@ dependencies {
 tasks.withType(Test).configureEach() {
   dependsOn ':javaagent-exporters:otlp:shadowJar'
   dependsOn ':javaagent-exporters:jaeger:shadowJar'
-  dependsOn ':javaagent-exporters:jaeger-thrift:shadowJar'
   dependsOn ':javaagent-exporters:logging:shadowJar'
   dependsOn ':javaagent-exporters:zipkin:shadowJar'
   dependsOn ':javaagent-exporters:prometheus:shadowJar'
@@ -32,7 +30,6 @@ tasks.withType(Test).configureEach() {
     systemProperty 'adapterRoot', "$rootDir/javaagent-exporters"
     systemProperty 'otlpExporterJar', project(':javaagent-exporters:otlp').tasks.shadowJar.archivePath
     systemProperty 'jaegerExporterJar', project(':javaagent-exporters:jaeger').tasks.shadowJar.archivePath
-    systemProperty 'jaegerThriftExporterJar', project(':javaagent-exporters:jaeger-thrift').tasks.shadowJar.archivePath
     systemProperty 'loggingExporterJar', project(':javaagent-exporters:logging').tasks.shadowJar.archivePath
     systemProperty 'zipkinExporterJar', project(':javaagent-exporters:zipkin').tasks.shadowJar.archivePath
     systemProperty 'prometheusExporterJar', project(':javaagent-exporters:prometheus').tasks.shadowJar.archivePath
@@ -47,7 +44,6 @@ dependencies {
   shadowInclude project(path: ':javaagent-exporters:logging', configuration: 'shadow')
   shadowInclude project(path: ':javaagent-exporters:otlp', configuration: 'shadow')
   shadowInclude project(path: ':javaagent-exporters:jaeger', configuration: 'shadow')
-  shadowInclude project(path: ':javaagent-exporters:jaeger-thrift', configuration: 'shadow')
   shadowInclude project(path: ':javaagent-exporters:zipkin', configuration: 'shadow')
   shadowInclude project(path: ':javaagent-exporters:prometheus', configuration: 'shadow')
 }

diff --git a/...s/src/test/groovy/io/opentelemetry/javaagent/exporteradapters/ExporterAdaptersTest.groovy b/...s/src/test/groovy/io/opentelemetry/javaagent/exporteradapters/ExporterAdaptersTest.groovy
@@ -16,9 +16,6 @@ class ExporterAdaptersTest extends Specification {
   @Shared
   def jaegerExporterJar = System.getProperty("jaegerExporterJar")
 
-  @Shared
-  def jaegerThriftExporterJar = System.getProperty("jaegerThriftExporterJar")
-
   @Shared
   def loggingExporterJar = System.getProperty("loggingExporterJar")
 
@@ -33,7 +30,7 @@ class ExporterAdaptersTest extends Specification {
     file != null
 
     where:
-    exporter << [otlpExporterJar, jaegerExporterJar, jaegerThriftExporterJar, loggingExporterJar, zipkinExporterJar]
+    exporter << [otlpExporterJar, jaegerExporterJar, loggingExporterJar, zipkinExporterJar]
   }
 
   def "test exporter load"() {
@@ -57,7 +54,6 @@ class ExporterAdaptersTest extends Specification {
     exporter                | classname
     otlpExporterJar         | 'io.opentelemetry.javaagent.exporters.otlp.OtlpSpanExporterFactory'
     jaegerExporterJar       | 'io.opentelemetry.javaagent.exporters.jaeger.JaegerExporterFactory'
-    jaegerThriftExporterJar | 'io.opentelemetry.javaagent.exporters.jaeger.JaegerThriftExporterFactory'
     loggingExporterJar      | 'io.opentelemetry.javaagent.exporters.logging.LoggingExporterFactory'
     zipkinExporterJar       | 'io.opentelemetry.javaagent.exporters.zipkin.ZipkinExporterFactory'
   }

diff --git a/settings.gradle b/settings.gradle
@@ -214,7 +214,6 @@ include ':instrumentation-core:servlet-2.2'
 // exporter adapters
 include ":javaagent-exporters"
 include ":javaagent-exporters:jaeger"
-include ":javaagent-exporters:jaeger-thrift"
 include ":javaagent-exporters:logging"
 include ":javaagent-exporters:otlp"
 include ":javaagent-exporters:zipkin"

diff --git a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/JaegerThriftExporterSmokeTest.groovy b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/JaegerThriftExporterSmokeTest.groovy
diff --git a/smoke-tests/src/test/resources/otel.yaml b/smoke-tests/src/test/resources/otel.yaml
@@ -12,8 +12,6 @@ receivers:
   zipkin:
   jaeger:
     protocols:
-      thrift_http:
-        endpoint: 0.0.0.0:14268
       grpc:
 
 processors: