Skip to content

Commit

Permalink
Apply spotless
Browse files Browse the repository at this point in the history
  • Loading branch information
Hayanesh committed Sep 17, 2023
1 parent 8982fcc commit cc1c5c7
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 18 deletions.
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
/*
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.spring.resources;

import static java.util.logging.Level.FINE;

import com.google.auto.service.AutoService;
import io.opentelemetry.instrumentation.spring.resources.SpringBootServiceNameDetector.SystemHelper;
import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
import io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider;
import io.opentelemetry.sdk.resources.Resource;
Expand All @@ -12,7 +18,6 @@
import java.util.Optional;
import java.util.Properties;
import java.util.logging.Logger;
import io.opentelemetry.instrumentation.spring.resources.SpringBootServiceNameDetector.SystemHelper;

@AutoService(ResourceProvider.class)
public class SpringBootServiceVersionDetector implements ResourceProvider {
Expand All @@ -27,30 +32,30 @@ public SpringBootServiceVersionDetector() {
}

// Exists for testing
public SpringBootServiceVersionDetector(SystemHelper system){
public SpringBootServiceVersionDetector(SystemHelper system) {
this.system = system;
}

@Override
public Resource createResource(ConfigProperties config) {
return getServiceVersionFromBuildInfo()
.map(version -> {
logger.log(FINE, "Auto-detected Spring Boot service version: {0}", version);
return Resource.builder().put(ResourceAttributes.SERVICE_VERSION, version).build();
})
.map(
version -> {
logger.log(FINE, "Auto-detected Spring Boot service version: {0}", version);
return Resource.builder().put(ResourceAttributes.SERVICE_VERSION, version).build();
})
.orElseGet(Resource::empty);
}


private Optional<String> getServiceVersionFromBuildInfo(){
try(InputStream in = system.openClasspathResource("build-info.properties", "META-INF")){
private Optional<String> getServiceVersionFromBuildInfo() {
try (InputStream in = system.openClasspathResource("build-info.properties", "META-INF")) {
return getServiceVersionPropertyFromStream(in);
}catch (Exception e){
} catch (Exception e) {
return Optional.empty();
}
}

private static Optional<String> getServiceVersionPropertyFromStream(InputStream in){
private static Optional<String> getServiceVersionPropertyFromStream(InputStream in) {
Properties properties = new Properties();
try {
// Note: load() uses ISO 8859-1 encoding, same as spring uses by default for property files
Expand All @@ -60,5 +65,4 @@ private static Optional<String> getServiceVersionPropertyFromStream(InputStream
return Optional.empty();
}
}

}
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/*
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.spring.resources;

import static io.opentelemetry.semconv.ResourceAttributes.SERVICE_VERSION;
Expand All @@ -6,22 +11,20 @@

import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
import io.opentelemetry.sdk.resources.Resource;
import java.io.InputStream;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
import java.io.InputStream;

@ExtendWith(MockitoExtension.class)
class SpringBootServiceVersionDetectorTest {

static final String BUILD_PROPS = "build-info.properties";
static final String META_INFO = "META-INF";

@Mock
ConfigProperties config;
@Mock
SpringBootServiceNameDetector.SystemHelper system;
@Mock ConfigProperties config;
@Mock SpringBootServiceNameDetector.SystemHelper system;

@Test
void givenBuildVersionIsPresentInBuildInfProperties_thenReturnBuildVersion() {
Expand All @@ -36,5 +39,4 @@ void givenBuildVersionIsPresentInBuildInfProperties_thenReturnBuildVersion() {
private InputStream openClasspathResource(String resource) {
return getClass().getClassLoader().getResourceAsStream(resource);
}

}

0 comments on commit cc1c5c7

Please sign in to comment.