From 4b1c4b6064a6ec4936d6d0ec8b9b207c8b972bcd Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Sun, 19 Jan 2025 19:35:03 -0800 Subject: [PATCH] fix --- .../azure/resource/AzureVmResourceProvider.java | 15 ++++++++++++--- .../MetadataBasedResourceProviderTest.java | 10 +++++++++- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/azure-resources/src/main/java/io/opentelemetry/contrib/azure/resource/AzureVmResourceProvider.java b/azure-resources/src/main/java/io/opentelemetry/contrib/azure/resource/AzureVmResourceProvider.java index 139b808d4..fe5979ab9 100644 --- a/azure-resources/src/main/java/io/opentelemetry/contrib/azure/resource/AzureVmResourceProvider.java +++ b/azure-resources/src/main/java/io/opentelemetry/contrib/azure/resource/AzureVmResourceProvider.java @@ -88,22 +88,31 @@ public int order() { } @Override + @SuppressWarnings("SystemOut") public Resource createResource(ConfigProperties config) { - return client - .get() + System.out.println("AzureVmResourceProvider.createResource"); + Optional optional = client.get(); + System.out.println("optional.isPresent: " + optional.isPresent()); + System.out.println("optional: " + optional); + return optional .map(body -> parseMetadata(body, COMPUTE_MAPPING, AZURE_VM)) .orElse(Resource.empty()); } + @SuppressWarnings("SystemOut") static Resource parseMetadata(String body, Map computeMapping, String platform) { + System.out.println("AzureVmResourceProvider.parseMetadata"); AttributesBuilder builder = azureAttributeBuilder(platform); try (JsonParser parser = AzureMetadataService.JSON_FACTORY.createParser(body)) { parser.nextToken(); parseResponse(parser, builder, computeMapping); } catch (IOException e) { + System.out.println(e.getMessage()); logger.log(Level.FINE, "Can't get Azure VM metadata", e); } - return Resource.create(builder.build()); + Attributes build = builder.build(); + System.out.println("build: " + build); + return Resource.create(build); } @NotNull diff --git a/azure-resources/src/test/java/io/opentelemetry/contrib/azure/resource/MetadataBasedResourceProviderTest.java b/azure-resources/src/test/java/io/opentelemetry/contrib/azure/resource/MetadataBasedResourceProviderTest.java index d43010657..bc84ad827 100644 --- a/azure-resources/src/test/java/io/opentelemetry/contrib/azure/resource/MetadataBasedResourceProviderTest.java +++ b/azure-resources/src/test/java/io/opentelemetry/contrib/azure/resource/MetadataBasedResourceProviderTest.java @@ -27,8 +27,12 @@ import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import org.junit.jupiter.api.parallel.Execution; +import org.junit.jupiter.api.parallel.ExecutionMode; +@Execution(ExecutionMode.SAME_THREAD) public abstract class MetadataBasedResourceProviderTest { + @RegisterExtension public static final MockWebServerExtension server = new MockWebServerExtension(); @@ -50,7 +54,11 @@ private AttributesAssert createResource(Supplier> client) { String response = client.get().orElse(null); System.out.println("response: " + response); client = () -> Optional.ofNullable(response); - Resource resource = getResourceProvider(client).createResource(null); + ResourceProvider resourceProvider = getResourceProvider(client); + System.out.println("resourceProvider: " + resourceProvider); + Resource resource = resourceProvider.createResource(null); + System.out.println("resource: " + resource); + System.out.println("resource.getAttributes(): " + resource.getAttributes()); return OpenTelemetryAssertions.assertThat(resource.getAttributes()); }