Rename auto-exporters' artifacts names
MODIFY
.circleci/config.yml
.circleci/config.yml
@@ -27,7 +27,7 @@ jobs:
- run:
name: Build Project
- command: GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xmx1G -Xms64M' -Dota.forkedMaxHeapSize=1G -Dota.forkedMinHeapSize=64M" ./gradlew clean compileTestGroovy compileLatestDepTestGroovy compileTestScala compileLatestDepTestScala compileTestJava compileLatestDepTestJava :opentelemetry-auto:shadowJar :auto-exporters:opentelemetry-auto-exporters-jaeger:shadowJar :auto-exporters:opentelemetry-auto-exporters-otlp:shadowJar :auto-exporters:opentelemetry-auto-exporters-logging:shadowJar :auto-exporters:opentelemetry-auto-exporters-zipkin:shadowJar --build-cache --parallel --stacktrace --no-daemon --max-workers=8
+ command: GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xmx1G -Xms64M' -Dota.forkedMaxHeapSize=1G -Dota.forkedMinHeapSize=64M" ./gradlew clean classes testClasses :opentelemetry-auto:shadowJar :auto-exporters:shadowJar --build-cache --parallel --stacktrace --no-daemon --max-workers=8
- run:
name: Collect Libs

MODIFY
CONTRIBUTING.md
CONTRIBUTING.md
@@ -92,9 +92,9 @@ named like:
```
libs/opentelemetry-auto-<version>-SNAPSHOT.jar
-libs/opentelemetry-auto-exporters-jaeger-<version>-SNAPSHOT.jar
-libs/opentelemetry-auto-exporters-logging-<version>-SNAPSHOT.jar
-libs/opentelemetry-auto-exporters-otlp-<version>-SNAPSHOT.jar
+libs/opentelemetry-auto-exporter-jaeger-<version>-SNAPSHOT.jar
+libs/opentelemetry-auto-exporter-logging-<version>-SNAPSHOT.jar
+libs/opentelemetry-auto-exporter-otlp-<version>-SNAPSHOT.jar
```
#### Building from source

