Merge branch 'main' into test/showcase-errordetails

Author: nnicolee

.github/workflows/create_additional_release_tag.yaml

@@ -7,6 +7,11 @@ on:
   release:
     types: [published]
   workflow_dispatch:
+    inputs:
+      target_ref:
+        description: 'Git ref (tag or SHA) to check out and tag. Defaults to branch HEAD if empty.'
+        required: false
+        default: ''
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -18,6 +23,7 @@ jobs:
     - name: Checkout code
       uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
       with:
+        ref: ${{ inputs.target_ref || github.ref }}
         token: ${{ secrets.CLOUD_JAVA_BOT_GITHUB_TOKEN }}
         persist-credentials: false
     - name: Set up Git
@@ -38,7 +44,7 @@ jobs:
             continue
           fi
           git tag $TAG_NAME
-          git push origin $TAG_NAME
+          git push https://x-access-token:${GH_TOKEN}@github.com/${GITHUB_REPOSITORY}.git $TAG_NAME
           if [ "${ARTIFACT_ID}" = "libraries-bom" ]; then
             echo "Creating GitHub Release for ${TAG_NAME}"
             gh release create "${TAG_NAME}" --title "GCP Libraries BOM ${VERSION}" --notes "libraries-bom release."

java-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/jdbc/BigQueryDatabaseMetaData.java

@@ -31,7 +31,6 @@
 
 import com.google.api.gax.paging.Page;
 import com.google.cloud.bigquery.*;
-import com.google.cloud.bigquery.BigQuery.RoutineListOption;
 import com.google.cloud.bigquery.exception.BigQueryJdbcException;
 import com.google.cloud.bigquery.jdbc.BigQueryJdbcTypeMappings.ColumnTypeInfo;
 import io.opentelemetry.api.common.AttributeKey;
@@ -49,11 +48,8 @@
 import java.sql.Statement;
 import java.sql.Types;
 import java.util.*;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
 import java.util.regex.Pattern;
 import java.util.stream.Stream;
 import org.junit.jupiter.api.AfterEach;
