fix: do not generate Version.java files by default

.github/workflows/sdk-platform-java-ci.yaml

@@ -162,7 +162,7 @@ jobs:
           JOB_TYPE: install
       - name: Integration Tests
         run: |
-          bazelisk --batch test //sdk-platform-java/test/integration/...
+          bazelisk --batch test //sdk-platform-java/test/integration/... --test_output=errors
 
   bazel-25:  
     needs: filter

rules_java_gapic/java_gapic.bzl

@@ -190,6 +190,7 @@ def _java_gapic_srcjar(
         # possible values are: "grpc", "rest", "grpc+rest"
         transport,
         rest_numeric_enums,
+        generate_version_java = False,
         # Can be used to provide a java_library with a customized generator,
         # like the one which dumps descriptor to a file for future debugging.
         java_generator_name = "java_gapic",
@@ -217,6 +218,9 @@ def _java_gapic_srcjar(
     if rest_numeric_enums:
         opt_args.append("rest-numeric-enums")
 
+    if generate_version_java:
+        opt_args.append("generate-version-java")
+
     # Produces the GAPIC metadata file if this flag is set. to any value.
     # Protoc invocation: --java_gapic_opt=metadata
     plugin_args = ["metadata"]
@@ -245,6 +249,7 @@ def java_gapic_library(
         # possible values are: "grpc", "rest", "grpc+rest"
         transport = None,
         rest_numeric_enums = False,
+        generate_version_java = False,
         **kwargs):
     srcjar_name = name + "_srcjar"
     raw_srcjar_name = srcjar_name + "_raw"
@@ -257,6 +262,7 @@ def java_gapic_library(
         service_yaml = service_yaml,
         transport = transport,
         rest_numeric_enums = rest_numeric_enums,
+        generate_version_java = generate_version_java,
         java_generator_name = "java_gapic",
         **kwargs
     )
@@ -399,6 +405,7 @@ def java_generator_request_dump(
         service_yaml = None,
         transport = None,
         rest_numeric_enums = False,
+        generate_version_java = False,
         **kwargs):
     _java_gapic_srcjar(
         name = name,
@@ -408,6 +415,7 @@ def java_generator_request_dump(
         service_yaml = service_yaml,
         transport = transport,
         rest_numeric_enums = rest_numeric_enums,
+        generate_version_java = generate_version_java,
         java_generator_name = "code_generator_request_dumper",
         **kwargs
     )

sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/Composer.java

@@ -40,6 +40,7 @@
 import com.google.common.annotations.VisibleForTesting;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -199,6 +200,9 @@ public static List<GapicClass> generateTestClasses(GapicContext context) {
   }
 
   public static List<GapicClass> generateVersionClasses(GapicContext context) {
+    if (!context.generateVersionJava()) {
+      return Collections.emptyList();
+    }
     return context.services().stream()
         .collect(Collectors.toMap(Service::pakkage, s -> s, (s1, s2) -> s1))
         .values()

sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceStubSettingsClassComposer.java

@@ -2133,22 +2133,24 @@ private MethodDefinition createGetLibraryMetadataMethod(GapicContext context, Se
               .build();
     }
 
-    libraryMetadataBuilderExpr =
-        MethodInvocationExpr.builder()
-            .setExprReferenceExpr(libraryMetadataBuilderExpr)
-            .setMethodName("setVersion")
-            .setArguments(
-                VariableExpr.builder()
-                    .setStaticReferenceType(
-                        TypeNode.withReference(
-                            VaporReference.builder()
-                                .setName("Version")
-                                .setPakkage(String.format("%s.stub", service.pakkage()))
-                                .build()))
-                    .setVariable(
-                        Variable.builder().setName("VERSION").setType(TypeNode.STRING).build())
-                    .build())
-            .build();
+    if (context.generateVersionJava()) {
+      libraryMetadataBuilderExpr =
+          MethodInvocationExpr.builder()
+              .setExprReferenceExpr(libraryMetadataBuilderExpr)
+              .setMethodName("setVersion")
+              .setArguments(
+                  VariableExpr.builder()
+                      .setStaticReferenceType(
+                          TypeNode.withReference(
+                              VaporReference.builder()
+                                  .setName("Version")
+                                  .setPakkage(String.format("%s.stub", service.pakkage()))
+                                  .build()))
+                      .setVariable(
+                          Variable.builder().setName("VERSION").setType(TypeNode.STRING).build())
+                      .build())
+              .build();
+    }
 
     Expr returnExpr =
         MethodInvocationExpr.builder()

sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/GapicContext.java

@@ -60,6 +60,8 @@ public abstract class GapicContext {
 
   public abstract boolean restNumericEnumsEnabled();
 
+  public abstract boolean generateVersionJava();
+
   public GapicMetadata gapicMetadata() {
     return gapicMetadata;
   }
@@ -105,7 +107,8 @@ public static Builder builder() {
     return new AutoValue_GapicContext.Builder()
         .setMixinServices(Collections.emptyList())
         .setGapicMetadataEnabled(false)
-        .setRestNumericEnumsEnabled(false);
+        .setRestNumericEnumsEnabled(false)
+        .setGenerateVersionJava(false);
   }
 
   @AutoValue.Builder
@@ -134,6 +137,8 @@ public Builder setHelperResourceNames(Set<ResourceName> helperResourceNames) {
 
     public abstract Builder setRestNumericEnumsEnabled(boolean restNumericEnumsEnabled);
 
+    public abstract Builder setGenerateVersionJava(boolean generateVersionJava);
+
     public abstract Builder setTransport(Transport transport);
 
     public abstract Builder setRepo(String repo);

sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/protoparser/Parser.java

@@ -155,6 +155,7 @@ public static GapicContext parse(CodeGeneratorRequest request) {
 
     boolean willGenerateMetadata = PluginArgumentParser.hasMetadataFlag(request);
     boolean willGenerateNumericEnum = PluginArgumentParser.hasNumericEnumFlag(request);
+    boolean willGenerateVersionJava = PluginArgumentParser.hasGenerateVersionJavaFlag(request);
 
     Optional<String> serviceConfigPathOpt = PluginArgumentParser.parseJsonConfigPath(request);
     Optional<GapicServiceConfig> serviceConfigOpt =
@@ -255,6 +256,7 @@ public static GapicContext parse(CodeGeneratorRequest request) {
         .setServiceYamlProto(serviceYamlProtoOpt.orElse(null))
         .setTransport(transport)
         .setRestNumericEnumsEnabled(willGenerateNumericEnum)
+        .setGenerateVersionJava(willGenerateVersionJava)
         .setRepo(repoOpt.orElse(null))
         .setArtifact(artifactOpt.orElse(null))
         .build();

sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/protoparser/PluginArgumentParser.java

@@ -30,7 +30,9 @@ public class PluginArgumentParser {
   @VisibleForTesting static final String KEY_GAPIC_CONFIG = "gapic-config";
   @VisibleForTesting static final String KEY_METADATA = "metadata";
   @VisibleForTesting static final String KEY_NUMERIC_ENUM = "rest-numeric-enums";
+  @VisibleForTesting static final String KEY_GENERATE_VERSION_JAVA = "generate-version-java";
   @VisibleForTesting static final String KEY_SERVICE_YAML_CONFIG = "api-service-config";
+
   @VisibleForTesting static final String KEY_TRANSPORT = "transport";
   @VisibleForTesting static final String KEY_REPO = "repo";
   @VisibleForTesting static final String KEY_ARTIFACT = "artifact";
@@ -71,6 +73,10 @@ static boolean hasNumericEnumFlag(CodeGeneratorRequest request) {
     return hasFlag(request.getParameter(), KEY_NUMERIC_ENUM);
   }
 
+  static boolean hasGenerateVersionJavaFlag(CodeGeneratorRequest request) {
+    return hasFlag(request.getParameter(), KEY_GENERATE_VERSION_JAVA);
+  }
+
   /** Expects a comma-separated list of file paths. */
   @VisibleForTesting
   static Optional<String> parseJsonConfigPath(String pluginProtocArgument) {

sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/ComposerTest.java

@@ -167,6 +167,17 @@ void testEmptyGapicContext_doesNotThrow() {
     assertTrue(Composer.composeServiceClasses(GapicContext.EMPTY).isEmpty());
   }
 
+  @Test
+  void testGenerateVersionClasses_generateVersionJavaFalse_returnsEmptyList() {
+    GapicContext contextWithFlagFalse = context.toBuilder().setGenerateVersionJava(false).build();
+    assertTrue(Composer.generateVersionClasses(contextWithFlagFalse).isEmpty());
+  }
+
+  @Test
+  void testGapicContext_generateVersionJava_disabledByDefault() {
+    assertFalse(GapicContext.EMPTY.generateVersionJava());
+  }
+
   @Test
   void testComposePackageInfo_emptyGapicContext_returnsNull() {
     assertNull(Composer.composePackageInfo(GapicContext.EMPTY));

sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/ApiVersionTestingStubSettings.golden

@@ -170,7 +170,7 @@ public class EchoWithVersionStubSettings extends StubSettings<EchoWithVersionStu
 
   @Override
   protected LibraryMetadata getLibraryMetadata() {
-    return LibraryMetadata.newBuilder().setVersion(Version.VERSION).build();
+    return LibraryMetadata.newBuilder().build();
   }
 
   /** Builder for EchoWithVersionStubSettings. */

sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/DeprecatedServiceStubSettings.golden

@@ -187,7 +187,7 @@ public class DeprecatedServiceStubSettings extends StubSettings<DeprecatedServic
 
   @Override
   protected LibraryMetadata getLibraryMetadata() {
-    return LibraryMetadata.newBuilder().setVersion(Version.VERSION).build();
+    return LibraryMetadata.newBuilder().build();
   }
 
   /** Builder for DeprecatedServiceStubSettings. */

sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/EchoServiceSelectiveGapicStubSettings.golden

@@ -224,7 +224,7 @@ public class EchoServiceShouldGeneratePartialUsualStubSettings
 
   @Override
   protected LibraryMetadata getLibraryMetadata() {
-    return LibraryMetadata.newBuilder().setVersion(Version.VERSION).build();
+    return LibraryMetadata.newBuilder().build();
   }
 
   /** Builder for EchoServiceShouldGeneratePartialUsualStubSettings. */

sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/EchoStubSettings.golden

@@ -413,7 +413,6 @@ public class EchoStubSettings extends StubSettings<EchoStubSettings> {
     return LibraryMetadata.newBuilder()
         .setArtifactName("com.google.cloud:gapic-showcase")
         .setRepository("googleapis/google-cloud-java")
-        .setVersion(Version.VERSION)
         .build();
   }
 

sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/JobServiceStubSettings.golden

@@ -260,7 +260,7 @@ public class JobServiceStubSettings extends StubSettings<JobServiceStubSettings>
 
   @Override
   protected LibraryMetadata getLibraryMetadata() {
-    return LibraryMetadata.newBuilder().setVersion(Version.VERSION).build();
+    return LibraryMetadata.newBuilder().build();
   }
 
   /** Builder for JobServiceStubSettings. */

sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/LoggingServiceV2StubSettings.golden

@@ -514,7 +514,6 @@ public class LoggingServiceV2StubSettings extends StubSettings<LoggingServiceV2S
   protected LibraryMetadata getLibraryMetadata() {
     return LibraryMetadata.newBuilder()
         .setArtifactName("com.google.cloud:google-cloud-logging")
-        .setVersion(Version.VERSION)
         .build();
   }
 

sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/PublisherStubSettings.golden

@@ -522,7 +522,7 @@ public class PublisherStubSettings extends StubSettings<PublisherStubSettings> {
 
   @Override
   protected LibraryMetadata getLibraryMetadata() {
-    return LibraryMetadata.newBuilder().setVersion(Version.VERSION).build();
+    return LibraryMetadata.newBuilder().build();
   }
 
   /** Builder for PublisherStubSettings. */

sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/ServiceStubSettingsClassComposerTest.java

@@ -32,7 +32,10 @@ class ServiceStubSettingsClassComposerTest {
   static Stream<Arguments> data() {
     return Stream.of(
         Arguments.of(
-            "EchoStubSettings.golden", GrpcRestTestProtoLoader.instance().parseShowcaseEcho()),
+            "EchoStubSettings.golden",
+            GrpcRestTestProtoLoader.instance().parseShowcaseEcho().toBuilder()
+                .setGenerateVersionJava(true)
+                .build()),
         Arguments.of(
             "WickedStubSettings.golden", GrpcRestTestProtoLoader.instance().parseShowcaseWicked()));
   }

sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/WickedStubSettings.golden

@@ -192,7 +192,6 @@ public class WickedStubSettings extends StubSettings<WickedStubSettings> {
     return LibraryMetadata.newBuilder()
         .setArtifactName("com.google.cloud:gapic-showcase")
         .setRepository("googleapis/google-cloud-java")
-        .setVersion(Version.VERSION)
         .build();
   }
 

sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/rest/ServiceStubSettingsClassComposerTest.java

@@ -36,7 +36,9 @@ static Stream<Arguments> data() {
             "ComplianceStubSettings.golden", RestTestProtoLoader.instance().parseCompliance()),
         Arguments.of(
             "HttpJsonApiVersionTestingStubSettings.golden",
-            RestTestProtoLoader.instance().parseApiVersionTesting()));
+            RestTestProtoLoader.instance().parseApiVersionTesting().toBuilder()
+                .setGenerateVersionJava(true)
+                .build()));
   }
 
   @ParameterizedTest

sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/rest/goldens/ComplianceStubSettings.golden

@@ -252,7 +252,7 @@ public class ComplianceStubSettings extends StubSettings<ComplianceStubSettings>
 
   @Override
   protected LibraryMetadata getLibraryMetadata() {
-    return LibraryMetadata.newBuilder().setVersion(Version.VERSION).build();
+    return LibraryMetadata.newBuilder().build();
   }
 
   /** Builder for ComplianceStubSettings. */

sdk-platform-java/gax-java/gax/src/main/java/com/google/api/gax/tracing/OpenTelemetryTracingFactory.java

@@ -119,7 +119,10 @@ public ApiTracerFactory withContext(ApiTracerContext context) {
     if (metadata == null || metadata.isEmpty() || Strings.isNullOrEmpty(metadata.artifactName())) {
       return new BaseApiTracerFactory();
     }
-    Tracer newTracer = openTelemetry.getTracer(metadata.artifactName(), metadata.version());
+    Tracer newTracer =
+        Strings.isNullOrEmpty(metadata.version())
+            ? openTelemetry.getTracer(metadata.artifactName())
+            : openTelemetry.getTracer(metadata.artifactName(), metadata.version());
     ApiTracerContext mergedContext = this.apiTracerContext.merge(context);
     return new OpenTelemetryTracingFactory(openTelemetry, newTracer, mergedContext);
   }

sdk-platform-java/gax-java/gax/src/test/java/com/google/api/gax/tracing/GoldenSignalsMetricsRecorderTest.java

@@ -144,4 +144,12 @@ void create_shouldReturnNull_whenArtifactNameIsEmpty() {
         GoldenSignalsMetricsRecorder.create(OpenTelemetry.noop(), metadata);
     assertThat(actual).isNull();
   }
+
+  @Test
+  void create_shouldNotThrow_whenVersionIsNull() {
+    LibraryMetadata metadata = LibraryMetadata.newBuilder().setArtifactName(ARTIFACT_NAME).build();
+    GoldenSignalsMetricsRecorder actual =
+        GoldenSignalsMetricsRecorder.create(OpenTelemetry.noop(), metadata);
+    assertThat(actual).isNotNull();
+  }
 }

sdk-platform-java/gax-java/gax/src/test/java/com/google/api/gax/tracing/OpenTelemetryTracingTracerFactoryTest.java

@@ -71,6 +71,7 @@ void setUp() {
     span = mock(Span.class);
     when(openTelemetry.getTracer(nullable(String.class), nullable(String.class)))
         .thenReturn(tracer);
+    when(openTelemetry.getTracer(anyString())).thenReturn(tracer);
     when(tracer.spanBuilder(anyString())).thenReturn(spanBuilder);
     when(spanBuilder.setSpanKind(any())).thenReturn(spanBuilder);
     when(spanBuilder.setAllAttributes(any(Attributes.class))).thenReturn(spanBuilder);
@@ -405,4 +406,17 @@ void testNeedsContext_returnsFalseWhenContextIsNotEmpty() {
 
     assertThat(factoryWithContext.needsContext()).isFalse();
   }
+
+  @Test
+  void testWithContext_nullVersion_createsFactorySuccessfully() {
+    LibraryMetadata metadata = mock(LibraryMetadata.class);
+    when(metadata.artifactName()).thenReturn("gax-java");
+    when(metadata.version()).thenReturn(null);
+    ApiTracerContext context = ApiTracerContext.newBuilder().setLibraryMetadata(metadata).build();
+
+    OpenTelemetryTracingFactory factory =
+        new OpenTelemetryTracingFactory(openTelemetry, tracer, ApiTracerContext.empty());
+    ApiTracerFactory factoryWithContext = factory.withContext(context);
+    assertThat(factoryWithContext).isInstanceOf(OpenTelemetryTracingFactory.class);
+  }
 }

sdk-platform-java/hermetic_build/library_generation/generate_library.sh

@@ -30,6 +30,11 @@ case $key in
     rest_numeric_enums="$2"
     shift
     ;;
+  --generate_version_java)
+    generate_version_java="$2"
+    shift
+    ;;
+
   --gapic_yaml)
     gapic_yaml="$2"
     shift
@@ -75,6 +80,11 @@ if [ -z "${proto_only}" ]; then
   proto_only="false"
 fi
 
+if [ -z "${generate_version_java}" ]; then
+  generate_version_java="true"
+fi
+
+
 if [ -z "${gapic_additional_protos}" ]; then
   gapic_additional_protos="google/cloud/common_resources.proto"
 fi
@@ -190,7 +200,7 @@ if [[ "${proto_only}" == "false" ]]; then
   "$protoc_path"/protoc --experimental_allow_proto3_optional \
   "--plugin=protoc-gen-java_gapic=${script_dir}/gapic-generator-java-wrapper" \
   "--java_gapic_out=metadata:${temp_destination_path}/java_gapic_srcjar_raw.srcjar.zip" \
-  "--java_gapic_opt=$(get_gapic_opts "${transport}" "${rest_numeric_enums}" "${gapic_yaml}" "${service_config}" "${service_yaml}" "${repo}" "${artifact}")" \
+  "--java_gapic_opt=$(get_gapic_opts "${transport}" "${rest_numeric_enums}" "${gapic_yaml}" "${service_config}" "${service_yaml}" "${repo}" "${artifact}" "${generate_version_java}")" \
   ${proto_files} ${gapic_additional_protos}
 
   unzip -o -q "${temp_destination_path}/java_gapic_srcjar_raw.srcjar.zip" -d "${temp_destination_path}"