MODIFY
README.md
README.md
@@ -23,7 +23,7 @@ be defined before the application JAR. For example:
```
java -javaagent:path/to/opentelemetry-auto-<version>.jar \
- -Dota.exporter.jar=path/to/opentelemetry-auto-exporters-jaeger-<version>.jar \
+ -Dota.exporter.jar=path/to/opentelemetry-auto-exporter-jaeger-<version>.jar \
-Dota.exporter.jaeger.endpoint=localhost:14250 \
-Dota.exporter.jaeger.service.name=shopping \
-jar myapp.jar

MODIFY
auto-exporters/auto-exporters.gradle
auto-exporters/auto-exporters.gradle
@@ -7,24 +7,24 @@ 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')
- testCompile project(':auto-exporters:opentelemetry-auto-exporters-zipkin')
+ testCompile project(':auto-exporters:opentelemetry-auto-exporter-otlp')
+ testCompile project(':auto-exporters:opentelemetry-auto-exporter-jaeger')
+ testCompile project(':auto-exporters:opentelemetry-auto-exporter-logging')
+ testCompile project(':auto-exporters:opentelemetry-auto-exporter-zipkin')
}
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'
- dependsOn ':auto-exporters:opentelemetry-auto-exporters-zipkin:shadowJar'
+ dependsOn ':auto-exporters:opentelemetry-auto-exporter-otlp:shadowJar'
+ dependsOn ':auto-exporters:opentelemetry-auto-exporter-jaeger:shadowJar'
+ dependsOn ':auto-exporters:opentelemetry-auto-exporter-logging:shadowJar'
+ dependsOn ':auto-exporters:opentelemetry-auto-exporter-zipkin: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
- systemProperty 'zipkinExporterJar', project(':auto-exporters:opentelemetry-auto-exporters-zipkin').tasks.shadowJar.archivePath
+ systemProperty 'otlpExporterJar', project(':auto-exporters:opentelemetry-auto-exporter-otlp').tasks.shadowJar.archivePath
+ systemProperty 'jaegerExporterJar', project(':auto-exporters:opentelemetry-auto-exporter-jaeger').tasks.shadowJar.archivePath
+ systemProperty 'loggingExporterJar', project(':auto-exporters:opentelemetry-auto-exporter-logging').tasks.shadowJar.archivePath
+ systemProperty 'zipkinExporterJar', project(':auto-exporters:opentelemetry-auto-exporter-zipkin').tasks.shadowJar.archivePath
}
}
@@ -33,10 +33,10 @@ configurations {
}
dependencies {
- shadowInclude project(path: ':auto-exporters:opentelemetry-auto-exporters-logging', configuration: 'shadow')
- shadowInclude project(path: ':auto-exporters:opentelemetry-auto-exporters-otlp', configuration: 'shadow')
- shadowInclude project(path: ':auto-exporters:opentelemetry-auto-exporters-jaeger', configuration: 'shadow')
- shadowInclude project(path: ':auto-exporters:opentelemetry-auto-exporters-zipkin', configuration: 'shadow')
+ shadowInclude project(path: ':auto-exporters:opentelemetry-auto-exporter-logging', configuration: 'shadow')
+ shadowInclude project(path: ':auto-exporters:opentelemetry-auto-exporter-otlp', configuration: 'shadow')
+ shadowInclude project(path: ':auto-exporters:opentelemetry-auto-exporter-jaeger', configuration: 'shadow')
+ shadowInclude project(path: ':auto-exporters:opentelemetry-auto-exporter-zipkin', configuration: 'shadow')
}

MODIFY
benchmark/src/jmh/java/io/opentelemetry/benchmark/HttpBenchmark.java
benchmark/src/jmh/java/io/opentelemetry/benchmark/HttpBenchmark.java
@@ -68,7 +68,7 @@ public class HttpBenchmark {
@Fork(
jvmArgsAppend = {
"-javaagent:/path/to/opentelemetry-java-instrumentation/java-agent/build/libs/opentelemetry-auto.jar",
- "-Dota.exporter.jar=/path/to/opentelemetry-java-instrumentation/auto-exporters/logging/build/libs/opentelemetry-auto-exporters-logging-or-other-exporter.jar"
+ "-Dota.exporter=logging"
})
public static class WithAgent extends ClassRetransformingBenchmark {}
}

MODIFY
settings.gradle
settings.gradle
@@ -176,7 +176,7 @@ setBuildFile(rootProject)
project(':agent-bootstrap').name = 'auto-bootstrap'
project(':agent-tooling').name = 'auto-tooling'
project(':java-agent').name = 'opentelemetry-auto'
-project(':auto-exporters:jaeger').name = 'opentelemetry-auto-exporters-jaeger'
-project(':auto-exporters:logging').name = 'opentelemetry-auto-exporters-logging'
-project(':auto-exporters:otlp').name = 'opentelemetry-auto-exporters-otlp'
-project(':auto-exporters:zipkin').name = 'opentelemetry-auto-exporters-zipkin'
+project(':auto-exporters:jaeger').name = 'opentelemetry-auto-exporter-jaeger'
+project(':auto-exporters:logging').name = 'opentelemetry-auto-exporter-logging'
+project(':auto-exporters:otlp').name = 'opentelemetry-auto-exporter-otlp'
+project(':auto-exporters:zipkin').name = 'opentelemetry-auto-exporter-zipkin'

MODIFY
smoke-tests/smoke-tests.gradle
smoke-tests/smoke-tests.gradle
@@ -5,18 +5,18 @@ description = 'smoke-tests'
dependencies {
compile deps.spock
compile project(':testing')
- compile project(':auto-exporters:opentelemetry-auto-exporters-logging')
+ compile project(':auto-exporters:opentelemetry-auto-exporter-logging')
}
subprojects { subProject ->
subProject.tasks.withType(Test).configureEach {
- dependsOn = [':opentelemetry-auto:embedExporters', ':auto-exporters:opentelemetry-auto-exporters-logging:shadowJar']
+ dependsOn = [':opentelemetry-auto:embedExporters', ':auto-exporters:opentelemetry-auto-exporter-logging:shadowJar']
doFirst {
// Tests depend on this to know where to run things and what agent jar to use
jvmArgs "-Dio.opentelemetry.smoketest.builddir=${buildDir}"
jvmArgs "-Dio.opentelemetry.smoketest.agent.shadowJar.path=${project(':opentelemetry-auto').tasks.embedExporters.archivePath}"
- jvmArgs "-Dota.exporter.jar=${project(':auto-exporters:opentelemetry-auto-exporters-logging').tasks.shadowJar.archivePath}"
+ jvmArgs "-Dota.exporter.jar=${project(':auto-exporters:opentelemetry-auto-exporter-logging').tasks.shadowJar.archivePath}"
}
}
}

Rename auto-exporters' artifacts names (#514)