@@ -761,7 +757,7 @@ public void testProcessSchemaInfo() {
     String schemaName = "dataset_beta";
     Dataset dataset = mockBigQueryDataset(catalog, schemaName);
 
-    dbMetadata.processSchemaInfo(dataset, collectedResults, resultSchemaFields);
+    dbMetadata.processSchemaInfo(dataset.getDatasetId(), collectedResults, resultSchemaFields);
 
     assertEquals(1, collectedResults.size());
     FieldValueList row = collectedResults.get(0);
@@ -1614,96 +1610,6 @@ public void testDefineGetProcedureColumnsComparator() {
     assertEquals("param_a", results.get(4).get("COLUMN_NAME").getStringValue());
   }
 
-  @Test
-  public void testListMatchingProcedureIdsFromDatasets() throws Exception {
-    String catalog = "test-proj";
-    String schema1Name = "dataset1";
-    String schema2Name = "dataset2";
-    Dataset dataset1 = mockBigQueryDataset(catalog, schema1Name);
-    Dataset dataset2 = mockBigQueryDataset(catalog, schema2Name);
-    List<Dataset> datasetsToScan = Arrays.asList(dataset1, dataset2);
-
-    Routine proc1_ds1 = mockBigQueryRoutine(catalog, schema1Name, "proc_a", "PROCEDURE", "desc a");
-    Routine func1_ds1 = mockBigQueryRoutine(catalog, schema1Name, "func_b", "FUNCTION", "desc b");
-    Routine proc2_ds2 = mockBigQueryRoutine(catalog, schema2Name, "proc_c", "PROCEDURE", "desc c");
-
-    Page<Routine> page1 = mock(Page.class, withSettings().withoutAnnotations());
-    when(page1.iterateAll()).thenReturn(Arrays.asList(proc1_ds1, func1_ds1));
-    when(bigqueryClient.listRoutines(eq(dataset1.getDatasetId()), any(RoutineListOption.class)))
-        .thenReturn(page1);
-
-    Page<Routine> page2 = mock(Page.class, withSettings().withoutAnnotations());
-    when(page2.iterateAll()).thenReturn(Collections.singletonList(proc2_ds2));
-    when(bigqueryClient.listRoutines(eq(dataset2.getDatasetId()), any(RoutineListOption.class)))
-        .thenReturn(page2);
-
-    ExecutorService mockExecutor = mock(ExecutorService.class);
-    doAnswer(
-            invocation -> {
-              Callable<?> callable = invocation.getArgument(0);
-              @SuppressWarnings("unchecked") // Suppress warning for raw Future mock
-              Future<Object> mockedFuture = mock(Future.class);
-
-              try {
-                Object result = callable.call();
-                doReturn(result).when(mockedFuture).get();
-              } catch (InterruptedException interruptedException) {
-                doThrow(interruptedException).when(mockedFuture).get();
-              } catch (Exception e) {
-                doThrow(new ExecutionException(e)).when(mockedFuture).get();
-              }
-              return mockedFuture;
-            })
-        .when(mockExecutor)
-        .submit(any(Callable.class));
-
-    List<RoutineId> resultIds =
-        dbMetadata.listMatchingProcedureIdsFromDatasets(
-            datasetsToScan, null, null, mockExecutor, catalog, dbMetadata.LOG);
-
-    assertEquals(2, resultIds.size());
-    assertTrue(resultIds.contains(proc1_ds1.getRoutineId()));
-    assertTrue(resultIds.contains(proc2_ds2.getRoutineId()));
-    assertFalse(resultIds.contains(func1_ds1.getRoutineId())); // Should not contain functions
-
-    verify(mockExecutor, times(2)).submit(any(Callable.class));
-  }
-
-  @Test
-  public void testProcessProcedureArgumentsSequentially_Basic() throws InterruptedException {
-    String catalog = "p";
-    String schemaName = "d";
-    RoutineArgument arg1 = mockRoutineArgument("arg1_name", StandardSQLTypeName.STRING, "IN");
-    Routine proc1 =
-        mockBigQueryRoutineWithArgs(
-            catalog, schemaName, "proc1", "PROCEDURE", "desc1", Collections.singletonList(arg1));
-    Routine func1 =
-        mockBigQueryRoutineWithArgs(
-            catalog,
-            schemaName,
-            "func1",
-            "FUNCTION",
-            "desc_func",
-            Collections.emptyList()); // Should be skipped
-    Routine proc2 =
-        mockBigQueryRoutineWithArgs(
-            catalog, schemaName, "proc2", "PROCEDURE", "desc2", Collections.emptyList());
-
-    List<Routine> fullRoutines = Arrays.asList(proc1, func1, proc2);
-    Pattern columnNameRegex = null;
-    List<FieldValueList> collectedResults = Collections.synchronizedList(new ArrayList<>());
-    Schema resultSchema = dbMetadata.defineGetProcedureColumnsSchema();
-    FieldList resultSchemaFields = resultSchema.getFields();
-
-    dbMetadata.processProcedureArgumentsSequentially(
-        fullRoutines, columnNameRegex, collectedResults, resultSchemaFields, dbMetadata.LOG);
-
-    // Only proc1 has arguments, so collectedResults should contain 1 row.
-    assertEquals(1, collectedResults.size());
-    FieldValueList row = collectedResults.get(0);
-    assertEquals("arg1_name", row.get("COLUMN_NAME").getStringValue());
-  }
-
   @Test
   public void testDefineGetTableTypesSchema() {
     Schema schema = BigQueryDatabaseMetaData.defineGetTableTypesSchema();

java-bigquery-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/BigQueryDatabaseMetaDataTest.java

@@ -1659,6 +1659,10 @@ public Routine apply(com.google.api.services.bigquery.model.Routine routinePb) {
 
   @Override
   public InsertAllResponse insertAll(InsertAllRequest request) {
+    // This API inserts the specified rows into a table using the BigQuery insertAll API.
+    // Note: To prevent duplicate rows, this method does not perform automatic retries unless
+    // insert IDs are provided. Transient service errors (such as UNAVAILABLE) may be thrown and
+    // should be handled by the caller.
     final TableId tableId =
         request
             .getTable()

java-bigquery/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryImpl.java

@@ -87,6 +87,11 @@
       <artifactId>google-cloud-core</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.awaitility</groupId>
+      <artifactId>awaitility</artifactId>
+      <scope>test</scope>
+    </dependency>
     <!-- {x-generated-grpc-dependencies-start} -->
     <dependency>
       <groupId>com.google.api.grpc</groupId>

java-dialogflow/google-cloud-dialogflow/pom.xml

@@ -15,7 +15,10 @@
  */
 package com.google.cloud.dialogflow.v2.it;
 
+import static com.google.common.collect.Streams.stream;
+import static org.awaitility.Awaitility.await;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import com.google.cloud.ServiceOptions;
 import com.google.cloud.dialogflow.v2.Agent;
@@ -54,10 +57,10 @@
 import com.google.protobuf.Struct;
 import com.google.protobuf.Value;
 import java.io.IOException;
+import java.time.Duration;
 import java.util.UUID;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Test;
 
 public class ITSystemTest {
@@ -259,7 +262,6 @@ public void getIntentTest() {
   }
 
   @Test
-  @Ignore("b/423958346")
   public void detectIntentTest() {
     QueryInput queryInput =
         QueryInput.newBuilder()
@@ -279,22 +281,28 @@ public void detectIntentTest() {
             .setSession(SESSION_NAME.toString())
             .setQueryInput(queryInput)
             .build();
-    DetectIntentResponse response = sessionsClient.detectIntent(request);
-    QueryResult result = response.getQueryResult();
-    assertEquals(EVENT_NAME, result.getQueryText());
-    assertEquals(ACTION_NAME, result.getAction());
-    assertEquals(DEFAULT_LANGUAGE_CODE, result.getLanguageCode());
-    assertEquals(intent.getDisplayName(), result.getIntent().getDisplayName());
+    await()
+        .atMost(Duration.ofSeconds(30))
+        .pollInterval(Duration.ofSeconds(2))
+        .untilAsserted(
+            () -> {
+              DetectIntentResponse response = sessionsClient.detectIntent(request);
+              QueryResult result = response.getQueryResult();
+              assertEquals(EVENT_NAME, result.getQueryText());
+              assertEquals(ACTION_NAME, result.getAction());
+              assertEquals(DEFAULT_LANGUAGE_CODE, result.getLanguageCode());
+              assertEquals(intent.getDisplayName(), result.getIntent().getDisplayName());
+            });
   }
 
   @Test
-  @Ignore("b/423958346")
   public void listContextsTest() {
     ListContextsRequest request =
         ListContextsRequest.newBuilder().setParent(SESSION_NAME.toString()).build();
-    for (Context actualContext : contextsClient.listContexts(request).iterateAll()) {
-      assertEquals(context.getName(), actualContext.getName());
-    }
+    boolean contextNameInActualContext =
+        stream(contextsClient.listContexts(request).iterateAll())
+            .anyMatch(actualContext -> context.getName().equals(actualContext.getName()));
+    assertTrue(contextNameInActualContext);
   }
 
   @Test

java-dialogflow/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/it/ITSystemTest.java

@@ -49,7 +49,7 @@ default:
       google/analytics: com.google.analytics
       google/maps: com.google.maps
       google/shopping: com.google.shopping
-    libraries_bom_version: 26.83.0
+    libraries_bom_version: 26.86.0
 libraries:
   - name: accessapproval
     version: 2.97.0-SNAPSHOT

librarian.yaml

@@ -89,7 +89,9 @@ private static Provider createProvider() {
         return Conscrypt.newProvider();
       } catch (SecurityException | LinkageError t) {
         LOG.log(
-            Level.WARNING, "Conscrypt native libraries not available. Falling back to JDK TLS.", t);
+            Level.FINE,
+            "Conscrypt native library unavailable. Falling back to default JDK TLS.",
+            t);
         return null;
       }
     }
@@ -124,7 +126,7 @@ public static NetHttpTransport.Builder configureConscryptSecurityProvider(
                 // intercepts runtime socket configuration errors (e.g. unsupported groups or
                 // closed socket) without swallowing JVM errors like OutOfMemoryError.
                 LOG.log(
-                    Level.WARNING,
+                    Level.FINE,
                     "Failed to set PQC named groups on Conscrypt socket. Falling back to Conscrypt"
                         + " default TLS groups.",
                     e);