Skip to content

Commit 37a34fd

Browse files
committed
fix
1 parent 13ae4fb commit 37a34fd

File tree

3 files changed

+31
-5
lines changed

3 files changed

+31
-5
lines changed

azure-resources/src/main/java/io/opentelemetry/contrib/azure/resource/AzureMetadataService.java

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import okhttp3.OkHttpClient;
1919
import okhttp3.Request;
2020
import okhttp3.Response;
21+
import okhttp3.ResponseBody;
2122

2223
public class AzureMetadataService {
2324
static final JsonFactory JSON_FACTORY = new JsonFactory();
@@ -42,7 +43,9 @@ static Supplier<Optional<String>> defaultClient() {
4243
}
4344

4445
// visible for testing
46+
@SuppressWarnings("SystemOut")
4547
static Optional<String> fetchMetadata(URL url) {
48+
System.out.println("fetchMetadata: " + url);
4649
OkHttpClient client =
4750
new OkHttpClient.Builder()
4851
.callTimeout(TIMEOUT)
@@ -54,6 +57,7 @@ static Optional<String> fetchMetadata(URL url) {
5457

5558
try (Response response = client.newCall(request).execute()) {
5659
int responseCode = response.code();
60+
System.out.println("responseCode: " + responseCode);
5761
if (responseCode != 200) {
5862
logger.log(
5963
Level.FINE,
@@ -66,8 +70,13 @@ static Optional<String> fetchMetadata(URL url) {
6670
return Optional.empty();
6771
}
6872

69-
return Optional.of(Objects.requireNonNull(response.body()).string());
73+
ResponseBody body = response.body();
74+
System.out.println("body: " + body);
75+
String str = Objects.requireNonNull(body).string();
76+
System.out.println("str: " + str);
77+
return Optional.of(str);
7078
} catch (IOException e) {
79+
System.out.println(e.getMessage());
7180
logger.log(Level.FINE, "Failed to fetch Azure VM metadata", e);
7281
return Optional.empty();
7382
}

azure-resources/src/main/java/io/opentelemetry/contrib/azure/resource/AzureVmResourceProvider.java

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,22 +88,31 @@ public int order() {
8888
}
8989

9090
@Override
91+
@SuppressWarnings("SystemOut")
9192
public Resource createResource(ConfigProperties config) {
92-
return client
93-
.get()
93+
System.out.println("AzureVmResourceProvider.createResource");
94+
Optional<String> optional = client.get();
95+
System.out.println("optional.isPresent: " + optional.isPresent());
96+
System.out.println("optional: " + optional);
97+
return optional
9498
.map(body -> parseMetadata(body, COMPUTE_MAPPING, AZURE_VM))
9599
.orElse(Resource.empty());
96100
}
97101

102+
@SuppressWarnings("SystemOut")
98103
static Resource parseMetadata(String body, Map<String, Entry> computeMapping, String platform) {
104+
System.out.println("AzureVmResourceProvider.parseMetadata");
99105
AttributesBuilder builder = azureAttributeBuilder(platform);
100106
try (JsonParser parser = AzureMetadataService.JSON_FACTORY.createParser(body)) {
101107
parser.nextToken();
102108
parseResponse(parser, builder, computeMapping);
103109
} catch (IOException e) {
110+
System.out.println(e.getMessage());
104111
logger.log(Level.FINE, "Can't get Azure VM metadata", e);
105112
}
106-
return Resource.create(builder.build());
113+
Attributes build = builder.build();
114+
System.out.println("build: " + build);
115+
return Resource.create(build);
107116
}
108117

109118
@NotNull

azure-resources/src/test/java/io/opentelemetry/contrib/azure/resource/MetadataBasedResourceProviderTest.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,12 @@
2727
import org.jetbrains.annotations.NotNull;
2828
import org.junit.jupiter.api.Test;
2929
import org.junit.jupiter.api.extension.RegisterExtension;
30+
import org.junit.jupiter.api.parallel.Execution;
31+
import org.junit.jupiter.api.parallel.ExecutionMode;
3032

33+
@Execution(ExecutionMode.SAME_THREAD)
3134
public abstract class MetadataBasedResourceProviderTest {
35+
3236
@RegisterExtension
3337
public static final MockWebServerExtension server = new MockWebServerExtension();
3438

@@ -50,7 +54,11 @@ private AttributesAssert createResource(Supplier<Optional<String>> client) {
5054
String response = client.get().orElse(null);
5155
System.out.println("response: " + response);
5256
client = () -> Optional.ofNullable(response);
53-
Resource resource = getResourceProvider(client).createResource(null);
57+
ResourceProvider resourceProvider = getResourceProvider(client);
58+
System.out.println("resourceProvider: " + resourceProvider);
59+
Resource resource = resourceProvider.createResource(null);
60+
System.out.println("resource: " + resource);
61+
System.out.println("resource.getAttributes(): " + resource.getAttributes());
5462
return OpenTelemetryAssertions.assertThat(resource.getAttributes());
5563
}
5664

0 commit comments

Comments
 (0)