Skip to content

Commit 69d329c

Browse files
committed
./gradlew spotlessApply
1 parent 688af8e commit 69d329c

File tree

9 files changed

+21
-31
lines changed

9 files changed

+21
-31
lines changed

instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/JarServiceNameDetector.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
import java.util.Map;
1616

1717
/**
18-
* A {@link ResourceProvider} that will attempt to detect the <code>service.name</code> from the
19-
* * main jar file name.
18+
* A {@link ResourceProvider} that will attempt to detect the <code>service.name</code> from the *
19+
* main jar file name.
2020
*/
2121
@AutoService(ResourceProvider.class)
2222
public final class JarServiceNameDetector implements ConditionalResourceProvider {

instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/ManifestResourceProvider.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@ public ManifestResourceProvider() {
2626
}
2727

2828
// Visible for testing
29-
ManifestResourceProvider(
30-
Supplier<Resource> resourceSupplier) {
29+
ManifestResourceProvider(Supplier<Resource> resourceSupplier) {
3130
super(
3231
new AttributeProvider<Resource>() {
3332
@Override

instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/internal/JarServiceNameResourceExtractor.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,16 @@
1616
import java.util.logging.Logger;
1717

1818
/**
19-
* A resource extractor that will attempt to detect the <code>service.name</code> from the
20-
* main jar file name.
19+
* A resource extractor that will attempt to detect the <code>service.name</code> from the main jar
20+
* file name.
2121
*
2222
* <p>This class is internal and is hence not for public use. Its APIs are unstable and can change
2323
* at any time.
2424
*/
2525
public final class JarServiceNameResourceExtractor {
2626

27-
private static final Logger logger = Logger.getLogger(JarServiceNameResourceExtractor.class.getName());
27+
private static final Logger logger =
28+
Logger.getLogger(JarServiceNameResourceExtractor.class.getName());
2829

2930
private final Supplier<Optional<Path>> jarPathSupplier;
3031

instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/internal/MainJarPathFinder.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import java.util.function.Supplier;
1515
import javax.annotation.Nullable;
1616

17-
1817
class MainJarPathFinder {
1918
private final Supplier<String[]> getProcessHandleArguments;
2019
private final Function<String, String> getSystemProperty;

instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/internal/ManifestResourceExtractor.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,7 @@ public Resource extract() {
5555
return jarPathSupplier
5656
.get()
5757
.flatMap(manifestReader)
58-
.map(
59-
manifest -> extract(manifest))
58+
.map(manifest -> extract(manifest))
6059
.orElseGet(Resource::empty);
6160
}
6261

instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/internal/ProcessArguments.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
package io.opentelemetry.instrumentation.resources.internal;
77

88
/**
9-
* This class is internal and is hence not for public use. Its APIs are unstable and can change
10-
* at any time.
9+
* This class is internal and is hence not for public use. Its APIs are unstable and can change at
10+
* any time.
1111
*/
1212
public final class ProcessArguments {
1313

instrumentation/resources/library/src/main/java9/io/opentelemetry/instrumentation/resources/internal/ProcessArguments.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
package io.opentelemetry.instrumentation.resources.internal;
77

88
/**
9-
* This class is internal and is hence not for public use. Its APIs are unstable and can change
10-
* at any time.
9+
* This class is internal and is hence not for public use. Its APIs are unstable and can change at
10+
* any time.
1111
*/
1212
public final class ProcessArguments {
1313

instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/internal/JarServiceNameResourceExtractorTest.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ void extractResource_empty() {
3131
String[] processArgs = new String[0];
3232
Function<String, String> getProperty = prop -> null;
3333
Predicate<Path> fileExists = JarServiceNameResourceExtractorTest::failPath;
34-
JarServiceNameResourceExtractor serviceNameProvider = getFinder(processArgs, getProperty, fileExists);
34+
JarServiceNameResourceExtractor serviceNameProvider =
35+
getFinder(processArgs, getProperty, fileExists);
3536

3637
Resource resource = serviceNameProvider.extract();
3738

@@ -58,7 +59,8 @@ void extractResource_noJarFileInArgs() {
5859
@Test
5960
void extractResource_processHandleJar() {
6061
JarServiceNameResourceExtractor serviceNameProvider =
61-
getFinder(getArgs("my-service.jar"), prop -> null, JarServiceNameResourceExtractorTest::failPath);
62+
getFinder(
63+
getArgs("my-service.jar"), prop -> null, JarServiceNameResourceExtractorTest::failPath);
6264

6365
Resource resource = serviceNameProvider.extract();
6466

@@ -82,7 +84,8 @@ void extractResource_processHandleJarExtraFlag() {
8284
@Test
8385
void extractResource_processHandleJarWithoutExtension() {
8486
JarServiceNameResourceExtractor serviceNameProvider =
85-
getFinder(getArgs("my-service"), prop -> null, JarServiceNameResourceExtractorTest::failPath);
87+
getFinder(
88+
getArgs("my-service"), prop -> null, JarServiceNameResourceExtractorTest::failPath);
8689

8790
Resource resource = serviceNameProvider.extract();
8891

instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/internal/ManifestResourceExtractorTest.java

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,7 @@ private static class TestCase {
2727
private final String expectedVersion;
2828
private final InputStream input;
2929

30-
TestCase(
31-
String name,
32-
String expectedName,
33-
String expectedVersion,
34-
InputStream input) {
30+
TestCase(String name, String expectedName, String expectedVersion, InputStream input) {
3531
this.name = name;
3632
this.expectedName = expectedName;
3733
this.expectedVersion = expectedVersion;
@@ -42,17 +38,10 @@ private static class TestCase {
4238
@TestFactory
4339
Collection<DynamicTest> extractResource() {
4440
return Stream.of(
45-
new TestCase(
46-
"name ok",
47-
"demo",
48-
"0.0.1-SNAPSHOT",
49-
openClasspathResource("MANIFEST.MF")),
41+
new TestCase("name ok", "demo", "0.0.1-SNAPSHOT", openClasspathResource("MANIFEST.MF")),
5042
new TestCase("name - no resource", null, null, null),
5143
new TestCase(
52-
"name - empty resource",
53-
null,
54-
null,
55-
openClasspathResource("empty-MANIFEST.MF")))
44+
"name - empty resource", null, null, openClasspathResource("empty-MANIFEST.MF")))
5645
.map(
5746
t ->
5847
DynamicTest.dynamicTest(

0 commit comments

Comments
 (0)