From fd32ee7763f7a01cea3e82c3dafcf6e6c2af3c71 Mon Sep 17 00:00:00 2001 From: Tom Ekshtein Date: Fri, 8 Sep 2023 12:24:10 -0700 Subject: [PATCH] Removed OTEL --- .run/petclinic.run.xml | 21 ------- build.gradle | 61 ++++++++----------- .../petclinic/owner/OwnerController.java | 6 -- 3 files changed, 26 insertions(+), 62 deletions(-) delete mode 100644 .run/petclinic.run.xml diff --git a/.run/petclinic.run.xml b/.run/petclinic.run.xml deleted file mode 100644 index 1af228ba3..000000000 --- a/.run/petclinic.run.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - \ No newline at end of file diff --git a/build.gradle b/build.gradle index 2bb8cf25e..7839ea7f9 100644 --- a/build.gradle +++ b/build.gradle @@ -1,8 +1,8 @@ plugins { - id 'java' - id 'org.springframework.boot' version '3.1.1' - id 'io.spring.dependency-management' version '1.1.0' - id 'org.graalvm.buildtools.native' version '0.9.23' + id 'java' + id 'org.springframework.boot' version '3.1.1' + id 'io.spring.dependency-management' version '1.1.0' + id 'org.graalvm.buildtools.native' version '0.9.23' } apply plugin: 'java' @@ -11,45 +11,36 @@ group = 'org.springframework.samples' version = '3.1.0' sourceCompatibility = '17' -def OPENTELEMETRY_VERSION = '1.22.1' - repositories { - mavenCentral() + mavenCentral() } ext.webjarsFontawesomeVersion = "4.7.0" ext.webjarsBootstrapVersion = "5.2.3" dependencies { - implementation 'org.hibernate:hibernate-core:6.2.1.Final' - implementation 'org.springframework.boot:spring-boot-starter-cache' - implementation 'org.springframework.boot:spring-boot-starter-data-jpa' - implementation 'org.springframework.boot:spring-boot-starter-thymeleaf' - implementation 'org.springframework.boot:spring-boot-starter-web' - implementation 'org.springframework.boot:spring-boot-starter-validation' - implementation 'javax.cache:cache-api' - implementation 'jakarta.xml.bind:jakarta.xml.bind-api' - runtimeOnly 'org.springframework.boot:spring-boot-starter-actuator' - runtimeOnly "org.webjars.npm:bootstrap:${webjarsBootstrapVersion}" - runtimeOnly "org.webjars.npm:font-awesome:${webjarsFontawesomeVersion}" - runtimeOnly 'com.github.ben-manes.caffeine:caffeine' - runtimeOnly 'com.h2database:h2' - runtimeOnly 'com.mysql:mysql-connector-j' - runtimeOnly 'org.postgresql:postgresql' - developmentOnly 'org.springframework.boot:spring-boot-devtools' - testImplementation 'org.springframework.boot:spring-boot-starter-test' - testImplementation 'org.springframework.boot:spring-boot-testcontainers' - testImplementation 'org.springframework.boot:spring-boot-docker-compose' - testImplementation 'org.testcontainers:junit-jupiter' - testImplementation 'org.testcontainers:mysql' - - implementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations:${OPENTELEMETRY_VERSION}") - implementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:${OPENTELEMETRY_VERSION}") - + implementation 'org.springframework.boot:spring-boot-starter-cache' + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + implementation 'org.springframework.boot:spring-boot-starter-thymeleaf' + implementation 'org.springframework.boot:spring-boot-starter-web' + implementation 'org.springframework.boot:spring-boot-starter-validation' + implementation 'javax.cache:cache-api' + implementation 'jakarta.xml.bind:jakarta.xml.bind-api' + runtimeOnly 'org.springframework.boot:spring-boot-starter-actuator' + runtimeOnly "org.webjars.npm:bootstrap:${webjarsBootstrapVersion}" + runtimeOnly "org.webjars.npm:font-awesome:${webjarsFontawesomeVersion}" + runtimeOnly 'com.github.ben-manes.caffeine:caffeine' + runtimeOnly 'com.h2database:h2' + runtimeOnly 'com.mysql:mysql-connector-j' + runtimeOnly 'org.postgresql:postgresql' + developmentOnly 'org.springframework.boot:spring-boot-devtools' + testImplementation 'org.springframework.boot:spring-boot-starter-test' + testImplementation 'org.springframework.boot:spring-boot-testcontainers' + testImplementation 'org.springframework.boot:spring-boot-docker-compose' + testImplementation 'org.testcontainers:junit-jupiter' + testImplementation 'org.testcontainers:mysql' } - - tasks.named('test') { - useJUnitPlatform() + useJUnitPlatform() } diff --git a/src/main/java/org/springframework/samples/petclinic/owner/OwnerController.java b/src/main/java/org/springframework/samples/petclinic/owner/OwnerController.java index 2b639c429..d87b7806e 100644 --- a/src/main/java/org/springframework/samples/petclinic/owner/OwnerController.java +++ b/src/main/java/org/springframework/samples/petclinic/owner/OwnerController.java @@ -18,7 +18,6 @@ package org.springframework.samples.petclinic.owner; import java.util.List; import java.util.Map; -import io.opentelemetry.instrumentation.annotations.WithSpan; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.PageRequest; @@ -65,7 +64,6 @@ class OwnerController { return ownerId == null ? new Owner() : this.owners.findById(ownerId); } - @WithSpan @GetMapping("/owners/new") public String initCreationForm(Map model) { Owner owner = new Owner(); @@ -83,14 +81,12 @@ class OwnerController { return "redirect:/owners/" + owner.getId(); } - @WithSpan @GetMapping("/owners/find") public String initFindForm() { return "owners/findOwners"; } - @WithSpan @GetMapping("/owners") public String processFindForm(@RequestParam(defaultValue = "1") int page, Owner owner, BindingResult result, Model model) { @@ -129,11 +125,9 @@ class OwnerController { private String addPaginationModel(int page, Model model, Page paginated) { model.addAttribute("listOwners", paginated); - //List listOwners = paginated.getContent(); model.addAttribute("currentPage", page); model.addAttribute("totalPages", paginated.getTotalPages()); model.addAttribute("totalItems", paginated.getTotalElements()); - //model.addAttribute("listOwners", listOwners); model.addAttribute("listOwners",paginated); return "owners/ownersList"; }