From 750a9793310459dd46d3318205d1d5e81edbb301 Mon Sep 17 00:00:00 2001
From: Trask Stalnaker <trask.stalnaker@gmail.com>
Date: Sun, 29 Mar 2020 21:38:34 -0700
Subject: [PATCH] Save CircleCI artifacts needed for release (#293)

* Save CircleCI artifacts needed for release

* Build and test otlp exporter
---
 .circleci/collect_libs.sh                                 | 7 +++----
 auto-exporters/auto-exporters.gradle                      | 3 +++
 .../auto/exporteradapters/ExporterAdaptersTest.groovy     | 8 ++++++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/.circleci/collect_libs.sh b/.circleci/collect_libs.sh
index ce6e53afd3..045f594f63 100755
--- a/.circleci/collect_libs.sh
+++ b/.circleci/collect_libs.sh
@@ -9,7 +9,6 @@ set -e
 LIBS_DIR=./libs/
 mkdir -p $LIBS_DIR >/dev/null 2>&1
 
-for lib_path in workspace/*/build/libs; do
-    echo "saving libs in $lib_path"
-    cp $lib_path/*.jar $LIBS_DIR/
-done
+cp workspace/java-agent/build/libs/*.jar $LIBS_DIR/
+cp workspace/auto-exporters/*/build/libs/*.jar $LIBS_DIR/
+cp workspace/exporter-support/build/libs/*.jar $LIBS_DIR/
diff --git a/auto-exporters/auto-exporters.gradle b/auto-exporters/auto-exporters.gradle
index db55c26793..e633f0dc7a 100644
--- a/auto-exporters/auto-exporters.gradle
+++ b/auto-exporters/auto-exporters.gradle
@@ -3,16 +3,19 @@ apply from: "${rootDir}/gradle/java.gradle"
 dependencies {
   testCompile project(':auto-tooling')
 
+  testCompile project(':auto-exporters:opentelemetry-auto-exporters-otlp')
   testCompile project(':auto-exporters:opentelemetry-auto-exporters-jaeger')
   testCompile project(':auto-exporters:opentelemetry-auto-exporters-logging')
 }
 
 tasks.withType(Test).configureEach() {
+  dependsOn ':auto-exporters:opentelemetry-auto-exporters-otlp:shadowJar'
   dependsOn ':auto-exporters:opentelemetry-auto-exporters-jaeger:shadowJar'
   dependsOn ':auto-exporters:opentelemetry-auto-exporters-logging:shadowJar'
   doFirst {
     systemProperty 'projectVersion', allprojects.version[0]
     systemProperty 'adapterRoot', "${rootDir}/auto-exporters"
+    systemProperty 'otlpExporterJar', project(':auto-exporters:opentelemetry-auto-exporters-otlp').tasks.shadowJar.archivePath
     systemProperty 'jaegerExporterJar', project(':auto-exporters:opentelemetry-auto-exporters-jaeger').tasks.shadowJar.archivePath
     systemProperty 'loggingExporterJar', project(':auto-exporters:opentelemetry-auto-exporters-logging').tasks.shadowJar.archivePath
   }
diff --git a/auto-exporters/src/test/groovy/io/opentelemetry/auto/exporteradapters/ExporterAdaptersTest.groovy b/auto-exporters/src/test/groovy/io/opentelemetry/auto/exporteradapters/ExporterAdaptersTest.groovy
index ec705192e0..377f5bed37 100644
--- a/auto-exporters/src/test/groovy/io/opentelemetry/auto/exporteradapters/ExporterAdaptersTest.groovy
+++ b/auto-exporters/src/test/groovy/io/opentelemetry/auto/exporteradapters/ExporterAdaptersTest.groovy
@@ -26,11 +26,14 @@ class ExporterAdaptersTest extends Specification {
   def adapterRoot = System.getProperty("adapterRoot")
 
   @Shared
-  def loggingExporterJar = System.getProperty("loggingExporterJar")
+  def otlpExporterJar = System.getProperty("otlpExporterJar")
 
   @Shared
   def jaegerExporterJar = System.getProperty("jaegerExporterJar")
 
+  @Shared
+  def loggingExporterJar = System.getProperty("loggingExporterJar")
+
   @Shared
   def jaegerDir = new File("${adapterRoot}/jaeger-adapter/build/libs")
 
@@ -42,7 +45,7 @@ class ExporterAdaptersTest extends Specification {
     file != null
 
     where:
-    exporter << [loggingExporterJar, jaegerExporterJar]
+    exporter << [otlpExporterJar, jaegerExporterJar, loggingExporterJar]
   }
 
   def "test exporter load"() {
@@ -65,6 +68,7 @@ class ExporterAdaptersTest extends Specification {
 
     where:
     exporter           | classname
+    otlpExporterJar    | 'io.opentelemetry.auto.exporters.otlp.OtlpSpanExporterFactory'
     jaegerExporterJar  | 'io.opentelemetry.auto.exporters.jaeger.JaegerExporterFactory'
     loggingExporterJar | 'io.opentelemetry.auto.exporters.logging.LoggingExporterFactory'
   }