feat(obs): introduce gpc.client.repo and gcp.client.artifact span attributes

.cloudbuild/library_generation/library_generation.Dockerfile

@@ -30,7 +30,7 @@ RUN cat /java-formatter-version
 RUN V=$(cat /java-formatter-version) && curl -o "/google-java-format.jar" "https://maven-central.storage-download.googleapis.com/maven2/com/google/googlejavaformat/google-java-format/${V}/google-java-format-${V}-all-deps.jar"
 
 # Compile and install packages
-RUN mvn install -B -ntp -DskipTests -Dclirr.skip -Dcheckstyle.skip
+RUN mvn install -B -ntp -T 1.5C -DskipTests -Dcheckstyle.skip -Dclirr.skip -Denforcer.skip -Dfmt.skip
 RUN cp "/root/.m2/repository/com/google/api/gapic-generator-java/${DOCKER_GAPIC_GENERATOR_VERSION}/gapic-generator-java-${DOCKER_GAPIC_GENERATOR_VERSION}.jar" \
   "./gapic-generator-java.jar"
 

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

@@ -17,6 +17,7 @@
 import com.google.api.generator.engine.ast.ClassDefinition;
 import com.google.api.generator.engine.ast.CommentStatement;
 import com.google.api.generator.gapic.composer.comment.CommentComposer;
+import com.google.api.generator.gapic.composer.common.GapicPropertiesClassComposer;
 import com.google.api.generator.gapic.composer.grpc.GrpcServiceCallableFactoryClassComposer;
 import com.google.api.generator.gapic.composer.grpc.GrpcServiceStubClassComposer;
 import com.google.api.generator.gapic.composer.grpc.MockServiceClassComposer;
@@ -69,6 +70,10 @@ public static List<GapicClass> generateServiceClasses(GapicContext context) {
     clazzes.addAll(generateClientSettingsClasses(context));
     clazzes.addAll(generateMockClasses(context, context.services()));
     clazzes.addAll(generateTestClasses(context));
+    if (context.containsServices()) {
+      clazzes.add(
+          GapicPropertiesClassComposer.instance().generate(context, context.services().get(0)));
+    }
     return clazzes;
   }
 

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

@@ -31,6 +31,7 @@
 import com.google.api.gax.longrunning.OperationSnapshot;
 import com.google.api.gax.longrunning.OperationTimedPollAlgorithm;
 import com.google.api.gax.retrying.RetrySettings;
+import com.google.api.gax.rpc.AbstractGapicProperties;
 import com.google.api.gax.rpc.ApiCallContext;
 import com.google.api.gax.rpc.ApiClientHeaderProvider;
 import com.google.api.gax.rpc.BatchedRequestIssuer;
@@ -1053,6 +1054,7 @@ private List<MethodDefinition> createClassMethods(
             SettingsCommentComposer.NEW_BUILDER_METHOD_COMMENT));
     javaMethods.addAll(createBuilderHelperMethods(service, typeStore));
     javaMethods.add(createClassConstructor(service, methodSettingsMemberVarExprs, typeStore));
+    javaMethods.add(createGetGapicPropertiesMethod(service, typeStore));
     return javaMethods;
   }
 
@@ -2096,9 +2098,20 @@ private static MethodDefinition createNestedClassBuildMethod(
         .build();
   }
 
