Merge branch 'main' into gemini-context

Author: chingor13

.github/workflows/ci.yaml

@@ -20,8 +20,33 @@ on:
   pull_request:
 name: ci
 jobs:
+  # detect whether or note we should run "bulk" (non-handwritten) unit tests
+  bulk-filter:
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: read
+    # Set job outputs to values from filter step
+    outputs:
+      src: ${{ steps.filter.outputs.src }}
+      ci: ${{ steps.filter.outputs.ci }}
+    steps:
+    - uses: actions/checkout@v4
+    - uses: dorny/paths-filter@v3
+      id: filter
+      with:
+        # we want to run tests if source code is changed or the scripts
+        # used to run the unit tests
+        filters: |
+          src:
+            - '**/*.java'
+            - '**/pom.xml'
+          ci:
+            - '.github/workflows/ci.yaml'
+            - '.kokoro/**'
+  # these unit tests are "bulk" (non-handwritten) libraries
   units:
     runs-on: ubuntu-latest
+    needs: bulk-filter
     strategy:
       fail-fast: false
       matrix:
@@ -42,11 +67,13 @@ jobs:
         path: ~/.m2/repository
         key: ${{ runner.os }}-maven-unified-${{ steps.date.outputs.week_of_year }}
     - run: .kokoro/build.sh
+      if: ${{ needs.bulk-filter.outputs.src == 'true' || needs.bulk-filter.outputs.ci == 'true' }}
       env:
         JOB_TYPE: test
         JOB_NAME: units-${{matrix.java}}
   units-8-runtime:
     runs-on: ubuntu-latest
+    needs: bulk-filter
     name: "units (8)"
     steps:
     - name: Get current week within the year
@@ -73,6 +100,7 @@ jobs:
         path: ~/.m2/repository
         key: ${{ runner.os }}-maven-unified-${{ steps.date.outputs.week_of_year }}
     - run: .kokoro/build.sh
+      if: ${{ needs.bulk-filter.outputs.src == 'true' || needs.bulk-filter.outputs.ci == 'true' }}
       shell: bash      
       env:
         JOB_TYPE: test

java-bigquery/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/telemetry/BigQueryTelemetryTracer.java

@@ -34,7 +34,6 @@ private BigQueryTelemetryTracer() {}
   public static final String BQ_GCP_CLIENT_SERVICE = "bigquery";
   public static final String BQ_GCP_CLIENT_REPO = "googleapis/google-cloud-java";
   public static final String BQ_GCP_CLIENT_ARTIFACT = "google-cloud-bigquery";
-  public static final String BQ_GCP_CLIENT_LANGUAGE = "java";
 
   // TODO: migrate to use gax attributes keys
   // https://github.com/googleapis/google-cloud-java/issues/12099
@@ -47,8 +46,6 @@ private BigQueryTelemetryTracer() {}
       AttributeKey.stringKey("gcp.client.repo");
   public static final AttributeKey<String> GCP_CLIENT_ARTIFACT =
       AttributeKey.stringKey("gcp.client.artifact");
-  public static final AttributeKey<String> GCP_CLIENT_LANGUAGE =
-      AttributeKey.stringKey("gcp.client.language");
   public static final AttributeKey<String> GCP_RESOURCE_DESTINATION_ID =
       AttributeKey.stringKey("gcp.resource.destination.id");
   public static final AttributeKey<String> RPC_SYSTEM_NAME =
@@ -68,7 +65,6 @@ public static void addCommonAttributeToSpan(Span span) {
     span.setAttribute(GCP_CLIENT_SERVICE, BQ_GCP_CLIENT_SERVICE)
         .setAttribute(GCP_CLIENT_REPO, BQ_GCP_CLIENT_REPO)
         .setAttribute(GCP_CLIENT_ARTIFACT, BQ_GCP_CLIENT_ARTIFACT)
-        .setAttribute(GCP_CLIENT_LANGUAGE, BQ_GCP_CLIENT_LANGUAGE)
         .setAttribute(GCP_CLIENT_VERSION, Version.VERSION);
   }
 

java-bigquery/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/it/ITOpenTelemetryTest.java

@@ -305,9 +305,6 @@ private void checkGeneralAttributes(Map<AttributeKey<?>, Object> attrs) {
     assertEquals(
         BigQueryTelemetryTracer.BQ_GCP_CLIENT_REPO,
         attrs.get(BigQueryTelemetryTracer.GCP_CLIENT_REPO));
-    assertEquals(
-        BigQueryTelemetryTracer.BQ_GCP_CLIENT_LANGUAGE,
-        attrs.get(BigQueryTelemetryTracer.GCP_CLIENT_LANGUAGE));
     assertEquals(
         BigQueryTelemetryTracer.BQ_GCP_CLIENT_ARTIFACT,
         attrs.get(BigQueryTelemetryTracer.GCP_CLIENT_ARTIFACT));

java-bigquery/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/telemetry/BigQueryTelemetryTracerTest.java

@@ -181,9 +181,6 @@ public void testAddCommonAttributeToSpan() {
     assertEquals(
         BigQueryTelemetryTracer.BQ_GCP_CLIENT_ARTIFACT,
         spanData.getAttributes().get(BigQueryTelemetryTracer.GCP_CLIENT_ARTIFACT));
-    assertEquals(
-        BigQueryTelemetryTracer.BQ_GCP_CLIENT_LANGUAGE,
-        spanData.getAttributes().get(BigQueryTelemetryTracer.GCP_CLIENT_LANGUAGE));
     assertEquals(
         Version.VERSION, spanData.getAttributes().get(BigQueryTelemetryTracer.GCP_CLIENT_VERSION));
   }

java-bigquery/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/telemetry/HttpTracingRequestInitializerTest.java

@@ -447,9 +447,6 @@ private void closeAndVerifySpanData(
     assertEquals(
         BigQueryTelemetryTracer.BQ_GCP_CLIENT_ARTIFACT,
         span.getAttributes().get(BigQueryTelemetryTracer.GCP_CLIENT_ARTIFACT));
-    assertEquals(
-        BigQueryTelemetryTracer.BQ_GCP_CLIENT_LANGUAGE,
-        span.getAttributes().get(BigQueryTelemetryTracer.GCP_CLIENT_LANGUAGE));
     assertEquals(
         HttpTracingRequestInitializer.HTTP_RPC_SYSTEM_NAME,
         span.getAttributes().get(BigQueryTelemetryTracer.RPC_SYSTEM_NAME));