open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Save CircleCI artifacts needed for release (#293) 

* Save CircleCI artifacts needed for release

* Build and test otlp exporter
This commit is contained in:
Trask Stalnaker 2020-03-29 21:38:34 -07:00 committed by GitHub
parent 2b500788f4
commit 750a979331
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.circleci/collect_libs.sh
View File

@ -9,7 +9,6 @@ set -e
LIBS_DIR=./libs/ LIBS_DIR=./libs/
mkdir -p $LIBS_DIR >/dev/null 2>&1 mkdir -p $LIBS_DIR >/dev/null 2>&1
for lib_path in workspace/*/build/libs; do cp workspace/java-agent/build/libs/*.jar $LIBS_DIR/
echo "saving libs in $lib_path" cp workspace/auto-exporters/*/build/libs/*.jar $LIBS_DIR/
cp $lib_path/*.jar $LIBS_DIR/ cp workspace/exporter-support/build/libs/*.jar $LIBS_DIR/
done

3
auto-exporters/auto-exporters.gradle
View File

@ -3,16 +3,19 @@ apply from: "${rootDir}/gradle/java.gradle"
dependencies { dependencies {
testCompile project(':auto-tooling') 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-jaeger')
testCompile project(':auto-exporters:opentelemetry-auto-exporters-logging') testCompile project(':auto-exporters:opentelemetry-auto-exporters-logging')
} }
tasks.withType(Test).configureEach() { 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-jaeger:shadowJar'
dependsOn ':auto-exporters:opentelemetry-auto-exporters-logging:shadowJar' dependsOn ':auto-exporters:opentelemetry-auto-exporters-logging:shadowJar'
doFirst { doFirst {
systemProperty 'projectVersion', allprojects.version[0] systemProperty 'projectVersion', allprojects.version[0]
systemProperty 'adapterRoot', "${rootDir}/auto-exporters" 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 'jaegerExporterJar', project(':auto-exporters:opentelemetry-auto-exporters-jaeger').tasks.shadowJar.archivePath
systemProperty 'loggingExporterJar', project(':auto-exporters:opentelemetry-auto-exporters-logging').tasks.shadowJar.archivePath systemProperty 'loggingExporterJar', project(':auto-exporters:opentelemetry-auto-exporters-logging').tasks.shadowJar.archivePath
} }

8
auto-exporters/src/test/groovy/io/opentelemetry/auto/exporteradapters/ExporterAdaptersTest.groovy
View File

@ -26,11 +26,14 @@ class ExporterAdaptersTest extends Specification {
def adapterRoot = System.getProperty("adapterRoot") def adapterRoot = System.getProperty("adapterRoot")
@Shared @Shared
def loggingExporterJar = System.getProperty("loggingExporterJar") def otlpExporterJar = System.getProperty("otlpExporterJar")
@Shared @Shared
def jaegerExporterJar = System.getProperty("jaegerExporterJar") def jaegerExporterJar = System.getProperty("jaegerExporterJar")
@Shared
def loggingExporterJar = System.getProperty("loggingExporterJar")
@Shared @Shared
def jaegerDir = new File("${adapterRoot}/jaeger-adapter/build/libs") def jaegerDir = new File("${adapterRoot}/jaeger-adapter/build/libs")
@ -42,7 +45,7 @@ class ExporterAdaptersTest extends Specification {
file != null file != null
where: where:
exporter << [loggingExporterJar, jaegerExporterJar] exporter << [otlpExporterJar, jaegerExporterJar, loggingExporterJar]
} }
def "test exporter load"() { def "test exporter load"() {
@ -65,6 +68,7 @@ class ExporterAdaptersTest extends Specification {
where: where:
exporter | classname exporter | classname
otlpExporterJar | 'io.opentelemetry.auto.exporters.otlp.OtlpSpanExporterFactory'
jaegerExporterJar | 'io.opentelemetry.auto.exporters.jaeger.JaegerExporterFactory' jaegerExporterJar | 'io.opentelemetry.auto.exporters.jaeger.JaegerExporterFactory'
loggingExporterJar | 'io.opentelemetry.auto.exporters.logging.LoggingExporterFactory' loggingExporterJar | 'io.opentelemetry.auto.exporters.logging.LoggingExporterFactory'
} }