Skip to content

Commit

Permalink
Migrate build from Groovy to Kotlin DSL (#247)
Browse files Browse the repository at this point in the history
Co-authored-by: Trask Stalnaker <[email protected]>
  • Loading branch information
AlexCzar and trask authored Nov 21, 2023
1 parent 71761f7 commit ea11d66
Show file tree
Hide file tree
Showing 25 changed files with 250 additions and 253 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,6 @@ bin

# Vim
.swp

# Polyglot runtime manager (asdf rust clone)
.rtx.toml
4 changes: 2 additions & 2 deletions autoconfigure/build.gradle → autoconfigure/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
plugins {
id 'java'
id("java")
}

description = "OpenTelemetry Examples for SDK autoconfiguration"
ext.moduleName = "io.opentelemetry.examples.autoconfigure"
val moduleName by extra { "io.opentelemetry.examples.autoconfigure" }

java {
toolchain {
Expand Down
30 changes: 0 additions & 30 deletions build.gradle

This file was deleted.

31 changes: 31 additions & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
plugins {
id("com.diffplug.spotless")
id("com.github.johnrengelman.shadow") apply false
id("java-library")
}

subprojects {
apply(plugin = "com.diffplug.spotless")
apply(plugin = "java-library")
apply(plugin = "com.github.johnrengelman.shadow")

group = "io.opentelemetry"
version = "0.1.0-SNAPSHOT"

repositories {
mavenCentral()
}

dependencies {
// using the bom ensures that all of your opentelemetry dependency versions are aligned
implementation(platform("io.opentelemetry:opentelemetry-bom-alpha:1.31.0-alpha"))
implementation(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.31.0-alpha"))
}

spotless {
java {
targetExclude("**/generated/**")
googleJavaFormat()
}
}
}
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
plugins {
id 'java'
id 'application'
id("java")
id("application")
}

description = 'OpenTelemetry Example for File Configuration'
ext.moduleName = "io.opentelemetry.examples.fileconfig"
description = "OpenTelemetry Example for File Configuration"
val moduleName by extra { "io.opentelemetry.examples.fileconfig" }

dependencies {
implementation("io.opentelemetry:opentelemetry-api")
Expand All @@ -14,5 +14,5 @@ dependencies {
}

application {
mainClass = 'io.opentelemetry.examples.fileconfig.Application'
mainClass = "io.opentelemetry.examples.fileconfig.Application"
}
8 changes: 4 additions & 4 deletions http/build.gradle → http/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
plugins {
id 'java'
id("java")
}

description = 'OpenTelemetry Examples for HTTP'
ext.moduleName = "io.opentelemetry.examples.http"
description = "OpenTelemetry Examples for HTTP"
val moduleName by extra { "io.opentelemetry.examples.http" }

java {
toolchain {
Expand All @@ -17,6 +17,6 @@ dependencies {
implementation("io.opentelemetry:opentelemetry-exporter-logging")

//alpha modules
implementation "io.opentelemetry.semconv:opentelemetry-semconv"
implementation("io.opentelemetry.semconv:opentelemetry-semconv")
implementation("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure")
}
8 changes: 4 additions & 4 deletions jaeger/build.gradle → jaeger/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
plugins {
id 'java'
id("java")
}

description = 'OpenTelemetry Examples for Jaeger Backend'
ext.moduleName = "io.opentelemetry.examples.jaeger"
description = "OpenTelemetry Examples for Jaeger Backend"
val moduleName by extra { "io.opentelemetry.examples.jaeger" }

java {
toolchain {
Expand All @@ -17,5 +17,5 @@ dependencies {
implementation("io.opentelemetry:opentelemetry-exporter-otlp")

//alpha module
implementation "io.opentelemetry.semconv:opentelemetry-semconv"
implementation("io.opentelemetry.semconv:opentelemetry-semconv")
}
40 changes: 0 additions & 40 deletions javaagent/build.gradle

This file was deleted.

40 changes: 40 additions & 0 deletions javaagent/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
import org.springframework.boot.gradle.tasks.bundling.BootJar

plugins {
id("java")
id("org.springframework.boot") version "2.7.17"
id("io.spring.dependency-management") version "1.1.4"
}

description = "OpenTelemetry Example for Java Agent"
val moduleName by extra { "io.opentelemetry.examples.javagent" }

java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(8))
}
}

val agent = configurations.create("agent")

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

//spring modules
implementation("org.springframework.boot:spring-boot-starter-web")

agent("io.opentelemetry.javaagent:opentelemetry-javaagent:1.31.0")
}

val copyAgent = tasks.register<Copy>("copyAgent") {
from(agent.singleFile)
into(layout.buildDirectory.dir("agent"))
rename("opentelemetry-javaagent-.*\\.jar", "opentelemetry-javaagent.jar")
}


tasks.named<BootJar>("bootJar") {
dependsOn(copyAgent)

archiveFileName = "app.jar"
}
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
plugins {
id 'org.jetbrains.kotlin.jvm' version '1.9.20'
id ("org.jetbrains.kotlin.jvm") version "1.9.20"
}

description = 'OpenTelemetry Example for Kotlin extensions'
description = "OpenTelemetry Example for Kotlin extensions"

kotlin {
compilerOptions {
Expand Down
2 changes: 1 addition & 1 deletion log-appender/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Details about the example:
* SLF4J API [configured with Logback](./src/main/resources/logback.xml) to
print logs to the console and
the [OpenTelemetry Logback Appender](https://github.com/open-telemetry/opentelemetry-java-instrumentation/blob/main/instrumentation/logback/logback-appender-1.0/library/README.md).
* [JUL to SLF4J](./build.gradle), which bridges JUL logs to the SLF4J API, and
* [JUL to SLF4J](./build.gradle.kts), which bridges JUL logs to the SLF4J API, and
ultimately to Logback.
* Demonstrates how trace context is propagated to logs when recorded within a
span.
Expand Down
16 changes: 8 additions & 8 deletions log-appender/build.gradle → log-appender/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
plugins {
id 'java'
id 'application'
id("java")
id("application")
}

description = 'OpenTelemetry Log Appender Example'
ext.moduleName = "io.opentelemetry.examples.log-appender"
description = "OpenTelemetry Log Appender Example"
val moduleName by extra { "io.opentelemetry.examples.log-appender" }

java {
toolchain {
Expand All @@ -29,13 +29,13 @@ dependencies {
// OpenTelemetry core
implementation("io.opentelemetry:opentelemetry-sdk")
implementation("io.opentelemetry:opentelemetry-exporter-otlp")
implementation "io.opentelemetry.semconv:opentelemetry-semconv"
implementation("io.opentelemetry.semconv:opentelemetry-semconv")

// OpenTelemetry log4j / logback appenders
implementation 'io.opentelemetry.instrumentation:opentelemetry-log4j-appender-2.17'
implementation 'io.opentelemetry.instrumentation:opentelemetry-logback-appender-1.0'
implementation("io.opentelemetry.instrumentation:opentelemetry-log4j-appender-2.17")
implementation("io.opentelemetry.instrumentation:opentelemetry-logback-appender-1.0")
}

application {
mainClass = 'io.opentelemetry.example.logappender.Application'
mainClass = "io.opentelemetry.example.logappender.Application"
}
4 changes: 2 additions & 2 deletions logging/build.gradle → logging/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
plugins {
id 'java'
id("java")
}

description = "OpenTelemetry Examples for logging exporters"
ext.moduleName = "io.opentelemetry.examples.logging"
val moduleName by extra { "io.opentelemetry.examples.logging" }

java {
toolchain {
Expand Down
6 changes: 3 additions & 3 deletions metrics/build.gradle → metrics/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
plugins {
id 'java'
id("java")
}

description = 'OpenTelemetry Examples for metrics'
ext.moduleName = "io.opentelemetry.examples.metrics"
description = "OpenTelemetry Examples for metrics"
val moduleName by extra { "io.opentelemetry.examples.metrics" }

java {
toolchain {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,20 +1,22 @@
import org.springframework.boot.gradle.tasks.run.BootRun

plugins {
id 'java'
id 'org.springframework.boot' version '2.7.17'
id 'io.spring.dependency-management' version '1.1.4'
id("java")
id("org.springframework.boot") version "2.7.17"
id("io.spring.dependency-management") version "1.1.4"
}

description = 'OpenTelemetry Example for Micrometer Shim'
ext.moduleName = "io.opentelemetry.examples.micrometer-shim"
description = "OpenTelemetry Example for Micrometer Shim"
val moduleName by extra { "io.opentelemetry.examples.micrometer-shim" }

java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(8))
}
}

bootRun {
mainClass.set 'io.opentelemetry.example.micrometer.Application'
val bootRun = tasks.named<BootRun>("bootRun") {
mainClass = "io.opentelemetry.example.micrometer.Application"
}

dependencies {
Expand Down
8 changes: 4 additions & 4 deletions otlp/build.gradle → otlp/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
plugins {
id 'java'
id("java")
}

description = 'OpenTelemetry Example for OTLP Exporters'
ext.moduleName = "io.opentelemetry.examples.otlp"
description = "OpenTelemetry Example for OTLP Exporters"
val moduleName by extra { "io.opentelemetry.examples.otlp" }

java {
toolchain {
Expand All @@ -15,5 +15,5 @@ dependencies {
implementation("io.opentelemetry:opentelemetry-api")
implementation("io.opentelemetry:opentelemetry-sdk")
implementation("io.opentelemetry:opentelemetry-exporter-otlp")
implementation "io.opentelemetry.semconv:opentelemetry-semconv"
implementation("io.opentelemetry.semconv:opentelemetry-semconv")
}
8 changes: 4 additions & 4 deletions prometheus/build.gradle → prometheus/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
plugins {
id 'java'
id("java")
}

description = 'OpenTelemetry Example for Prometheus Exporter'
ext.moduleName = "io.opentelemetry.examples.prometheus"
description = "OpenTelemetry Example for Prometheus Exporter"
val moduleName by extra { "io.opentelemetry.examples.prometheus" }

java {
toolchain {
Expand All @@ -15,7 +15,7 @@ dependencies {
implementation("io.opentelemetry:opentelemetry-api")
implementation("io.opentelemetry:opentelemetry-sdk")
implementation("io.opentelemetry:opentelemetry-exporter-logging")
implementation "io.opentelemetry.semconv:opentelemetry-semconv"
implementation("io.opentelemetry.semconv:opentelemetry-semconv")

//alpha modules
implementation("io.opentelemetry:opentelemetry-exporter-prometheus")
Expand Down
17 changes: 0 additions & 17 deletions sdk-usage/build.gradle

This file was deleted.

Loading

0 comments on commit ea11d66

Please sign in to comment.