Skip to content

Commit 4ecc4f4

Browse files
dashpoledashpole
authored
Use faas.instance instead of faas.id in resource detection and mapping (#260)
change faas.id usage to faas.instance
1 parent b50338b commit 4ecc4f4

File tree

10 files changed

+15
-14
lines changed

10 files changed

+15
-14
lines changed

‎cloudbuild-e2e-cloud-functions-gen2.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,5 +44,5 @@ steps:
4444

4545
logsBucket: gs://opentelemetry-ops-e2e-cloud-build-logs
4646
substitutions:
47-
_TEST_RUNNER_IMAGE: gcr.io/${PROJECT_ID}/opentelemetry-operations-e2e-testing:0.16.0
47+
_TEST_RUNNER_IMAGE: gcr.io/${PROJECT_ID}/opentelemetry-operations-e2e-testing:0.17.0
4848
_TEST_SERVER_IMAGE: gcr.io/${PROJECT_ID}/opentelemetry-operations-java-e2e-test-server:${SHORT_SHA}

‎cloudbuild-e2e-cloud-run.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@ steps:
3232

3333
logsBucket: gs://opentelemetry-ops-e2e-cloud-build-logs
3434
substitutions:
35-
_TEST_RUNNER_IMAGE: gcr.io/${PROJECT_ID}/opentelemetry-operations-e2e-testing:0.16.0
35+
_TEST_RUNNER_IMAGE: gcr.io/${PROJECT_ID}/opentelemetry-operations-e2e-testing:0.17.0
3636
_TEST_SERVER_IMAGE: gcr.io/${PROJECT_ID}/opentelemetry-operations-java-e2e-test-server:${SHORT_SHA}

‎cloudbuild-e2e-gae.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,5 @@ steps:
3333

3434
logsBucket: gs://opentelemetry-ops-e2e-cloud-build-logs
3535
substitutions:
36-
_TEST_RUNNER_IMAGE: gcr.io/${PROJECT_ID}/opentelemetry-operations-e2e-testing:0.16.0
36+
_TEST_RUNNER_IMAGE: gcr.io/${PROJECT_ID}/opentelemetry-operations-e2e-testing:0.17.0
3737
_TEST_SERVER_IMAGE: gcr.io/${PROJECT_ID}/opentelemetry-operations-java-e2e-test-server:${SHORT_SHA}

‎cloudbuild-e2e-gce.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@ steps:
3232

3333
logsBucket: gs://opentelemetry-ops-e2e-cloud-build-logs
3434
substitutions:
35-
_TEST_RUNNER_IMAGE: gcr.io/${PROJECT_ID}/opentelemetry-operations-e2e-testing:0.16.0
35+
_TEST_RUNNER_IMAGE: gcr.io/${PROJECT_ID}/opentelemetry-operations-e2e-testing:0.17.0
3636
_TEST_SERVER_IMAGE: gcr.io/${PROJECT_ID}/opentelemetry-operations-java-e2e-test-server:${SHORT_SHA}

‎cloudbuild-e2e-gke.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@ steps:
3232

3333
logsBucket: gs://opentelemetry-ops-e2e-cloud-build-logs
3434
substitutions:
35-
_TEST_RUNNER_IMAGE: gcr.io/${PROJECT_ID}/opentelemetry-operations-e2e-testing:0.16.0
35+
_TEST_RUNNER_IMAGE: gcr.io/${PROJECT_ID}/opentelemetry-operations-e2e-testing:0.17.0
3636
_TEST_SERVER_IMAGE: gcr.io/${PROJECT_ID}/opentelemetry-operations-java-e2e-test-server:${SHORT_SHA}

‎cloudbuild-e2e-local.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,5 @@ steps:
3333

3434
logsBucket: gs://opentelemetry-ops-e2e-cloud-build-logs
3535
substitutions:
36-
_TEST_RUNNER_IMAGE: gcr.io/${PROJECT_ID}/opentelemetry-operations-e2e-testing:0.16.0
36+
_TEST_RUNNER_IMAGE: gcr.io/${PROJECT_ID}/opentelemetry-operations-e2e-testing:0.17.0
3737
_TEST_SERVER_IMAGE: gcr.io/${PROJECT_ID}/opentelemetry-operations-java-e2e-test-server:${SHORT_SHA}

‎detectors/resources/src/main/java/com/google/cloud/opentelemetry/detectors/AttributesExtractorUtil.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ public static void addCloudRegionFromMetadataUsingRegion(
114114
*
115115
* <ul>
116116
* <li>If the instance ID cannot be found, calling this method has no effect.
117-
* <li>Calling this method will update {@link ResourceAttributes#FAAS_ID} attribute.
117+
* <li>Calling this method will update {@link ResourceAttributes#FAAS_INSTANCE} attribute.
118118
* </ul>
119119
*
120120
* @param attributesBuilder The {@link AttributesBuilder} to which the extracted property needs to
@@ -126,7 +126,7 @@ public static void addInstanceIdFromMetadata(
126126
AttributesBuilder attributesBuilder, GCPMetadataConfig metadataConfig) {
127127
String instanceId = metadataConfig.getInstanceId();
128128
if (instanceId != null) {
129-
attributesBuilder.put(ResourceAttributes.FAAS_ID, instanceId);
129+
attributesBuilder.put(ResourceAttributes.FAAS_INSTANCE, instanceId);
130130
}
131131
}
132132
}

‎detectors/resources/src/main/java/com/google/cloud/opentelemetry/detectors/GCPResource.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ private boolean generateGAEAttributesIfApplicable(AttributesBuilder attrBuilder)
286286

287287
String appInstanceId = envVars.get("GAE_INSTANCE");
288288
if (appInstanceId != null) {
289-
attrBuilder.put(ResourceAttributes.FAAS_ID, appInstanceId);
289+
attrBuilder.put(ResourceAttributes.FAAS_INSTANCE, appInstanceId);
290290
}
291291
updateAttributesWithRegion(attrBuilder);
292292
AttributesExtractorUtil.addAvailabilityZoneFromMetadata(attrBuilder, metadata);

‎detectors/resources/src/test/java/com/google/cloud/opentelemetry/detectors/GCPResourceTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ public void testGCFResourceWithCloudFunctionAttributesSucceeds() {
184184
.containsEntry(ResourceAttributes.CLOUD_REGION, "country-region")
185185
.containsEntry(ResourceAttributes.FAAS_NAME, envVars.get("K_SERVICE"))
186186
.containsEntry(ResourceAttributes.FAAS_VERSION, envVars.get("K_REVISION"))
187-
.containsEntry(ResourceAttributes.FAAS_ID, "GCF-instance-id");
187+
.containsEntry(ResourceAttributes.FAAS_INSTANCE, "GCF-instance-id");
188188
}
189189

190190
/** Google App Engine Tests * */
@@ -212,7 +212,7 @@ public void testGAEResourceWithAppEngineAttributesSucceedsInFlex() {
212212
.containsEntry(ResourceAttributes.CLOUD_AVAILABILITY_ZONE, "country-region-zone")
213213
.containsEntry(ResourceAttributes.FAAS_NAME, envVars.get("GAE_SERVICE"))
214214
.containsEntry(ResourceAttributes.FAAS_VERSION, envVars.get("GAE_VERSION"))
215-
.containsEntry(ResourceAttributes.FAAS_ID, envVars.get("GAE_INSTANCE"));
215+
.containsEntry(ResourceAttributes.FAAS_INSTANCE, envVars.get("GAE_INSTANCE"));
216216
}
217217

218218
@Test
@@ -241,7 +241,7 @@ public void testGAEResourceWithAppEngineAttributesSucceedsInStandard() {
241241
.containsEntry(ResourceAttributes.CLOUD_AVAILABILITY_ZONE, "country-region-zone")
242242
.containsEntry(ResourceAttributes.FAAS_NAME, envVars.get("GAE_SERVICE"))
243243
.containsEntry(ResourceAttributes.FAAS_VERSION, envVars.get("GAE_VERSION"))
244-
.containsEntry(ResourceAttributes.FAAS_ID, envVars.get("GAE_INSTANCE"));
244+
.containsEntry(ResourceAttributes.FAAS_INSTANCE, envVars.get("GAE_INSTANCE"));
245245
}
246246

247247
// Helper method to help stub endpoints

‎shared/resourcemapping/src/main/java/com/google/cloud/opentelemetry/resource/ResourceTranslator.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public static AttributeMapping create(
9393
Arrays.asList(
9494
AttributeMapping.create("module_id", ResourceAttributes.FAAS_NAME),
9595
AttributeMapping.create("version_id", ResourceAttributes.FAAS_VERSION),
96-
AttributeMapping.create("instance_id", ResourceAttributes.FAAS_ID),
96+
AttributeMapping.create("instance_id", ResourceAttributes.FAAS_INSTANCE),
9797
AttributeMapping.create("location", ResourceAttributes.CLOUD_REGION));
9898
private static List<AttributeMapping> GENERIC_TASK_LABELS =
9999
Arrays.asList(
@@ -106,7 +106,8 @@ public static AttributeMapping create(
106106
AttributeMapping.create("job", ResourceAttributes.SERVICE_NAME, ""),
107107
AttributeMapping.create(
108108
"task_id",
109-
Arrays.asList(ResourceAttributes.SERVICE_INSTANCE_ID, ResourceAttributes.FAAS_ID),
109+
Arrays.asList(
110+
ResourceAttributes.SERVICE_INSTANCE_ID, ResourceAttributes.FAAS_INSTANCE),
110111
""));
111112

112113
/** Converts a Java OpenTelemetry SDK resource into a GCP resource. */

0 commit comments

Comments
 (0)