Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "Use faas.instance instead of faas.id in resource detection and mapping (#260) #269

Closed
wants to merge 1 commit into from
Closed

Revert "Use faas.instance instead of faas.id in resource detection and mapping (#260) #269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cloudbuild-e2e-cloud-functions-gen2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,5 @@ steps:

logsBucket: gs://opentelemetry-ops-e2e-cloud-build-logs
substitutions:
_TEST_RUNNER_IMAGE: gcr.io/${PROJECT_ID}/opentelemetry-operations-e2e-testing:0.17.0
_TEST_RUNNER_IMAGE: gcr.io/${PROJECT_ID}/opentelemetry-operations-e2e-testing:0.16.0
_TEST_SERVER_IMAGE: gcr.io/${PROJECT_ID}/opentelemetry-operations-java-e2e-test-server:${SHORT_SHA}
2 changes: 1 addition & 1 deletion cloudbuild-e2e-cloud-run.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@ steps:

logsBucket: gs://opentelemetry-ops-e2e-cloud-build-logs
substitutions:
_TEST_RUNNER_IMAGE: gcr.io/${PROJECT_ID}/opentelemetry-operations-e2e-testing:0.17.0
_TEST_RUNNER_IMAGE: gcr.io/${PROJECT_ID}/opentelemetry-operations-e2e-testing:0.16.0
_TEST_SERVER_IMAGE: gcr.io/${PROJECT_ID}/opentelemetry-operations-java-e2e-test-server:${SHORT_SHA}
2 changes: 1 addition & 1 deletion cloudbuild-e2e-gae.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,5 @@ steps:

logsBucket: gs://opentelemetry-ops-e2e-cloud-build-logs
substitutions:
_TEST_RUNNER_IMAGE: gcr.io/${PROJECT_ID}/opentelemetry-operations-e2e-testing:0.17.0
_TEST_RUNNER_IMAGE: gcr.io/${PROJECT_ID}/opentelemetry-operations-e2e-testing:0.16.0
_TEST_SERVER_IMAGE: gcr.io/${PROJECT_ID}/opentelemetry-operations-java-e2e-test-server:${SHORT_SHA}
2 changes: 1 addition & 1 deletion cloudbuild-e2e-gce.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@ steps:

logsBucket: gs://opentelemetry-ops-e2e-cloud-build-logs
substitutions:
_TEST_RUNNER_IMAGE: gcr.io/${PROJECT_ID}/opentelemetry-operations-e2e-testing:0.17.0
_TEST_RUNNER_IMAGE: gcr.io/${PROJECT_ID}/opentelemetry-operations-e2e-testing:0.16.0
_TEST_SERVER_IMAGE: gcr.io/${PROJECT_ID}/opentelemetry-operations-java-e2e-test-server:${SHORT_SHA}
2 changes: 1 addition & 1 deletion cloudbuild-e2e-gke.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@ steps:

logsBucket: gs://opentelemetry-ops-e2e-cloud-build-logs
substitutions:
_TEST_RUNNER_IMAGE: gcr.io/${PROJECT_ID}/opentelemetry-operations-e2e-testing:0.17.0
_TEST_RUNNER_IMAGE: gcr.io/${PROJECT_ID}/opentelemetry-operations-e2e-testing:0.16.0
_TEST_SERVER_IMAGE: gcr.io/${PROJECT_ID}/opentelemetry-operations-java-e2e-test-server:${SHORT_SHA}
2 changes: 1 addition & 1 deletion cloudbuild-e2e-local.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,5 @@ steps:

