Skip to content

Commit 4e04f66

Browse files
SylvainJugeSylvainJuge
committed
make spotless happy
1 parent c549087 commit 4e04f66

File tree

24 files changed

+47
-49
lines changed

24 files changed

+47
-49
lines changed

‎instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/SqlClientAttributesExtractor.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
* attributes</a>. This class is designed with SQL (or SQL-like) database clients in mind.
2020
*
2121
* <p>It sets the same set of attributes as {@link DbClientAttributesExtractor} plus an additional
22-
* <code>{@link DbIncubatingAttributes#DB_SQL_TABLE}</code> attribute. The raw SQL
23-
* statements returned by the {@link SqlClientAttributesGetter#getRawStatement(Object)} method are
24-
* sanitized before use, all statement parameters are removed.
22+
* <code>{@link DbIncubatingAttributes#DB_SQL_TABLE}</code> attribute. The raw SQL statements
23+
* returned by the {@link SqlClientAttributesGetter#getRawStatement(Object)} method are sanitized
24+
* before use, all statement parameters are removed.
2525
*/
2626
public final class SqlClientAttributesExtractor<REQUEST, RESPONSE>
2727
extends DbClientCommonAttributesExtractor<

‎instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/internal/AwsLambdaFunctionAttributesExtractor.java

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import io.opentelemetry.instrumentation.awslambdacore.v1_0.AwsLambdaRequest;
1212
import io.opentelemetry.semconv.incubating.CloudIncubatingAttributes;
1313
import io.opentelemetry.semconv.incubating.FaasIncubatingAttributes;
14-
1514
import java.lang.invoke.MethodHandle;
1615
import java.lang.invoke.MethodHandles;
1716
import java.lang.invoke.MethodType;

‎instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/AwsLambdaStreamWrapperHttpPropagationTest.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
2121
import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension;
2222
import io.opentelemetry.sdk.trace.data.StatusData;
23+
import io.opentelemetry.semconv.incubating.CloudIncubatingAttributes;
24+
import io.opentelemetry.semconv.incubating.FaasIncubatingAttributes;
2325
import java.io.BufferedWriter;
2426
import java.io.ByteArrayInputStream;
2527
import java.io.ByteArrayOutputStream;
@@ -28,9 +30,6 @@
2830
import java.io.OutputStream;
2931
import java.io.OutputStreamWriter;
3032
import java.nio.charset.StandardCharsets;
31-
32-
import io.opentelemetry.semconv.incubating.CloudIncubatingAttributes;
33-
import io.opentelemetry.semconv.incubating.FaasIncubatingAttributes;
3433
import org.junit.jupiter.api.AfterEach;
3534
import org.junit.jupiter.api.BeforeEach;
3635
import org.junit.jupiter.api.Test;

‎instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/AwsLambdaStreamWrapperTest.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
1818
import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension;
1919
import io.opentelemetry.sdk.trace.data.StatusData;
20+
import io.opentelemetry.semconv.incubating.CloudIncubatingAttributes;
21+
import io.opentelemetry.semconv.incubating.FaasIncubatingAttributes;
2022
import java.io.BufferedReader;
2123
import java.io.BufferedWriter;
2224
import java.io.ByteArrayInputStream;
@@ -27,9 +29,6 @@
2729
import java.io.OutputStream;
2830
import java.io.OutputStreamWriter;
2931
import java.nio.charset.StandardCharsets;
30-
31-
import io.opentelemetry.semconv.incubating.CloudIncubatingAttributes;
32-
import io.opentelemetry.semconv.incubating.FaasIncubatingAttributes;
3332
import org.junit.jupiter.api.AfterEach;
3433
import org.junit.jupiter.api.BeforeEach;
3534
import org.junit.jupiter.api.Test;

‎instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/AttributeResourceProvider.java

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import io.opentelemetry.sdk.autoconfigure.spi.internal.ConditionalResourceProvider;
1414
import io.opentelemetry.sdk.resources.Resource;
1515
import io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes;
16-
1716
import java.util.HashMap;
1817
import java.util.Map;
1918
import java.util.Objects;

‎instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/HostIdResourceProvider.java

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import io.opentelemetry.sdk.autoconfigure.spi.internal.ConditionalResourceProvider;
1414
import io.opentelemetry.sdk.resources.Resource;
1515
import io.opentelemetry.semconv.incubating.HostIncubatingAttributes;
16-
1716
import java.io.BufferedReader;
1817
import java.io.IOException;
1918
import java.io.InputStreamReader;

‎instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/HostResource.java

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import io.opentelemetry.sdk.resources.Resource;
1111
import io.opentelemetry.semconv.SchemaUrls;
1212
import io.opentelemetry.semconv.incubating.HostIncubatingAttributes;
13-
1413
import java.net.InetAddress;
1514
import java.net.UnknownHostException;
1615

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

+4-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import io.opentelemetry.sdk.autoconfigure.spi.internal.ConditionalResourceProvider;
1515
import io.opentelemetry.sdk.resources.Resource;
1616
import io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes;
17-
1817
import java.nio.file.Path;
1918
import java.util.Map;
2019
import java.util.Optional;
@@ -54,7 +53,8 @@ public Resource createResource(ConfigProperties config) {
5453
String serviceName = getServiceName(jarPath);
5554
logger.log(
5655
FINE, "Auto-detected service name from the jar file name: {0}", serviceName);
57-
return Resource.create(Attributes.of(ServiceIncubatingAttributes.SERVICE_NAME, serviceName));
56+
return Resource.create(
57+
Attributes.of(ServiceIncubatingAttributes.SERVICE_NAME, serviceName));
5858
})
5959
.orElseGet(Resource::empty);
6060
}
@@ -65,7 +65,8 @@ public boolean shouldApply(ConfigProperties config, Resource existing) {
6565
Map<String, String> resourceAttributes = config.getMap("otel.resource.attributes");
6666
return serviceName == null
6767
&& !resourceAttributes.containsKey(ServiceIncubatingAttributes.SERVICE_NAME.getKey())
68-
&& "unknown_service:java".equals(existing.getAttribute(ServiceIncubatingAttributes.SERVICE_NAME));
68+
&& "unknown_service:java"
69+
.equals(existing.getAttribute(ServiceIncubatingAttributes.SERVICE_NAME));
6970
}
7071

7172
private static String getServiceName(Path jarPath) {

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import com.google.auto.service.AutoService;
1111
import io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider;
1212
import io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes;
13-
1413
import java.io.IOException;
1514
import java.nio.file.Path;
1615
import java.util.Optional;
@@ -47,7 +46,7 @@ public Optional<Manifest> readData() {
4746
public void registerAttributes(Builder<Manifest> builder) {
4847
builder
4948
.add(
50-
ServiceIncubatingAttributes.SERVICE_NAME,
49+
ServiceIncubatingAttributes.SERVICE_NAME,
5150
manifest -> {
5251
String serviceName =
5352
manifest.getMainAttributes().getValue("Implementation-Title");

‎instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/OsResource.java

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import io.opentelemetry.sdk.resources.Resource;
1111
import io.opentelemetry.semconv.SchemaUrls;
1212
import io.opentelemetry.semconv.incubating.OsIncubatingAttributes;
13-
1413
import java.util.Locale;
1514
import javax.annotation.Nullable;
1615

‎instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/ProcessResource.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import io.opentelemetry.sdk.resources.Resource;
1111
import io.opentelemetry.semconv.SchemaUrls;
1212
import io.opentelemetry.semconv.incubating.ProcessIncubatingAttributes;
13-
1413
import java.io.File;
1514
import java.lang.management.ManagementFactory;
1615
import java.lang.management.RuntimeMXBean;
@@ -79,7 +78,8 @@ private static Resource doBuildResource() {
7978
executablePath.append(".exe");
8079
}
8180

82-
attributes.put(ProcessIncubatingAttributes.PROCESS_EXECUTABLE_PATH, executablePath.toString());
81+
attributes.put(
82+
ProcessIncubatingAttributes.PROCESS_EXECUTABLE_PATH, executablePath.toString());
8383

8484
String[] args = ProcessArguments.getProcessArguments();
8585
// This will only work with Java 9+ but provides everything except the executablePath.

‎instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/ProcessRuntimeResource.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ static Resource buildResource() {
3838
name,
3939
ProcessIncubatingAttributes.PROCESS_RUNTIME_VERSION,
4040
version,
41-
ProcessIncubatingAttributes.PROCESS_RUNTIME_DESCRIPTION,
41+
ProcessIncubatingAttributes.PROCESS_RUNTIME_DESCRIPTION,
4242
description),
4343
SchemaUrls.V1_24_0);
4444
} catch (SecurityException ignored) {

‎instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/HostIdResourceProviderTest.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import io.opentelemetry.api.common.AttributeKey;
1111
import io.opentelemetry.sdk.autoconfigure.spi.internal.DefaultConfigProperties;
1212
import io.opentelemetry.sdk.resources.Resource;
13+
import io.opentelemetry.semconv.incubating.HostIncubatingAttributes;
1314
import java.nio.file.Path;
1415
import java.util.Arrays;
1516
import java.util.Collection;
@@ -19,8 +20,6 @@
1920
import java.util.function.Supplier;
2021
import java.util.stream.Collectors;
2122
import java.util.stream.Stream;
22-
23-
import io.opentelemetry.semconv.incubating.HostIncubatingAttributes;
2423
import org.assertj.core.api.MapAssert;
2524
import org.junit.jupiter.api.DynamicTest;
2625
import org.junit.jupiter.api.Test;

‎instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/JarServiceNameDetectorTest.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,12 @@
1010

1111
import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
1212
import io.opentelemetry.sdk.resources.Resource;
13+
import io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes;
1314
import java.nio.file.Path;
1415
import java.nio.file.Paths;
1516
import java.util.function.Function;
1617
import java.util.function.Predicate;
1718
import java.util.stream.Stream;
18-
19-
import io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes;
2019
import org.junit.jupiter.api.Test;
2120
import org.junit.jupiter.api.extension.ExtendWith;
2221
import org.junit.jupiter.api.extension.ExtensionContext;

‎instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/ManifestResourceProviderTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,14 @@
1111
import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
1212
import io.opentelemetry.sdk.autoconfigure.spi.internal.DefaultConfigProperties;
1313
import io.opentelemetry.sdk.resources.Resource;
14+
import io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes;
1415
import java.io.InputStream;
1516
import java.util.Collection;
1617
import java.util.Collections;
1718
import java.util.Optional;
1819
import java.util.jar.Manifest;
1920
import java.util.stream.Collectors;
2021
import java.util.stream.Stream;
21-
22-
import io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes;
2322
import org.junit.jupiter.api.DynamicTest;
2423
import org.junit.jupiter.api.TestFactory;
2524

@@ -93,7 +92,8 @@ Collection<DynamicTest> createResource() {
9392
provider.shouldApply(config, t.existing);
9493

9594
Resource resource = provider.createResource(config);
96-
assertThat(resource.getAttribute(ServiceIncubatingAttributes.SERVICE_NAME)).isEqualTo(t.expectedName);
95+
assertThat(resource.getAttribute(ServiceIncubatingAttributes.SERVICE_NAME))
96+
.isEqualTo(t.expectedName);
9797
assertThat(resource.getAttribute(ServiceIncubatingAttributes.SERVICE_VERSION))
9898
.isEqualTo(t.expectedVersion);
9999
}))

‎instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/ProcessResourceTest.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ void notWindows() {
2929
Attributes attributes = resource.getAttributes();
3030

3131
assertThat(attributes.get(ProcessIncubatingAttributes.PROCESS_PID)).isGreaterThan(1);
32-
assertThat(attributes.get(ProcessIncubatingAttributes.PROCESS_EXECUTABLE_PATH)).matches(".*[/\\\\]java");
32+
assertThat(attributes.get(ProcessIncubatingAttributes.PROCESS_EXECUTABLE_PATH))
33+
.matches(".*[/\\\\]java");
3334
assertThat(attributes.get(ProcessIncubatingAttributes.PROCESS_COMMAND_LINE))
3435
.contains(attributes.get(ProcessIncubatingAttributes.PROCESS_EXECUTABLE_PATH));
3536
// With Java 9+ and a compiled jar, ResourceAttributes.PROCESS_COMMAND_ARGS

‎instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/ProcessRuntimeResourceTest.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ void shouldCreateRuntimeAttributes() {
2929
assertThat(resource.getSchemaUrl()).isEqualTo(SchemaUrls.V1_24_0);
3030
assertThat(attributes.get(ProcessIncubatingAttributes.PROCESS_RUNTIME_NAME)).isNotBlank();
3131
assertThat(attributes.get(ProcessIncubatingAttributes.PROCESS_RUNTIME_VERSION)).isNotBlank();
32-
assertThat(attributes.get(ProcessIncubatingAttributes.PROCESS_RUNTIME_DESCRIPTION)).isNotBlank();
32+
assertThat(attributes.get(ProcessIncubatingAttributes.PROCESS_RUNTIME_DESCRIPTION))
33+
.isNotBlank();
3334
}
3435

3536
@Nested

‎instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/resources/SpringResourceProvider.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,8 @@
1010
import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
1111
import io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider;
1212
import io.opentelemetry.sdk.resources.Resource;
13-
import java.util.Optional;
14-
1513
import io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes;
14+
import java.util.Optional;
1615
import org.springframework.boot.info.BuildProperties;
1716

1817
public class SpringResourceProvider implements ResourceProvider {

‎instrumentation/spring/spring-boot-autoconfigure/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/resources/SpringResourceProviderTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,9 @@
1414
import io.opentelemetry.sdk.autoconfigure.spi.internal.DefaultConfigProperties;
1515
import io.opentelemetry.sdk.testing.assertj.AttributesAssert;
1616
import io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions;
17+
import io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes;
1718
import java.util.Collections;
1819
import java.util.Properties;
19-
20-
import io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes;
2120
import org.junit.jupiter.api.DisplayName;
2221
import org.junit.jupiter.api.Test;
2322
import org.springframework.boot.autoconfigure.AutoConfigurations;
@@ -42,7 +41,8 @@ void shouldDetermineServiceNameBySpringApplicationName() {
4241
.withPropertyValues("spring.application.name=myapp-backend")
4342
.run(
4443
context ->
45-
assertResourceAttributes(context).containsEntry(ServiceIncubatingAttributes.SERVICE_NAME, "myapp-backend"));
44+
assertResourceAttributes(context)
45+
.containsEntry(ServiceIncubatingAttributes.SERVICE_NAME, "myapp-backend"));
4646
}
4747

4848
@Test

‎instrumentation/spring/spring-boot-resources/javaagent-unit-tests/src/test/java/io/opentelemetry/instrumentation/spring/resources/TestBootInfClassesResource.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ void testServiceName() {
2828

2929
SpringBootServiceNameDetector guesser = new SpringBootServiceNameDetector();
3030
Resource result = guesser.createResource(config);
31-
assertThat(result.getAttribute(ServiceIncubatingAttributes.SERVICE_NAME)).isEqualTo("otel-spring-test-app");
31+
assertThat(result.getAttribute(ServiceIncubatingAttributes.SERVICE_NAME))
32+
.isEqualTo("otel-spring-test-app");
3233
}
3334
}

‎instrumentation/spring/spring-boot-resources/javaagent/src/main/java/io/opentelemetry/instrumentation/spring/resources/SpringBootServiceNameDetector.java

+6-4
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider;
1414
import io.opentelemetry.sdk.autoconfigure.spi.internal.ConditionalResourceProvider;
1515
import io.opentelemetry.sdk.resources.Resource;
16+
import io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes;
1617
import java.io.IOException;
1718
import java.io.InputStream;
1819
import java.util.Map;
@@ -25,8 +26,6 @@
2526
import java.util.regex.Pattern;
2627
import java.util.stream.Stream;
2728
import javax.annotation.Nullable;
28-
29-
import io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes;
3029
import org.snakeyaml.engine.v2.api.Load;
3130
import org.snakeyaml.engine.v2.api.LoadSettings;
3231

@@ -100,7 +99,9 @@ public Resource createResource(ConfigProperties config) {
10099
.map(
101100
serviceName -> {
102101
logger.log(FINE, "Auto-detected Spring Boot service name: {0}", serviceName);
103-
return Resource.builder().put(ServiceIncubatingAttributes.SERVICE_NAME, serviceName).build();
102+
return Resource.builder()
103+
.put(ServiceIncubatingAttributes.SERVICE_NAME, serviceName)
104+
.build();
104105
})
105106
.orElseGet(Resource::empty);
106107
}
@@ -113,7 +114,8 @@ public boolean shouldApply(ConfigProperties config, Resource resource) {
113114
Map<String, String> resourceAttributes = config.getMap("otel.resource.attributes");
114115
return serviceName == null
115116
&& !resourceAttributes.containsKey(ServiceIncubatingAttributes.SERVICE_NAME.getKey())
116-
&& "unknown_service:java".equals(resource.getAttribute(ServiceIncubatingAttributes.SERVICE_NAME));
117+
&& "unknown_service:java"
118+
.equals(resource.getAttribute(ServiceIncubatingAttributes.SERVICE_NAME));
117119
}
118120

119121
@Override

‎instrumentation/spring/spring-boot-resources/javaagent/src/main/java/io/opentelemetry/instrumentation/spring/resources/SpringBootServiceVersionDetector.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider;
1313
import io.opentelemetry.sdk.resources.Resource;
1414
import io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes;
15-
1615
import java.io.IOException;
1716
import java.io.InputStream;
1817
import java.util.Optional;
@@ -46,7 +45,9 @@ public Resource createResource(ConfigProperties config) {
4645
.map(
4746
version -> {
4847
logger.log(FINE, "Auto-detected Spring Boot service version: {0}", version);
49-
return Resource.builder().put(ServiceIncubatingAttributes.SERVICE_VERSION, version).build();
48+
return Resource.builder()
49+
.put(ServiceIncubatingAttributes.SERVICE_VERSION, version)
50+
.build();
5051
})
5152
.orElseGet(Resource::empty);
5253
}

‎instrumentation/spring/spring-boot-resources/javaagent/src/test/java/io/opentelemetry/instrumentation/spring/resources/SpringBootServiceNameDetectorTest.java

+7-4
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,13 @@
1313
import io.opentelemetry.api.common.Attributes;
1414
import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
1515
import io.opentelemetry.sdk.resources.Resource;
16+
import io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes;
1617
import java.io.InputStream;
1718
import java.io.OutputStream;
1819
import java.net.URL;
1920
import java.nio.file.Files;
2021
import java.nio.file.Path;
2122
import java.nio.file.Paths;
22-
23-
import io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes;
2423
import org.junit.jupiter.api.Test;
2524
import org.junit.jupiter.api.extension.ExtendWith;
2625
import org.junit.jupiter.params.ParameterizedTest;
@@ -174,7 +173,10 @@ void shouldApply() {
174173
void shouldNotApplyWhenResourceHasServiceName() {
175174
SpringBootServiceNameDetector guesser = new SpringBootServiceNameDetector(system);
176175
Resource resource =
177-
Resource.getDefault().merge(Resource.create(Attributes.of(ServiceIncubatingAttributes.SERVICE_NAME, "test-service")));
176+
Resource.getDefault()
177+
.merge(
178+
Resource.create(
179+
Attributes.of(ServiceIncubatingAttributes.SERVICE_NAME, "test-service")));
178180
assertThat(guesser.shouldApply(config, resource)).isFalse();
179181
}
180182

@@ -189,7 +191,8 @@ void shouldNotApplyIfConfigHasServiceName() {
189191
void shouldNotApplyIfConfigHasServiceNameResourceAttribute() {
190192
SpringBootServiceNameDetector guesser = new SpringBootServiceNameDetector(system);
191193
when(config.getMap("otel.resource.attributes"))
192-
.thenReturn(singletonMap(ServiceIncubatingAttributes.SERVICE_NAME.getKey(), "test-service"));
194+
.thenReturn(
195+
singletonMap(ServiceIncubatingAttributes.SERVICE_NAME.getKey(), "test-service"));
193196
assertThat(guesser.shouldApply(config, Resource.getDefault())).isFalse();
194197
}
195198

‎instrumentation/spring/spring-boot-resources/javaagent/src/test/java/io/opentelemetry/instrumentation/spring/resources/SpringBootServiceVersionDetectorTest.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,8 @@
1010

1111
import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
1212
import io.opentelemetry.sdk.resources.Resource;
13-
import java.io.InputStream;
14-
1513
import io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes;
14+
import java.io.InputStream;
1615
import org.junit.jupiter.api.Test;
1716
import org.junit.jupiter.api.extension.ExtendWith;
1817
import org.mockito.Mock;

0 commit comments

Comments
 (0)