test: adjust goldens for pubsub

Author: diegomarquezp

gax-java/dependencies.properties

@@ -40,6 +40,7 @@ maven.com_google_api_grpc_grpc_google_common_protos=com.google.api.grpc:grpc-goo
 maven.com_google_auth_google_auth_library_oauth2_http=com.google.auth:google-auth-library-oauth2-http:1.42.1
 maven.com_google_auth_google_auth_library_credentials=com.google.auth:google-auth-library-credentials:1.42.1
 maven.io_opentelemetry_opentelemetry_api=io.opentelemetry:opentelemetry-api:1.47.0
+maven.io_opentelemetry_opentelemetry_context=io.opentelemetry:opentelemetry-context:1.47.0
 maven.io_opencensus_opencensus_api=io.opencensus:opencensus-api:0.31.1
 maven.io_opencensus_opencensus_contrib_grpc_metrics=io.opencensus:opencensus-contrib-grpc-metrics:0.31.1
 maven.io_opencensus_opencensus_contrib_http_util=io.opencensus:opencensus-contrib-http-util:0.31.1

gax-java/gax/BUILD.bazel

@@ -19,6 +19,7 @@ _COMPILE_DEPS = [
     "@com_google_errorprone_error_prone_annotations//jar",
     "@com_google_guava_guava//jar",
     "@io_opentelemetry_opentelemetry_api//jar",
+    "@io_opentelemetry_opentelemetry_context//jar",
     "@io_opencensus_opencensus_api//jar",
     "@io_opencensus_opencensus_contrib_http_util//jar",
     "@io_grpc_grpc_java//context:context",

rules_java_gapic/java_gapic.bzl

@@ -197,9 +197,6 @@ def _java_gapic_srcjar(
         **kwargs):
     file_args_dict = {}
 
-    if artifact_name:
-        opt_args.append("artifact-name=%s" % artifact_name)
-
     if grpc_service_config:
         file_args_dict[grpc_service_config] = "grpc-service-config"
     elif not transport or transport == "grpc":
@@ -215,6 +212,9 @@ def _java_gapic_srcjar(
 
     opt_args = []
 
+    if artifact_name:
+        opt_args.append("artifact-name=%s" % artifact_name)
+
     if transport:
         opt_args.append("transport=%s" % transport)
 

test/integration/BUILD.bazel

@@ -244,6 +244,7 @@ java_gapic_library(
     grpc_service_config = "@com_google_googleapis//google/pubsub/v1:pubsub_grpc_service_config.json",
     # For the IAM mixin.
     service_yaml = "pubsub_v1.yaml",
+    artifact_name = "com.google.cloud:google-cloud-pubsub",
     test_deps = [
         "@com_google_googleapis//google/pubsub/v1:pubsub_java_grpc",
         "@com_google_googleapis//google/iam/v1:iam_java_grpc",

test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/stub/PublisherStubSettings.java

@@ -485,6 +485,11 @@ public String getServiceName() {
     return "pubsub";
   }
 
+  @Override
+  protected String getArtifactName() {
+    return "com.google.cloud:google-cloud-pubsub";
+  }
+
   /** Returns a builder for the default ExecutorProvider for this service. */
   public static InstantiatingExecutorProvider.Builder defaultExecutorProviderBuilder() {
     return InstantiatingExecutorProvider.newBuilder();

test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/stub/SchemaServiceStubSettings.java

@@ -346,6 +346,11 @@ public String getServiceName() {
     return "pubsub";
   }
 
+  @Override
+  protected String getArtifactName() {
+    return "com.google.cloud:google-cloud-pubsub";
+  }
+
   /** Returns a builder for the default ExecutorProvider for this service. */
   public static InstantiatingExecutorProvider.Builder defaultExecutorProviderBuilder() {
     return InstantiatingExecutorProvider.newBuilder();

test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/stub/SubscriberStubSettings.java

@@ -392,6 +392,11 @@ public String getServiceName() {
     return "pubsub";
   }
 
+  @Override
+  protected String getArtifactName() {
+    return "com.google.cloud:google-cloud-pubsub";
+  }
+
   /** Returns a builder for the default ExecutorProvider for this service. */
   public static InstantiatingExecutorProvider.Builder defaultExecutorProviderBuilder() {
     return InstantiatingExecutorProvider.newBuilder();