rename

Author: Duncan-tree-zhou

instrumentation-annotations-incubator/src/main/java/io/opentelemetry/instrumentation/annotations/incubator/Attribute.java

@@ -14,8 +14,7 @@
  * This annotation marks that a parameter of a method or constructor annotated with {@link Timed} or
  * {@link Counted} should be added as an attribute to the metric.
  *
- * <p>By default, the `{@link Object#toString()}` will be called on the parameter value to convert
- * it to a String.
+ * <p>`{@link Object#toString()}` will be called on the parameter value to convert it to a String.
  *
  * <p>Application developers can use this annotation to signal OpenTelemetry auto-instrumentation
  * that the attribute should be captured.

instrumentation-annotations-incubator/src/main/java/io/opentelemetry/instrumentation/annotations/incubator/AttributeReturnValue.java renamed to instrumentation-annotations-incubator/src/main/java/io/opentelemetry/instrumentation/annotations/incubator/ReturnValueAttribute.java

@@ -14,8 +14,7 @@
  * This annotation allows for adding the method return value as an attribute to metrics recorded
  * using the {@link Timed} and {@link Counted} annotations.
  *
- * <p>By default, the {@link Object#toString()} will be called on the return value to convert it to
- * a String.
+ * <p>{@link Object#toString()} will be called on the return value to convert it to a String.
  *
  * <p>Application developers can use this annotation to signal OpenTelemetry auto-instrumentation
  * that the attribute should be captured.
@@ -29,7 +28,7 @@
  */
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
-public @interface AttributeReturnValue {
+public @interface ReturnValueAttribute {
 
   /**
    * Attribute name for the return value.

instrumentation/opentelemetry-instrumentation-annotations/opentelemetry-instrumentation-annotations-incubator/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/instrumentationannotations/incubator/MetricsAnnotationHelper.java

@@ -6,7 +6,7 @@
 package io.opentelemetry.javaagent.instrumentation.instrumentationannotations.incubator;
 
 import application.io.opentelemetry.instrumentation.annotations.incubator.Attribute;
-import application.io.opentelemetry.instrumentation.annotations.incubator.AttributeReturnValue;
+import application.io.opentelemetry.instrumentation.annotations.incubator.ReturnValueAttribute;
 import application.io.opentelemetry.instrumentation.annotations.incubator.StaticAttribute;
 import io.opentelemetry.api.GlobalOpenTelemetry;
 import io.opentelemetry.api.common.Attributes;
@@ -67,7 +67,7 @@ static class MetricAttributeHelper {
 
     MetricAttributeHelper(Method method) {
       bindParameters = MethodBinder.bindParameters(method, PARAMETER_ATTRIBUTE_NAMES_EXTRACTOR);
-      AttributeReturnValue returnValueAttribute = method.getAnnotation(AttributeReturnValue.class);
+      ReturnValueAttribute returnValueAttribute = method.getAnnotation(ReturnValueAttribute.class);
       bindReturn =
           returnValueAttribute != null
               ? MethodBinder.bindReturnValue(method, returnValueAttribute.value())

instrumentation/opentelemetry-instrumentation-annotations/opentelemetry-instrumentation-annotations-incubator/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/instrumentationannotations/incubator/counted/CountedExample.java

@@ -6,8 +6,8 @@
 package io.opentelemetry.javaagent.instrumentation.instrumentationannotations.incubator.counted;
 
 import io.opentelemetry.instrumentation.annotations.incubator.Attribute;
-import io.opentelemetry.instrumentation.annotations.incubator.AttributeReturnValue;
 import io.opentelemetry.instrumentation.annotations.incubator.Counted;
+import io.opentelemetry.instrumentation.annotations.incubator.ReturnValueAttribute;
 import io.opentelemetry.instrumentation.annotations.incubator.StaticAttribute;
 import java.util.concurrent.CompletableFuture;
 
@@ -40,7 +40,7 @@ public void exampleWithAttributes(
       @Attribute("custom_attr2") ToStringObject toStringObject) {}
 
   @Counted(value = "example.with.return.count")
-  @AttributeReturnValue("returnValue")
+  @ReturnValueAttribute("returnValue")
   public ToStringObject exampleWithReturnValueAttribute() {
     return new ToStringObject();
   }
@@ -54,7 +54,7 @@ public void exampleWithException() {
   public void exampleIgnore() {}
 
   @Counted(value = "example.completable.future.count")
-  @AttributeReturnValue("returnValue")
+  @ReturnValueAttribute("returnValue")
   public CompletableFuture<String> completableFuture(CompletableFuture<String> future) {
     return future;
   }

instrumentation/opentelemetry-instrumentation-annotations/opentelemetry-instrumentation-annotations-incubator/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/instrumentationannotations/incubator/timed/TimedExample.java

@@ -6,7 +6,7 @@
 package io.opentelemetry.javaagent.instrumentation.instrumentationannotations.incubator.timed;
 
 import io.opentelemetry.instrumentation.annotations.incubator.Attribute;
-import io.opentelemetry.instrumentation.annotations.incubator.AttributeReturnValue;
+import io.opentelemetry.instrumentation.annotations.incubator.ReturnValueAttribute;
 import io.opentelemetry.instrumentation.annotations.incubator.StaticAttribute;
 import io.opentelemetry.instrumentation.annotations.incubator.Timed;
 import java.util.concurrent.CompletableFuture;
@@ -42,13 +42,13 @@ public void exampleWithException() {
   }
 
   @Timed(value = "example.with.return.duration")
-  @AttributeReturnValue("returnValue")
+  @ReturnValueAttribute("returnValue")
   public ToStringObject exampleWithReturnValueAttribute() {
     return new ToStringObject();
   }
 
   @Timed(value = "example.completable.future.duration")
-  @AttributeReturnValue("returnValue")
+  @ReturnValueAttribute("returnValue")
   public CompletableFuture<String> completableFuture(CompletableFuture<String> future) {
     return future;
   }