+  private MethodDefinition createGetGapicPropertiesMethod(Service service, TypeStore typeStore) {
+    return MethodDefinition.builder()
+        .setIsOverride(true)
+        .setScope(ScopeNode.PROTECTED)
+        .setReturnType(FIXED_TYPESTORE.get("AbstractGapicProperties"))
+        .setName("getGapicProperties")
+        .setReturnExpr(NewObjectExpr.withType(typeStore.get("GapicProperties")))
+        .build();
+  }
+
   private static TypeStore createStaticTypes() {
     List<Class<?>> concreteClazzes =
         Arrays.asList(
+            AbstractGapicProperties.class,
             ApiCallContext.class,
             ApiClientHeaderProvider.class,
             ApiFunction.class,
@@ -2175,6 +2188,12 @@ private TypeStore createDynamicTypes(Service service, String pakkage) {
         true,
         ClassNames.getServiceClientClassName(service));
 
+    // Gapic properties
+    typeStore.put(
+        service.pakkage(),
+        "GapicProperties",
+        FIXED_TYPESTORE.get("AbstractGapicProperties").reference());
+
     return typeStore;
   }
 

gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/GapicPropertiesClassComposer.java

@@ -0,0 +1,121 @@
+/*
+ * Copyright 2026 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.api.generator.gapic.composer.common;
+
+import com.google.api.core.InternalApi;
+import com.google.api.gax.core.GaxProperties;
+import com.google.api.gax.rpc.AbstractGapicProperties;
+import com.google.api.generator.engine.ast.AnnotationNode;
+import com.google.api.generator.engine.ast.ClassDefinition;
+import com.google.api.generator.engine.ast.Expr;
+import com.google.api.generator.engine.ast.MethodDefinition;
+import com.google.api.generator.engine.ast.ScopeNode;
+import com.google.api.generator.engine.ast.StringObjectValue;
+import com.google.api.generator.engine.ast.TypeNode;
+import com.google.api.generator.engine.ast.ValueExpr;
+import com.google.api.generator.gapic.composer.store.TypeStore;
+import com.google.api.generator.gapic.model.GapicClass;
+import com.google.api.generator.gapic.model.GapicContext;
+import com.google.api.generator.gapic.model.Service;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import javax.annotation.Generated;
+
+public class GapicPropertiesClassComposer implements ClassComposer {
+  private static final GapicPropertiesClassComposer INSTANCE = new GapicPropertiesClassComposer();
+
+  private static final TypeStore FIXED_TYPESTORE = createStaticTypes();
+
+  private GapicPropertiesClassComposer() {}
+
+  public static GapicPropertiesClassComposer instance() {
+    return INSTANCE;
+  }
+
+  @Override
+  public GapicClass generate(GapicContext context, Service service) {
+    String pakkage = service.pakkage();
+    String className = "GapicProperties";
+
+    ClassDefinition classDef =
+        ClassDefinition.builder()
+            .setPackageString(pakkage)
+            .setAnnotations(createClassAnnotations())
+            .setScope(ScopeNode.PUBLIC)
+            .setName(className)
+            .setExtendsType(FIXED_TYPESTORE.get("AbstractGapicProperties"))
+            .setMethods(createClassMethods(context))
+            .build();
+
+    return GapicClass.create(GapicClass.Kind.MAIN, classDef);
+  }
+
+  private static List<AnnotationNode> createClassAnnotations() {
+    return Arrays.asList(
+        AnnotationNode.withType(FIXED_TYPESTORE.get("InternalApi")),
+        AnnotationNode.builder()
+            .setType(FIXED_TYPESTORE.get("Generated"))
+            .setDescription("by gapic-generator-java")
+            .build());
+  }
+
+  private List<MethodDefinition> createClassMethods(GapicContext context) {
+    List<MethodDefinition> methods = new ArrayList<>();
+    methods.add(createGetRepositoryMethod(context));
+    methods.add(createGetArtifactNameMethod(context));
+    return methods;
+  }
+
+  private MethodDefinition createGetRepositoryMethod(GapicContext context) {
+    Expr returnExpr = ValueExpr.createNullExpr();
+    if (context.repo().isPresent()) {
+      returnExpr = ValueExpr.withValue(StringObjectValue.withValue(context.repo().orElse(null)));
+    }
+    return MethodDefinition.builder()
+        .setIsOverride(true)
+        .setScope(ScopeNode.PUBLIC)
+        .setReturnType(TypeNode.STRING)
+        .setName("getRepository")
+        .setReturnExpr(returnExpr)
+        .build();
+  }
+
+  private MethodDefinition createGetArtifactNameMethod(GapicContext context) {
+    Expr returnExpr = ValueExpr.createNullExpr();
+    if (context.artifact().isPresent()) {
+      returnExpr =
+          ValueExpr.withValue(StringObjectValue.withValue(context.artifact().orElse(null)));
+    }
+    return MethodDefinition.builder()
+        .setIsOverride(true)
+        .setScope(ScopeNode.PUBLIC)
+        .setReturnType(TypeNode.STRING)
+        .setName("getArtifactName")
+        .setReturnExpr(returnExpr)
+        .build();
+  }
+
+  private static TypeStore createStaticTypes() {
+    return new TypeStore(
+        Arrays.asList(
+            InternalApi.class,
+            Generated.class,
+            AbstractGapicProperties.class,
+            GaxProperties.class));
+  }
+}

gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/store/TypeStore.java

@@ -15,6 +15,7 @@
 package com.google.api.generator.gapic.composer.store;
 
 import com.google.api.generator.engine.ast.ConcreteReference;
+import com.google.api.generator.engine.ast.Reference;
 import com.google.api.generator.engine.ast.TypeNode;
 import com.google.api.generator.engine.ast.VaporReference;
 import com.google.api.generator.gapic.model.Message;
@@ -52,6 +53,16 @@ public void put(String pakkage, String typeName) {
             VaporReference.builder().setName(typeName).setPakkage(pakkage).build()));
   }
 
+  public void put(String pakkage, String typeName, Reference supertypeReference) {
+    VaporReference reference =
+        VaporReference.builder()
+            .setName(typeName)
+            .setPakkage(pakkage)
+            .setSupertypeReference(supertypeReference)
+            .build();
+    store.put(typeName, TypeNode.withReference(reference));
+  }
+
   public void putAll(String pakkage, List<String> typeNames) {
     for (String typeName : typeNames) {
       put(pakkage, typeName);

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

@@ -95,11 +95,17 @@ static GapicMetadata defaultGapicMetadata() {
 
   public abstract Transport transport();
 
+  public abstract Optional<String> repo();
+
+  public abstract Optional<String> artifact();
+
   public static Builder builder() {
     return new AutoValue_GapicContext.Builder()
         .setMixinServices(Collections.emptyList())
         .setGapicMetadataEnabled(false)
-        .setRestNumericEnumsEnabled(false);
+        .setRestNumericEnumsEnabled(false)
+        .setRepo(Optional.empty())
+        .setArtifact(Optional.empty());
   }
 
   @AutoValue.Builder
@@ -130,6 +136,10 @@ public Builder setHelperResourceNames(Set<ResourceName> helperResourceNames) {
 
     public abstract Builder setTransport(Transport transport);
 
+    public abstract Builder setRepo(Optional<String> repo);
+
+    public abstract Builder setArtifact(Optional<String> artifact);
+
     abstract ImmutableMap<String, ResourceName> resourceNames();
 
     abstract ImmutableMap<String, ResourceName> helperResourceNames();

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

@@ -150,6 +150,8 @@ public static GapicContext parse(CodeGeneratorRequest request) {
     Optional<GapicLanguageSettings> languageSettingsOpt =
         GapicLanguageSettingsParser.parse(gapicYamlConfigPathOpt);
     Optional<String> transportOpt = PluginArgumentParser.parseTransport(request);
+    Optional<String> repoOpt = PluginArgumentParser.parseRepo(request);
+    Optional<String> artifactOpt = PluginArgumentParser.parseArtifact(request);
 
     boolean willGenerateMetadata = PluginArgumentParser.hasMetadataFlag(request);
     boolean willGenerateNumericEnum = PluginArgumentParser.hasNumericEnumFlag(request);
@@ -253,6 +255,8 @@ public static GapicContext parse(CodeGeneratorRequest request) {
         .setServiceYamlProto(serviceYamlProtoOpt.orElse(null))
         .setTransport(transport)
         .setRestNumericEnumsEnabled(willGenerateNumericEnum)
+        .setRepo(repoOpt)
+        .setArtifact(artifactOpt)
         .build();
   }
 

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

@@ -32,6 +32,8 @@ public class PluginArgumentParser {
   @VisibleForTesting static final String KEY_NUMERIC_ENUM = "rest-numeric-enums";
   @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";
 
   private static final String JSON_FILE_ENDING = "grpc_service_config.json";
   private static final String GAPIC_YAML_FILE_ENDING = "gapic.yaml";
@@ -53,6 +55,14 @@ static Optional<String> parseTransport(CodeGeneratorRequest request) {
     return parseConfigArgument(request.getParameter(), KEY_TRANSPORT);
   }
 
+  static Optional<String> parseRepo(CodeGeneratorRequest request) {
+    return parseConfigArgument(request.getParameter(), KEY_REPO);
+  }
+
+  static Optional<String> parseArtifact(CodeGeneratorRequest request) {
+    return parseConfigArgument(request.getParameter(), KEY_ARTIFACT);
+  }
+
   static boolean hasMetadataFlag(CodeGeneratorRequest request) {
     return hasFlag(request.getParameter(), KEY_METADATA);
   }

gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/common/GapicPropertiesClassComposerTest.java

@@ -0,0 +1,35 @@
+/*
+ * Copyright 2026 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.api.generator.gapic.composer.common;
+
+import com.google.api.generator.gapic.model.GapicClass;
+import com.google.api.generator.gapic.model.GapicContext;
+import com.google.api.generator.gapic.model.Service;
+import com.google.api.generator.test.framework.Assert;
+import com.google.api.generator.test.protoloader.GrpcTestProtoLoader;
+import org.junit.jupiter.api.Test;
+
+class GapicPropertiesClassComposerTest {
+  @Test
+  void generateGapicPropertiesClass() {
+    GapicContext context = GrpcTestProtoLoader.instance().parseShowcaseEcho();
+    Service service = context.services().get(0);
+    GapicClass clazz = GapicPropertiesClassComposer.instance().generate(context, service);
+
+    Assert.assertGoldenClass(this.getClass(), clazz, "GapicProperties.golden");
+  }
+}

gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/common/goldens/GapicProperties.golden

@@ -0,0 +1,20 @@
+package com.google.showcase.v1beta1;
+
+import com.google.api.core.InternalApi;
+import com.google.api.gax.rpc.AbstractGapicProperties;
+import javax.annotation.Generated;
+
+@InternalApi
+@Generated("by gapic-generator-java")
+public class GapicProperties extends AbstractGapicProperties {
+
+  @Override
+  public String getRepository() {
+    return "googleapis/sdk-platform-java";
+  }
+
+  @Override
+  public String getArtifactName() {
+    return "com.google.cloud:gapic-showcase";
+  }
+}

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

@@ -9,6 +9,7 @@ import com.google.api.gax.grpc.GaxGrpcProperties;
 import com.google.api.gax.grpc.GrpcTransportChannel;
 import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
 import com.google.api.gax.retrying.RetrySettings;
+import com.google.api.gax.rpc.AbstractGapicProperties;
 import com.google.api.gax.rpc.ApiClientHeaderProvider;
 import com.google.api.gax.rpc.ClientContext;
 import com.google.api.gax.rpc.StatusCode;
@@ -17,6 +18,7 @@ import com.google.api.gax.rpc.TransportChannelProvider;
 import com.google.api.gax.rpc.UnaryCallSettings;
 import com.google.api.version.test.EchoRequest;
 import com.google.api.version.test.EchoResponse;
+import com.google.api.version.test.GapicProperties;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
@@ -166,6 +168,11 @@ public class EchoWithVersionStubSettings extends StubSettings<EchoWithVersionStu
     echoWithVersionMethodSettings = settingsBuilder.echoWithVersionMethodSettings().build();
   }
 
+  @Override
+  protected AbstractGapicProperties getGapicProperties() {
+    return new GapicProperties();
+  }
+
   /** Builder for EchoWithVersionStubSettings. */
   public static class Builder extends StubSettings.Builder<EchoWithVersionStubSettings, Builder> {
     private final ImmutableList<UnaryCallSettings.Builder<?, ?>> unaryMethodSettingsBuilders;