Update dependencies to remove OSS vulnerabilities (#190)

psx95 · web-flow · commit d9ab659902ed · 2023-02-07T14:49:05.000-05:00
* Update dependencies to remove OSS vulnerabilities * Re-run cloud-build * Update the test runner image to 0.16.0 (latest) * Empty commit. Re-run the build image step * Fix failing tests Failing tests are due to an update in the gRPC version The updated version requires the build tool (gradle, in this case) to merge the service files. For more details look at grpc/grpc-java#5493. * Add missing attribute to GAE resource detector * Fix failing unit tests
diff --git a/build.gradle b/build.gradle
@@ -103,10 +103,10 @@ subprojects {
 	ext {
 		assertjVersion = '3.22.0'
 		autoServiceVersion = '1.0-rc7'
-		autoValueVersion = '1.7.4'
+		autoValueVersion = '1.10.1'
 		slf4jVersion = '1.7.30'
-		googleCloudVersion = '2.0.5'
-		googleTraceVersion = '2.0.0'
+		googleCloudVersion = '2.8.28'
+		googleTraceVersion = '2.1.12'
 		cloudMonitoringVersion = '3.0.0'
 		openTelemetryVersion = '1.15.0'
 		openTelemetryInstrumentationVersion = '1.14.0'
@@ -129,7 +129,7 @@ subprojects {
 			cloudevents_core : "io.cloudevents:cloudevents-core:${cloudEventsCoreVersion}",
 			google_cloud_core            : "com.google.cloud:google-cloud-core:${googleCloudVersion}",
 			google_cloud_trace           : "com.google.cloud:google-cloud-trace:${googleTraceVersion}",
-			google_cloud_trace_grpc      : "com.google.api.grpc:grpc-google-cloud-trace-v2:2.0.1",
+			google_cloud_trace_grpc      : "com.google.api.grpc:grpc-google-cloud-trace-v2:${googleTraceVersion}",
 			google_cloud_monitoring      : "com.google.cloud:google-cloud-monitoring:${cloudMonitoringVersion}",
 			google_cloud_monitoring_grpc : "com.google.cloud:grpc-google-cloud-monitoring-v3:${cloudMonitoringVersion}",
 			google_cloud_pubsub          : "com.google.cloud:google-cloud-pubsub:${pubSubVersion}",
diff --git a/cloudbuild-e2e-cloud-functions-gen2.yaml b/cloudbuild-e2e-cloud-functions-gen2.yaml
@@ -45,5 +45,5 @@ steps:
 
 logsBucket: gs://opentelemetry-ops-e2e-cloud-build-logs
 substitutions:
-  _TEST_RUNNER_IMAGE: gcr.io/${PROJECT_ID}/opentelemetry-operations-e2e-testing:0.15.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}
diff --git a/cloudbuild-e2e-cloud-run.yaml b/cloudbuild-e2e-cloud-run.yaml
@@ -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.15.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}
diff --git a/cloudbuild-e2e-gae.yaml b/cloudbuild-e2e-gae.yaml
@@ -34,5 +34,5 @@ steps:
 
 logsBucket: gs://opentelemetry-ops-e2e-cloud-build-logs
 substitutions:
-  _TEST_RUNNER_IMAGE: gcr.io/${PROJECT_ID}/opentelemetry-operations-e2e-testing:0.15.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}
diff --git a/cloudbuild-e2e-gce.yaml b/cloudbuild-e2e-gce.yaml
@@ -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.15.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}
diff --git a/cloudbuild-e2e-gke.yaml b/cloudbuild-e2e-gke.yaml
@@ -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.15.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}
diff --git a/cloudbuild-e2e-local.yaml b/cloudbuild-e2e-local.yaml
@@ -34,5 +34,5 @@ steps:
 
 logsBucket: gs://opentelemetry-ops-e2e-cloud-build-logs
 substitutions:
