Skip to content

Commit 9cd5ec5

Browse files
heyamszeitlinger
heyams
authored and
zeitlinger
committed
Fix tests
1 parent 68dbb23 commit 9cd5ec5

File tree

4 files changed

+65
-38
lines changed

4 files changed

+65
-38
lines changed

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

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,18 @@
55

66
package io.opentelemetry.contrib.azure.resource;
77

8+
import static io.opentelemetry.semconv.ServiceAttributes.SERVICE_NAME;
9+
import static io.opentelemetry.semconv.incubating.CloudIncubatingAttributes.CLOUD_PLATFORM;
10+
import static io.opentelemetry.semconv.incubating.CloudIncubatingAttributes.CLOUD_PROVIDER;
11+
import static io.opentelemetry.semconv.incubating.CloudIncubatingAttributes.CLOUD_REGION;
12+
import static io.opentelemetry.semconv.incubating.CloudIncubatingAttributes.CLOUD_RESOURCE_ID;
13+
import static io.opentelemetry.semconv.incubating.DeploymentIncubatingAttributes.DEPLOYMENT_ENVIRONMENT;
14+
import static io.opentelemetry.semconv.incubating.HostIncubatingAttributes.HOST_ID;
15+
import static io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes.SERVICE_INSTANCE_ID;
16+
817
import com.google.common.collect.ImmutableMap;
918
import io.opentelemetry.sdk.testing.assertj.AttributesAssert;
1019
import io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions;
11-
import io.opentelemetry.semconv.ResourceAttributes;
1220
import java.util.HashMap;
1321
import java.util.Map;
1422
import org.jetbrains.annotations.NotNull;
@@ -38,16 +46,16 @@ class AzureAppServiceResourceProviderTest {
3846
@Test
3947
void defaultValues() {
4048
createResource(DEFAULT_ENV_VARS)
41-
.containsEntry(ResourceAttributes.SERVICE_NAME, TEST_WEBSITE_SITE_NAME)
42-
.containsEntry(ResourceAttributes.CLOUD_PROVIDER, "azure")
43-
.containsEntry(ResourceAttributes.CLOUD_PLATFORM, "azure_app_service")
49+
.containsEntry(SERVICE_NAME, TEST_WEBSITE_SITE_NAME)
50+
.containsEntry(CLOUD_PROVIDER, "azure")
51+
.containsEntry(CLOUD_PLATFORM, "azure_app_service")
4452
.containsEntry(
45-
ResourceAttributes.CLOUD_RESOURCE_ID,
53+
CLOUD_RESOURCE_ID,
4654
"/subscriptions/TEST_WEBSITE_OWNER_NAME/resourceGroups/TEST_WEBSITE_RESOURCE_GROUP/providers/Microsoft.Web/sites/TEST_WEBSITE_SITE_NAME")
47-
.containsEntry(ResourceAttributes.CLOUD_REGION, TEST_REGION_NAME)
48-
.containsEntry(ResourceAttributes.DEPLOYMENT_ENVIRONMENT, TEST_WEBSITE_SLOT_NAME)
49-
.containsEntry(ResourceAttributes.HOST_ID, TEST_WEBSITE_HOSTNAME)
50-
.containsEntry(ResourceAttributes.SERVICE_INSTANCE_ID, TEST_WEBSITE_INSTANCE_ID)
55+
.containsEntry(CLOUD_REGION, TEST_REGION_NAME)
56+
.containsEntry(DEPLOYMENT_ENVIRONMENT, TEST_WEBSITE_SLOT_NAME)
57+
.containsEntry(HOST_ID, TEST_WEBSITE_HOSTNAME)
58+
.containsEntry(SERVICE_INSTANCE_ID, TEST_WEBSITE_INSTANCE_ID)
5159
.containsEntry(
5260
AzureAppServiceResourceProvider.AZURE_APP_SERVICE_STAMP_RESOURCE_ATTRIBUTE,
5361
TEST_WEBSITE_HOME_STAMPNAME);
@@ -60,7 +68,7 @@ void subscriptionFromOwner() {
6068

6169
createResource(map)
6270
.containsEntry(
63-
ResourceAttributes.CLOUD_RESOURCE_ID,
71+
CLOUD_RESOURCE_ID,
6472
"/subscriptions/foo/resourceGroups/TEST_WEBSITE_RESOURCE_GROUP/providers/Microsoft.Web/sites/TEST_WEBSITE_SITE_NAME");
6573
}
6674

@@ -69,7 +77,7 @@ void noResourceId() {
6977
HashMap<String, String> map = new HashMap<>(DEFAULT_ENV_VARS);
7078
map.remove("WEBSITE_RESOURCE_GROUP");
7179

72-
createResource(map).doesNotContainKey(ResourceAttributes.CLOUD_RESOURCE_ID);
80+
createResource(map).doesNotContainKey(CLOUD_RESOURCE_ID);
7381
}
7482

7583
@Test

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

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,15 @@
55

66
package io.opentelemetry.contrib.azure.resource;
77

8+
import static io.opentelemetry.semconv.ServiceAttributes.SERVICE_NAME;
9+
import static io.opentelemetry.semconv.ServiceAttributes.SERVICE_VERSION;
10+
import static io.opentelemetry.semconv.incubating.CloudIncubatingAttributes.CLOUD_PLATFORM;
11+
import static io.opentelemetry.semconv.incubating.CloudIncubatingAttributes.CLOUD_PROVIDER;
12+
import static io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes.SERVICE_INSTANCE_ID;
13+
814
import com.google.common.collect.ImmutableMap;
915
import io.opentelemetry.sdk.testing.assertj.AttributesAssert;
1016
import io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions;
11-
import io.opentelemetry.semconv.ResourceAttributes;
1217
import java.util.HashMap;
1318
import java.util.Map;
1419
import org.jetbrains.annotations.NotNull;
@@ -28,11 +33,11 @@ class AzureContainersResourceProviderTest {
2833
@Test
2934
void defaultValues() {
3035
createResource(DEFAULT_ENV_VARS)
31-
.containsEntry(ResourceAttributes.CLOUD_PROVIDER, "azure")
32-
.containsEntry(ResourceAttributes.CLOUD_PLATFORM, "azure_container_apps")
33-
.containsEntry(ResourceAttributes.SERVICE_NAME, TEST_APP_NAME)
34-
.containsEntry(ResourceAttributes.SERVICE_INSTANCE_ID, TEST_REPLICA_NAME)
35-
.containsEntry(ResourceAttributes.SERVICE_VERSION, TEST_REVISION);
36+
.containsEntry(CLOUD_PROVIDER, "azure")
37+
.containsEntry(CLOUD_PLATFORM, "azure_container_apps")
38+
.containsEntry(SERVICE_NAME, TEST_APP_NAME)
39+
.containsEntry(SERVICE_INSTANCE_ID, TEST_REPLICA_NAME)
40+
.containsEntry(SERVICE_VERSION, TEST_REVISION);
3641
}
3742

3843
@Test

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

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,16 @@
55

66
package io.opentelemetry.contrib.azure.resource;
77

8+
import static io.opentelemetry.semconv.incubating.CloudIncubatingAttributes.CLOUD_PLATFORM;
9+
import static io.opentelemetry.semconv.incubating.CloudIncubatingAttributes.CLOUD_PROVIDER;
10+
import static io.opentelemetry.semconv.incubating.FaasIncubatingAttributes.FAAS_INSTANCE;
11+
import static io.opentelemetry.semconv.incubating.FaasIncubatingAttributes.FAAS_MAX_MEMORY;
12+
import static io.opentelemetry.semconv.incubating.FaasIncubatingAttributes.FAAS_NAME;
13+
import static io.opentelemetry.semconv.incubating.FaasIncubatingAttributes.FAAS_VERSION;
14+
815
import com.google.common.collect.ImmutableMap;
916
import io.opentelemetry.sdk.testing.assertj.AttributesAssert;
1017
import io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions;
11-
import io.opentelemetry.semconv.ResourceAttributes;
1218
import java.util.HashMap;
1319
import java.util.Map;
1420
import org.jetbrains.annotations.NotNull;
@@ -31,12 +37,12 @@ class AzureFunctionsResourceProviderTest {
3137
@Test
3238
void defaultValues() {
3339
createResource(DEFAULT_ENV_VARS)
34-
.containsEntry(ResourceAttributes.CLOUD_PROVIDER, "azure")
35-
.containsEntry(ResourceAttributes.CLOUD_PLATFORM, "azure_functions")
36-
.containsEntry(ResourceAttributes.FAAS_NAME, TEST_WEBSITE_SITE_NAME)
37-
.containsEntry(ResourceAttributes.FAAS_VERSION, TEST_FUNCTION_VERSION)
38-
.containsEntry(ResourceAttributes.FAAS_INSTANCE, TEST_WEBSITE_INSTANCE_ID)
39-
.containsEntry(ResourceAttributes.FAAS_MAX_MEMORY, Long.parseLong(TEST_MEM_LIMIT));
40+
.containsEntry(CLOUD_PROVIDER, "azure")
41+
.containsEntry(CLOUD_PLATFORM, "azure_functions")
42+
.containsEntry(FAAS_NAME, TEST_WEBSITE_SITE_NAME)
43+
.containsEntry(FAAS_VERSION, TEST_FUNCTION_VERSION)
44+
.containsEntry(FAAS_INSTANCE, TEST_WEBSITE_INSTANCE_ID)
45+
.containsEntry(FAAS_MAX_MEMORY, Long.parseLong(TEST_MEM_LIMIT));
4046
}
4147

4248
@Test

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

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,16 @@
55

66
package io.opentelemetry.contrib.azure.resource;
77

8+
import static io.opentelemetry.semconv.incubating.CloudIncubatingAttributes.CLOUD_PLATFORM;
9+
import static io.opentelemetry.semconv.incubating.CloudIncubatingAttributes.CLOUD_PROVIDER;
10+
import static io.opentelemetry.semconv.incubating.CloudIncubatingAttributes.CLOUD_REGION;
11+
import static io.opentelemetry.semconv.incubating.CloudIncubatingAttributes.CLOUD_RESOURCE_ID;
12+
import static io.opentelemetry.semconv.incubating.HostIncubatingAttributes.HOST_ID;
13+
import static io.opentelemetry.semconv.incubating.HostIncubatingAttributes.HOST_NAME;
14+
import static io.opentelemetry.semconv.incubating.HostIncubatingAttributes.HOST_TYPE;
15+
import static io.opentelemetry.semconv.incubating.OsIncubatingAttributes.OS_TYPE;
16+
import static org.mockito.internal.util.Platform.OS_VERSION;
17+
818
import com.google.common.base.Charsets;
919
import com.google.common.io.CharStreams;
1020
import com.linecorp.armeria.common.HttpResponse;
@@ -14,7 +24,7 @@
1424
import io.opentelemetry.sdk.resources.Resource;
1525
import io.opentelemetry.sdk.testing.assertj.AttributesAssert;
1626
import io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions;
17-
import io.opentelemetry.semconv.ResourceAttributes;
27+
import io.opentelemetry.semconv.incubating.CloudIncubatingAttributes;
1828
import java.io.IOException;
1929
import java.io.InputStreamReader;
2030
import java.net.MalformedURLException;
@@ -80,25 +90,23 @@ private static AttributesAssert createResource(Supplier<Optional<String>> client
8090
private static void assertOnlyProvider(AttributesAssert attributesAssert) {
8191
attributesAssert
8292
.hasSize(2)
83-
.containsEntry(ResourceAttributes.CLOUD_PROVIDER, "azure")
84-
.containsEntry(
85-
ResourceAttributes.CLOUD_PLATFORM, ResourceAttributes.CloudPlatformValues.AZURE_VM);
93+
.containsEntry(CLOUD_PROVIDER, "azure")
94+
.containsEntry(CLOUD_PLATFORM, CloudIncubatingAttributes.CloudPlatformValues.AZURE_VM);
8695
}
8796

8897
private static void assertDefaultAttributes(AttributesAssert attributesAssert) {
8998
attributesAssert
90-
.containsEntry(ResourceAttributes.CLOUD_PROVIDER, "azure")
91-
.containsEntry(
92-
ResourceAttributes.CLOUD_PLATFORM, ResourceAttributes.CloudPlatformValues.AZURE_VM)
93-
.containsEntry(ResourceAttributes.CLOUD_REGION, "westus")
99+
.containsEntry(CLOUD_PROVIDER, "azure")
100+
.containsEntry(CLOUD_PLATFORM, CloudIncubatingAttributes.CloudPlatformValues.AZURE_VM)
101+
.containsEntry(CLOUD_REGION, "westus")
94102
.containsEntry(
95-
ResourceAttributes.CLOUD_RESOURCE_ID,
103+
CLOUD_RESOURCE_ID,
96104
"/subscriptions/xxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxx/resourceGroups/macikgo-test-may-23/providers/Microsoft.Compute/virtualMachines/examplevmname")
97-
.containsEntry(ResourceAttributes.HOST_ID, "02aab8a4-74ef-476e-8182-f6d2ba4166a6")
98-
.containsEntry(ResourceAttributes.HOST_NAME, "examplevmname")
99-
.containsEntry(ResourceAttributes.HOST_TYPE, "Standard_A3")
100-
.containsEntry(ResourceAttributes.OS_TYPE, "Linux")
101-
.containsEntry(ResourceAttributes.OS_VERSION, "15.05.22")
105+
.containsEntry(HOST_ID, "02aab8a4-74ef-476e-8182-f6d2ba4166a6")
106+
.containsEntry(HOST_NAME, "examplevmname")
107+
.containsEntry(HOST_TYPE, "Standard_A3")
108+
.containsEntry(OS_TYPE, "Linux")
109+
.containsEntry(OS_VERSION, "15.05.22")
102110
.containsEntry("azure.vm.scaleset.name", "crpteste9vflji9")
103111
.containsEntry("azure.vm.sku", "18.04-LTS");
104112
}

0 commit comments

Comments
 (0)