Skip to content

Commit 43c12c5

Browse files
add metric annotation instrumentation
1 parent 6fe72c7 commit 43c12c5

File tree

5 files changed

+33
-24
lines changed

5 files changed

+33
-24
lines changed

instrumentation-annotations/src/main/java/io/opentelemetry/instrumentation/annotations/Timed.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import java.lang.annotation.Retention;
1010
import java.lang.annotation.RetentionPolicy;
1111
import java.lang.annotation.Target;
12-
import java.util.concurrent.TimeUnit;
1312

1413
/**
1514
* This annotation creates a {@link io.opentelemetry.api.metrics.LongHistogram Histogram} instrument

instrumentation/opentelemetry-instrumentation-annotations-1.16/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/instrumentationannotations/AnnotationSingletons.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@
1111
import application.io.opentelemetry.instrumentation.annotations.MetricAttribute;
1212
import application.io.opentelemetry.instrumentation.annotations.Timed;
1313
import application.io.opentelemetry.instrumentation.annotations.WithSpan;
14-
//import io.opentelemetry.javaagent.instrumentation.instrumentationannotations.annotations.Counted;
15-
//import io.opentelemetry.javaagent.instrumentation.instrumentationannotations.annotations.MetricAttribute;
16-
//import io.opentelemetry.javaagent.instrumentation.instrumentationannotations.annotations.Timed;
14+
// import io.opentelemetry.javaagent.instrumentation.instrumentationannotations.annotations.Counted;
15+
// import
16+
// io.opentelemetry.javaagent.instrumentation.instrumentationannotations.annotations.MetricAttribute;
17+
// import io.opentelemetry.javaagent.instrumentation.instrumentationannotations.annotations.Timed;
1718
import com.google.common.base.Stopwatch;
1819
import io.opentelemetry.api.GlobalOpenTelemetry;
1920
import io.opentelemetry.api.common.Attributes;
@@ -105,9 +106,7 @@ private static void extractAdditionAttributes(
105106
String[] attributes, AttributesBuilder attributesBuilder) {
106107
int length = attributes.length;
107108
for (int i = 0; i < length / 2; i++) {
108-
attributesBuilder.put(
109-
attributes[i],
110-
i + 1 > length ? "" : attributes[i + 1]);
109+
attributesBuilder.put(attributes[i], i + 1 > length ? "" : attributes[i + 1]);
111110
}
112111
}
113112

instrumentation/opentelemetry-instrumentation-annotations-1.16/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/instrumentationannotations/CountedInstrumentation.java

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
package io.opentelemetry.javaagent.instrumentation.instrumentationannotations;
1+
/*
2+
* Copyright The OpenTelemetry Authors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
25

3-
import net.bytebuddy.description.annotation.AnnotationSource;
4-
import net.bytebuddy.description.method.MethodDescription;
5-
import net.bytebuddy.matcher.ElementMatcher;
6+
package io.opentelemetry.javaagent.instrumentation.instrumentationannotations;
67

78
import static io.opentelemetry.javaagent.instrumentation.instrumentationannotations.KotlinCoroutineUtil.isKotlinSuspendMethod;
89
import static net.bytebuddy.matcher.ElementMatchers.declaresMethod;
@@ -17,9 +18,11 @@
1718
import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
1819
import java.lang.reflect.Method;
1920
import net.bytebuddy.asm.Advice;
21+
import net.bytebuddy.description.annotation.AnnotationSource;
22+
import net.bytebuddy.description.method.MethodDescription;
2023
import net.bytebuddy.description.type.TypeDescription;
2124
import net.bytebuddy.implementation.bytecode.assign.Assigner;
22-
25+
import net.bytebuddy.matcher.ElementMatcher;
2326

2427
public class CountedInstrumentation implements TypeInstrumentation {
2528

instrumentation/opentelemetry-instrumentation-annotations-1.16/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/instrumentationannotations/CountedInstrumentationsModule.java

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
1+
/*
2+
* Copyright The OpenTelemetry Authors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
16
package io.opentelemetry.javaagent.instrumentation.instrumentationannotations;
27

8+
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
9+
import static java.util.Arrays.asList;
10+
11+
import application.io.opentelemetry.instrumentation.annotations.Counted;
312
import com.google.auto.service.AutoService;
413
import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
514
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
6-
import net.bytebuddy.matcher.ElementMatcher;
715
import java.util.List;
8-
9-
10-
import application.io.opentelemetry.instrumentation.annotations.Counted;
11-
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
12-
import static java.util.Arrays.asList;
16+
import net.bytebuddy.matcher.ElementMatcher;
1317

1418
@AutoService(CountedInstrumentationsModule.class)
1519
public class CountedInstrumentationsModule extends InstrumentationModule {
@@ -34,5 +38,4 @@ public int order() {
3438
// earlier in the instrumented method and create the span to attach attributes to.
3539
return -1000;
3640
}
37-
3841
}

instrumentation/opentelemetry-instrumentation-annotations-1.16/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/instrumentationannotations/TimedInstrumentationsModule.java

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,19 @@
1+
/*
2+
* Copyright The OpenTelemetry Authors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
16
package io.opentelemetry.javaagent.instrumentation.instrumentationannotations;
27

8+
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
9+
import static java.util.Arrays.asList;
10+
11+
import application.io.opentelemetry.instrumentation.annotations.Timed;
312
import com.google.auto.service.AutoService;
413
import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
514
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
6-
import net.bytebuddy.matcher.ElementMatcher;
715
import java.util.List;
8-
9-
import application.io.opentelemetry.instrumentation.annotations.Timed;
10-
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
11-
import static java.util.Arrays.asList;
16+
import net.bytebuddy.matcher.ElementMatcher;
1217

1318
@AutoService(TimedInstrumentationsModule.class)
1419
public class TimedInstrumentationsModule extends InstrumentationModule {

0 commit comments

Comments
 (0)