logsBucket: gs://opentelemetry-ops-e2e-cloud-build-logs
substitutions:
_TEST_RUNNER_IMAGE: gcr.io/${PROJECT_ID}/opentelemetry-operations-e2e-testing:0.17.0
_TEST_RUNNER_IMAGE: gcr.io/${PROJECT_ID}/opentelemetry-operations-e2e-testing:0.16.0
_TEST_SERVER_IMAGE: gcr.io/${PROJECT_ID}/opentelemetry-operations-java-e2e-test-server:${SHORT_SHA}
4 changes: 2 additions & 2 deletions ...urces/src/main/java/com/google/cloud/opentelemetry/detectors/AttributesExtractorUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ public static void addCloudRegionFromMetadataUsingRegion(
*
* <ul>
* <li>If the instance ID cannot be found, calling this method has no effect.
* <li>Calling this method will update {@link ResourceAttributes#FAAS_INSTANCE} attribute.
* <li>Calling this method will update {@link ResourceAttributes#FAAS_ID} attribute.
* </ul>
*
* @param attributesBuilder The {@link AttributesBuilder} to which the extracted property needs to
Expand All @@ -126,7 +126,7 @@ public static void addInstanceIdFromMetadata(
AttributesBuilder attributesBuilder, GCPMetadataConfig metadataConfig) {
String instanceId = metadataConfig.getInstanceId();
if (instanceId != null) {
attributesBuilder.put(ResourceAttributes.FAAS_INSTANCE, instanceId);
attributesBuilder.put(ResourceAttributes.FAAS_ID, instanceId);
}
}
}
2 changes: 1 addition & 1 deletion detectors/resources/src/main/java/com/google/cloud/opentelemetry/detectors/GCPResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ private boolean generateGAEAttributesIfApplicable(AttributesBuilder attrBuilder)

String appInstanceId = envVars.get("GAE_INSTANCE");
if (appInstanceId != null) {
attrBuilder.put(ResourceAttributes.FAAS_INSTANCE, appInstanceId);
attrBuilder.put(ResourceAttributes.FAAS_ID, appInstanceId);
}
updateAttributesWithRegion(attrBuilder);
AttributesExtractorUtil.addAvailabilityZoneFromMetadata(attrBuilder, metadata);
Expand Down
6 changes: 3 additions & 3 deletions ...ors/resources/src/test/java/com/google/cloud/opentelemetry/detectors/GCPResourceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ public void testGCFResourceWithCloudFunctionAttributesSucceeds() {
.containsEntry(ResourceAttributes.CLOUD_REGION, "country-region")
.containsEntry(ResourceAttributes.FAAS_NAME, envVars.get("K_SERVICE"))
.containsEntry(ResourceAttributes.FAAS_VERSION, envVars.get("K_REVISION"))
.containsEntry(ResourceAttributes.FAAS_INSTANCE, "GCF-instance-id");
.containsEntry(ResourceAttributes.FAAS_ID, "GCF-instance-id");
}

/** Google App Engine Tests * */
Expand Down Expand Up @@ -212,7 +212,7 @@ public void testGAEResourceWithAppEngineAttributesSucceedsInFlex() {
.containsEntry(ResourceAttributes.CLOUD_AVAILABILITY_ZONE, "country-region-zone")
.containsEntry(ResourceAttributes.FAAS_NAME, envVars.get("GAE_SERVICE"))
.containsEntry(ResourceAttributes.FAAS_VERSION, envVars.get("GAE_VERSION"))
.containsEntry(ResourceAttributes.FAAS_INSTANCE, envVars.get("GAE_INSTANCE"));
.containsEntry(ResourceAttributes.FAAS_ID, envVars.get("GAE_INSTANCE"));
}

@Test
Expand Down Expand Up @@ -241,7 +241,7 @@ public void testGAEResourceWithAppEngineAttributesSucceedsInStandard() {
.containsEntry(ResourceAttributes.CLOUD_AVAILABILITY_ZONE, "country-region-zone")
.containsEntry(ResourceAttributes.FAAS_NAME, envVars.get("GAE_SERVICE"))
.containsEntry(ResourceAttributes.FAAS_VERSION, envVars.get("GAE_VERSION"))
.containsEntry(ResourceAttributes.FAAS_INSTANCE, envVars.get("GAE_INSTANCE"));
.containsEntry(ResourceAttributes.FAAS_ID, envVars.get("GAE_INSTANCE"));
}

// Helper method to help stub endpoints
Expand Down
5 changes: 2 additions & 3 deletions ...urcemapping/src/main/java/com/google/cloud/opentelemetry/resource/ResourceTranslator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ public static AttributeMapping create(
Arrays.asList(
AttributeMapping.create("module_id", ResourceAttributes.FAAS_NAME),
AttributeMapping.create("version_id", ResourceAttributes.FAAS_VERSION),
AttributeMapping.create("instance_id", ResourceAttributes.FAAS_INSTANCE),
AttributeMapping.create("instance_id", ResourceAttributes.FAAS_ID),
AttributeMapping.create("location", ResourceAttributes.CLOUD_REGION));
private static List<AttributeMapping> GENERIC_TASK_LABELS =
Arrays.asList(
Expand All @@ -106,8 +106,7 @@ public static AttributeMapping create(
AttributeMapping.create("job", ResourceAttributes.SERVICE_NAME, ""),
AttributeMapping.create(
"task_id",
Arrays.asList(
ResourceAttributes.SERVICE_INSTANCE_ID, ResourceAttributes.FAAS_INSTANCE),
Arrays.asList(ResourceAttributes.SERVICE_INSTANCE_ID, ResourceAttributes.FAAS_ID),
""));

/** Converts a Java OpenTelemetry SDK resource into a GCP resource. */
Expand Down
Loading