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.

Sign up for GitHub

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

Jump to bottom

Add Spring Boot service name guesser / ResourceProvider #6516

Merged
merged 11 commits into from
Sep 7, 2022
Merged

Add Spring Boot service name guesser / ResourceProvider #6516

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
956da5b
Add spring boot service name guesser.
breedx-splk Aug 26, 2022
c64a806
add encoding
breedx-splk Aug 26, 2022
db22133
improve commandline handling
breedx-splk Aug 26, 2022
7973ce0
move guesser to own module
breedx-splk Aug 29, 2022
e588243
use readAllBytes which exists in java 8
breedx-splk Aug 29, 2022
19d863a
spotless
breedx-splk Aug 29, 2022
6e2d5d2
add note and link to spring docs
breedx-splk Aug 30, 2022
b5f6bc3
group for readability
breedx-splk Aug 30, 2022
aca0afc
repackage
breedx-splk Aug 30, 2022
d01ddad
Apply suggestions from code review
Sep 7, 2022
967a800
code review comments
Sep 7, 2022
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
3 changes: 0 additions & 3 deletions instrumentation/spring/spring-boot-autoconfigure/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,6 @@ dependencies {
implementation("org.springframework.boot:spring-boot-autoconfigure:$springBootVersion")
annotationProcessor("org.springframework.boot:spring-boot-autoconfigure-processor:$springBootVersion")
implementation("javax.validation:validation-api:2.0.1.Final")
annotationProcessor("com.google.auto.service:auto-service")
compileOnly("com.google.auto.service:auto-service-annotations")
testCompileOnly("com.google.auto.service:auto-service-annotations")

implementation(project(":instrumentation-annotations-support"))
implementation(project(":instrumentation:kafka:kafka-clients:kafka-clients-2.6:library"))
Expand Down
12 changes: 12 additions & 0 deletions instrumentation/spring/spring-boot-resources/library/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
plugins {
id("otel.library-instrumentation")
mateuszrzeszutek marked this conversation as resolved.
Show resolved Hide resolved
}

dependencies {
compileOnly("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi")
annotationProcessor("com.google.auto.service:auto-service")
compileOnly("com.google.auto.service:auto-service-annotations")
implementation("org.yaml:snakeyaml:1.31")
testCompileOnly("com.google.auto.service:auto-service-annotations")
testImplementation("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi")
breedx-splk marked this conversation as resolved.
Show resolved Hide resolved
}
0 ...sources/SpringBootServiceNameGuesser.java → ...sources/SpringBootServiceNameGuesser.java
View file
Open in desktop
File renamed without changes.
15 changes: 2 additions & 13 deletions ...ces/SpringBootServiceNameGuesserTest.java → ...ces/SpringBootServiceNameGuesserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,7 @@

import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
import io.opentelemetry.sdk.resources.Resource;
import java.io.BufferedReader;
import java.io.FileNotFoundException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.net.URL;
import java.nio.file.Files;
Expand Down Expand Up @@ -127,15 +124,7 @@ private static void writeString(Path path, String value) throws Exception {
}

private static String readString(Path path) throws Exception {
StringBuilder buff = new StringBuilder();
try (InputStream in = Files.newInputStream(path)) {
BufferedReader reader = new BufferedReader(new InputStreamReader(in, UTF_8));
char[] block = new char[1024];
int rc;
while ((rc = reader.read(block)) > 0) {
buff.append(block, 0, rc);
}
return buff.toString();
}
byte[] allBytes = Files.readAllBytes(path);
return new String(allBytes, UTF_8);
}
}
0 ...src/test/resources/application.properties → ...src/test/resources/application.properties
View file
Open in desktop
File renamed without changes.
0 ...figure/src/test/resources/application.yml → ...ibrary/src/test/resources/application.yml
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,6 +423,7 @@ include(":instrumentation:servlet:servlet-5.0:javaagent")
include(":instrumentation:spark-2.3:javaagent")
include(":instrumentation:spring:spring-batch-3.0:javaagent")
include(":instrumentation:spring:spring-boot-actuator-autoconfigure-2.0:javaagent")
include(":instrumentation:spring:spring-boot-resources:library")
include(":instrumentation:spring:spring-core-2.0:javaagent")
include(":instrumentation:spring:spring-data-1.8:javaagent")
include(":instrumentation:spring:spring-integration-4.1:javaagent")
Expand Down