Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate javaagent-* to kotlin dsl #3434

Merged
merged 2 commits into from
Jun 29, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 0 additions & 22 deletions javaagent-api/build.gradle

This file was deleted.

23 changes: 23 additions & 0 deletions javaagent-api/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
plugins {
id("otel.java-conventions")
id("otel.jacoco-conventions")
id("otel.publish-conventions")
}

group = "io.opentelemetry.javaagent"

dependencies {
api("io.opentelemetry:opentelemetry-api")
compileOnly("io.opentelemetry:opentelemetry-sdk")

implementation(project(":instrumentation-api"))
implementation("org.slf4j:slf4j-api")

compileOnly("com.google.auto.value:auto-value-annotations")
annotationProcessor("com.google.auto.value:auto-value")

testImplementation(project(":testing-common"))
testImplementation("org.mockito:mockito-core")
testImplementation("org.mockito:mockito-junit-jupiter")
testImplementation("org.assertj:assertj-core")
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ plugins {
dependencies {
// For testing javaagent-bootstrap's Caffeine patch, we need to compile against our cache API
// but make sure to run against javaagent-bootstrap
testCompileOnly project(':instrumentation-api-caching')
testRuntimeOnly project(":javaagent-bootstrap")
testCompileOnly(project(":instrumentation-api-caching"))
testRuntimeOnly(project(":javaagent-bootstrap"))

testImplementation "org.assertj:assertj-core"
}
testImplementation("org.assertj:assertj-core")
}
43 changes: 0 additions & 43 deletions javaagent-bootstrap/build.gradle

This file was deleted.

42 changes: 42 additions & 0 deletions javaagent-bootstrap/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
plugins {
id("otel.java-conventions")
id("otel.publish-conventions")
}

group = "io.opentelemetry.javaagent"

// patch inner class from Caffeine to avoid ForkJoinTask from being loaded too early
val patch = sourceSets.create("patch")
patch.java {}

tasks {
named<Jar>("jar") {
from(patch.output) {
include("io/opentelemetry/instrumentation/api/internal/shaded/caffeine/cache/BoundedLocalCache\$PerformCleanupTask.class")
}
}
}

val instrumentationMuzzle by configurations.creating {
isCanBeConsumed = true
isCanBeResolved = false
extendsFrom(configurations.implementation.get())
}

dependencies {
api("io.opentelemetry:opentelemetry-api")
api("io.opentelemetry:opentelemetry-api-metrics")

compileOnly("io.opentelemetry:opentelemetry-sdk")

implementation(project(":instrumentation-api"))
implementation(project(":javaagent-api"))

implementation("org.slf4j:slf4j-api")
implementation("org.slf4j:slf4j-simple")
// ^ Generally a bad idea for libraries, but we're shadowing.

testImplementation(project(":testing-common"))
testImplementation("org.mockito:mockito-core")
testImplementation("org.assertj:assertj-core")
}
28 changes: 0 additions & 28 deletions javaagent-exporters/build.gradle

This file was deleted.

29 changes: 29 additions & 0 deletions javaagent-exporters/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
// Project to collect and shade exporter dependencies included in the agent's full distribution.

plugins {
id("otel.java-conventions")
id("otel.shadow-conventions")
}

dependencies {
implementation("io.opentelemetry:opentelemetry-exporter-jaeger")
implementation("io.opentelemetry:opentelemetry-exporter-otlp")
implementation("io.opentelemetry:opentelemetry-exporter-otlp-metrics")

implementation("io.opentelemetry:opentelemetry-exporter-prometheus")
implementation("io.prometheus:simpleclient")
implementation("io.prometheus:simpleclient_httpserver")

implementation("io.opentelemetry:opentelemetry-exporter-zipkin")

// TODO(anuraaga): Move version to dependency management
implementation("io.grpc:grpc-netty-shaded:1.38.0")
}

configurations {
implementation {
exclude("io.opentelemetry", "opentelemetry-api")
exclude("io.opentelemetry", "opentelemetry-api-metrics")
exclude("io.opentelemetry", "opentelemetry-semconv")
}
}
30 changes: 0 additions & 30 deletions javaagent-extension-api/build.gradle

This file was deleted.

31 changes: 31 additions & 0 deletions javaagent-extension-api/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
plugins {
id("otel.java-conventions")
id("otel.publish-conventions")
}

group = "io.opentelemetry.javaagent"

val instrumentationMuzzle by configurations.creating {
isCanBeConsumed = true
isCanBeResolved = false
// TODO(anuraaga): Should be compileClasspath?
extendsFrom(configurations.api.get())
extendsFrom(configurations.implementation.get())
}

dependencies {
api("io.opentelemetry:opentelemetry-sdk")

api("net.bytebuddy:byte-buddy")
api("org.slf4j:slf4j-api")

implementation(project(":instrumentation-api"))
implementation(project(":javaagent-api"))
// TODO: ideally this module should not depend on bootstrap, bootstrap should be an internal component
implementation(project(":javaagent-bootstrap"))

// metrics are unstable, do not expose as api
implementation("io.opentelemetry:opentelemetry-sdk-metrics")

instrumentationMuzzle(sourceSets.main.get().output)
}
59 changes: 0 additions & 59 deletions javaagent-tooling/build.gradle

This file was deleted.

59 changes: 59 additions & 0 deletions javaagent-tooling/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
plugins {
id("otel.java-conventions")
id("otel.publish-conventions")
}

group = "io.opentelemetry.javaagent"

val instrumentationMuzzle by configurations.creating {
isCanBeConsumed = true
isCanBeResolved = false
extendsFrom(configurations.implementation.get())
}

dependencies {
// Only used during compilation by bytebuddy plugin
compileOnly("com.google.guava:guava")

implementation(project(":javaagent-bootstrap"))
implementation(project(":javaagent-extension-api"))
implementation(project(":javaagent-api"))
implementation(project(":instrumentation-api"))

implementation("io.opentelemetry:opentelemetry-api")
implementation("io.opentelemetry:opentelemetry-api-metrics")
implementation("io.opentelemetry:opentelemetry-sdk")
implementation("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure")
implementation("io.opentelemetry:opentelemetry-sdk-metrics")
implementation("io.opentelemetry:opentelemetry-extension-kotlin")
implementation("io.opentelemetry:opentelemetry-extension-aws")
implementation("io.opentelemetry:opentelemetry-extension-trace-propagators")
implementation("io.opentelemetry:opentelemetry-sdk-extension-resources")

// Only the logging exporter is included in our slim distribution so we include it here.
// Other exporters are in javaagent-exporters
implementation("io.opentelemetry:opentelemetry-exporter-logging")

api("net.bytebuddy:byte-buddy")
implementation("org.slf4j:slf4j-api")

annotationProcessor("com.google.auto.service:auto-service")
compileOnly("com.google.auto.service:auto-service")

testImplementation(project(":testing-common"))
testImplementation("com.google.guava:guava")
testImplementation("org.assertj:assertj-core")
testImplementation("org.mockito:mockito-core")
testImplementation("org.mockito:mockito-junit-jupiter")

instrumentationMuzzle(sourceSets.main.get().output)
}

// Here we only include autoconfigure but don"t include OTLP exporters to ensure they are only in
// the full distribution. We need to override the default exporter setting of OTLP as a result.
tasks {
withType<Test>().configureEach {
environment("OTEL_TRACES_EXPORTER", "none")
environment("OTEL_METRICS_EXPORTER", "none")
}
}