Skip to content
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
6 changes: 0 additions & 6 deletions .github/renovate.json5
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,6 @@
"matchPackagePrefixes": ["com.google.protobuf"],
"groupName": "protobuf packages"
},
{
// intentionally using Spring Boot 2 in some examples
"matchPackageNames": ["org.springframework.boot"],
"matchUpdateTypes": ["major"],
"enabled": false
},
{
// intentionally using Java 11 in some examples
// not using matchUpdateTypes "major", because renovate wants to bump "11-jre" to "11.0.19_7-jre"
Expand Down
8 changes: 1 addition & 7 deletions javaagent/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,12 @@ import org.springframework.boot.gradle.tasks.bundling.BootJar

plugins {
id("java")
id("org.springframework.boot") version "2.7.18"
id("org.springframework.boot") version "3.3.5"
}

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")
val extension = configurations.create("extension")

Expand Down
8 changes: 1 addition & 7 deletions micrometer-shim/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,12 @@ import org.springframework.boot.gradle.tasks.run.BootRun

plugins {
id("java")
id("org.springframework.boot") version "2.7.18"
id("org.springframework.boot") version "3.3.5"
}

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

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

val bootRun = tasks.named<BootRun>("bootRun") {
mainClass = "io.opentelemetry.example.micrometer.Application"
}
Expand Down
10 changes: 2 additions & 8 deletions telemetry-testing/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,12 @@ import org.springframework.boot.gradle.tasks.run.BootRun

plugins {
id("java")
id("org.springframework.boot") version "2.7.18"
id("org.springframework.boot") version "3.3.5"
}

description = "OpenTelemetry Example for Telemetry Testing"
val moduleName by extra { "io.opentelemetry.examples.telemetry-testing" }

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

val bootRun = tasks.named<BootRun>("bootRun") {
mainClass = "io.opentelemetry.example.javagent.Application"
}
Expand All @@ -37,7 +31,7 @@ dependencies {
testImplementation(enforcedPlatform("org.junit:junit-bom:5.11.3"))
testImplementation("org.junit.jupiter:junit-jupiter-api")
testImplementation("org.junit.jupiter:junit-jupiter-engine")
testImplementation("org.mock-server:mockserver-netty:5.15.0:shaded")
testImplementation("org.mock-server:mockserver-netty:5.15.0")
testImplementation("org.awaitility:awaitility:4.2.2")
testImplementation("io.opentelemetry.proto:opentelemetry-proto:1.3.2-alpha")
testImplementation("org.assertj:assertj-core:3.26.3")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.web.client.TestRestTemplate;
import org.springframework.boot.web.server.LocalServerPort;
import org.springframework.boot.test.web.server.LocalServerPort;

/**
* The role of this class is to test the telemetry. It only works if the opentelemetry java agent is
Expand Down
Loading