-  _TEST_RUNNER_IMAGE: gcr.io/${PROJECT_ID}/opentelemetry-operations-e2e-testing:0.15.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}
diff --git a/detectors/resources/src/main/java/com/google/cloud/opentelemetry/detectors/GCPResource.java b/detectors/resources/src/main/java/com/google/cloud/opentelemetry/detectors/GCPResource.java
@@ -289,6 +289,7 @@ private boolean generateGAEAttributesIfApplicable(AttributesBuilder attrBuilder)
         attrBuilder.put(ResourceAttributes.FAAS_ID, appInstanceId);
       }
       updateAttributesWithRegion(attrBuilder);
+      AttributesExtractorUtil.addAvailabilityZoneFromMetadata(attrBuilder, metadata);
       return true;
     }
     return false;
diff --git a/detectors/resources/src/test/java/com/google/cloud/opentelemetry/detectors/GCPResourceTest.java b/detectors/resources/src/test/java/com/google/cloud/opentelemetry/detectors/GCPResourceTest.java
@@ -200,13 +200,14 @@ public void testGAEResourceWithAppEngineAttributesSucceedsInFlex() {
 
     GCPResource testResource = new GCPResource(metadataConfig, new EnvVarMock(envVars));
     assertThat(testResource.getAttributes())
-        .hasSize(6)
+        .hasSize(7)
         .containsEntry(
             ResourceAttributes.CLOUD_PROVIDER, ResourceAttributes.CloudProviderValues.GCP)
         .containsEntry(
             ResourceAttributes.CLOUD_PLATFORM,
             ResourceAttributes.CloudPlatformValues.GCP_APP_ENGINE)
         .containsEntry(ResourceAttributes.CLOUD_REGION, "country-region")
+        .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_ID, envVars.get("GAE_INSTANCE"));
@@ -228,13 +229,14 @@ public void testGAEResourceWithAppEngineAttributesSucceedsInStandard() {
     updatedEnvVars.put("GAE_ENV", "standard");
     GCPResource testResource = new GCPResource(metadataConfig, new EnvVarMock(updatedEnvVars));
     assertThat(testResource.getAttributes())
-        .hasSize(6)
+        .hasSize(7)
         .containsEntry(
             ResourceAttributes.CLOUD_PROVIDER, ResourceAttributes.CloudProviderValues.GCP)
         .containsEntry(
             ResourceAttributes.CLOUD_PLATFORM,
             ResourceAttributes.CloudPlatformValues.GCP_APP_ENGINE)
         .containsEntry(ResourceAttributes.CLOUD_REGION, "country-region1")
+        .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_ID, envVars.get("GAE_INSTANCE"));
diff --git a/e2e-test-server/build.gradle b/e2e-test-server/build.gradle
@@ -25,6 +25,10 @@ application {
 
 description = 'End-To-End integration testing server'
 
+shadowJar {
+	mergeServiceFiles()
+}
+
 dependencies {
 	implementation(libraries.opentelemetry_autoconfigure)
 	implementation(libraries.opentelemetry_api)
diff --git a/exporters/auto/build.gradle b/exporters/auto/build.gradle
@@ -44,6 +44,7 @@ dependencies {
 
 shadowJar{
 	classifier = null
+	mergeServiceFiles()
 }
 
 publishing {
diff --git a/shared/resourcemapping/build.gradle b/shared/resourcemapping/build.gradle
@@ -40,6 +40,7 @@ shadowJar{
 		exclude(dependency(libraries.opentelemetry_sdk_common))
 		exclude(dependency(libraries.opentelemetry_context))
 	}
+	mergeServiceFiles()
 }
 
 publishing {

Original file line number	Diff line number	Diff line change
`@@ -289,6 +289,7 @@ private boolean generateGAEAttributesIfApplicable(AttributesBuilder attrBuilder)`
`289`	`289`	`attrBuilder.put(ResourceAttributes.FAAS_ID, appInstanceId);`
`290`	`290`	`}`
`291`	`291`	`updateAttributesWithRegion(attrBuilder);`
	`292`	`+ AttributesExtractorUtil.addAvailabilityZoneFromMetadata(attrBuilder, metadata);`
`292`	`293`	`return true;`
`293`	`294`	`}`
`294`	`295`	`return false;`