diff --git a/conventions/src/main/kotlin/otel.errorprone-conventions.gradle.kts b/conventions/src/main/kotlin/otel.errorprone-conventions.gradle.kts index e48859786ec6..f61a14266eb7 100644 --- a/conventions/src/main/kotlin/otel.errorprone-conventions.gradle.kts +++ b/conventions/src/main/kotlin/otel.errorprone-conventions.gradle.kts @@ -58,8 +58,8 @@ tasks { // Suggests using Guava types for fields but we don't use Guava disable("ImmutableMemberCollection") - // Fully qualified names may be necessary when deprecating a class to avoid - // deprecation warning. + // Replaced by custom OtelUnnecessarilyFullyQualified check which handles + // application.* and other repo-specific conventions disable("UnnecessarilyFullyQualified") // TODO (trask) use animal sniffer diff --git a/custom-checks/src/main/java/io/opentelemetry/javaagent/customchecks/OtelUnnecessarilyFullyQualified.java b/custom-checks/src/main/java/io/opentelemetry/javaagent/customchecks/OtelUnnecessarilyFullyQualified.java new file mode 100644 index 000000000000..c45b0d7d71b6 --- /dev/null +++ b/custom-checks/src/main/java/io/opentelemetry/javaagent/customchecks/OtelUnnecessarilyFullyQualified.java @@ -0,0 +1,371 @@ +/* + * Copyright The OpenTelemetry Authors + * SPDX-License-Identifier: Apache-2.0 + */ + +// Includes work from: +/* + * Copyright 2025 The Error Prone Authors. + * + * 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 io.opentelemetry.javaagent.customchecks; + +import static com.google.common.collect.Iterables.getOnlyElement; +import static com.google.errorprone.matchers.Description.NO_MATCH; +import static com.google.errorprone.util.ASTHelpers.getGeneratedBy; +import static com.google.errorprone.util.ASTHelpers.getSymbol; +import static com.google.errorprone.util.ASTHelpers.getType; +import static com.google.errorprone.util.ASTHelpers.isGeneratedConstructor; +import static com.google.errorprone.util.FindIdentifiers.findIdent; +import static com.sun.tools.javac.code.Kinds.KindSelector.VAL_TYP; +import static java.util.stream.Collectors.toCollection; + +import com.google.auto.service.AutoService; +import com.google.common.base.Ascii; +import com.google.common.collect.HashBasedTable; +import com.google.common.collect.HashMultimap; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.SetMultimap; +import com.google.common.collect.Table; +import com.google.errorprone.BugPattern; +import com.google.errorprone.BugPattern.SeverityLevel; +import com.google.errorprone.ErrorProneFlags; +import com.google.errorprone.VisitorState; +import com.google.errorprone.bugpatterns.BugChecker; +import com.google.errorprone.bugpatterns.BugChecker.CompilationUnitTreeMatcher; +import com.google.errorprone.fixes.SuggestedFix; +import com.google.errorprone.matchers.Description; +import com.google.errorprone.util.ASTHelpers; +import com.sun.source.tree.ClassTree; +import com.sun.source.tree.CompilationUnitTree; +import com.sun.source.tree.ExpressionTree; +import com.sun.source.tree.IdentifierTree; +import com.sun.source.tree.ImportTree; +import com.sun.source.tree.MemberSelectTree; +import com.sun.source.tree.MethodTree; +import com.sun.source.tree.Tree; +import com.sun.source.util.SimpleTreeVisitor; +import com.sun.source.util.TreePath; +import com.sun.tools.javac.code.Symbol; +import com.sun.tools.javac.code.Symbol.ClassSymbol; +import com.sun.tools.javac.code.Symbol.PackageSymbol; +import com.sun.tools.javac.code.Symbol.TypeSymbol; +import com.sun.tools.javac.code.Type; +import com.sun.tools.javac.util.Position; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.concurrent.atomic.AtomicBoolean; +import javax.inject.Inject; +import javax.lang.model.element.Name; + +/** Flags uses of fully qualified names which are not ambiguous if imported. */ +@BugPattern( + severity = SeverityLevel.WARNING, + summary = "This fully qualified name is unambiguous to the compiler if imported.", + // so it can be suppressed with @SuppressWarnings("UnnecessarilyFullyQualified") + altNames = "UnnecessarilyFullyQualified") +@AutoService(BugChecker.class) +public final class OtelUnnecessarilyFullyQualified extends BugChecker + implements CompilationUnitTreeMatcher { + + private static final ImmutableSet EXEMPTED_NAMES = ImmutableSet.of("Annotation"); + + /** + * Fully qualified names that are intentionally kept as FQNs. For example, {@code + * io.opentelemetry.extension.annotations.WithSpan} is the deprecated predecessor of {@code + * io.opentelemetry.instrumentation.annotations.WithSpan}; test code that exercises the old + * annotation uses the FQN to make it obvious which variant is under test. + */ + private static final ImmutableSet EXEMPTED_FQNS = + ImmutableSet.of( + "io.opentelemetry.extension.annotations.SpanAttribute", + "io.opentelemetry.extension.annotations.WithSpan"); + + /** + * Class names which are bad as a direct import if they have an enclosing class. + * + *

The common factor for these names isn't just that they may be vague class names; there are + * many more examples of that. What's important is that they are vague and generally + * clarified by the name of the outer class (that is, {@code Foo.Builder} is clearer than {@code + * Builder}). + */ + // Copied from com.google.errorprone.bugpatterns.BadImport.BAD_NESTED_CLASSES (package-private). + private static final ImmutableSet BAD_NESTED_CLASSES = + ImmutableSet.of( + "Builder", + "BuilderFactory", + "Callback", + "Class", + "Enum", + "Factory", + "Type", + "Key", + "Id", + "Provider"); + + /** + * Exempted types that fully qualified name usages are acceptable for their nested types when + * importing the enclosing type is ambiguous. + * + *

Some types are meant to provide a namespace; therefore, imports for their nested types can + * be confusing. + * + *

For instance, unlike its name suggests, {@code org.immutables.value.Value.Immutable} is used + * to generate immutable value types, and its import can be misleading. So, importing {@code + * org.immutables.value.Value} and using {@code @Value.Immutable} is more favorable than importing + * {@code org.immutables.value.Value.Immutable} and using {@code @Immutable}. + */ + private final ImmutableSet exemptedEnclosingTypes; + + private final boolean batchFindings; + + public OtelUnnecessarilyFullyQualified() { + this(ErrorProneFlags.empty()); + } + + @Inject + OtelUnnecessarilyFullyQualified(ErrorProneFlags errorProneFlags) { + this.exemptedEnclosingTypes = errorProneFlags.getSetOrEmpty("BadImport:BadEnclosingTypes"); + this.batchFindings = + errorProneFlags.getBoolean("OtelUnnecessarilyFullyQualified:BatchFindings").orElse(false); + } + + @Override + public Description matchCompilationUnit(CompilationUnitTree tree, VisitorState state) { + if (tree.getTypeDecls().stream() + .anyMatch(t -> getSymbol(tree) != null && !getGeneratedBy(getSymbol(tree)).isEmpty())) { + return NO_MATCH; + } + if (isPackageInfo(tree)) { + return NO_MATCH; + } + Table> table = HashBasedTable.create(); + SetMultimap identifiersSeen = HashMultimap.create(); + new SuppressibleTreePathScanner(state) { + @Override + public Void visitImport(ImportTree importTree, Void unused) { + return null; + } + + @Override + public Void visitClass(ClassTree tree, Void unused) { + scan(tree.getModifiers(), null); + scan(tree.getTypeParameters(), null); + // Some anonymous classes have an extends clause which is fully qualified. Just ignore it. + if (!getSymbol(tree).isAnonymous()) { + scan(tree.getExtendsClause(), null); + scan(tree.getImplementsClause(), null); + } + scan(tree.getMembers(), null); + return null; + } + + @Override + public Void visitMethod(MethodTree tree, Void unused) { + // Some generated constructors sneak in a fully qualified argument. + return isGeneratedConstructor(tree) ? null : super.visitMethod(tree, null); + } + + @Override + public Void visitMemberSelect(MemberSelectTree memberSelectTree, Void unused) { + if (!shouldIgnore()) { + handle(getCurrentPath()); + } + return super.visitMemberSelect(memberSelectTree, null); + } + + @Override + public Void visitIdentifier(IdentifierTree identifierTree, Void unused) { + Type type = getType(identifierTree); + if (type != null) { + identifiersSeen.put(identifierTree.getName(), type.tsym); + } + return null; + } + + private boolean shouldIgnore() { + // Don't report duplicate hits if we're not at the tail of a series of member selects on + // classes. + Tree parentTree = getCurrentPath().getParentPath().getLeaf(); + return parentTree instanceof MemberSelectTree + && getSymbol(parentTree) instanceof ClassSymbol; + } + + private void handle(TreePath path) { + MemberSelectTree tree = (MemberSelectTree) path.getLeaf(); + if (!isFullyQualified(tree)) { + return; + } + if (isApplicationClass(tree)) { + return; + } + Symbol sym = getSymbol(tree); + if (sym instanceof ClassSymbol + && EXEMPTED_FQNS.contains(sym.getQualifiedName().toString())) { + return; + } + if (isBadNestedClass(tree) || isExemptedEnclosingType(tree)) { + handle(new TreePath(path, tree.getExpression())); + return; + } + Symbol symbol = getSymbol(tree); + if (!(symbol instanceof ClassSymbol)) { + return; + } + // Classes deprecated for removal (e.g. java.security.AccessController) must stay + // fully qualified: importing them produces a [removal] javadoc warning that cannot + // be suppressed at the import site, only at usage sites via @SuppressWarnings. + if (isDeprecatedForRemoval(symbol)) { + return; + } + if (state.getEndPosition(tree) == Position.NOPOS) { + return; + } + List treePaths = table.get(tree.getIdentifier(), symbol.type.tsym); + if (treePaths == null) { + treePaths = new ArrayList<>(); + table.put(tree.getIdentifier(), symbol.type.tsym, treePaths); + } + treePaths.add(path); + } + + private boolean isBadNestedClass(MemberSelectTree tree) { + return BAD_NESTED_CLASSES.contains(tree.getIdentifier().toString()); + } + + private boolean isDeprecatedForRemoval(Symbol symbol) { + // When not cross-compiling, the javac symbol flag works directly. + if (symbol.isDeprecatedForRemoval()) { + return true; + } + // When compiling with --release 8, javac loads JDK class metadata from ct.sym + // which uses Java 8's @Deprecated (no forRemoval element), so the + // DEPRECATED_REMOVAL flag is never set on the symbol. Fall back to loading + // the class from the running JVM (JDK 9+) to check the actual annotation. + try { + Class clazz = Class.forName(symbol.getQualifiedName().toString()); + Deprecated deprecated = clazz.getAnnotation(Deprecated.class); + return deprecated != null && deprecated.forRemoval(); + } catch (ClassNotFoundException | NoClassDefFoundError e) { + return false; + } + } + + private boolean isExemptedEnclosingType(MemberSelectTree tree) { + ExpressionTree expression = tree.getExpression(); + if (!(expression instanceof MemberSelectTree)) { + return false; + } + Symbol symbol = getSymbol(expression); + if (!(symbol instanceof ClassSymbol)) { + return false; + } + + return exemptedEnclosingTypes.contains(symbol.getQualifiedName().toString()); + } + + private boolean isApplicationClass(MemberSelectTree tree) { + ExpressionTree expression = tree; + while (expression instanceof MemberSelectTree) { + expression = ((MemberSelectTree) expression).getExpression(); + } + if (expression instanceof IdentifierTree) { + return ((IdentifierTree) expression).getName().contentEquals("application"); + } + return false; + } + + private boolean isFullyQualified(MemberSelectTree tree) { + AtomicBoolean isFullyQualified = new AtomicBoolean(); + new SimpleTreeVisitor() { + @Override + public Void visitMemberSelect(MemberSelectTree memberSelectTree, Void unused) { + return visit(memberSelectTree.getExpression(), null); + } + + @Override + public Void visitIdentifier(IdentifierTree identifierTree, Void unused) { + if (getSymbol(identifierTree) instanceof PackageSymbol) { + isFullyQualified.set(true); + } + return null; + } + }.visit(tree, null); + return isFullyQualified.get(); + } + }.scan(state.getPath(), null); + + for (Map.Entry>> rows : table.rowMap().entrySet()) { + Name name = rows.getKey(); + Map> types = rows.getValue(); + // Skip places where the same simple name refers to multiple types. + if (types.size() > 1) { + continue; + } + TypeSymbol type = getOnlyElement(types.keySet()); + // Skip weird Android classes which don't look like classes. + if (Ascii.isLowerCase(name.charAt(0))) { + continue; + } + // Don't replace if this name is already used in the file to refer to a _different_ type. + if (identifiersSeen.get(name).stream().anyMatch(s -> !s.equals(type))) { + continue; + } + String nameString = name.toString(); + if (EXEMPTED_NAMES.contains(nameString)) { + continue; + } + List pathsToFix = Objects.requireNonNull(getOnlyElement(types.values())); + Set meaningAtUsageSites = + pathsToFix.stream() + .map(path -> findIdent(nameString, state.withPath(path), VAL_TYP)) + .collect(toCollection(HashSet::new)); + // Don't report a finding if the simple name has a different meaning elsewhere. + if (meaningAtUsageSites.stream().anyMatch(s -> s != null && !s.equals(type))) { + continue; + } + SuggestedFix.Builder fixBuilder = SuggestedFix.builder(); + // Only add the import if any of the usage sites don't already resolve to this type. + if (meaningAtUsageSites.stream().anyMatch(Objects::isNull)) { + fixBuilder.addImport( + Objects.requireNonNull(getOnlyElement(types.keySet())).getQualifiedName().toString()); + } + for (TreePath path : pathsToFix) { + fixBuilder.replace(path.getLeaf(), nameString); + } + SuggestedFix fix = fixBuilder.build(); + for (TreePath path : pathsToFix) { + state.reportMatch(describeMatch(path.getLeaf(), fix)); + if (this.batchFindings) { + break; + } + } + } + return NO_MATCH; + } + + private static boolean isPackageInfo(CompilationUnitTree tree) { + String name = ASTHelpers.getFileName(tree); + int idx = name.lastIndexOf('/'); + if (idx != -1) { + name = name.substring(idx + 1); + } + return name.equals("package-info.java"); + } +} diff --git a/custom-checks/src/test/java/io/opentelemetry/javaagent/customchecks/OtelUnnecessarilyFullyQualifiedTest.java b/custom-checks/src/test/java/io/opentelemetry/javaagent/customchecks/OtelUnnecessarilyFullyQualifiedTest.java new file mode 100644 index 000000000000..a60e9cc9de51 --- /dev/null +++ b/custom-checks/src/test/java/io/opentelemetry/javaagent/customchecks/OtelUnnecessarilyFullyQualifiedTest.java @@ -0,0 +1,531 @@ +/* + * Copyright The OpenTelemetry Authors + * SPDX-License-Identifier: Apache-2.0 + */ + +// Includes work from: +/* + * Copyright 2020 The Error Prone Authors. + * + * 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 io.opentelemetry.javaagent.customchecks; + +import com.google.errorprone.BugCheckerRefactoringTestHelper; +import com.google.errorprone.CompilationTestHelper; +import org.junit.jupiter.api.Test; + +/** Tests for {@link OtelUnnecessarilyFullyQualified}. */ +class OtelUnnecessarilyFullyQualifiedTest { + private final BugCheckerRefactoringTestHelper helper = + BugCheckerRefactoringTestHelper.newInstance( + OtelUnnecessarilyFullyQualified.class, getClass()); + + private final CompilationTestHelper compilationHelper = + CompilationTestHelper.newInstance(OtelUnnecessarilyFullyQualified.class, getClass()); + + @Test + void singleUse() { + helper + .addInputLines( + "Test.java", + """ + interface Test { + java.util.List foo(); + + java.util.List bar(); + } + """) + .addOutputLines( + "Test.java", + """ + import java.util.List; + + interface Test { + List foo(); + + List bar(); + } + """) + .doTest(); + } + + @Test + void wouldBeAmbiguous() { + helper + .addInputLines( + "List.java", // + "class List {}") + .expectUnchanged() + .addInputLines( + "Test.java", + """ + interface Test { + java.util.List foo(); + } + """) + .expectUnchanged() + .doTest(); + } + + @Test + void refersToMultipleTypes() { + helper + .addInputLines( + "List.java", + """ + package a; + + public class List {} + """) + .expectUnchanged() + .addInputLines( + "Test.java", + """ + package b; + + interface Test { + java.util.List foo(); + + a.List bar(); + } + """) + .expectUnchanged() + .doTest(); + } + + @Test + void refersToMultipleTypes_dependingOnLocation() { + helper + .addInputLines( + "Outer.java", + """ + package a; + + public class Outer { + public class List {} + } + """) + .expectUnchanged() + .addInputLines( + "Test.java", + """ + package b; + + import a.Outer; + + interface Test { + java.util.List foo(); + + public abstract class Inner extends Outer { + abstract List bar(); + } + } + """) + .expectUnchanged() + .doTest(); + } + + @Test + void inconsistentImportUsage() { + helper + .addInputLines( + "Test.java", + """ + import java.util.List; + + public class Test { + public java.util.List foo(List list) { + return list; + } + } + """) + .addOutputLines( + "Test.java", + """ + import java.util.List; + + public class Test { + public List foo(List list) { + return list; + } + } + """) + .doTest(); + } + + @Test + void clashesWithTypeInSuperType() { + helper + .addInputLines( + "A.java", + """ + package a; + + public interface A { + public static class List {} + } + """) + .expectUnchanged() + .addInputLines( + "Test.java", + """ + package b; + + import a.A; + + class Test implements A { + java.util.List foo() { + return null; + } + } + """) + .expectUnchanged() + .doTest(); + } + + @Test + void builder() { + helper + .addInputLines( + "Foo.java", + """ + package a; + + public class Foo { + public static final class Builder {} + } + """) + .expectUnchanged() + .addInputLines( + "Test.java", + """ + package b; + + interface Test { + a.Foo foo(); + + a.Foo.Builder fooBuilder(); + } + """) + .addOutputLines( + "Test.java", + """ + package b; + + import a.Foo; + + interface Test { + Foo foo(); + + Foo.Builder fooBuilder(); + } + """) + .doTest(); + } + + @Test + void exemptedNames() { + helper + .addInputLines( + "Annotation.java", + """ + package pkg; + + public class Annotation {} + """) + .expectUnchanged() + .addInputLines( + "Test.java", + """ + interface Test { + pkg.Annotation foo(); + } + """) + .expectUnchanged() + .doTest(); + } + + @Test + void innerClass() { + helper + .addInputLines( + "A.java", + """ + package test; + + public class A { + class B {} + + void test(A a) { + a.new B() {}; + } + } + """) + .expectUnchanged() + .doTest(); + } + + @Test + void packageInfo() { + compilationHelper + .addSourceLines( + "a/A.java", + """ + package a; + + public @interface A {} + """) + .addSourceLines( + "b/package-info.java", + """ + @a.A + package b; + """) + .doTest(); + } + + @Test + void staticNestedClass() { + helper + .addInputLines( + "test/EnclosingType.java", + """ + package test; + + public final class EnclosingType { + public static final class StaticNestedClass {} + } + """) + .expectUnchanged() + .addInputLines( + "Test.java", + """ + interface Test { + test.EnclosingType.StaticNestedClass method(); + } + """) + .addOutputLines( + "Test.java", + """ + import test.EnclosingType.StaticNestedClass; + + interface Test { + StaticNestedClass method(); + } + """) + .doTest(); + } + + @Test + void exemptedEnclosingTypes() { + helper + .setArgs("-XepOpt:BadImport:BadEnclosingTypes=org.immutables.value.Value") + .addInputLines( + "org/immutables/value/Value.java", + """ + package org.immutables.value; + + public @interface Value { + @interface Immutable {} + } + """) + .expectUnchanged() + .addInputLines( + "Test.java", + """ + import org.immutables.value.Value.Immutable; + + class Test { + @org.immutables.value.Value.Immutable + abstract class AbstractType {} + } + """) + .addOutputLines( + "Test.java", + """ + import org.immutables.value.Value; + import org.immutables.value.Value.Immutable; + + class Test { + @Value.Immutable + abstract class AbstractType {} + } + """) + .doTest(); + } + + @Test + void exemptedEnclosingTypes_importWouldBeAmbiguous() { + helper + .setArgs("-XepOpt:BadImport:BadEnclosingTypes=org.immutables.value.Value") + .addInputLines( + "org/immutables/value/Value.java", + """ + package org.immutables.value; + + public @interface Value { + @interface Immutable {} + } + """) + .expectUnchanged() + .addInputLines( + "annotation/Value.java", + """ + package annotation; + + public @interface Value { + String value(); + } + """) + .expectUnchanged() + .addInputLines( + "Test.java", + """ + import annotation.Value; + + final class Test { + Test(@Value("test") String value) {} + + @org.immutables.value.Value.Immutable + abstract class AbstractType {} + } + """) + .expectUnchanged() + .doTest(); + } + + @Test + void unbatchedFindings() { + compilationHelper + .addSourceLines( + "Test.java", + """ + interface Test { + // BUG: Diagnostic contains: + java.util.List foo(); + + // BUG: Diagnostic contains: + java.util.List bar(); + } + """) + .doTest(); + } + + @Test + void batchedFindings() { + compilationHelper + .addSourceLines( + "Test.java", + """ + interface Test { + // BUG: Diagnostic contains: + java.util.List foo(); + + java.util.List bar(); + } + """) + .setArgs("-XepOpt:OtelUnnecessarilyFullyQualified:BatchFindings=true") + .doTest(); + } + + @Test + void lambdaParameter() { + compilationHelper + .addSourceLines( + "Lib.java", + """ + import java.util.List; + import java.util.stream.Stream; + + interface Lib { + Stream> f(); + } + """) + .addSourceLines( + "Test.java", + """ + class Test { + void f(Lib l) { + l.f().map(x -> x); + } + + void g(Lib l) { + l.f().map(x -> x); + } + } + """) + .setArgs("-XepOpt:OtelUnnecessarilyFullyQualified:BatchFindings=true") + .doTest(); + } + + @Test + void applicationClassesNotFlagged() { + // application.io.opentelemetry.* classes are shaded copies that must use fully qualified + // names to avoid conflicts with the agent's own copy of the classes + compilationHelper + .addSourceLines( + "application/io/opentelemetry/api/trace/SpanKind.java", + """ + package application.io.opentelemetry.api.trace; + + public enum SpanKind { + INTERNAL, + SERVER, + CLIENT + } + """) + .addSourceLines( + "Test.java", + """ + class Test { + application.io.opentelemetry.api.trace.SpanKind method() { + return application.io.opentelemetry.api.trace.SpanKind.INTERNAL; + } + } + """) + .doTest(); + } + + @Test + void applicationAnnotationsNotFlagged() { + compilationHelper + .addSourceLines( + "application/io/opentelemetry/extension/annotations/WithSpan.java", + """ + package application.io.opentelemetry.extension.annotations; + + import java.lang.annotation.ElementType; + import java.lang.annotation.Retention; + import java.lang.annotation.RetentionPolicy; + import java.lang.annotation.Target; + + @Retention(RetentionPolicy.RUNTIME) + @Target(ElementType.METHOD) + public @interface WithSpan { + String value() default ""; + } + """) + .addSourceLines( + "Test.java", + """ + class Test { + application.io.opentelemetry.extension.annotations.WithSpan getAnnotation() { + return null; + } + } + """) + .doTest(); + } +} diff --git a/instrumentation/java-util-logging/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jul/JavaUtilLoggingHelper.java b/instrumentation/java-util-logging/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jul/JavaUtilLoggingHelper.java index 62a141d3546e..385a3b59710f 100644 --- a/instrumentation/java-util-logging/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jul/JavaUtilLoggingHelper.java +++ b/instrumentation/java-util-logging/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jul/JavaUtilLoggingHelper.java @@ -14,7 +14,6 @@ import static java.util.logging.Level.SEVERE; import static java.util.logging.Level.WARNING; -import application.java.util.logging.Logger; import io.opentelemetry.api.GlobalOpenTelemetry; import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.common.AttributesBuilder; @@ -36,7 +35,7 @@ public final class JavaUtilLoggingHelper { DeclarativeConfigUtil.getInstrumentationConfig(GlobalOpenTelemetry.get(), "java_util_logging") .getBoolean("experimental_log_attributes/development", false); - public static void capture(Logger logger, LogRecord logRecord) { + public static void capture(application.java.util.logging.Logger logger, LogRecord logRecord) { if (!logger.isLoggable(logRecord.getLevel())) { // this is already checked in most cases, except if Logger.log(LogRecord) was called directly diff --git a/instrumentation/java-util-logging/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jul/JavaUtilLoggingInstrumentation.java b/instrumentation/java-util-logging/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jul/JavaUtilLoggingInstrumentation.java index c612fe395f24..1ab107f8dbd0 100644 --- a/instrumentation/java-util-logging/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jul/JavaUtilLoggingInstrumentation.java +++ b/instrumentation/java-util-logging/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jul/JavaUtilLoggingInstrumentation.java @@ -12,7 +12,6 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArgument; import static net.bytebuddy.matcher.ElementMatchers.takesArguments; -import application.java.util.logging.Logger; import io.opentelemetry.api.logs.LoggerProvider; import io.opentelemetry.javaagent.bootstrap.CallDepth; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; @@ -45,7 +44,8 @@ public static class LogAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) public static CallDepth methodEnter( - @Advice.This Logger logger, @Advice.Argument(0) LogRecord logRecord) { + @Advice.This application.java.util.logging.Logger logger, + @Advice.Argument(0) LogRecord logRecord) { // need to track call depth across all loggers in order to avoid double capture when one // logging framework delegates to another CallDepth callDepth = CallDepth.forClass(LoggerProvider.class); diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/ApplicationOpenTelemetry.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/ApplicationOpenTelemetry.java index 1eb1ebb0ffab..d916a8a34170 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/ApplicationOpenTelemetry.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/ApplicationOpenTelemetry.java @@ -5,21 +5,18 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi; -import application.io.opentelemetry.api.OpenTelemetry; -import application.io.opentelemetry.api.trace.TracerProvider; -import application.io.opentelemetry.context.propagation.ContextPropagators; +import io.opentelemetry.api.GlobalOpenTelemetry; +import io.opentelemetry.api.OpenTelemetry; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.context.propagation.ApplicationContextPropagators; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.trace.ApplicationTracerProvider; import javax.annotation.Nullable; -// Our convention for accessing agent package -@SuppressWarnings("UnnecessarilyFullyQualified") -public class ApplicationOpenTelemetry implements OpenTelemetry { +public class ApplicationOpenTelemetry implements application.io.opentelemetry.api.OpenTelemetry { - public static final OpenTelemetry INSTANCE; + public static final application.io.opentelemetry.api.OpenTelemetry INSTANCE; static { - OpenTelemetry instance = getOpenTelemetry156(); + application.io.opentelemetry.api.OpenTelemetry instance = getOpenTelemetry156(); if (instance == null) { instance = getOpenTelemetry127(); } @@ -32,13 +29,13 @@ public class ApplicationOpenTelemetry implements OpenTelemetry { INSTANCE = instance; } - private final TracerProvider applicationTracerProvider; + private final application.io.opentelemetry.api.trace.TracerProvider applicationTracerProvider; - private final ContextPropagators applicationContextPropagators; + private final application.io.opentelemetry.context.propagation.ContextPropagators + applicationContextPropagators; private ApplicationOpenTelemetry() { - io.opentelemetry.api.OpenTelemetry agentOpenTelemetry = - io.opentelemetry.api.GlobalOpenTelemetry.get(); + OpenTelemetry agentOpenTelemetry = GlobalOpenTelemetry.get(); applicationTracerProvider = ApplicationTracerProvider.create(agentOpenTelemetry.getTracerProvider()); applicationContextPropagators = @@ -46,37 +43,37 @@ private ApplicationOpenTelemetry() { } @Override - public TracerProvider getTracerProvider() { + public application.io.opentelemetry.api.trace.TracerProvider getTracerProvider() { return applicationTracerProvider; } @Override - public ContextPropagators getPropagators() { + public application.io.opentelemetry.context.propagation.ContextPropagators getPropagators() { return applicationContextPropagators; } @Nullable - private static OpenTelemetry getOpenTelemetry156() { + private static application.io.opentelemetry.api.OpenTelemetry getOpenTelemetry156() { return getOpenTelemetry( "io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_56.incubator.ApplicationOpenTelemetry156Incubator"); } @Nullable - private static OpenTelemetry getOpenTelemetry127() { + private static application.io.opentelemetry.api.OpenTelemetry getOpenTelemetry127() { return getOpenTelemetry( "io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_27.ApplicationOpenTelemetry127"); } @Nullable - private static OpenTelemetry getOpenTelemetry110() { + private static application.io.opentelemetry.api.OpenTelemetry getOpenTelemetry110() { return getOpenTelemetry( "io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.ApplicationOpenTelemetry110"); } - private static OpenTelemetry getOpenTelemetry(String className) { + private static application.io.opentelemetry.api.OpenTelemetry getOpenTelemetry(String className) { try { Class clazz = Class.forName(className); - return (OpenTelemetry) clazz.getField("INSTANCE").get(null); + return (application.io.opentelemetry.api.OpenTelemetry) clazz.getField("INSTANCE").get(null); } catch (ClassNotFoundException | NoSuchFieldException | IllegalAccessException exception) { return null; } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/ContextInstrumentation.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/ContextInstrumentation.java index 912af97f9439..d4fb5c12f5fd 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/ContextInstrumentation.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/ContextInstrumentation.java @@ -9,8 +9,6 @@ import static net.bytebuddy.matcher.ElementMatchers.isStatic; import static net.bytebuddy.matcher.ElementMatchers.named; -import application.io.opentelemetry.context.Context; -import application.io.opentelemetry.context.ContextStorage; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.context.AgentContextStorage; @@ -20,10 +18,10 @@ import net.bytebuddy.matcher.ElementMatcher; /** - * Returns {@link AgentContextStorage} as the implementation of {@link ContextStorage} in the - * application classpath. We do this instead of using the normal service loader mechanism to make - * sure there is no dependency on a system property or possibility of a user overriding this since - * it's required for instrumentation in the agent to work properly. + * Returns AgentContextStorage as the implementation of ContextStorage in the application classpath. + * We do this instead of using the normal service loader mechanism to make sure there is no + * dependency on a system property or possibility of a user overriding this since it's required for + * instrumentation in the agent to work properly. */ public class ContextInstrumentation implements TypeInstrumentation { @@ -44,7 +42,8 @@ public static class WrapRootAdvice { @AssignReturned.ToReturned @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) - public static Context methodExit(@Advice.Return Context root) { + public static application.io.opentelemetry.context.Context methodExit( + @Advice.Return application.io.opentelemetry.context.Context root) { return AgentContextStorage.wrapRootContext(root); } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/ContextStorageWrappersInstrumentation.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/ContextStorageWrappersInstrumentation.java index d034412cda49..4a58ffdcc3a3 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/ContextStorageWrappersInstrumentation.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/ContextStorageWrappersInstrumentation.java @@ -7,7 +7,6 @@ import static net.bytebuddy.matcher.ElementMatchers.named; -import application.io.opentelemetry.context.ContextStorage; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.context.AgentContextStorage; @@ -20,10 +19,10 @@ import net.bytebuddy.matcher.ElementMatcher; /** - * Returns {@link AgentContextStorage} as the implementation of {@link ContextStorage} in the - * application classpath. We do this instead of using the normal service loader mechanism to make - * sure there is no dependency on a system property or possibility of a user overriding this since - * it's required for instrumentation in the agent to work properly. + * Returns AgentContextStorage as the implementation of ContextStorage in the application classpath. + * We do this instead of using the normal service loader mechanism to make sure there is no + * dependency on a system property or possibility of a user overriding this since it's required for + * instrumentation in the agent to work properly. */ public class ContextStorageWrappersInstrumentation implements TypeInstrumentation { @@ -44,11 +43,22 @@ public static class AddWrapperAdvice { @AssignReturned.ToReturned @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) - public static List> methodExit( - @Advice.Return - List> originalWrappers) { - List> wrappers = - new ArrayList<>(originalWrappers); + public static List< + Function< + ? super application.io.opentelemetry.context.ContextStorage, + ? extends application.io.opentelemetry.context.ContextStorage>> + methodExit( + @Advice.Return + List< + Function< + ? super application.io.opentelemetry.context.ContextStorage, + ? extends application.io.opentelemetry.context.ContextStorage>> + originalWrappers) { + List< + Function< + ? super application.io.opentelemetry.context.ContextStorage, + ? extends application.io.opentelemetry.context.ContextStorage>> + wrappers = new ArrayList<>(originalWrappers); // AgentContextStorage wrapper doesn't delegate, so needs to be the innermost wrapper wrappers.add(0, AgentContextStorage.wrap()); return wrappers; diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/InstrumentationUtilInstrumentation.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/InstrumentationUtilInstrumentation.java index b0e69ec38fe5..ee85e4d2891c 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/InstrumentationUtilInstrumentation.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/InstrumentationUtilInstrumentation.java @@ -9,7 +9,6 @@ import static net.bytebuddy.matcher.ElementMatchers.returns; import static net.bytebuddy.matcher.ElementMatchers.takesArgument; -import application.io.opentelemetry.context.Context; import io.opentelemetry.api.internal.InstrumentationUtil; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer; @@ -47,7 +46,8 @@ public static boolean methodEnter() { @AssignReturned.ToReturned @Advice.OnMethodExit(suppress = Throwable.class) - public static boolean methodExit(@Advice.Argument(0) Context context) { + public static boolean methodExit( + @Advice.Argument(0) application.io.opentelemetry.context.Context context) { return InstrumentationUtil.shouldSuppressInstrumentation( AgentContextStorage.getAgentContext(context)); } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/SpanInstrumentation.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/SpanInstrumentation.java index 9e4dd11645b7..5ee8b381e8da 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/SpanInstrumentation.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/SpanInstrumentation.java @@ -9,8 +9,7 @@ import static net.bytebuddy.matcher.ElementMatchers.isStatic; import static net.bytebuddy.matcher.ElementMatchers.named; -import application.io.opentelemetry.api.trace.Span; -import application.io.opentelemetry.api.trace.SpanContext; +import io.opentelemetry.api.trace.Span; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.trace.Bridging; @@ -43,9 +42,10 @@ public static boolean methodEnter() { @AssignReturned.ToReturned @Advice.OnMethodExit - public static Span methodExit(@Advice.Argument(0) SpanContext applicationSpanContext) { - return Bridging.toApplication( - io.opentelemetry.api.trace.Span.wrap(Bridging.toAgent(applicationSpanContext))); + public static application.io.opentelemetry.api.trace.Span methodExit( + @Advice.Argument(0) + application.io.opentelemetry.api.trace.SpanContext applicationSpanContext) { + return Bridging.toApplication(Span.wrap(Bridging.toAgent(applicationSpanContext))); } } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/baggage/BaggageBridging.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/baggage/BaggageBridging.java index 076cea38a6ca..da8e25a00afa 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/baggage/BaggageBridging.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/baggage/BaggageBridging.java @@ -5,33 +5,35 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.baggage; -import application.io.opentelemetry.api.baggage.Baggage; -import application.io.opentelemetry.api.baggage.BaggageBuilder; -import application.io.opentelemetry.api.baggage.BaggageEntryMetadata; +import io.opentelemetry.api.baggage.Baggage; +import io.opentelemetry.api.baggage.BaggageBuilder; +import io.opentelemetry.api.baggage.BaggageEntryMetadata; public final class BaggageBridging { - public static Baggage toApplication(io.opentelemetry.api.baggage.Baggage agentBaggage) { - BaggageBuilder applicationBaggageBuilder = Baggage.builder(); + public static application.io.opentelemetry.api.baggage.Baggage toApplication( + Baggage agentBaggage) { + application.io.opentelemetry.api.baggage.BaggageBuilder applicationBaggageBuilder = + application.io.opentelemetry.api.baggage.Baggage.builder(); agentBaggage.forEach( (key, entry) -> applicationBaggageBuilder.put( key, entry.getValue(), - BaggageEntryMetadata.create(entry.getMetadata().getValue()))); + application.io.opentelemetry.api.baggage.BaggageEntryMetadata.create( + entry.getMetadata().getValue()))); return applicationBaggageBuilder.build(); } - public static io.opentelemetry.api.baggage.Baggage toAgent(Baggage applicationBaggage) { - io.opentelemetry.api.baggage.BaggageBuilder agentBaggageBuilder = - io.opentelemetry.api.baggage.Baggage.builder(); + public static Baggage toAgent( + application.io.opentelemetry.api.baggage.Baggage applicationBaggage) { + BaggageBuilder agentBaggageBuilder = Baggage.builder(); applicationBaggage.forEach( (key, entry) -> agentBaggageBuilder.put( key, entry.getValue(), - io.opentelemetry.api.baggage.BaggageEntryMetadata.create( - entry.getMetadata().getValue()))); + BaggageEntryMetadata.create(entry.getMetadata().getValue()))); return agentBaggageBuilder.build(); } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/context/AgentContextStorage.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/context/AgentContextStorage.java index 4e84a3d43db9..364d54fd011c 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/context/AgentContextStorage.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/context/AgentContextStorage.java @@ -7,11 +7,9 @@ import static java.util.logging.Level.FINE; -import application.io.opentelemetry.api.baggage.Baggage; -import application.io.opentelemetry.api.trace.Span; -import application.io.opentelemetry.context.Context; -import application.io.opentelemetry.context.ContextStorage; -import application.io.opentelemetry.context.Scope; +import io.opentelemetry.context.Context; +import io.opentelemetry.context.ContextKey; +import io.opentelemetry.context.ContextStorage; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; import java.lang.invoke.MethodType; @@ -19,22 +17,22 @@ import java.util.logging.Logger; /** - * {@link ContextStorage} which stores the {@link Context} in the user's application inside the - * {@link Context} in the agent. This allows for context interaction to be maintained between the - * app and agent. + * ContextStorage which stores the Context in the user's application inside the Context in the + * agent. This allows for context interaction to be maintained between the app and agent. * *

This storage allows for implicit parenting of context to exist between the agent and * application by storing the concrete application context in the agent context and returning a * wrapper which accesses into this stored concrete context. * *

This storage also makes sure that OpenTelemetry objects are shared within the context. To do - * this, it recognizes the keys for OpenTelemetry objects (e.g, {@link Span}, {@link Baggage}) and - * always stores and retrieves them from the agent context, even when accessed from the application. - * All other accesses are to the concrete application context. + * this, it recognizes the keys for OpenTelemetry objects (e.g, Span, Baggage) and always stores and + * retrieves them from the agent context, even when accessed from the application. All other + * accesses are to the concrete application context. */ // Annotation doesn't work on some fields due to fully qualified name (no clue why it matters...) @SuppressWarnings("FieldMissingNullable") -public class AgentContextStorage implements ContextStorage, AutoCloseable { +public class AgentContextStorage + implements application.io.opentelemetry.context.ContextStorage, AutoCloseable { private static final Logger logger = Logger.getLogger(AgentContextStorage.class.getName()); @@ -42,11 +40,11 @@ public class AgentContextStorage implements ContextStorage, AutoCloseable { private static final MethodHandle CONTEXT_STORAGE_ROOT_HANDLE = getContextStorageRootHandle(); // unwrapped application root context - private final Context applicationRoot; + private final application.io.opentelemetry.context.Context applicationRoot; // wrapped application root context - private final Context root; + private final application.io.opentelemetry.context.Context root; - private AgentContextStorage(ContextStorage delegate) { + private AgentContextStorage(application.io.opentelemetry.context.ContextStorage delegate) { applicationRoot = getRootContext(delegate); root = getWrappedRootContext(applicationRoot); } @@ -54,7 +52,10 @@ private AgentContextStorage(ContextStorage delegate) { private static MethodHandle getContextStorageRootHandle() { try { return MethodHandles.lookup() - .findVirtual(ContextStorage.class, "root", MethodType.methodType(Context.class)); + .findVirtual( + application.io.opentelemetry.context.ContextStorage.class, + "root", + MethodType.methodType(application.io.opentelemetry.context.Context.class)); } catch (NoSuchMethodException | IllegalAccessException exception) { return null; } @@ -64,11 +65,13 @@ private static boolean has15Api() { return CONTEXT_STORAGE_ROOT_HANDLE != null; } - private static Context getRootContext(ContextStorage contextStorage) { + private static application.io.opentelemetry.context.Context getRootContext( + application.io.opentelemetry.context.ContextStorage contextStorage) { if (has15Api()) { // when bridging to 1.5 api call ContextStorage.root() try { - return (Context) CONTEXT_STORAGE_ROOT_HANDLE.invoke(contextStorage); + return (application.io.opentelemetry.context.Context) + CONTEXT_STORAGE_ROOT_HANDLE.invoke(contextStorage); } catch (Throwable throwable) { throw new IllegalStateException("Failed to get root context", throwable); } @@ -77,14 +80,16 @@ private static Context getRootContext(ContextStorage contextStorage) { } } - private static Context getWrappedRootContext(Context rootContext) { + private static application.io.opentelemetry.context.Context getWrappedRootContext( + application.io.opentelemetry.context.Context rootContext) { if (has15Api()) { - return new AgentContextWrapper(io.opentelemetry.context.Context.root(), rootContext); + return new AgentContextWrapper(Context.root(), rootContext); } return RootContextHolder.ROOT; } - public static Context wrapRootContext(Context rootContext) { + public static application.io.opentelemetry.context.Context wrapRootContext( + application.io.opentelemetry.context.Context rootContext) { if (has15Api()) { return rootContext; } @@ -94,12 +99,14 @@ public static Context wrapRootContext(Context rootContext) { // helper class for keeping track of root context when bridging to api earlier than 1.5 private static class RootContextHolder { // unwrapped application root context - static final Context APPLICATION_ROOT = Context.root(); + static final application.io.opentelemetry.context.Context APPLICATION_ROOT = + application.io.opentelemetry.context.Context.root(); // wrapped application root context - static final Context ROOT = - new AgentContextWrapper(io.opentelemetry.context.Context.root(), APPLICATION_ROOT); + static final application.io.opentelemetry.context.Context ROOT = + new AgentContextWrapper(Context.root(), APPLICATION_ROOT); - static Context getRootContext(Context rootContext) { + static application.io.opentelemetry.context.Context getRootContext( + application.io.opentelemetry.context.Context rootContext) { // APPLICATION_ROOT is null when this method is called while the static initializer is // initializing the value of APPLICATION_ROOT field if (RootContextHolder.APPLICATION_ROOT == null) { @@ -109,11 +116,15 @@ static Context getRootContext(Context rootContext) { } } - public static Function wrap() { + public static Function< + ? super application.io.opentelemetry.context.ContextStorage, + ? extends application.io.opentelemetry.context.ContextStorage> + wrap() { return contextStorage -> new AgentContextStorage(contextStorage); } - public static io.opentelemetry.context.Context getAgentContext(Context applicationContext) { + public static Context getAgentContext( + application.io.opentelemetry.context.Context applicationContext) { if (applicationContext instanceof AgentContextWrapper) { return ((AgentContextWrapper) applicationContext).toAgentContext(); } @@ -121,39 +132,41 @@ public static io.opentelemetry.context.Context getAgentContext(Context applicati logger.log( FINE, "unexpected context: " + applicationContext, new Exception("unexpected context")); } - return io.opentelemetry.context.Context.root(); + return Context.root(); } - public static Context toApplicationContext(io.opentelemetry.context.Context agentContext) { + public static application.io.opentelemetry.context.Context toApplicationContext( + Context agentContext) { return new AgentContextWrapper(agentContext); } - public static Context newContextWrapper( - io.opentelemetry.context.Context agentContext, Context applicationContext) { + public static application.io.opentelemetry.context.Context newContextWrapper( + Context agentContext, application.io.opentelemetry.context.Context applicationContext) { if (applicationContext instanceof AgentContextWrapper) { applicationContext = ((AgentContextWrapper) applicationContext).applicationContext; } return new AgentContextWrapper(agentContext, applicationContext); } - static final io.opentelemetry.context.ContextKey APPLICATION_CONTEXT = - io.opentelemetry.context.ContextKey.named("otel-context"); + static final ContextKey APPLICATION_CONTEXT = + ContextKey.named("otel-context"); @Override - public Scope attach(Context toAttach) { - io.opentelemetry.context.Context currentAgentContext = - io.opentelemetry.context.Context.current(); - Context currentApplicationContext = currentAgentContext.get(APPLICATION_CONTEXT); + public application.io.opentelemetry.context.Scope attach( + application.io.opentelemetry.context.Context toAttach) { + Context currentAgentContext = Context.current(); + application.io.opentelemetry.context.Context currentApplicationContext = + currentAgentContext.get(APPLICATION_CONTEXT); if (currentApplicationContext == null) { currentApplicationContext = applicationRoot; } - io.opentelemetry.context.Context newAgentContext; + Context newAgentContext; if (toAttach instanceof AgentContextWrapper) { AgentContextWrapper wrapper = (AgentContextWrapper) toAttach; if (currentApplicationContext == wrapper.applicationContext && currentAgentContext == wrapper.agentContext) { - return Scope.noop(); + return application.io.opentelemetry.context.Scope.noop(); } newAgentContext = wrapper.toAgentContext(); } else { @@ -164,28 +177,27 @@ public Scope attach(Context toAttach) { } @Override - public Context current() { - io.opentelemetry.context.Context agentContext = io.opentelemetry.context.Context.current(); - Context applicationContext = agentContext.get(APPLICATION_CONTEXT); + public application.io.opentelemetry.context.Context current() { + Context agentContext = Context.current(); + application.io.opentelemetry.context.Context applicationContext = + agentContext.get(APPLICATION_CONTEXT); if (applicationContext == null) { applicationContext = applicationRoot; } - if (applicationContext == applicationRoot - && agentContext == io.opentelemetry.context.Context.root()) { + if (applicationContext == applicationRoot && agentContext == Context.root()) { return root; } return new AgentContextWrapper(agentContext, applicationContext); } @Override - public Context root() { + public application.io.opentelemetry.context.Context root() { return root; } @Override public void close() throws Exception { - io.opentelemetry.context.ContextStorage agentStorage = - io.opentelemetry.context.ContextStorage.get(); + ContextStorage agentStorage = ContextStorage.get(); if (agentStorage instanceof AutoCloseable) { ((AutoCloseable) agentStorage).close(); } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/context/AgentContextWrapper.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/context/AgentContextWrapper.java index be18e807e8b2..35369a0bb2b3 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/context/AgentContextWrapper.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/context/AgentContextWrapper.java @@ -5,16 +5,15 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.context; -import application.io.opentelemetry.api.trace.Span; -import application.io.opentelemetry.context.Context; -import application.io.opentelemetry.context.ContextKey; +import io.opentelemetry.api.trace.Span; +import io.opentelemetry.context.Context; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.baggage.BaggageBridging; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.trace.Bridging; import java.util.ArrayList; import java.util.Collections; import java.util.List; -final class AgentContextWrapper implements Context { +final class AgentContextWrapper implements application.io.opentelemetry.context.Context { static final List> CONTEXT_KEY_BRIDGES; @@ -22,7 +21,7 @@ final class AgentContextWrapper implements Context { List> bridges = new ArrayList<>(); try { bridges.add( - new ContextKeyBridge( + new ContextKeyBridge( "application.io.opentelemetry.api.trace.SpanContextKey", "io.opentelemetry.api.trace.SpanContextKey", Bridging::toApplication, @@ -44,14 +43,15 @@ final class AgentContextWrapper implements Context { CONTEXT_KEY_BRIDGES = Collections.unmodifiableList(bridges); } - final io.opentelemetry.context.Context agentContext; - final Context applicationContext; + final Context agentContext; + final application.io.opentelemetry.context.Context applicationContext; - AgentContextWrapper(io.opentelemetry.context.Context agentContext) { + AgentContextWrapper(Context agentContext) { this(agentContext, agentContext.get(AgentContextStorage.APPLICATION_CONTEXT)); } - AgentContextWrapper(io.opentelemetry.context.Context agentContext, Context applicationContext) { + AgentContextWrapper( + Context agentContext, application.io.opentelemetry.context.Context applicationContext) { if (applicationContext instanceof AgentContextWrapper) { throw new IllegalStateException("Expected unwrapped context"); } @@ -59,19 +59,19 @@ final class AgentContextWrapper implements Context { this.applicationContext = applicationContext; } - io.opentelemetry.context.Context toAgentContext() { + Context toAgentContext() { if (agentContext.get(AgentContextStorage.APPLICATION_CONTEXT) == applicationContext) { return agentContext; } return agentContext.with(AgentContextStorage.APPLICATION_CONTEXT, applicationContext); } - public io.opentelemetry.context.Context getAgentContext() { + public Context getAgentContext() { return agentContext; } @Override - public V get(ContextKey key) { + public V get(application.io.opentelemetry.context.ContextKey key) { for (ContextKeyBridge bridge : CONTEXT_KEY_BRIDGES) { V value = bridge.get(this, key); if (value != null) { @@ -83,9 +83,10 @@ public V get(ContextKey key) { } @Override - public Context with(ContextKey k1, V v1) { + public application.io.opentelemetry.context.Context with( + application.io.opentelemetry.context.ContextKey k1, V v1) { for (ContextKeyBridge bridge : CONTEXT_KEY_BRIDGES) { - Context context = bridge.with(this, k1, v1); + application.io.opentelemetry.context.Context context = bridge.with(this, k1, v1); if (context != null) { return context; } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/context/ContextKeyBridge.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/context/ContextKeyBridge.java index 742e254b6196..f1fd709af652 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/context/ContextKeyBridge.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/context/ContextKeyBridge.java @@ -5,16 +5,15 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.context; -import application.io.opentelemetry.context.Context; -import application.io.opentelemetry.context.ContextKey; +import io.opentelemetry.context.ContextKey; import java.lang.reflect.Field; import java.util.function.Function; import javax.annotation.Nullable; final class ContextKeyBridge { - private final ContextKey applicationContextKey; - private final io.opentelemetry.context.ContextKey agentContextKey; + private final application.io.opentelemetry.context.ContextKey applicationContextKey; + private final ContextKey agentContextKey; private final Function toAgent; private final Function toApplication; @@ -74,19 +73,22 @@ final class ContextKeyBridge { Field applicationContextKeyField = applicationKeyHolderClass.getDeclaredField(applicationFieldName); applicationContextKeyField.setAccessible(true); - this.applicationContextKey = (ContextKey) applicationContextKeyField.get(null); + this.applicationContextKey = + (application.io.opentelemetry.context.ContextKey) + applicationContextKeyField.get(null); Field agentContextKeyField = agentKeyHolderClass.getDeclaredField(agentFieldName); agentContextKeyField.setAccessible(true); - this.agentContextKey = - (io.opentelemetry.context.ContextKey) agentContextKeyField.get(null); + this.agentContextKey = (ContextKey) agentContextKeyField.get(null); this.toApplication = toApplication; this.toAgent = toAgent; } @Nullable - V get(AgentContextWrapper contextWrapper, ContextKey requestedKey) { + V get( + AgentContextWrapper contextWrapper, + application.io.opentelemetry.context.ContextKey requestedKey) { if (requestedKey == applicationContextKey) { AGENT agentValue = contextWrapper.agentContext.get(agentContextKey); if (agentValue == null) { @@ -101,7 +103,10 @@ V get(AgentContextWrapper contextWrapper, ContextKey requestedKey) { } @Nullable - Context with(AgentContextWrapper contextWrapper, ContextKey requestedKey, V value) { + application.io.opentelemetry.context.Context with( + AgentContextWrapper contextWrapper, + application.io.opentelemetry.context.ContextKey requestedKey, + V value) { if (requestedKey == applicationContextKey) { @SuppressWarnings("unchecked") // fine APPLICATION applicationValue = (APPLICATION) value; diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/context/InstrumentationApiContextBridging.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/context/InstrumentationApiContextBridging.java index eed3c4d281df..a419040123ec 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/context/InstrumentationApiContextBridging.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/context/InstrumentationApiContextBridging.java @@ -5,7 +5,7 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.context; -import application.io.opentelemetry.api.trace.Span; +import io.opentelemetry.api.trace.Span; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.trace.Bridging; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; @@ -22,7 +22,7 @@ final class InstrumentationApiContextBridging { try { bridges.add( - new ContextKeyBridge( + new ContextKeyBridge( "application.io.opentelemetry.instrumentation.api.instrumenter.LocalRootSpan", "io.opentelemetry.instrumentation.api.instrumenter.LocalRootSpan", Bridging::toApplication, @@ -35,7 +35,7 @@ final class InstrumentationApiContextBridging { // old SERVER_KEY bridge - needed to make legacy ServerSpan work, for users who're using old // instrumentation-api version with the newest agent version bridges.add( - new ContextKeyBridge( + new ContextKeyBridge( "application.io.opentelemetry.instrumentation.api.internal.SpanKey", "io.opentelemetry.instrumentation.api.instrumenter.LocalRootSpan", "SERVER_KEY", @@ -92,11 +92,7 @@ final class InstrumentationApiContextBridging { agentHttpRouteState, "create", MethodType.methodType( - agentHttpRouteState, - String.class, - String.class, - int.class, - io.opentelemetry.api.trace.Span.class)); + agentHttpRouteState, String.class, String.class, int.class, Span.class)); agentGetMethod = lookup.findVirtual(agentHttpRouteState, "getMethod", MethodType.methodType(String.class)); agentGetRoute = @@ -105,10 +101,7 @@ final class InstrumentationApiContextBridging { lookup.findVirtual( agentHttpRouteState, "getUpdatedBySourceOrder", MethodType.methodType(int.class)); agentGetSpan = - lookup.findVirtual( - agentHttpRouteState, - "getSpan", - MethodType.methodType(io.opentelemetry.api.trace.Span.class)); + lookup.findVirtual(agentHttpRouteState, "getSpan", MethodType.methodType(Span.class)); applicationHttpRouteState = Class.forName("application.io.opentelemetry.instrumentation.api.internal.HttpRouteState"); @@ -118,7 +111,11 @@ final class InstrumentationApiContextBridging { applicationHttpRouteState, "create", MethodType.methodType( - applicationHttpRouteState, String.class, String.class, int.class, Span.class)); + applicationHttpRouteState, + String.class, + String.class, + int.class, + application.io.opentelemetry.api.trace.Span.class)); } catch (NoSuchMethodException exception) { // older instrumentation-api has only the variant that does not take span applicationCreate = @@ -142,7 +139,9 @@ final class InstrumentationApiContextBridging { try { applicationGetSpan = lookup.findVirtual( - applicationHttpRouteState, "getSpan", MethodType.methodType(Span.class)); + applicationHttpRouteState, + "getSpan", + MethodType.methodType(application.io.opentelemetry.api.trace.Span.class)); } catch (NoSuchMethodException ignored) { // not present in older instrumentation-api } @@ -186,14 +185,17 @@ final class InstrumentationApiContextBridging { AGENT_GET_ROUTE, AGENT_GET_UPDATED_BY_SOURCE_ORDER, AGENT_GET_SPAN, - o -> o != null ? Bridging.toApplication((io.opentelemetry.api.trace.Span) o) : null), + o -> o != null ? Bridging.toApplication((Span) o) : null), httpRouteStateConvert( AGENT_CREATE, APPLICATION_GET_METHOD, APPLICATION_GET_ROUTE, APPLICATION_GET_UPDATED_BY_SOURCE_ORDER, APPLICATION_GET_SPAN, - o -> o != null ? Bridging.toAgentOrNull((Span) o) : null)); + o -> + o != null + ? Bridging.toAgentOrNull((application.io.opentelemetry.api.trace.Span) o) + : null)); } catch (Throwable ignored) { return null; } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/context/propagation/ApplicationContextPropagators.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/context/propagation/ApplicationContextPropagators.java index c2b1ad694488..981e2bb0c33b 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/context/propagation/ApplicationContextPropagators.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/context/propagation/ApplicationContextPropagators.java @@ -5,21 +5,20 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.context.propagation; -import application.io.opentelemetry.context.propagation.ContextPropagators; -import application.io.opentelemetry.context.propagation.TextMapPropagator; +import io.opentelemetry.context.propagation.ContextPropagators; -public class ApplicationContextPropagators implements ContextPropagators { +public class ApplicationContextPropagators + implements application.io.opentelemetry.context.propagation.ContextPropagators { private final ApplicationTextMapPropagator applicationTextMapPropagator; - public ApplicationContextPropagators( - io.opentelemetry.context.propagation.ContextPropagators agentPropagators) { + public ApplicationContextPropagators(ContextPropagators agentPropagators) { applicationTextMapPropagator = new ApplicationTextMapPropagator(agentPropagators.getTextMapPropagator()); } @Override - public TextMapPropagator getTextMapPropagator() { + public application.io.opentelemetry.context.propagation.TextMapPropagator getTextMapPropagator() { return applicationTextMapPropagator; } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/context/propagation/ApplicationTextMapPropagator.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/context/propagation/ApplicationTextMapPropagator.java index 80b758ab57a2..172ba059027a 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/context/propagation/ApplicationTextMapPropagator.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/context/propagation/ApplicationTextMapPropagator.java @@ -5,19 +5,19 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.context.propagation; -import application.io.opentelemetry.context.Context; -import application.io.opentelemetry.context.propagation.TextMapGetter; -import application.io.opentelemetry.context.propagation.TextMapPropagator; -import application.io.opentelemetry.context.propagation.TextMapSetter; +import io.opentelemetry.context.Context; +import io.opentelemetry.context.propagation.TextMapGetter; +import io.opentelemetry.context.propagation.TextMapPropagator; +import io.opentelemetry.context.propagation.TextMapSetter; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.context.AgentContextStorage; import java.util.Collection; -class ApplicationTextMapPropagator implements TextMapPropagator { +class ApplicationTextMapPropagator + implements application.io.opentelemetry.context.propagation.TextMapPropagator { - private final io.opentelemetry.context.propagation.TextMapPropagator agentTextMapPropagator; + private final TextMapPropagator agentTextMapPropagator; - ApplicationTextMapPropagator( - io.opentelemetry.context.propagation.TextMapPropagator agentTextMapPropagator) { + ApplicationTextMapPropagator(TextMapPropagator agentTextMapPropagator) { this.agentTextMapPropagator = agentTextMapPropagator; } @@ -27,11 +27,12 @@ public Collection fields() { } @Override - public Context extract( - Context applicationContext, C carrier, TextMapGetter applicationGetter) { - io.opentelemetry.context.Context agentContext = - AgentContextStorage.getAgentContext(applicationContext); - io.opentelemetry.context.Context agentUpdatedContext = + public application.io.opentelemetry.context.Context extract( + application.io.opentelemetry.context.Context applicationContext, + C carrier, + application.io.opentelemetry.context.propagation.TextMapGetter applicationGetter) { + Context agentContext = AgentContextStorage.getAgentContext(applicationContext); + Context agentUpdatedContext = agentTextMapPropagator.extract(agentContext, carrier, new AgentGetter<>(applicationGetter)); if (agentUpdatedContext == agentContext) { return applicationContext; @@ -41,18 +42,20 @@ public Context extract( @Override public void inject( - Context applicationContext, C carrier, TextMapSetter applicationSetter) { - io.opentelemetry.context.Context agentContext = - AgentContextStorage.getAgentContext(applicationContext); + application.io.opentelemetry.context.Context applicationContext, + C carrier, + application.io.opentelemetry.context.propagation.TextMapSetter applicationSetter) { + Context agentContext = AgentContextStorage.getAgentContext(applicationContext); agentTextMapPropagator.inject(agentContext, carrier, new AgentSetter<>(applicationSetter)); } - private static class AgentGetter - implements io.opentelemetry.context.propagation.TextMapGetter { + private static class AgentGetter implements TextMapGetter { - private final TextMapGetter applicationGetter; + private final application.io.opentelemetry.context.propagation.TextMapGetter + applicationGetter; - AgentGetter(TextMapGetter applicationGetter) { + AgentGetter( + application.io.opentelemetry.context.propagation.TextMapGetter applicationGetter) { this.applicationGetter = applicationGetter; } @@ -67,12 +70,13 @@ public String get(C carrier, String key) { } } - private static class AgentSetter - implements io.opentelemetry.context.propagation.TextMapSetter { + private static class AgentSetter implements TextMapSetter { - private final TextMapSetter applicationSetter; + private final application.io.opentelemetry.context.propagation.TextMapSetter + applicationSetter; - AgentSetter(TextMapSetter applicationSetter) { + AgentSetter( + application.io.opentelemetry.context.propagation.TextMapSetter applicationSetter) { this.applicationSetter = applicationSetter; } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/trace/ApplicationSpan.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/trace/ApplicationSpan.java index 02ee99320c05..22539bf8c7a8 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/trace/ApplicationSpan.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/trace/ApplicationSpan.java @@ -5,52 +5,49 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.trace; -import application.io.opentelemetry.api.common.AttributeKey; -import application.io.opentelemetry.api.common.Attributes; -import application.io.opentelemetry.api.trace.Span; -import application.io.opentelemetry.api.trace.SpanContext; -import application.io.opentelemetry.api.trace.StatusCode; import com.google.errorprone.annotations.CanIgnoreReturnValue; +import io.opentelemetry.api.common.AttributeKey; +import io.opentelemetry.api.trace.Span; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.ValueBridging; import java.util.concurrent.TimeUnit; import javax.annotation.Nullable; -public class ApplicationSpan implements Span { +public class ApplicationSpan implements application.io.opentelemetry.api.trace.Span { - private final io.opentelemetry.api.trace.Span agentSpan; + private final Span agentSpan; - public ApplicationSpan(io.opentelemetry.api.trace.Span agentSpan) { + public ApplicationSpan(Span agentSpan) { this.agentSpan = agentSpan; } - io.opentelemetry.api.trace.Span getAgentSpan() { + Span getAgentSpan() { return agentSpan; } @Override @CanIgnoreReturnValue - public Span setAttribute(String key, String value) { + public application.io.opentelemetry.api.trace.Span setAttribute(String key, String value) { agentSpan.setAttribute(key, value); return this; } @Override @CanIgnoreReturnValue - public Span setAttribute(String key, long value) { + public application.io.opentelemetry.api.trace.Span setAttribute(String key, long value) { agentSpan.setAttribute(key, value); return this; } @Override @CanIgnoreReturnValue - public Span setAttribute(String key, double value) { + public application.io.opentelemetry.api.trace.Span setAttribute(String key, double value) { agentSpan.setAttribute(key, value); return this; } @Override @CanIgnoreReturnValue - public Span setAttribute(String key, boolean value) { + public application.io.opentelemetry.api.trace.Span setAttribute(String key, boolean value) { agentSpan.setAttribute(key, value); return this; } @@ -59,13 +56,13 @@ public Span setAttribute(String key, boolean value) { @CanIgnoreReturnValue // unchecked: toAgent returns raw AttributeKey, VALUE bridging requires casting to Object key @SuppressWarnings({"unchecked", "rawtypes"}) - public Span setAttribute(AttributeKey applicationKey, T value) { - io.opentelemetry.api.common.AttributeKey agentKey = Bridging.toAgent(applicationKey); + public application.io.opentelemetry.api.trace.Span setAttribute( + application.io.opentelemetry.api.common.AttributeKey applicationKey, T value) { + AttributeKey agentKey = Bridging.toAgent(applicationKey); if (agentKey != null) { // For VALUE type attributes, need to bridge the Value object as well if (applicationKey.getType().name().equals("VALUE")) { - agentSpan.setAttribute( - (io.opentelemetry.api.common.AttributeKey) agentKey, ValueBridging.toAgent(value)); + agentSpan.setAttribute((AttributeKey) agentKey, ValueBridging.toAgent(value)); } else { agentSpan.setAttribute(agentKey, value); } @@ -75,78 +72,89 @@ public Span setAttribute(AttributeKey applicationKey, T value) { @Override @CanIgnoreReturnValue - public Span addEvent(String name) { + public application.io.opentelemetry.api.trace.Span addEvent(String name) { agentSpan.addEvent(name); return this; } @Override @CanIgnoreReturnValue - public Span addEvent(String name, long timestamp, TimeUnit unit) { + public application.io.opentelemetry.api.trace.Span addEvent( + String name, long timestamp, TimeUnit unit) { agentSpan.addEvent(name, timestamp, unit); return this; } @Override @CanIgnoreReturnValue - public Span addEvent(String name, Attributes applicationAttributes) { + public application.io.opentelemetry.api.trace.Span addEvent( + String name, application.io.opentelemetry.api.common.Attributes applicationAttributes) { agentSpan.addEvent(name, Bridging.toAgent(applicationAttributes)); return this; } @Override @CanIgnoreReturnValue - public Span addEvent( - String name, Attributes applicationAttributes, long timestamp, TimeUnit unit) { + public application.io.opentelemetry.api.trace.Span addEvent( + String name, + application.io.opentelemetry.api.common.Attributes applicationAttributes, + long timestamp, + TimeUnit unit) { agentSpan.addEvent(name, Bridging.toAgent(applicationAttributes), timestamp, unit); return this; } @Override @CanIgnoreReturnValue - public Span addLink(SpanContext spanContext) { + public application.io.opentelemetry.api.trace.Span addLink( + application.io.opentelemetry.api.trace.SpanContext spanContext) { agentSpan.addLink(Bridging.toAgent(spanContext)); return this; } @Override @CanIgnoreReturnValue - public Span addLink(SpanContext spanContext, Attributes attributes) { + public application.io.opentelemetry.api.trace.Span addLink( + application.io.opentelemetry.api.trace.SpanContext spanContext, + application.io.opentelemetry.api.common.Attributes attributes) { agentSpan.addLink(Bridging.toAgent(spanContext), Bridging.toAgent(attributes)); return this; } @Override @CanIgnoreReturnValue - public Span setStatus(StatusCode status) { + public application.io.opentelemetry.api.trace.Span setStatus( + application.io.opentelemetry.api.trace.StatusCode status) { agentSpan.setStatus(Bridging.toAgent(status)); return this; } @Override @CanIgnoreReturnValue - public Span setStatus(StatusCode status, String description) { + public application.io.opentelemetry.api.trace.Span setStatus( + application.io.opentelemetry.api.trace.StatusCode status, String description) { agentSpan.setStatus(Bridging.toAgent(status), description); return this; } @Override @CanIgnoreReturnValue - public Span recordException(Throwable throwable) { + public application.io.opentelemetry.api.trace.Span recordException(Throwable throwable) { agentSpan.recordException(throwable); return this; } @Override @CanIgnoreReturnValue - public Span recordException(Throwable throwable, Attributes attributes) { + public application.io.opentelemetry.api.trace.Span recordException( + Throwable throwable, application.io.opentelemetry.api.common.Attributes attributes) { agentSpan.recordException(throwable, Bridging.toAgent(attributes)); return this; } @Override @CanIgnoreReturnValue - public Span updateName(String name) { + public application.io.opentelemetry.api.trace.Span updateName(String name) { agentSpan.updateName(name); return this; } @@ -162,7 +170,7 @@ public void end(long timestamp, TimeUnit unit) { } @Override - public SpanContext getSpanContext() { + public application.io.opentelemetry.api.trace.SpanContext getSpanContext() { return Bridging.toApplication(agentSpan.getSpanContext()); } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/trace/ApplicationSpanBuilder.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/trace/ApplicationSpanBuilder.java index c46657328aea..1534e513852f 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/trace/ApplicationSpanBuilder.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/trace/ApplicationSpanBuilder.java @@ -7,49 +7,49 @@ import static io.opentelemetry.javaagent.instrumentation.opentelemetryapi.trace.Bridging.toAgentOrNull; -import application.io.opentelemetry.api.common.AttributeKey; -import application.io.opentelemetry.api.common.Attributes; -import application.io.opentelemetry.api.trace.Span; -import application.io.opentelemetry.api.trace.SpanBuilder; -import application.io.opentelemetry.api.trace.SpanContext; -import application.io.opentelemetry.api.trace.SpanKind; -import application.io.opentelemetry.context.Context; import com.google.errorprone.annotations.CanIgnoreReturnValue; +import io.opentelemetry.api.common.AttributeKey; +import io.opentelemetry.api.trace.SpanBuilder; +import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.context.AgentContextStorage; import java.util.concurrent.TimeUnit; -public class ApplicationSpanBuilder implements SpanBuilder { +public class ApplicationSpanBuilder implements application.io.opentelemetry.api.trace.SpanBuilder { - private final io.opentelemetry.api.trace.SpanBuilder agentBuilder; + private final SpanBuilder agentBuilder; - protected ApplicationSpanBuilder(io.opentelemetry.api.trace.SpanBuilder agentBuilder) { + protected ApplicationSpanBuilder(SpanBuilder agentBuilder) { this.agentBuilder = agentBuilder; } @Override @CanIgnoreReturnValue - public SpanBuilder setParent(Context applicationContext) { + public application.io.opentelemetry.api.trace.SpanBuilder setParent( + application.io.opentelemetry.context.Context applicationContext) { agentBuilder.setParent(AgentContextStorage.getAgentContext(applicationContext)); return this; } @Override @CanIgnoreReturnValue - public SpanBuilder setNoParent() { + public application.io.opentelemetry.api.trace.SpanBuilder setNoParent() { agentBuilder.setNoParent(); return this; } @Override @CanIgnoreReturnValue - public SpanBuilder addLink(SpanContext applicationSpanContext) { + public application.io.opentelemetry.api.trace.SpanBuilder addLink( + application.io.opentelemetry.api.trace.SpanContext applicationSpanContext) { agentBuilder.addLink(Bridging.toAgent(applicationSpanContext)); return this; } @Override @CanIgnoreReturnValue - public SpanBuilder addLink(SpanContext applicationSpanContext, Attributes applicationAttributes) { + public application.io.opentelemetry.api.trace.SpanBuilder addLink( + application.io.opentelemetry.api.trace.SpanContext applicationSpanContext, + application.io.opentelemetry.api.common.Attributes applicationAttributes) { agentBuilder.addLink( Bridging.toAgent(applicationSpanContext), Bridging.toAgent(applicationAttributes)); return this; @@ -57,37 +57,39 @@ public SpanBuilder addLink(SpanContext applicationSpanContext, Attributes applic @Override @CanIgnoreReturnValue - public SpanBuilder setAttribute(String key, String value) { + public application.io.opentelemetry.api.trace.SpanBuilder setAttribute(String key, String value) { agentBuilder.setAttribute(key, value); return this; } @Override @CanIgnoreReturnValue - public SpanBuilder setAttribute(String key, long value) { + public application.io.opentelemetry.api.trace.SpanBuilder setAttribute(String key, long value) { agentBuilder.setAttribute(key, value); return this; } @Override @CanIgnoreReturnValue - public SpanBuilder setAttribute(String key, double value) { + public application.io.opentelemetry.api.trace.SpanBuilder setAttribute(String key, double value) { agentBuilder.setAttribute(key, value); return this; } @Override @CanIgnoreReturnValue - public SpanBuilder setAttribute(String key, boolean value) { + public application.io.opentelemetry.api.trace.SpanBuilder setAttribute( + String key, boolean value) { agentBuilder.setAttribute(key, value); return this; } @Override @CanIgnoreReturnValue - public SpanBuilder setAttribute(AttributeKey applicationKey, T value) { + public application.io.opentelemetry.api.trace.SpanBuilder setAttribute( + application.io.opentelemetry.api.common.AttributeKey applicationKey, T value) { @SuppressWarnings("unchecked") // toAgent uses raw AttributeKey - io.opentelemetry.api.common.AttributeKey agentKey = Bridging.toAgent(applicationKey); + AttributeKey agentKey = Bridging.toAgent(applicationKey); if (agentKey != null) { agentBuilder.setAttribute(agentKey, value); } @@ -96,8 +98,9 @@ public SpanBuilder setAttribute(AttributeKey applicationKey, T value) { @Override @CanIgnoreReturnValue - public SpanBuilder setSpanKind(SpanKind applicationSpanKind) { - io.opentelemetry.api.trace.SpanKind agentSpanKind = toAgentOrNull(applicationSpanKind); + public application.io.opentelemetry.api.trace.SpanBuilder setSpanKind( + application.io.opentelemetry.api.trace.SpanKind applicationSpanKind) { + SpanKind agentSpanKind = toAgentOrNull(applicationSpanKind); if (agentSpanKind != null) { agentBuilder.setSpanKind(agentSpanKind); } @@ -106,13 +109,14 @@ public SpanBuilder setSpanKind(SpanKind applicationSpanKind) { @Override @CanIgnoreReturnValue - public SpanBuilder setStartTimestamp(long startTimestamp, TimeUnit unit) { + public application.io.opentelemetry.api.trace.SpanBuilder setStartTimestamp( + long startTimestamp, TimeUnit unit) { agentBuilder.setStartTimestamp(startTimestamp, unit); return this; } @Override - public Span startSpan() { + public application.io.opentelemetry.api.trace.Span startSpan() { return new ApplicationSpan(agentBuilder.startSpan()); } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/trace/ApplicationTracer.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/trace/ApplicationTracer.java index c664ae0acd06..7e824bab1c3b 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/trace/ApplicationTracer.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/trace/ApplicationTracer.java @@ -5,19 +5,18 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.trace; -import application.io.opentelemetry.api.trace.SpanBuilder; -import application.io.opentelemetry.api.trace.Tracer; +import io.opentelemetry.api.trace.Tracer; -public class ApplicationTracer implements Tracer { +public class ApplicationTracer implements application.io.opentelemetry.api.trace.Tracer { - private final io.opentelemetry.api.trace.Tracer agentTracer; + private final Tracer agentTracer; - public ApplicationTracer(io.opentelemetry.api.trace.Tracer agentTracer) { + public ApplicationTracer(Tracer agentTracer) { this.agentTracer = agentTracer; } @Override - public SpanBuilder spanBuilder(String spanName) { + public application.io.opentelemetry.api.trace.SpanBuilder spanBuilder(String spanName) { return new ApplicationSpanBuilder(agentTracer.spanBuilder(spanName)); } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/trace/ApplicationTracerFactory.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/trace/ApplicationTracerFactory.java index af5460601e24..421e6c909796 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/trace/ApplicationTracerFactory.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/trace/ApplicationTracerFactory.java @@ -5,7 +5,9 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.trace; +import io.opentelemetry.api.trace.Tracer; + public interface ApplicationTracerFactory { - ApplicationTracer newTracer(io.opentelemetry.api.trace.Tracer agentTracer); + ApplicationTracer newTracer(Tracer agentTracer); } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/trace/ApplicationTracerProvider.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/trace/ApplicationTracerProvider.java index a432fce4c8c4..ce7cb3297381 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/trace/ApplicationTracerProvider.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/trace/ApplicationTracerProvider.java @@ -5,22 +5,21 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.trace; -import application.io.opentelemetry.api.trace.Tracer; -import application.io.opentelemetry.api.trace.TracerProvider; +import io.opentelemetry.api.trace.TracerProvider; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; import java.lang.invoke.MethodType; -public class ApplicationTracerProvider implements TracerProvider { +public class ApplicationTracerProvider + implements application.io.opentelemetry.api.trace.TracerProvider { private static final MethodHandle TRACE_PROVIDER_14 = getApplicationTracerProvider14(); protected final ApplicationTracerFactory tracerFactory; - protected final io.opentelemetry.api.trace.TracerProvider agentTracerProvider; + protected final TracerProvider agentTracerProvider; protected ApplicationTracerProvider( - ApplicationTracerFactory tracerFactory, - io.opentelemetry.api.trace.TracerProvider agentTracerProvider) { + ApplicationTracerFactory tracerFactory, TracerProvider agentTracerProvider) { this.tracerFactory = tracerFactory; this.agentTracerProvider = agentTracerProvider; } @@ -32,19 +31,18 @@ private static MethodHandle getApplicationTracerProvider14() { Class.forName( "io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_4.trace.ApplicationTracerProvider14"); return MethodHandles.lookup() - .findConstructor( - clazz, - MethodType.methodType(void.class, io.opentelemetry.api.trace.TracerProvider.class)); + .findConstructor(clazz, MethodType.methodType(void.class, TracerProvider.class)); } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException exception) { return null; } } - public static TracerProvider create( - io.opentelemetry.api.trace.TracerProvider agentTracerProvider) { + public static application.io.opentelemetry.api.trace.TracerProvider create( + TracerProvider agentTracerProvider) { if (TRACE_PROVIDER_14 != null) { try { - return (TracerProvider) TRACE_PROVIDER_14.invoke(agentTracerProvider); + return (application.io.opentelemetry.api.trace.TracerProvider) + TRACE_PROVIDER_14.invoke(agentTracerProvider); } catch (Throwable throwable) { throw new IllegalStateException("Failed to create ApplicationTracerProvider", throwable); } @@ -54,12 +52,13 @@ public static TracerProvider create( } @Override - public Tracer get(String instrumentationName) { + public application.io.opentelemetry.api.trace.Tracer get(String instrumentationName) { return tracerFactory.newTracer(agentTracerProvider.get(instrumentationName)); } @Override - public Tracer get(String instrumentationName, String instrumentationVersion) { + public application.io.opentelemetry.api.trace.Tracer get( + String instrumentationName, String instrumentationVersion) { return tracerFactory.newTracer( agentTracerProvider.get(instrumentationName, instrumentationVersion)); } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/trace/BridgedTraceFlags.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/trace/BridgedTraceFlags.java index 0a3cdb073144..a4b9310b1970 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/trace/BridgedTraceFlags.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/trace/BridgedTraceFlags.java @@ -5,27 +5,29 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.trace; -import application.io.opentelemetry.api.trace.TraceFlags; +import io.opentelemetry.api.trace.TraceFlags; -final class BridgedTraceFlags implements TraceFlags, io.opentelemetry.api.trace.TraceFlags { +final class BridgedTraceFlags + implements application.io.opentelemetry.api.trace.TraceFlags, TraceFlags { private static final BridgedTraceFlags[] INSTANCES = buildInstances(); - static BridgedTraceFlags toAgent(TraceFlags applicationTraceFlags) { + static BridgedTraceFlags toAgent( + application.io.opentelemetry.api.trace.TraceFlags applicationTraceFlags) { if (applicationTraceFlags instanceof BridgedTraceFlags) { return (BridgedTraceFlags) applicationTraceFlags; } return INSTANCES[applicationTraceFlags.asByte() & 255]; } - static BridgedTraceFlags fromAgent(io.opentelemetry.api.trace.TraceFlags agentTraceFlags) { + static BridgedTraceFlags fromAgent(TraceFlags agentTraceFlags) { if (agentTraceFlags instanceof BridgedTraceFlags) { return (BridgedTraceFlags) agentTraceFlags; } return INSTANCES[agentTraceFlags.asByte() & 255]; } - private final TraceFlags delegate; + private final application.io.opentelemetry.api.trace.TraceFlags delegate; @Override public boolean isSampled() { @@ -50,12 +52,14 @@ public String toString() { private static BridgedTraceFlags[] buildInstances() { BridgedTraceFlags[] instances = new BridgedTraceFlags[256]; for (int i = 0; i < 256; i++) { - instances[i] = new BridgedTraceFlags(TraceFlags.fromByte((byte) i)); + instances[i] = + new BridgedTraceFlags( + application.io.opentelemetry.api.trace.TraceFlags.fromByte((byte) i)); } return instances; } - private BridgedTraceFlags(TraceFlags delegate) { + private BridgedTraceFlags(application.io.opentelemetry.api.trace.TraceFlags delegate) { this.delegate = delegate; } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/trace/Bridging.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/trace/Bridging.java index a4e92c0e8da1..a48ff1654bab 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/trace/Bridging.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/trace/Bridging.java @@ -7,14 +7,15 @@ import static java.util.logging.Level.FINE; -import application.io.opentelemetry.api.common.AttributeKey; -import application.io.opentelemetry.api.common.Attributes; -import application.io.opentelemetry.api.trace.Span; -import application.io.opentelemetry.api.trace.SpanContext; -import application.io.opentelemetry.api.trace.SpanKind; -import application.io.opentelemetry.api.trace.StatusCode; -import application.io.opentelemetry.api.trace.TraceState; -import application.io.opentelemetry.api.trace.TraceStateBuilder; +import io.opentelemetry.api.common.AttributeKey; +import io.opentelemetry.api.common.Attributes; +import io.opentelemetry.api.common.AttributesBuilder; +import io.opentelemetry.api.trace.Span; +import io.opentelemetry.api.trace.SpanContext; +import io.opentelemetry.api.trace.SpanKind; +import io.opentelemetry.api.trace.StatusCode; +import io.opentelemetry.api.trace.TraceState; +import io.opentelemetry.api.trace.TraceStateBuilder; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.ValueBridging; import java.util.ArrayList; import java.util.List; @@ -33,30 +34,29 @@ * *

Also see comments in this module's gradle file. */ -// Our convention for accessing agent package -@SuppressWarnings("UnnecessarilyFullyQualified") public class Bridging { private static final Logger logger = Logger.getLogger(Bridging.class.getName()); - public static Span toApplication(io.opentelemetry.api.trace.Span agentSpan) { + public static application.io.opentelemetry.api.trace.Span toApplication(Span agentSpan) { if (!agentSpan.getSpanContext().isValid()) { // no need to wrap - return Span.getInvalid(); + return application.io.opentelemetry.api.trace.Span.getInvalid(); } else { return new ApplicationSpan(agentSpan); } } - public static SpanContext toApplication(io.opentelemetry.api.trace.SpanContext agentContext) { + public static application.io.opentelemetry.api.trace.SpanContext toApplication( + SpanContext agentContext) { if (agentContext.isRemote()) { - return SpanContext.createFromRemoteParent( + return application.io.opentelemetry.api.trace.SpanContext.createFromRemoteParent( agentContext.getTraceId(), agentContext.getSpanId(), BridgedTraceFlags.fromAgent(agentContext.getTraceFlags()), toApplication(agentContext.getTraceState())); } else { - return SpanContext.create( + return application.io.opentelemetry.api.trace.SpanContext.create( agentContext.getTraceId(), agentContext.getSpanId(), BridgedTraceFlags.fromAgent(agentContext.getTraceFlags()), @@ -64,16 +64,18 @@ public static SpanContext toApplication(io.opentelemetry.api.trace.SpanContext a } } - private static TraceState toApplication(io.opentelemetry.api.trace.TraceState agentTraceState) { - TraceStateBuilder applicationTraceState = TraceState.builder(); + private static application.io.opentelemetry.api.trace.TraceState toApplication( + TraceState agentTraceState) { + application.io.opentelemetry.api.trace.TraceStateBuilder applicationTraceState = + application.io.opentelemetry.api.trace.TraceState.builder(); agentTraceState.forEach(applicationTraceState::put); return applicationTraceState.build(); } - public static io.opentelemetry.api.trace.Span toAgentOrNull(Span applicationSpan) { + public static Span toAgentOrNull(application.io.opentelemetry.api.trace.Span applicationSpan) { if (!applicationSpan.getSpanContext().isValid()) { // no need to wrap - return io.opentelemetry.api.trace.Span.getInvalid(); + return Span.getInvalid(); } else if (applicationSpan instanceof ApplicationSpan) { return ((ApplicationSpan) applicationSpan).getAgentSpan(); } else { @@ -81,24 +83,26 @@ public static io.opentelemetry.api.trace.Span toAgentOrNull(Span applicationSpan } } - public static io.opentelemetry.api.trace.SpanKind toAgentOrNull(SpanKind applicationSpanKind) { + public static SpanKind toAgentOrNull( + application.io.opentelemetry.api.trace.SpanKind applicationSpanKind) { try { - return io.opentelemetry.api.trace.SpanKind.valueOf(applicationSpanKind.name()); + return SpanKind.valueOf(applicationSpanKind.name()); } catch (IllegalArgumentException e) { logger.log(FINE, "unexpected span kind: {0}", applicationSpanKind.name()); return null; } } - public static io.opentelemetry.api.trace.SpanContext toAgent(SpanContext applicationContext) { + public static SpanContext toAgent( + application.io.opentelemetry.api.trace.SpanContext applicationContext) { if (applicationContext.isRemote()) { - return io.opentelemetry.api.trace.SpanContext.createFromRemoteParent( + return SpanContext.createFromRemoteParent( applicationContext.getTraceId(), applicationContext.getSpanId(), BridgedTraceFlags.toAgent(applicationContext.getTraceFlags()), toAgent(applicationContext.getTraceState())); } else { - return io.opentelemetry.api.trace.SpanContext.create( + return SpanContext.create( applicationContext.getTraceId(), applicationContext.getSpanId(), BridgedTraceFlags.toAgent(applicationContext.getTraceFlags()), @@ -107,12 +111,12 @@ public static io.opentelemetry.api.trace.SpanContext toAgent(SpanContext applica } @SuppressWarnings({"unchecked", "rawtypes"}) // toAgent conversion uses raw AttributeKey - public static io.opentelemetry.api.common.Attributes toAgent(Attributes applicationAttributes) { - io.opentelemetry.api.common.AttributesBuilder agentAttributes = - io.opentelemetry.api.common.Attributes.builder(); + public static Attributes toAgent( + application.io.opentelemetry.api.common.Attributes applicationAttributes) { + AttributesBuilder agentAttributes = Attributes.builder(); applicationAttributes.forEach( (key, value) -> { - io.opentelemetry.api.common.AttributeKey agentKey = toAgent(key); + AttributeKey agentKey = toAgent(key); if (agentKey != null) { if (key.getType().name().equals("VALUE")) { agentAttributes.put(agentKey, ValueBridging.toAgent(value)); @@ -127,57 +131,58 @@ public static io.opentelemetry.api.common.Attributes toAgent(Attributes applicat // TODO optimize this by storing shaded AttributeKey inside of application AttributeKey instead of // creating every time @SuppressWarnings({"rawtypes"}) // conversion uses raw AttributeKey - public static io.opentelemetry.api.common.AttributeKey toAgent(AttributeKey applicationKey) { + public static AttributeKey toAgent( + application.io.opentelemetry.api.common.AttributeKey applicationKey) { switch (applicationKey.getType()) { case STRING: - return io.opentelemetry.api.common.AttributeKey.stringKey(applicationKey.getKey()); + return AttributeKey.stringKey(applicationKey.getKey()); case BOOLEAN: - return io.opentelemetry.api.common.AttributeKey.booleanKey(applicationKey.getKey()); + return AttributeKey.booleanKey(applicationKey.getKey()); case LONG: - return io.opentelemetry.api.common.AttributeKey.longKey(applicationKey.getKey()); + return AttributeKey.longKey(applicationKey.getKey()); case DOUBLE: - return io.opentelemetry.api.common.AttributeKey.doubleKey(applicationKey.getKey()); + return AttributeKey.doubleKey(applicationKey.getKey()); case STRING_ARRAY: - return io.opentelemetry.api.common.AttributeKey.stringArrayKey(applicationKey.getKey()); + return AttributeKey.stringArrayKey(applicationKey.getKey()); case BOOLEAN_ARRAY: - return io.opentelemetry.api.common.AttributeKey.booleanArrayKey(applicationKey.getKey()); + return AttributeKey.booleanArrayKey(applicationKey.getKey()); case LONG_ARRAY: - return io.opentelemetry.api.common.AttributeKey.longArrayKey(applicationKey.getKey()); + return AttributeKey.longArrayKey(applicationKey.getKey()); case DOUBLE_ARRAY: - return io.opentelemetry.api.common.AttributeKey.doubleArrayKey(applicationKey.getKey()); + return AttributeKey.doubleArrayKey(applicationKey.getKey()); default: if (applicationKey.getType().name().equals("VALUE")) { - return io.opentelemetry.api.common.AttributeKey.valueKey(applicationKey.getKey()); + return AttributeKey.valueKey(applicationKey.getKey()); } logger.log(FINE, "unexpected attribute key type: {0}", applicationKey.getType()); return null; } } - public static List> toAgent( - List> attributeKeys) { - List> result = - new ArrayList<>(attributeKeys.size()); - for (AttributeKey attributeKey : attributeKeys) { + public static List> toAgent( + List> attributeKeys) { + List> result = new ArrayList<>(attributeKeys.size()); + for (application.io.opentelemetry.api.common.AttributeKey attributeKey : attributeKeys) { result.add(toAgent(attributeKey)); } return result; } - public static io.opentelemetry.api.trace.StatusCode toAgent(StatusCode applicationStatus) { - io.opentelemetry.api.trace.StatusCode agentCanonicalCode; + public static StatusCode toAgent( + application.io.opentelemetry.api.trace.StatusCode applicationStatus) { + StatusCode agentCanonicalCode; try { - agentCanonicalCode = io.opentelemetry.api.trace.StatusCode.valueOf(applicationStatus.name()); + agentCanonicalCode = StatusCode.valueOf(applicationStatus.name()); } catch (IllegalArgumentException e) { logger.log(FINE, "unexpected status canonical code: {0}", applicationStatus.name()); - return io.opentelemetry.api.trace.StatusCode.UNSET; + return StatusCode.UNSET; } return agentCanonicalCode; } - private static io.opentelemetry.api.trace.TraceState toAgent(TraceState applicationTraceState) { - io.opentelemetry.api.trace.TraceStateBuilder agentTraceState = - io.opentelemetry.api.trace.TraceState.builder(); + private static TraceState toAgent( + application.io.opentelemetry.api.trace.TraceState applicationTraceState) { + TraceStateBuilder agentTraceState = TraceState.builder(); applicationTraceState.forEach(agentTraceState::put); return agentTraceState.build(); } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/TestInstrumentation.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/TestInstrumentation.java index 2db0412045f0..fdfc177810b6 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/TestInstrumentation.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/TestInstrumentation.java @@ -7,7 +7,6 @@ import static net.bytebuddy.matcher.ElementMatchers.named; -import application.io.opentelemetry.context.Context; import io.opentelemetry.api.internal.InstrumentationUtil; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer; @@ -34,7 +33,8 @@ public static class TestAdvice { @AssignReturned.ToReturned @Advice.OnMethodExit(suppress = Throwable.class) - public static boolean onExit(@Advice.Argument(0) Context context) { + public static boolean onExit( + @Advice.Argument(0) application.io.opentelemetry.context.Context context) { return InstrumentationUtil.shouldSuppressInstrumentation( AgentContextStorage.getAgentContext(context)); } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/ApplicationOpenTelemetry110.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/ApplicationOpenTelemetry110.java index 8426fc2ac9d1..dccf71c2d100 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/ApplicationOpenTelemetry110.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/ApplicationOpenTelemetry110.java @@ -5,10 +5,8 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10; -import application.io.opentelemetry.api.OpenTelemetry; -import application.io.opentelemetry.api.metrics.MeterProvider; -import application.io.opentelemetry.api.trace.TracerProvider; -import application.io.opentelemetry.context.propagation.ContextPropagators; +import io.opentelemetry.api.GlobalOpenTelemetry; +import io.opentelemetry.api.OpenTelemetry; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.context.propagation.ApplicationContextPropagators; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics.ApplicationMeterFactory; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics.ApplicationMeterFactory14; @@ -16,20 +14,21 @@ import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_4.trace.ApplicationTracerProvider14; import java.lang.reflect.InvocationTargetException; -public final class ApplicationOpenTelemetry110 implements OpenTelemetry { +public final class ApplicationOpenTelemetry110 + implements application.io.opentelemetry.api.OpenTelemetry { // Accessed with reflection @SuppressWarnings("unused") - public static final OpenTelemetry INSTANCE = new ApplicationOpenTelemetry110(); + public static final application.io.opentelemetry.api.OpenTelemetry INSTANCE = + new ApplicationOpenTelemetry110(); - private final TracerProvider applicationTracerProvider; - private final ContextPropagators applicationContextPropagators; - private final MeterProvider applicationMeterProvider; + private final application.io.opentelemetry.api.trace.TracerProvider applicationTracerProvider; + private final application.io.opentelemetry.context.propagation.ContextPropagators + applicationContextPropagators; + private final application.io.opentelemetry.api.metrics.MeterProvider applicationMeterProvider; - @SuppressWarnings("UnnecessarilyFullyQualified") private ApplicationOpenTelemetry110() { - io.opentelemetry.api.OpenTelemetry agentOpenTelemetry = - io.opentelemetry.api.GlobalOpenTelemetry.get(); + OpenTelemetry agentOpenTelemetry = GlobalOpenTelemetry.get(); applicationTracerProvider = new ApplicationTracerProvider14(agentOpenTelemetry.getTracerProvider()); applicationContextPropagators = @@ -39,17 +38,17 @@ private ApplicationOpenTelemetry110() { } @Override - public TracerProvider getTracerProvider() { + public application.io.opentelemetry.api.trace.TracerProvider getTracerProvider() { return applicationTracerProvider; } @Override - public MeterProvider getMeterProvider() { + public application.io.opentelemetry.api.metrics.MeterProvider getMeterProvider() { return applicationMeterProvider; } @Override - public ContextPropagators getPropagators() { + public application.io.opentelemetry.context.propagation.ContextPropagators getPropagators() { return applicationContextPropagators; } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationDoubleCounter.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationDoubleCounter.java index 1a849b372b5f..09be04d24f77 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationDoubleCounter.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationDoubleCounter.java @@ -5,17 +5,16 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics; -import application.io.opentelemetry.api.common.Attributes; -import application.io.opentelemetry.api.metrics.DoubleCounter; -import application.io.opentelemetry.context.Context; +import io.opentelemetry.api.metrics.DoubleCounter; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.context.AgentContextStorage; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.trace.Bridging; -public class ApplicationDoubleCounter implements DoubleCounter { +public class ApplicationDoubleCounter + implements application.io.opentelemetry.api.metrics.DoubleCounter { - private final io.opentelemetry.api.metrics.DoubleCounter agentCounter; + private final DoubleCounter agentCounter; - protected ApplicationDoubleCounter(io.opentelemetry.api.metrics.DoubleCounter agentCounter) { + protected ApplicationDoubleCounter(DoubleCounter agentCounter) { this.agentCounter = agentCounter; } @@ -25,12 +24,16 @@ public void add(double value) { } @Override - public void add(double value, Attributes applicationAttributes) { + public void add( + double value, application.io.opentelemetry.api.common.Attributes applicationAttributes) { agentCounter.add(value, Bridging.toAgent(applicationAttributes)); } @Override - public void add(double value, Attributes applicationAttributes, Context applicationContext) { + public void add( + double value, + application.io.opentelemetry.api.common.Attributes applicationAttributes, + application.io.opentelemetry.context.Context applicationContext) { agentCounter.add( value, Bridging.toAgent(applicationAttributes), diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationDoubleCounterBuilder.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationDoubleCounterBuilder.java index 0dacb8afdec0..b204e265f4b1 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationDoubleCounterBuilder.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationDoubleCounterBuilder.java @@ -5,44 +5,43 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics; -import application.io.opentelemetry.api.metrics.DoubleCounter; -import application.io.opentelemetry.api.metrics.DoubleCounterBuilder; -import application.io.opentelemetry.api.metrics.ObservableDoubleCounter; -import application.io.opentelemetry.api.metrics.ObservableDoubleMeasurement; import com.google.errorprone.annotations.CanIgnoreReturnValue; +import io.opentelemetry.api.metrics.DoubleCounterBuilder; import java.util.function.Consumer; -public class ApplicationDoubleCounterBuilder implements DoubleCounterBuilder { +public class ApplicationDoubleCounterBuilder + implements application.io.opentelemetry.api.metrics.DoubleCounterBuilder { - private final io.opentelemetry.api.metrics.DoubleCounterBuilder agentBuilder; + private final DoubleCounterBuilder agentBuilder; - protected ApplicationDoubleCounterBuilder( - io.opentelemetry.api.metrics.DoubleCounterBuilder agentBuilder) { + protected ApplicationDoubleCounterBuilder(DoubleCounterBuilder agentBuilder) { this.agentBuilder = agentBuilder; } @Override @CanIgnoreReturnValue - public DoubleCounterBuilder setDescription(String description) { + public application.io.opentelemetry.api.metrics.DoubleCounterBuilder setDescription( + String description) { agentBuilder.setDescription(description); return this; } @Override @CanIgnoreReturnValue - public DoubleCounterBuilder setUnit(String unit) { + public application.io.opentelemetry.api.metrics.DoubleCounterBuilder setUnit(String unit) { agentBuilder.setUnit(unit); return this; } @Override - public DoubleCounter build() { + public application.io.opentelemetry.api.metrics.DoubleCounter build() { return new ApplicationDoubleCounter(agentBuilder.build()); } @Override - public ObservableDoubleCounter buildWithCallback( - Consumer applicationCallback) { + public application.io.opentelemetry.api.metrics.ObservableDoubleCounter buildWithCallback( + Consumer + applicationCallback) { return new ApplicationObservableDoubleCounter( agentBuilder.buildWithCallback( agentMeasurement -> @@ -51,7 +50,7 @@ public ObservableDoubleCounter buildWithCallback( } // added in 1.15.0 - public ObservableDoubleMeasurement buildObserver() { + public application.io.opentelemetry.api.metrics.ObservableDoubleMeasurement buildObserver() { return new ApplicationObservableDoubleMeasurement(agentBuilder.buildObserver()); } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationDoubleGaugeBuilder.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationDoubleGaugeBuilder.java index 4878492c0b2d..75a962c16a94 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationDoubleGaugeBuilder.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationDoubleGaugeBuilder.java @@ -5,44 +5,43 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics; -import application.io.opentelemetry.api.metrics.DoubleGaugeBuilder; -import application.io.opentelemetry.api.metrics.LongGaugeBuilder; -import application.io.opentelemetry.api.metrics.ObservableDoubleGauge; -import application.io.opentelemetry.api.metrics.ObservableDoubleMeasurement; import com.google.errorprone.annotations.CanIgnoreReturnValue; +import io.opentelemetry.api.metrics.DoubleGaugeBuilder; import java.util.function.Consumer; -public class ApplicationDoubleGaugeBuilder implements DoubleGaugeBuilder { +public class ApplicationDoubleGaugeBuilder + implements application.io.opentelemetry.api.metrics.DoubleGaugeBuilder { - private final io.opentelemetry.api.metrics.DoubleGaugeBuilder agentBuilder; + private final DoubleGaugeBuilder agentBuilder; - protected ApplicationDoubleGaugeBuilder( - io.opentelemetry.api.metrics.DoubleGaugeBuilder agentBuilder) { + protected ApplicationDoubleGaugeBuilder(DoubleGaugeBuilder agentBuilder) { this.agentBuilder = agentBuilder; } @Override @CanIgnoreReturnValue - public DoubleGaugeBuilder setDescription(String description) { + public application.io.opentelemetry.api.metrics.DoubleGaugeBuilder setDescription( + String description) { agentBuilder.setDescription(description); return this; } @Override @CanIgnoreReturnValue - public DoubleGaugeBuilder setUnit(String unit) { + public application.io.opentelemetry.api.metrics.DoubleGaugeBuilder setUnit(String unit) { agentBuilder.setUnit(unit); return this; } @Override - public LongGaugeBuilder ofLongs() { + public application.io.opentelemetry.api.metrics.LongGaugeBuilder ofLongs() { return new ApplicationLongGaugeBuilder(agentBuilder.ofLongs()); } @Override - public ObservableDoubleGauge buildWithCallback( - Consumer applicationCallback) { + public application.io.opentelemetry.api.metrics.ObservableDoubleGauge buildWithCallback( + Consumer + applicationCallback) { return new ApplicationObservableDoubleGauge( agentBuilder.buildWithCallback( agentMeasurement -> @@ -51,7 +50,7 @@ public ObservableDoubleGauge buildWithCallback( } // added in 1.15.0 - public ObservableDoubleMeasurement buildObserver() { + public application.io.opentelemetry.api.metrics.ObservableDoubleMeasurement buildObserver() { return new ApplicationObservableDoubleMeasurement(agentBuilder.buildObserver()); } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationDoubleHistogram.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationDoubleHistogram.java index f370c7347c5b..66a58af2075a 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationDoubleHistogram.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationDoubleHistogram.java @@ -5,18 +5,16 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics; -import application.io.opentelemetry.api.common.Attributes; -import application.io.opentelemetry.api.metrics.DoubleHistogram; -import application.io.opentelemetry.context.Context; +import io.opentelemetry.api.metrics.DoubleHistogram; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.context.AgentContextStorage; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.trace.Bridging; -public class ApplicationDoubleHistogram implements DoubleHistogram { +public class ApplicationDoubleHistogram + implements application.io.opentelemetry.api.metrics.DoubleHistogram { - private final io.opentelemetry.api.metrics.DoubleHistogram agentHistogram; + private final DoubleHistogram agentHistogram; - protected ApplicationDoubleHistogram( - io.opentelemetry.api.metrics.DoubleHistogram agentHistogram) { + protected ApplicationDoubleHistogram(DoubleHistogram agentHistogram) { this.agentHistogram = agentHistogram; } @@ -26,12 +24,16 @@ public void record(double value) { } @Override - public void record(double value, Attributes applicationAttributes) { + public void record( + double value, application.io.opentelemetry.api.common.Attributes applicationAttributes) { agentHistogram.record(value, Bridging.toAgent(applicationAttributes)); } @Override - public void record(double value, Attributes applicationAttributes, Context applicationContext) { + public void record( + double value, + application.io.opentelemetry.api.common.Attributes applicationAttributes, + application.io.opentelemetry.context.Context applicationContext) { agentHistogram.record( value, Bridging.toAgent(applicationAttributes), diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationDoubleHistogramBuilder.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationDoubleHistogramBuilder.java index 01e534277b2f..0f8dddce19e1 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationDoubleHistogramBuilder.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationDoubleHistogramBuilder.java @@ -5,41 +5,40 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics; -import application.io.opentelemetry.api.metrics.DoubleHistogram; -import application.io.opentelemetry.api.metrics.DoubleHistogramBuilder; -import application.io.opentelemetry.api.metrics.LongHistogramBuilder; import com.google.errorprone.annotations.CanIgnoreReturnValue; +import io.opentelemetry.api.metrics.DoubleHistogramBuilder; -public class ApplicationDoubleHistogramBuilder implements DoubleHistogramBuilder { +public class ApplicationDoubleHistogramBuilder + implements application.io.opentelemetry.api.metrics.DoubleHistogramBuilder { - private final io.opentelemetry.api.metrics.DoubleHistogramBuilder agentBuilder; + private final DoubleHistogramBuilder agentBuilder; - protected ApplicationDoubleHistogramBuilder( - io.opentelemetry.api.metrics.DoubleHistogramBuilder agentBuilder) { + protected ApplicationDoubleHistogramBuilder(DoubleHistogramBuilder agentBuilder) { this.agentBuilder = agentBuilder; } @Override @CanIgnoreReturnValue - public DoubleHistogramBuilder setDescription(String description) { + public application.io.opentelemetry.api.metrics.DoubleHistogramBuilder setDescription( + String description) { agentBuilder.setDescription(description); return this; } @Override @CanIgnoreReturnValue - public DoubleHistogramBuilder setUnit(String unit) { + public application.io.opentelemetry.api.metrics.DoubleHistogramBuilder setUnit(String unit) { agentBuilder.setUnit(unit); return this; } @Override - public LongHistogramBuilder ofLongs() { + public application.io.opentelemetry.api.metrics.LongHistogramBuilder ofLongs() { return new ApplicationLongHistogramBuilder(agentBuilder.ofLongs()); } @Override - public DoubleHistogram build() { + public application.io.opentelemetry.api.metrics.DoubleHistogram build() { return new ApplicationDoubleHistogram(agentBuilder.build()); } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationDoubleUpDownCounter.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationDoubleUpDownCounter.java index 6d6db90f070b..43ef22818584 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationDoubleUpDownCounter.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationDoubleUpDownCounter.java @@ -5,18 +5,16 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics; -import application.io.opentelemetry.api.common.Attributes; -import application.io.opentelemetry.api.metrics.DoubleUpDownCounter; -import application.io.opentelemetry.context.Context; +import io.opentelemetry.api.metrics.DoubleUpDownCounter; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.context.AgentContextStorage; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.trace.Bridging; -public class ApplicationDoubleUpDownCounter implements DoubleUpDownCounter { +public class ApplicationDoubleUpDownCounter + implements application.io.opentelemetry.api.metrics.DoubleUpDownCounter { - private final io.opentelemetry.api.metrics.DoubleUpDownCounter agentCounter; + private final DoubleUpDownCounter agentCounter; - protected ApplicationDoubleUpDownCounter( - io.opentelemetry.api.metrics.DoubleUpDownCounter agentCounter) { + protected ApplicationDoubleUpDownCounter(DoubleUpDownCounter agentCounter) { this.agentCounter = agentCounter; } @@ -26,12 +24,16 @@ public void add(double value) { } @Override - public void add(double value, Attributes applicationAttributes) { + public void add( + double value, application.io.opentelemetry.api.common.Attributes applicationAttributes) { agentCounter.add(value, Bridging.toAgent(applicationAttributes)); } @Override - public void add(double value, Attributes applicationAttributes, Context applicationContext) { + public void add( + double value, + application.io.opentelemetry.api.common.Attributes applicationAttributes, + application.io.opentelemetry.context.Context applicationContext) { agentCounter.add( value, Bridging.toAgent(applicationAttributes), diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationDoubleUpDownCounterBuilder.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationDoubleUpDownCounterBuilder.java index 43a3569112b2..b1429adfb937 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationDoubleUpDownCounterBuilder.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationDoubleUpDownCounterBuilder.java @@ -5,44 +5,43 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics; -import application.io.opentelemetry.api.metrics.DoubleUpDownCounter; -import application.io.opentelemetry.api.metrics.DoubleUpDownCounterBuilder; -import application.io.opentelemetry.api.metrics.ObservableDoubleMeasurement; -import application.io.opentelemetry.api.metrics.ObservableDoubleUpDownCounter; import com.google.errorprone.annotations.CanIgnoreReturnValue; +import io.opentelemetry.api.metrics.DoubleUpDownCounterBuilder; import java.util.function.Consumer; -public class ApplicationDoubleUpDownCounterBuilder implements DoubleUpDownCounterBuilder { +public class ApplicationDoubleUpDownCounterBuilder + implements application.io.opentelemetry.api.metrics.DoubleUpDownCounterBuilder { - private final io.opentelemetry.api.metrics.DoubleUpDownCounterBuilder agentBuilder; + private final DoubleUpDownCounterBuilder agentBuilder; - protected ApplicationDoubleUpDownCounterBuilder( - io.opentelemetry.api.metrics.DoubleUpDownCounterBuilder agentBuilder) { + protected ApplicationDoubleUpDownCounterBuilder(DoubleUpDownCounterBuilder agentBuilder) { this.agentBuilder = agentBuilder; } @Override @CanIgnoreReturnValue - public DoubleUpDownCounterBuilder setDescription(String description) { + public application.io.opentelemetry.api.metrics.DoubleUpDownCounterBuilder setDescription( + String description) { agentBuilder.setDescription(description); return this; } @Override @CanIgnoreReturnValue - public DoubleUpDownCounterBuilder setUnit(String unit) { + public application.io.opentelemetry.api.metrics.DoubleUpDownCounterBuilder setUnit(String unit) { agentBuilder.setUnit(unit); return this; } @Override - public DoubleUpDownCounter build() { + public application.io.opentelemetry.api.metrics.DoubleUpDownCounter build() { return new ApplicationDoubleUpDownCounter(agentBuilder.build()); } @Override - public ObservableDoubleUpDownCounter buildWithCallback( - Consumer applicationCallback) { + public application.io.opentelemetry.api.metrics.ObservableDoubleUpDownCounter buildWithCallback( + Consumer + applicationCallback) { return new ApplicationObservableDoubleUpDownCounter( agentBuilder.buildWithCallback( agentMeasurement -> @@ -51,7 +50,7 @@ public ObservableDoubleUpDownCounter buildWithCallback( } // added in 1.15.0 - public ObservableDoubleMeasurement buildObserver() { + public application.io.opentelemetry.api.metrics.ObservableDoubleMeasurement buildObserver() { return new ApplicationObservableDoubleMeasurement(agentBuilder.buildObserver()); } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationLongCounter.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationLongCounter.java index 631ddc2c9d5e..e9dc922d718a 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationLongCounter.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationLongCounter.java @@ -5,17 +5,16 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics; -import application.io.opentelemetry.api.common.Attributes; -import application.io.opentelemetry.api.metrics.LongCounter; -import application.io.opentelemetry.context.Context; +import io.opentelemetry.api.metrics.LongCounter; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.context.AgentContextStorage; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.trace.Bridging; -public class ApplicationLongCounter implements LongCounter { +public class ApplicationLongCounter + implements application.io.opentelemetry.api.metrics.LongCounter { - private final io.opentelemetry.api.metrics.LongCounter agentCounter; + private final LongCounter agentCounter; - protected ApplicationLongCounter(io.opentelemetry.api.metrics.LongCounter agentCounter) { + protected ApplicationLongCounter(LongCounter agentCounter) { this.agentCounter = agentCounter; } @@ -25,12 +24,16 @@ public void add(long value) { } @Override - public void add(long value, Attributes applicationAttributes) { + public void add( + long value, application.io.opentelemetry.api.common.Attributes applicationAttributes) { agentCounter.add(value, Bridging.toAgent(applicationAttributes)); } @Override - public void add(long value, Attributes applicationAttributes, Context applicationContext) { + public void add( + long value, + application.io.opentelemetry.api.common.Attributes applicationAttributes, + application.io.opentelemetry.context.Context applicationContext) { agentCounter.add( value, Bridging.toAgent(applicationAttributes), diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationLongCounterBuilder.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationLongCounterBuilder.java index 71857a387eb0..1c719897bf0c 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationLongCounterBuilder.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationLongCounterBuilder.java @@ -5,50 +5,48 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics; -import application.io.opentelemetry.api.metrics.DoubleCounterBuilder; -import application.io.opentelemetry.api.metrics.LongCounter; -import application.io.opentelemetry.api.metrics.LongCounterBuilder; -import application.io.opentelemetry.api.metrics.ObservableLongCounter; -import application.io.opentelemetry.api.metrics.ObservableLongMeasurement; import com.google.errorprone.annotations.CanIgnoreReturnValue; +import io.opentelemetry.api.metrics.LongCounterBuilder; import java.util.function.Consumer; -public class ApplicationLongCounterBuilder implements LongCounterBuilder { +public class ApplicationLongCounterBuilder + implements application.io.opentelemetry.api.metrics.LongCounterBuilder { - private final io.opentelemetry.api.metrics.LongCounterBuilder agentBuilder; + private final LongCounterBuilder agentBuilder; - protected ApplicationLongCounterBuilder( - io.opentelemetry.api.metrics.LongCounterBuilder agentBuilder) { + protected ApplicationLongCounterBuilder(LongCounterBuilder agentBuilder) { this.agentBuilder = agentBuilder; } @Override @CanIgnoreReturnValue - public LongCounterBuilder setDescription(String description) { + public application.io.opentelemetry.api.metrics.LongCounterBuilder setDescription( + String description) { agentBuilder.setDescription(description); return this; } @Override @CanIgnoreReturnValue - public LongCounterBuilder setUnit(String unit) { + public application.io.opentelemetry.api.metrics.LongCounterBuilder setUnit(String unit) { agentBuilder.setUnit(unit); return this; } @Override - public DoubleCounterBuilder ofDoubles() { + public application.io.opentelemetry.api.metrics.DoubleCounterBuilder ofDoubles() { return new ApplicationDoubleCounterBuilder(agentBuilder.ofDoubles()); } @Override - public LongCounter build() { + public application.io.opentelemetry.api.metrics.LongCounter build() { return new ApplicationLongCounter(agentBuilder.build()); } @Override - public ObservableLongCounter buildWithCallback( - Consumer applicationCallback) { + public application.io.opentelemetry.api.metrics.ObservableLongCounter buildWithCallback( + Consumer + applicationCallback) { return new ApplicationObservableLongCounter( agentBuilder.buildWithCallback( agentMeasurement -> @@ -57,7 +55,7 @@ public ObservableLongCounter buildWithCallback( } // added in 1.15.0 - public ObservableLongMeasurement buildObserver() { + public application.io.opentelemetry.api.metrics.ObservableLongMeasurement buildObserver() { return new ApplicationObservableLongMeasurement(agentBuilder.buildObserver()); } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationLongGaugeBuilder.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationLongGaugeBuilder.java index 552dba2e297e..678d9ea574a8 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationLongGaugeBuilder.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationLongGaugeBuilder.java @@ -5,38 +5,38 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics; -import application.io.opentelemetry.api.metrics.LongGaugeBuilder; -import application.io.opentelemetry.api.metrics.ObservableLongGauge; -import application.io.opentelemetry.api.metrics.ObservableLongMeasurement; import com.google.errorprone.annotations.CanIgnoreReturnValue; +import io.opentelemetry.api.metrics.LongGaugeBuilder; import java.util.function.Consumer; -public class ApplicationLongGaugeBuilder implements LongGaugeBuilder { +public class ApplicationLongGaugeBuilder + implements application.io.opentelemetry.api.metrics.LongGaugeBuilder { - private final io.opentelemetry.api.metrics.LongGaugeBuilder agentBuilder; + private final LongGaugeBuilder agentBuilder; - protected ApplicationLongGaugeBuilder( - io.opentelemetry.api.metrics.LongGaugeBuilder agentBuilder) { + protected ApplicationLongGaugeBuilder(LongGaugeBuilder agentBuilder) { this.agentBuilder = agentBuilder; } @Override @CanIgnoreReturnValue - public LongGaugeBuilder setDescription(String description) { + public application.io.opentelemetry.api.metrics.LongGaugeBuilder setDescription( + String description) { agentBuilder.setDescription(description); return this; } @Override @CanIgnoreReturnValue - public LongGaugeBuilder setUnit(String unit) { + public application.io.opentelemetry.api.metrics.LongGaugeBuilder setUnit(String unit) { agentBuilder.setUnit(unit); return this; } @Override - public ObservableLongGauge buildWithCallback( - Consumer applicationCallback) { + public application.io.opentelemetry.api.metrics.ObservableLongGauge buildWithCallback( + Consumer + applicationCallback) { return new ApplicationObservableLongGauge( agentBuilder.buildWithCallback( agentMeasurement -> @@ -45,7 +45,7 @@ public ObservableLongGauge buildWithCallback( } // added in 1.15.0 - public ObservableLongMeasurement buildObserver() { + public application.io.opentelemetry.api.metrics.ObservableLongMeasurement buildObserver() { return new ApplicationObservableLongMeasurement(agentBuilder.buildObserver()); } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationLongHistogram.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationLongHistogram.java index ae938f1f8af3..192246e5d4d8 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationLongHistogram.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationLongHistogram.java @@ -5,17 +5,16 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics; -import application.io.opentelemetry.api.common.Attributes; -import application.io.opentelemetry.api.metrics.LongHistogram; -import application.io.opentelemetry.context.Context; +import io.opentelemetry.api.metrics.LongHistogram; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.context.AgentContextStorage; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.trace.Bridging; -public class ApplicationLongHistogram implements LongHistogram { +public class ApplicationLongHistogram + implements application.io.opentelemetry.api.metrics.LongHistogram { - private final io.opentelemetry.api.metrics.LongHistogram agentHistogram; + private final LongHistogram agentHistogram; - protected ApplicationLongHistogram(io.opentelemetry.api.metrics.LongHistogram agentHistogram) { + protected ApplicationLongHistogram(LongHistogram agentHistogram) { this.agentHistogram = agentHistogram; } @@ -25,12 +24,16 @@ public void record(long value) { } @Override - public void record(long value, Attributes applicationAttributes) { + public void record( + long value, application.io.opentelemetry.api.common.Attributes applicationAttributes) { agentHistogram.record(value, Bridging.toAgent(applicationAttributes)); } @Override - public void record(long value, Attributes applicationAttributes, Context applicationContext) { + public void record( + long value, + application.io.opentelemetry.api.common.Attributes applicationAttributes, + application.io.opentelemetry.context.Context applicationContext) { agentHistogram.record( value, Bridging.toAgent(applicationAttributes), diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationLongHistogramBuilder.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationLongHistogramBuilder.java index f96523d75c70..e67ceb3ad5cf 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationLongHistogramBuilder.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationLongHistogramBuilder.java @@ -5,35 +5,35 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics; -import application.io.opentelemetry.api.metrics.LongHistogram; -import application.io.opentelemetry.api.metrics.LongHistogramBuilder; import com.google.errorprone.annotations.CanIgnoreReturnValue; +import io.opentelemetry.api.metrics.LongHistogramBuilder; -public class ApplicationLongHistogramBuilder implements LongHistogramBuilder { +public class ApplicationLongHistogramBuilder + implements application.io.opentelemetry.api.metrics.LongHistogramBuilder { - private final io.opentelemetry.api.metrics.LongHistogramBuilder agentBuilder; + private final LongHistogramBuilder agentBuilder; - protected ApplicationLongHistogramBuilder( - io.opentelemetry.api.metrics.LongHistogramBuilder agentBuilder) { + protected ApplicationLongHistogramBuilder(LongHistogramBuilder agentBuilder) { this.agentBuilder = agentBuilder; } @Override @CanIgnoreReturnValue - public LongHistogramBuilder setDescription(String description) { + public application.io.opentelemetry.api.metrics.LongHistogramBuilder setDescription( + String description) { agentBuilder.setDescription(description); return this; } @Override @CanIgnoreReturnValue - public LongHistogramBuilder setUnit(String unit) { + public application.io.opentelemetry.api.metrics.LongHistogramBuilder setUnit(String unit) { agentBuilder.setUnit(unit); return this; } @Override - public LongHistogram build() { + public application.io.opentelemetry.api.metrics.LongHistogram build() { return new ApplicationLongHistogram(agentBuilder.build()); } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationLongUpDownCounter.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationLongUpDownCounter.java index 07da56ca558e..9f2bc2a2e2ee 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationLongUpDownCounter.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationLongUpDownCounter.java @@ -5,18 +5,16 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics; -import application.io.opentelemetry.api.common.Attributes; -import application.io.opentelemetry.api.metrics.LongUpDownCounter; -import application.io.opentelemetry.context.Context; +import io.opentelemetry.api.metrics.LongUpDownCounter; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.context.AgentContextStorage; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.trace.Bridging; -public class ApplicationLongUpDownCounter implements LongUpDownCounter { +public class ApplicationLongUpDownCounter + implements application.io.opentelemetry.api.metrics.LongUpDownCounter { - private final io.opentelemetry.api.metrics.LongUpDownCounter agentCounter; + private final LongUpDownCounter agentCounter; - protected ApplicationLongUpDownCounter( - io.opentelemetry.api.metrics.LongUpDownCounter agentCounter) { + protected ApplicationLongUpDownCounter(LongUpDownCounter agentCounter) { this.agentCounter = agentCounter; } @@ -26,12 +24,16 @@ public void add(long value) { } @Override - public void add(long value, Attributes applicationAttributes) { + public void add( + long value, application.io.opentelemetry.api.common.Attributes applicationAttributes) { agentCounter.add(value, Bridging.toAgent(applicationAttributes)); } @Override - public void add(long value, Attributes applicationAttributes, Context applicationContext) { + public void add( + long value, + application.io.opentelemetry.api.common.Attributes applicationAttributes, + application.io.opentelemetry.context.Context applicationContext) { agentCounter.add( value, Bridging.toAgent(applicationAttributes), diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationLongUpDownCounterBuilder.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationLongUpDownCounterBuilder.java index 03de81fd43f3..a87f11f66f1e 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationLongUpDownCounterBuilder.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationLongUpDownCounterBuilder.java @@ -5,50 +5,48 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics; -import application.io.opentelemetry.api.metrics.DoubleUpDownCounterBuilder; -import application.io.opentelemetry.api.metrics.LongUpDownCounter; -import application.io.opentelemetry.api.metrics.LongUpDownCounterBuilder; -import application.io.opentelemetry.api.metrics.ObservableLongMeasurement; -import application.io.opentelemetry.api.metrics.ObservableLongUpDownCounter; import com.google.errorprone.annotations.CanIgnoreReturnValue; +import io.opentelemetry.api.metrics.LongUpDownCounterBuilder; import java.util.function.Consumer; -public class ApplicationLongUpDownCounterBuilder implements LongUpDownCounterBuilder { +public class ApplicationLongUpDownCounterBuilder + implements application.io.opentelemetry.api.metrics.LongUpDownCounterBuilder { - private final io.opentelemetry.api.metrics.LongUpDownCounterBuilder agentBuilder; + private final LongUpDownCounterBuilder agentBuilder; - protected ApplicationLongUpDownCounterBuilder( - io.opentelemetry.api.metrics.LongUpDownCounterBuilder agentBuilder) { + protected ApplicationLongUpDownCounterBuilder(LongUpDownCounterBuilder agentBuilder) { this.agentBuilder = agentBuilder; } @Override @CanIgnoreReturnValue - public LongUpDownCounterBuilder setDescription(String description) { + public application.io.opentelemetry.api.metrics.LongUpDownCounterBuilder setDescription( + String description) { agentBuilder.setDescription(description); return this; } @Override @CanIgnoreReturnValue - public LongUpDownCounterBuilder setUnit(String unit) { + public application.io.opentelemetry.api.metrics.LongUpDownCounterBuilder setUnit(String unit) { agentBuilder.setUnit(unit); return this; } @Override - public DoubleUpDownCounterBuilder ofDoubles() { + public application.io.opentelemetry.api.metrics.DoubleUpDownCounterBuilder ofDoubles() { return new ApplicationDoubleUpDownCounterBuilder(agentBuilder.ofDoubles()); } @Override - public LongUpDownCounter build() { + public application.io.opentelemetry.api.metrics.LongUpDownCounter build() { return new ApplicationLongUpDownCounter(agentBuilder.build()); } @Override - public ObservableLongUpDownCounter buildWithCallback( - Consumer applicationCallback) { + public application.io.opentelemetry.api.metrics.ObservableLongUpDownCounter buildWithCallback( + Consumer + applicationCallback) { return new ApplicationObservableLongUpDownCounter( agentBuilder.buildWithCallback( agentMeasurement -> @@ -57,7 +55,7 @@ public ObservableLongUpDownCounter buildWithCallback( } // added in 1.15.0 - public ObservableLongMeasurement buildObserver() { + public application.io.opentelemetry.api.metrics.ObservableLongMeasurement buildObserver() { return new ApplicationObservableLongMeasurement(agentBuilder.buildObserver()); } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationMeter.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationMeter.java index 5e2c3a2d8ff0..4d8d5df05ef9 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationMeter.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationMeter.java @@ -5,37 +5,35 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics; -import application.io.opentelemetry.api.metrics.DoubleGaugeBuilder; -import application.io.opentelemetry.api.metrics.DoubleHistogramBuilder; -import application.io.opentelemetry.api.metrics.LongCounterBuilder; -import application.io.opentelemetry.api.metrics.LongUpDownCounterBuilder; -import application.io.opentelemetry.api.metrics.Meter; +import io.opentelemetry.api.metrics.Meter; -public class ApplicationMeter implements Meter { +public class ApplicationMeter implements application.io.opentelemetry.api.metrics.Meter { - private final io.opentelemetry.api.metrics.Meter agentMeter; + private final Meter agentMeter; - protected ApplicationMeter(io.opentelemetry.api.metrics.Meter agentMeter) { + protected ApplicationMeter(Meter agentMeter) { this.agentMeter = agentMeter; } @Override - public LongCounterBuilder counterBuilder(String name) { + public application.io.opentelemetry.api.metrics.LongCounterBuilder counterBuilder(String name) { return new ApplicationLongCounterBuilder(agentMeter.counterBuilder(name)); } @Override - public LongUpDownCounterBuilder upDownCounterBuilder(String name) { + public application.io.opentelemetry.api.metrics.LongUpDownCounterBuilder upDownCounterBuilder( + String name) { return new ApplicationLongUpDownCounterBuilder(agentMeter.upDownCounterBuilder(name)); } @Override - public DoubleHistogramBuilder histogramBuilder(String name) { + public application.io.opentelemetry.api.metrics.DoubleHistogramBuilder histogramBuilder( + String name) { return new ApplicationDoubleHistogramBuilder(agentMeter.histogramBuilder(name)); } @Override - public DoubleGaugeBuilder gaugeBuilder(String name) { + public application.io.opentelemetry.api.metrics.DoubleGaugeBuilder gaugeBuilder(String name) { return new ApplicationDoubleGaugeBuilder(agentMeter.gaugeBuilder(name)); } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationMeterBuilder.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationMeterBuilder.java index 61146349e0a7..5834b5e8c94e 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationMeterBuilder.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationMeterBuilder.java @@ -5,38 +5,37 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics; -import application.io.opentelemetry.api.metrics.Meter; -import application.io.opentelemetry.api.metrics.MeterBuilder; import com.google.errorprone.annotations.CanIgnoreReturnValue; +import io.opentelemetry.api.metrics.MeterBuilder; -final class ApplicationMeterBuilder implements MeterBuilder { +final class ApplicationMeterBuilder + implements application.io.opentelemetry.api.metrics.MeterBuilder { private final ApplicationMeterFactory meterFactory; - private final io.opentelemetry.api.metrics.MeterBuilder agentBuilder; + private final MeterBuilder agentBuilder; - ApplicationMeterBuilder( - ApplicationMeterFactory meterFactory, - io.opentelemetry.api.metrics.MeterBuilder agentBuilder) { + ApplicationMeterBuilder(ApplicationMeterFactory meterFactory, MeterBuilder agentBuilder) { this.meterFactory = meterFactory; this.agentBuilder = agentBuilder; } @Override @CanIgnoreReturnValue - public MeterBuilder setSchemaUrl(String schemaUrl) { + public application.io.opentelemetry.api.metrics.MeterBuilder setSchemaUrl(String schemaUrl) { agentBuilder.setSchemaUrl(schemaUrl); return this; } @Override @CanIgnoreReturnValue - public MeterBuilder setInstrumentationVersion(String version) { + public application.io.opentelemetry.api.metrics.MeterBuilder setInstrumentationVersion( + String version) { agentBuilder.setInstrumentationVersion(version); return this; } @Override - public Meter build() { + public application.io.opentelemetry.api.metrics.Meter build() { return meterFactory.newMeter(agentBuilder.build()); } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationMeterFactory.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationMeterFactory.java index 88c0f7ca1c7f..216576595c42 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationMeterFactory.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationMeterFactory.java @@ -5,7 +5,9 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics; +import io.opentelemetry.api.metrics.Meter; + public interface ApplicationMeterFactory { - ApplicationMeter newMeter(io.opentelemetry.api.metrics.Meter agentMeter); + ApplicationMeter newMeter(Meter agentMeter); } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationMeterProvider.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationMeterProvider.java index 90368f34ad30..9e2bce92c935 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationMeterProvider.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationMeterProvider.java @@ -5,25 +5,23 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics; -import application.io.opentelemetry.api.metrics.MeterBuilder; -import application.io.opentelemetry.api.metrics.MeterProvider; +import io.opentelemetry.api.metrics.MeterProvider; -// Our convention for accessing agent packages. -@SuppressWarnings("UnnecessarilyFullyQualified") -public class ApplicationMeterProvider implements MeterProvider { +public class ApplicationMeterProvider + implements application.io.opentelemetry.api.metrics.MeterProvider { private final ApplicationMeterFactory meterFactory; - private final io.opentelemetry.api.metrics.MeterProvider agentMeterProvider; + private final MeterProvider agentMeterProvider; public ApplicationMeterProvider( - ApplicationMeterFactory meterFactory, - io.opentelemetry.api.metrics.MeterProvider agentMeterProvider) { + ApplicationMeterFactory meterFactory, MeterProvider agentMeterProvider) { this.meterFactory = meterFactory; this.agentMeterProvider = agentMeterProvider; } @Override - public MeterBuilder meterBuilder(String instrumentationName) { + public application.io.opentelemetry.api.metrics.MeterBuilder meterBuilder( + String instrumentationName) { return new ApplicationMeterBuilder( meterFactory, agentMeterProvider.meterBuilder(instrumentationName)); } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationObservableDoubleCounter.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationObservableDoubleCounter.java index 5e9df91ae422..98e49501a6ab 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationObservableDoubleCounter.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationObservableDoubleCounter.java @@ -5,14 +5,14 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics; -import application.io.opentelemetry.api.metrics.ObservableDoubleCounter; +import io.opentelemetry.api.metrics.ObservableDoubleCounter; -public final class ApplicationObservableDoubleCounter implements ObservableDoubleCounter { +public final class ApplicationObservableDoubleCounter + implements application.io.opentelemetry.api.metrics.ObservableDoubleCounter { - private final io.opentelemetry.api.metrics.ObservableDoubleCounter agentCounter; + private final ObservableDoubleCounter agentCounter; - public ApplicationObservableDoubleCounter( - io.opentelemetry.api.metrics.ObservableDoubleCounter agentCounter) { + public ApplicationObservableDoubleCounter(ObservableDoubleCounter agentCounter) { this.agentCounter = agentCounter; } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationObservableDoubleGauge.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationObservableDoubleGauge.java index 1aaf70e76e94..709de1335fa9 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationObservableDoubleGauge.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationObservableDoubleGauge.java @@ -5,14 +5,14 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics; -import application.io.opentelemetry.api.metrics.ObservableDoubleGauge; +import io.opentelemetry.api.metrics.ObservableDoubleGauge; -public final class ApplicationObservableDoubleGauge implements ObservableDoubleGauge { +public final class ApplicationObservableDoubleGauge + implements application.io.opentelemetry.api.metrics.ObservableDoubleGauge { - private final io.opentelemetry.api.metrics.ObservableDoubleGauge agentGauge; + private final ObservableDoubleGauge agentGauge; - public ApplicationObservableDoubleGauge( - io.opentelemetry.api.metrics.ObservableDoubleGauge agentGauge) { + public ApplicationObservableDoubleGauge(ObservableDoubleGauge agentGauge) { this.agentGauge = agentGauge; } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationObservableDoubleMeasurement.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationObservableDoubleMeasurement.java index 321fd3e6fbb5..ba556486fecb 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationObservableDoubleMeasurement.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationObservableDoubleMeasurement.java @@ -5,18 +5,16 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics; -import application.io.opentelemetry.api.common.Attributes; -import application.io.opentelemetry.api.metrics.ObservableDoubleMeasurement; +import io.opentelemetry.api.metrics.ObservableDoubleMeasurement; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.trace.Bridging; final class ApplicationObservableDoubleMeasurement - implements ObservableDoubleMeasurement, - ObservableMeasurementWrapper { + implements application.io.opentelemetry.api.metrics.ObservableDoubleMeasurement, + ObservableMeasurementWrapper { - private final io.opentelemetry.api.metrics.ObservableDoubleMeasurement agentMeasurement; + private final ObservableDoubleMeasurement agentMeasurement; - ApplicationObservableDoubleMeasurement( - io.opentelemetry.api.metrics.ObservableDoubleMeasurement agentMeasurement) { + ApplicationObservableDoubleMeasurement(ObservableDoubleMeasurement agentMeasurement) { this.agentMeasurement = agentMeasurement; } @@ -26,12 +24,12 @@ public void record(double v) { } @Override - public void record(double v, Attributes attributes) { + public void record(double v, application.io.opentelemetry.api.common.Attributes attributes) { agentMeasurement.record(v, Bridging.toAgent(attributes)); } @Override - public io.opentelemetry.api.metrics.ObservableDoubleMeasurement unwrap() { + public ObservableDoubleMeasurement unwrap() { return agentMeasurement; } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationObservableDoubleUpDownCounter.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationObservableDoubleUpDownCounter.java index 7909a4d59d53..122803a8c49f 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationObservableDoubleUpDownCounter.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationObservableDoubleUpDownCounter.java @@ -5,15 +5,15 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics; -import application.io.opentelemetry.api.metrics.ObservableDoubleUpDownCounter; +import io.opentelemetry.api.metrics.ObservableDoubleUpDownCounter; public final class ApplicationObservableDoubleUpDownCounter - implements ObservableDoubleUpDownCounter { + implements application.io.opentelemetry.api.metrics.ObservableDoubleUpDownCounter { - private final io.opentelemetry.api.metrics.ObservableDoubleUpDownCounter agentUpDownCounter; + private final ObservableDoubleUpDownCounter agentUpDownCounter; public ApplicationObservableDoubleUpDownCounter( - io.opentelemetry.api.metrics.ObservableDoubleUpDownCounter agentUpDownCounter) { + ObservableDoubleUpDownCounter agentUpDownCounter) { this.agentUpDownCounter = agentUpDownCounter; } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationObservableLongCounter.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationObservableLongCounter.java index f086e81a8eb1..f59bcc722331 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationObservableLongCounter.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationObservableLongCounter.java @@ -5,14 +5,14 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics; -import application.io.opentelemetry.api.metrics.ObservableLongCounter; +import io.opentelemetry.api.metrics.ObservableLongCounter; -public final class ApplicationObservableLongCounter implements ObservableLongCounter { +public final class ApplicationObservableLongCounter + implements application.io.opentelemetry.api.metrics.ObservableLongCounter { - private final io.opentelemetry.api.metrics.ObservableLongCounter agentCounter; + private final ObservableLongCounter agentCounter; - public ApplicationObservableLongCounter( - io.opentelemetry.api.metrics.ObservableLongCounter agentCounter) { + public ApplicationObservableLongCounter(ObservableLongCounter agentCounter) { this.agentCounter = agentCounter; } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationObservableLongGauge.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationObservableLongGauge.java index b901ce8fbda0..0f8a86ac22c3 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationObservableLongGauge.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationObservableLongGauge.java @@ -5,14 +5,14 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics; -import application.io.opentelemetry.api.metrics.ObservableLongGauge; +import io.opentelemetry.api.metrics.ObservableLongGauge; -public final class ApplicationObservableLongGauge implements ObservableLongGauge { +public final class ApplicationObservableLongGauge + implements application.io.opentelemetry.api.metrics.ObservableLongGauge { - private final io.opentelemetry.api.metrics.ObservableLongGauge agentGauge; + private final ObservableLongGauge agentGauge; - public ApplicationObservableLongGauge( - io.opentelemetry.api.metrics.ObservableLongGauge agentGauge) { + public ApplicationObservableLongGauge(ObservableLongGauge agentGauge) { this.agentGauge = agentGauge; } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationObservableLongMeasurement.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationObservableLongMeasurement.java index 5fd6c44b1195..98c642003e0d 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationObservableLongMeasurement.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationObservableLongMeasurement.java @@ -5,18 +5,16 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics; -import application.io.opentelemetry.api.common.Attributes; -import application.io.opentelemetry.api.metrics.ObservableLongMeasurement; +import io.opentelemetry.api.metrics.ObservableLongMeasurement; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.trace.Bridging; final class ApplicationObservableLongMeasurement - implements ObservableLongMeasurement, - ObservableMeasurementWrapper { + implements application.io.opentelemetry.api.metrics.ObservableLongMeasurement, + ObservableMeasurementWrapper { - private final io.opentelemetry.api.metrics.ObservableLongMeasurement agentMeasurement; + private final ObservableLongMeasurement agentMeasurement; - ApplicationObservableLongMeasurement( - io.opentelemetry.api.metrics.ObservableLongMeasurement agentMeasurement) { + ApplicationObservableLongMeasurement(ObservableLongMeasurement agentMeasurement) { this.agentMeasurement = agentMeasurement; } @@ -26,12 +24,12 @@ public void record(long v) { } @Override - public void record(long v, Attributes attributes) { + public void record(long v, application.io.opentelemetry.api.common.Attributes attributes) { agentMeasurement.record(v, Bridging.toAgent(attributes)); } @Override - public io.opentelemetry.api.metrics.ObservableLongMeasurement unwrap() { + public ObservableLongMeasurement unwrap() { return agentMeasurement; } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationObservableLongUpDownCounter.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationObservableLongUpDownCounter.java index e2be0640b8a1..55252589fb71 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationObservableLongUpDownCounter.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationObservableLongUpDownCounter.java @@ -5,14 +5,14 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics; -import application.io.opentelemetry.api.metrics.ObservableLongUpDownCounter; +import io.opentelemetry.api.metrics.ObservableLongUpDownCounter; -public final class ApplicationObservableLongUpDownCounter implements ObservableLongUpDownCounter { +public final class ApplicationObservableLongUpDownCounter + implements application.io.opentelemetry.api.metrics.ObservableLongUpDownCounter { - private final io.opentelemetry.api.metrics.ObservableLongUpDownCounter agentUpDownCounter; + private final ObservableLongUpDownCounter agentUpDownCounter; - public ApplicationObservableLongUpDownCounter( - io.opentelemetry.api.metrics.ObservableLongUpDownCounter agentUpDownCounter) { + public ApplicationObservableLongUpDownCounter(ObservableLongUpDownCounter agentUpDownCounter) { this.agentUpDownCounter = agentUpDownCounter; } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ObservableMeasurementWrapper.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ObservableMeasurementWrapper.java index ddb3ff981e7f..ff10d111f0ef 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ObservableMeasurementWrapper.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ObservableMeasurementWrapper.java @@ -5,8 +5,9 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics; -public interface ObservableMeasurementWrapper< - T extends io.opentelemetry.api.metrics.ObservableMeasurement> { +import io.opentelemetry.api.metrics.ObservableMeasurement; + +public interface ObservableMeasurementWrapper { T unwrap(); } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.15/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_15/metrics/ApplicationBatchCallback.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.15/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_15/metrics/ApplicationBatchCallback.java index 9bfb25cb65a4..8becb9a7b406 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.15/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_15/metrics/ApplicationBatchCallback.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.15/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_15/metrics/ApplicationBatchCallback.java @@ -5,12 +5,13 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_15.metrics; -import application.io.opentelemetry.api.metrics.BatchCallback; +import io.opentelemetry.api.metrics.BatchCallback; -final class ApplicationBatchCallback implements BatchCallback { - private final io.opentelemetry.api.metrics.BatchCallback agentCallback; +final class ApplicationBatchCallback + implements application.io.opentelemetry.api.metrics.BatchCallback { + private final BatchCallback agentCallback; - ApplicationBatchCallback(io.opentelemetry.api.metrics.BatchCallback agentCallback) { + ApplicationBatchCallback(BatchCallback agentCallback) { this.agentCallback = agentCallback; } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.15/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_15/metrics/ApplicationMeter115.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.15/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_15/metrics/ApplicationMeter115.java index 052545427b11..94991325b75e 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.15/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_15/metrics/ApplicationMeter115.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.15/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_15/metrics/ApplicationMeter115.java @@ -5,50 +5,49 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_15.metrics; -import application.io.opentelemetry.api.metrics.BatchCallback; -import application.io.opentelemetry.api.metrics.ObservableMeasurement; +import io.opentelemetry.api.metrics.Meter; +import io.opentelemetry.api.metrics.ObservableMeasurement; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics.ApplicationMeter; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics.ObservableMeasurementWrapper; public class ApplicationMeter115 extends ApplicationMeter { - private final io.opentelemetry.api.metrics.Meter agentMeter; + private final Meter agentMeter; - protected ApplicationMeter115(io.opentelemetry.api.metrics.Meter agentMeter) { + protected ApplicationMeter115(Meter agentMeter) { super(agentMeter); this.agentMeter = agentMeter; } @Override - public BatchCallback batchCallback( + public application.io.opentelemetry.api.metrics.BatchCallback batchCallback( Runnable callback, - ObservableMeasurement observableMeasurement, - ObservableMeasurement... additionalMeasurements) { + application.io.opentelemetry.api.metrics.ObservableMeasurement observableMeasurement, + application.io.opentelemetry.api.metrics.ObservableMeasurement... additionalMeasurements) { return new ApplicationBatchCallback( agentMeter.batchCallback( callback, unwrap(observableMeasurement), unwrap(additionalMeasurements))); } - private static io.opentelemetry.api.metrics.ObservableMeasurement unwrap( - ObservableMeasurement observableMeasurement) { + private static ObservableMeasurement unwrap( + application.io.opentelemetry.api.metrics.ObservableMeasurement observableMeasurement) { if (observableMeasurement == null) { return null; } if (!(observableMeasurement instanceof ObservableMeasurementWrapper)) { // unwrap instruments that weren't created by us into a dummy instrument // sdk ignores instruments that it didn't create - return new io.opentelemetry.api.metrics.ObservableMeasurement() {}; + return new ObservableMeasurement() {}; } return ((ObservableMeasurementWrapper) observableMeasurement).unwrap(); } - private static io.opentelemetry.api.metrics.ObservableMeasurement[] unwrap( - ObservableMeasurement[] observableMeasurements) { + private static ObservableMeasurement[] unwrap( + application.io.opentelemetry.api.metrics.ObservableMeasurement[] observableMeasurements) { if (observableMeasurements == null) { return null; } - io.opentelemetry.api.metrics.ObservableMeasurement[] result = - new io.opentelemetry.api.metrics.ObservableMeasurement[observableMeasurements.length]; + ObservableMeasurement[] result = new ObservableMeasurement[observableMeasurements.length]; for (int i = 0; i < observableMeasurements.length; i++) { result[i] = unwrap(observableMeasurements[i]); } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.27/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_27/ApplicationOpenTelemetry127.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.27/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_27/ApplicationOpenTelemetry127.java index d2d5481e51dd..59fcc074c0f0 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.27/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_27/ApplicationOpenTelemetry127.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.27/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_27/ApplicationOpenTelemetry127.java @@ -5,11 +5,8 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_27; -import application.io.opentelemetry.api.OpenTelemetry; -import application.io.opentelemetry.api.logs.LoggerProvider; -import application.io.opentelemetry.api.metrics.MeterProvider; -import application.io.opentelemetry.api.trace.TracerProvider; -import application.io.opentelemetry.context.propagation.ContextPropagators; +import io.opentelemetry.api.GlobalOpenTelemetry; +import io.opentelemetry.api.OpenTelemetry; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.context.propagation.ApplicationContextPropagators; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.trace.ApplicationTracerFactory; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics.ApplicationMeterFactory; @@ -22,21 +19,21 @@ import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_4.trace.ApplicationTracerProvider14; import java.lang.reflect.InvocationTargetException; -public class ApplicationOpenTelemetry127 implements OpenTelemetry { +public class ApplicationOpenTelemetry127 implements application.io.opentelemetry.api.OpenTelemetry { // Accessed with reflection @SuppressWarnings("unused") - public static final OpenTelemetry INSTANCE = new ApplicationOpenTelemetry127(); + public static final application.io.opentelemetry.api.OpenTelemetry INSTANCE = + new ApplicationOpenTelemetry127(); - private final TracerProvider applicationTracerProvider; - private final ContextPropagators applicationContextPropagators; - private final MeterProvider applicationMeterProvider; - private final LoggerProvider applicationLoggerProvider; + private final application.io.opentelemetry.api.trace.TracerProvider applicationTracerProvider; + private final application.io.opentelemetry.context.propagation.ContextPropagators + applicationContextPropagators; + private final application.io.opentelemetry.api.metrics.MeterProvider applicationMeterProvider; + private final application.io.opentelemetry.api.logs.LoggerProvider applicationLoggerProvider; - @SuppressWarnings("UnnecessarilyFullyQualified") protected ApplicationOpenTelemetry127() { - io.opentelemetry.api.OpenTelemetry agentOpenTelemetry = - io.opentelemetry.api.GlobalOpenTelemetry.get(); + OpenTelemetry agentOpenTelemetry = GlobalOpenTelemetry.get(); applicationTracerProvider = new ApplicationTracerProvider14(getTracerFactory(), agentOpenTelemetry.getTracerProvider()); applicationContextPropagators = @@ -48,22 +45,22 @@ protected ApplicationOpenTelemetry127() { } @Override - public TracerProvider getTracerProvider() { + public application.io.opentelemetry.api.trace.TracerProvider getTracerProvider() { return applicationTracerProvider; } @Override - public MeterProvider getMeterProvider() { + public application.io.opentelemetry.api.metrics.MeterProvider getMeterProvider() { return applicationMeterProvider; } @Override - public LoggerProvider getLogsBridge() { + public application.io.opentelemetry.api.logs.LoggerProvider getLogsBridge() { return applicationLoggerProvider; } @Override - public ContextPropagators getPropagators() { + public application.io.opentelemetry.context.propagation.ContextPropagators getPropagators() { return applicationContextPropagators; } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.27/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_27/logs/ApplicationLogRecordBuilder.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.27/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_27/logs/ApplicationLogRecordBuilder.java index b5071bf6e557..b8d2ffd4bb19 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.27/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_27/logs/ApplicationLogRecordBuilder.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.27/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_27/logs/ApplicationLogRecordBuilder.java @@ -5,84 +5,88 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_27.logs; -import application.io.opentelemetry.api.common.AttributeKey; -import application.io.opentelemetry.api.logs.LogRecordBuilder; -import application.io.opentelemetry.api.logs.Severity; -import application.io.opentelemetry.context.Context; import com.google.errorprone.annotations.CanIgnoreReturnValue; +import io.opentelemetry.api.common.AttributeKey; +import io.opentelemetry.api.logs.LogRecordBuilder; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.context.AgentContextStorage; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.trace.Bridging; import java.time.Instant; import java.util.concurrent.TimeUnit; -public class ApplicationLogRecordBuilder implements LogRecordBuilder { +public class ApplicationLogRecordBuilder + implements application.io.opentelemetry.api.logs.LogRecordBuilder { - private final io.opentelemetry.api.logs.LogRecordBuilder agentLogRecordBuilder; + private final LogRecordBuilder agentLogRecordBuilder; - protected ApplicationLogRecordBuilder( - io.opentelemetry.api.logs.LogRecordBuilder agentLogRecordBuilder) { + protected ApplicationLogRecordBuilder(LogRecordBuilder agentLogRecordBuilder) { this.agentLogRecordBuilder = agentLogRecordBuilder; } @Override @CanIgnoreReturnValue - public LogRecordBuilder setTimestamp(long l, TimeUnit timeUnit) { + public application.io.opentelemetry.api.logs.LogRecordBuilder setTimestamp( + long l, TimeUnit timeUnit) { agentLogRecordBuilder.setTimestamp(l, timeUnit); return this; } @Override @CanIgnoreReturnValue - public LogRecordBuilder setTimestamp(Instant instant) { + public application.io.opentelemetry.api.logs.LogRecordBuilder setTimestamp(Instant instant) { agentLogRecordBuilder.setTimestamp(instant); return this; } @Override - public LogRecordBuilder setObservedTimestamp(long l, TimeUnit timeUnit) { + public application.io.opentelemetry.api.logs.LogRecordBuilder setObservedTimestamp( + long l, TimeUnit timeUnit) { agentLogRecordBuilder.setObservedTimestamp(l, timeUnit); return this; } @Override - public LogRecordBuilder setObservedTimestamp(Instant instant) { + public application.io.opentelemetry.api.logs.LogRecordBuilder setObservedTimestamp( + Instant instant) { agentLogRecordBuilder.setObservedTimestamp(instant); return this; } @Override @CanIgnoreReturnValue - public LogRecordBuilder setContext(Context context) { + public application.io.opentelemetry.api.logs.LogRecordBuilder setContext( + application.io.opentelemetry.context.Context context) { agentLogRecordBuilder.setContext(AgentContextStorage.getAgentContext(context)); return this; } @Override @CanIgnoreReturnValue - public LogRecordBuilder setSeverity(Severity severity) { + public application.io.opentelemetry.api.logs.LogRecordBuilder setSeverity( + application.io.opentelemetry.api.logs.Severity severity) { agentLogRecordBuilder.setSeverity(LogBridging.toAgent(severity)); return this; } @Override @CanIgnoreReturnValue - public LogRecordBuilder setSeverityText(String s) { + public application.io.opentelemetry.api.logs.LogRecordBuilder setSeverityText(String s) { agentLogRecordBuilder.setSeverityText(s); return this; } @Override @CanIgnoreReturnValue - public LogRecordBuilder setBody(String s) { + public application.io.opentelemetry.api.logs.LogRecordBuilder setBody(String s) { agentLogRecordBuilder.setBody(s); return this; } @Override @CanIgnoreReturnValue - public LogRecordBuilder setAttribute(AttributeKey attributeKey, T t) { + public application.io.opentelemetry.api.logs.LogRecordBuilder setAttribute( + application.io.opentelemetry.api.common.AttributeKey attributeKey, T t) { @SuppressWarnings("unchecked") // toAgent uses raw AttributeKey - io.opentelemetry.api.common.AttributeKey agentKey = Bridging.toAgent(attributeKey); + AttributeKey agentKey = Bridging.toAgent(attributeKey); if (agentKey != null) { agentLogRecordBuilder.setAttribute(agentKey, t); } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.27/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_27/logs/ApplicationLogger.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.27/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_27/logs/ApplicationLogger.java index d05568f2545e..5fa314948b54 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.27/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_27/logs/ApplicationLogger.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.27/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_27/logs/ApplicationLogger.java @@ -5,19 +5,18 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_27.logs; -import application.io.opentelemetry.api.logs.LogRecordBuilder; -import application.io.opentelemetry.api.logs.Logger; +import io.opentelemetry.api.logs.Logger; -public class ApplicationLogger implements Logger { +public class ApplicationLogger implements application.io.opentelemetry.api.logs.Logger { - private final io.opentelemetry.api.logs.Logger agentLogger; + private final Logger agentLogger; - protected ApplicationLogger(io.opentelemetry.api.logs.Logger agentLogger) { + protected ApplicationLogger(Logger agentLogger) { this.agentLogger = agentLogger; } @Override - public LogRecordBuilder logRecordBuilder() { + public application.io.opentelemetry.api.logs.LogRecordBuilder logRecordBuilder() { return new ApplicationLogRecordBuilder(agentLogger.logRecordBuilder()); } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.27/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_27/logs/ApplicationLoggerBuilder.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.27/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_27/logs/ApplicationLoggerBuilder.java index 1636b4d96560..039b0659b665 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.27/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_27/logs/ApplicationLoggerBuilder.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.27/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_27/logs/ApplicationLoggerBuilder.java @@ -5,38 +5,37 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_27.logs; -import application.io.opentelemetry.api.logs.Logger; -import application.io.opentelemetry.api.logs.LoggerBuilder; import com.google.errorprone.annotations.CanIgnoreReturnValue; +import io.opentelemetry.api.logs.LoggerBuilder; -final class ApplicationLoggerBuilder implements LoggerBuilder { +final class ApplicationLoggerBuilder + implements application.io.opentelemetry.api.logs.LoggerBuilder { private final ApplicationLoggerFactory loggerFactory; - private final io.opentelemetry.api.logs.LoggerBuilder agentBuilder; + private final LoggerBuilder agentBuilder; - ApplicationLoggerBuilder( - ApplicationLoggerFactory loggerFactory, - io.opentelemetry.api.logs.LoggerBuilder agentBuilder) { + ApplicationLoggerBuilder(ApplicationLoggerFactory loggerFactory, LoggerBuilder agentBuilder) { this.loggerFactory = loggerFactory; this.agentBuilder = agentBuilder; } @Override @CanIgnoreReturnValue - public LoggerBuilder setSchemaUrl(String schemaUrl) { + public application.io.opentelemetry.api.logs.LoggerBuilder setSchemaUrl(String schemaUrl) { agentBuilder.setSchemaUrl(schemaUrl); return this; } @Override @CanIgnoreReturnValue - public LoggerBuilder setInstrumentationVersion(String version) { + public application.io.opentelemetry.api.logs.LoggerBuilder setInstrumentationVersion( + String version) { agentBuilder.setInstrumentationVersion(version); return this; } @Override - public Logger build() { + public application.io.opentelemetry.api.logs.Logger build() { return loggerFactory.newLogger(agentBuilder.build()); } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.27/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_27/logs/ApplicationLoggerFactory.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.27/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_27/logs/ApplicationLoggerFactory.java index b66ee7e5722f..339e8bfd35cd 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.27/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_27/logs/ApplicationLoggerFactory.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.27/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_27/logs/ApplicationLoggerFactory.java @@ -5,7 +5,9 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_27.logs; +import io.opentelemetry.api.logs.Logger; + public interface ApplicationLoggerFactory { - ApplicationLogger newLogger(io.opentelemetry.api.logs.Logger agentLogger); + ApplicationLogger newLogger(Logger agentLogger); } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.27/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_27/logs/ApplicationLoggerProvider.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.27/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_27/logs/ApplicationLoggerProvider.java index 875bf75daaa8..381e38c91f6f 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.27/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_27/logs/ApplicationLoggerProvider.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.27/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_27/logs/ApplicationLoggerProvider.java @@ -5,25 +5,23 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_27.logs; -import application.io.opentelemetry.api.logs.LoggerBuilder; -import application.io.opentelemetry.api.logs.LoggerProvider; +import io.opentelemetry.api.logs.LoggerProvider; -// Our convention for accessing agent packages. -@SuppressWarnings("UnnecessarilyFullyQualified") -public class ApplicationLoggerProvider implements LoggerProvider { +public class ApplicationLoggerProvider + implements application.io.opentelemetry.api.logs.LoggerProvider { private final ApplicationLoggerFactory loggerFactory; - private final io.opentelemetry.api.logs.LoggerProvider agentLoggerProvider; + private final LoggerProvider agentLoggerProvider; public ApplicationLoggerProvider( - ApplicationLoggerFactory loggerFactory, - io.opentelemetry.api.logs.LoggerProvider agentLoggerProvider) { + ApplicationLoggerFactory loggerFactory, LoggerProvider agentLoggerProvider) { this.loggerFactory = loggerFactory; this.agentLoggerProvider = agentLoggerProvider; } @Override - public LoggerBuilder loggerBuilder(String instrumentationName) { + public application.io.opentelemetry.api.logs.LoggerBuilder loggerBuilder( + String instrumentationName) { return new ApplicationLoggerBuilder( loggerFactory, agentLoggerProvider.loggerBuilder(instrumentationName)); } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.27/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_27/logs/LogBridging.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.27/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_27/logs/LogBridging.java index 2e627b249fe3..bfd0154d2b64 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.27/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_27/logs/LogBridging.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.27/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_27/logs/LogBridging.java @@ -5,7 +5,7 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_27.logs; -import application.io.opentelemetry.api.logs.Severity; +import io.opentelemetry.api.logs.Severity; import java.util.EnumMap; /** @@ -21,26 +21,26 @@ * *

Also see comments in this module's gradle file. */ -// Our convention for accessing agent package -@SuppressWarnings("UnnecessarilyFullyQualified") public class LogBridging { - private static final EnumMap severityMap; + private static final EnumMap + severityMap; static { - severityMap = new EnumMap<>(Severity.class); - for (Severity severity : Severity.values()) { + severityMap = new EnumMap<>(application.io.opentelemetry.api.logs.Severity.class); + for (application.io.opentelemetry.api.logs.Severity severity : + application.io.opentelemetry.api.logs.Severity.values()) { try { - severityMap.put(severity, io.opentelemetry.api.logs.Severity.valueOf(severity.name())); + severityMap.put(severity, Severity.valueOf(severity.name())); } catch (IllegalArgumentException e) { // No mapping exists for this severity, ignore } } } - public static io.opentelemetry.api.logs.Severity toAgent(Severity applicationSeverity) { - return severityMap.getOrDefault( - applicationSeverity, io.opentelemetry.api.logs.Severity.UNDEFINED_SEVERITY_NUMBER); + public static Severity toAgent( + application.io.opentelemetry.api.logs.Severity applicationSeverity) { + return severityMap.getOrDefault(applicationSeverity, Severity.UNDEFINED_SEVERITY_NUMBER); } private LogBridging() {} diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.31/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_31/incubator/metrics/ApplicationDoubleCounterBuilder131.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.31/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_31/incubator/metrics/ApplicationDoubleCounterBuilder131.java index 959fb363f55f..12afb02d8e83 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.31/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_31/incubator/metrics/ApplicationDoubleCounterBuilder131.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.31/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_31/incubator/metrics/ApplicationDoubleCounterBuilder131.java @@ -5,27 +5,28 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_31.incubator.metrics; -import application.io.opentelemetry.api.common.AttributeKey; -import application.io.opentelemetry.extension.incubator.metrics.ExtendedDoubleCounterBuilder; +import io.opentelemetry.api.incubator.metrics.ExtendedDoubleCounterBuilder; +import io.opentelemetry.api.metrics.DoubleCounterBuilder; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.trace.Bridging; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics.ApplicationDoubleCounterBuilder; import java.util.List; final class ApplicationDoubleCounterBuilder131 extends ApplicationDoubleCounterBuilder - implements ExtendedDoubleCounterBuilder { + implements application.io.opentelemetry.extension.incubator.metrics + .ExtendedDoubleCounterBuilder { - private final io.opentelemetry.api.metrics.DoubleCounterBuilder agentBuilder; + private final DoubleCounterBuilder agentBuilder; - ApplicationDoubleCounterBuilder131( - io.opentelemetry.api.metrics.DoubleCounterBuilder agentBuilder) { + ApplicationDoubleCounterBuilder131(DoubleCounterBuilder agentBuilder) { super(agentBuilder); this.agentBuilder = agentBuilder; } @Override - public ExtendedDoubleCounterBuilder setAttributesAdvice(List> attributes) { - ((io.opentelemetry.api.incubator.metrics.ExtendedDoubleCounterBuilder) agentBuilder) - .setAttributesAdvice(Bridging.toAgent(attributes)); + public application.io.opentelemetry.extension.incubator.metrics.ExtendedDoubleCounterBuilder + setAttributesAdvice( + List> attributes) { + ((ExtendedDoubleCounterBuilder) agentBuilder).setAttributesAdvice(Bridging.toAgent(attributes)); return this; } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.31/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_31/incubator/metrics/ApplicationDoubleGaugeBuilder131.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.31/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_31/incubator/metrics/ApplicationDoubleGaugeBuilder131.java index e35104e68553..dd674cdf32d6 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.31/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_31/incubator/metrics/ApplicationDoubleGaugeBuilder131.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.31/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_31/incubator/metrics/ApplicationDoubleGaugeBuilder131.java @@ -5,34 +5,32 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_31.incubator.metrics; -import application.io.opentelemetry.api.common.AttributeKey; -import application.io.opentelemetry.api.common.Attributes; -import application.io.opentelemetry.api.metrics.LongGaugeBuilder; -import application.io.opentelemetry.extension.incubator.metrics.DoubleGauge; -import application.io.opentelemetry.extension.incubator.metrics.ExtendedDoubleGaugeBuilder; +import io.opentelemetry.api.incubator.metrics.ExtendedDoubleGaugeBuilder; +import io.opentelemetry.api.metrics.DoubleGauge; +import io.opentelemetry.api.metrics.DoubleGaugeBuilder; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.trace.Bridging; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics.ApplicationDoubleGaugeBuilder; import java.util.List; final class ApplicationDoubleGaugeBuilder131 extends ApplicationDoubleGaugeBuilder - implements ExtendedDoubleGaugeBuilder { + implements application.io.opentelemetry.extension.incubator.metrics.ExtendedDoubleGaugeBuilder { - private final io.opentelemetry.api.metrics.DoubleGaugeBuilder agentBuilder; + private final DoubleGaugeBuilder agentBuilder; - ApplicationDoubleGaugeBuilder131(io.opentelemetry.api.metrics.DoubleGaugeBuilder agentBuilder) { + ApplicationDoubleGaugeBuilder131(DoubleGaugeBuilder agentBuilder) { super(agentBuilder); this.agentBuilder = agentBuilder; } @Override - public LongGaugeBuilder ofLongs() { + public application.io.opentelemetry.api.metrics.LongGaugeBuilder ofLongs() { return new ApplicationLongGaugeBuilder131(agentBuilder.ofLongs()); } @Override - public DoubleGauge build() { - io.opentelemetry.api.metrics.DoubleGauge agentDoubleGauge = agentBuilder.build(); - return new DoubleGauge() { + public application.io.opentelemetry.extension.incubator.metrics.DoubleGauge build() { + DoubleGauge agentDoubleGauge = agentBuilder.build(); + return new application.io.opentelemetry.extension.incubator.metrics.DoubleGauge() { @Override public void set(double value) { @@ -40,16 +38,17 @@ public void set(double value) { } @Override - public void set(double value, Attributes attributes) { + public void set(double value, application.io.opentelemetry.api.common.Attributes attributes) { agentDoubleGauge.set(value, Bridging.toAgent(attributes)); } }; } @Override - public ExtendedDoubleGaugeBuilder setAttributesAdvice(List> attributes) { - ((io.opentelemetry.api.incubator.metrics.ExtendedDoubleGaugeBuilder) agentBuilder) - .setAttributesAdvice(Bridging.toAgent(attributes)); + public application.io.opentelemetry.extension.incubator.metrics.ExtendedDoubleGaugeBuilder + setAttributesAdvice( + List> attributes) { + ((ExtendedDoubleGaugeBuilder) agentBuilder).setAttributesAdvice(Bridging.toAgent(attributes)); return this; } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.31/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_31/incubator/metrics/ApplicationDoubleHistogramBuilder131.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.31/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_31/incubator/metrics/ApplicationDoubleHistogramBuilder131.java index 679371fce6c9..9f263c6d844a 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.31/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_31/incubator/metrics/ApplicationDoubleHistogramBuilder131.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.31/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_31/incubator/metrics/ApplicationDoubleHistogramBuilder131.java @@ -5,39 +5,40 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_31.incubator.metrics; -import application.io.opentelemetry.api.common.AttributeKey; -import application.io.opentelemetry.api.metrics.LongHistogramBuilder; -import application.io.opentelemetry.extension.incubator.metrics.ExtendedDoubleHistogramBuilder; +import io.opentelemetry.api.incubator.metrics.ExtendedDoubleHistogramBuilder; +import io.opentelemetry.api.metrics.DoubleHistogramBuilder; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.trace.Bridging; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics.ApplicationDoubleHistogramBuilder; import java.util.List; final class ApplicationDoubleHistogramBuilder131 extends ApplicationDoubleHistogramBuilder - implements ExtendedDoubleHistogramBuilder { + implements application.io.opentelemetry.extension.incubator.metrics + .ExtendedDoubleHistogramBuilder { - private final io.opentelemetry.api.metrics.DoubleHistogramBuilder agentBuilder; + private final DoubleHistogramBuilder agentBuilder; - ApplicationDoubleHistogramBuilder131( - io.opentelemetry.api.metrics.DoubleHistogramBuilder agentBuilder) { + ApplicationDoubleHistogramBuilder131(DoubleHistogramBuilder agentBuilder) { super(agentBuilder); this.agentBuilder = agentBuilder; } @Override - public LongHistogramBuilder ofLongs() { + public application.io.opentelemetry.api.metrics.LongHistogramBuilder ofLongs() { return new ApplicationLongHistogramBuilder131(agentBuilder.ofLongs()); } @Override - public ExtendedDoubleHistogramBuilder setExplicitBucketBoundariesAdvice( - List bucketBoundaries) { + public application.io.opentelemetry.extension.incubator.metrics.ExtendedDoubleHistogramBuilder + setExplicitBucketBoundariesAdvice(List bucketBoundaries) { agentBuilder.setExplicitBucketBoundariesAdvice(bucketBoundaries); return this; } @Override - public ExtendedDoubleHistogramBuilder setAttributesAdvice(List> attributes) { - ((io.opentelemetry.api.incubator.metrics.ExtendedDoubleHistogramBuilder) agentBuilder) + public application.io.opentelemetry.extension.incubator.metrics.ExtendedDoubleHistogramBuilder + setAttributesAdvice( + List> attributes) { + ((ExtendedDoubleHistogramBuilder) agentBuilder) .setAttributesAdvice(Bridging.toAgent(attributes)); return this; } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.31/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_31/incubator/metrics/ApplicationDoubleUpDownCounterBuilder131.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.31/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_31/incubator/metrics/ApplicationDoubleUpDownCounterBuilder131.java index f26dc473c5d9..d3eaaf62553c 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.31/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_31/incubator/metrics/ApplicationDoubleUpDownCounterBuilder131.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.31/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_31/incubator/metrics/ApplicationDoubleUpDownCounterBuilder131.java @@ -5,26 +5,28 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_31.incubator.metrics; -import application.io.opentelemetry.api.common.AttributeKey; -import application.io.opentelemetry.extension.incubator.metrics.ExtendedDoubleUpDownCounterBuilder; +import io.opentelemetry.api.incubator.metrics.ExtendedDoubleUpDownCounterBuilder; +import io.opentelemetry.api.metrics.DoubleUpDownCounterBuilder; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.trace.Bridging; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics.ApplicationDoubleUpDownCounterBuilder; import java.util.List; final class ApplicationDoubleUpDownCounterBuilder131 extends ApplicationDoubleUpDownCounterBuilder - implements ExtendedDoubleUpDownCounterBuilder { + implements application.io.opentelemetry.extension.incubator.metrics + .ExtendedDoubleUpDownCounterBuilder { - private final io.opentelemetry.api.metrics.DoubleUpDownCounterBuilder agentBuilder; + private final DoubleUpDownCounterBuilder agentBuilder; - ApplicationDoubleUpDownCounterBuilder131( - io.opentelemetry.api.metrics.DoubleUpDownCounterBuilder agentBuilder) { + ApplicationDoubleUpDownCounterBuilder131(DoubleUpDownCounterBuilder agentBuilder) { super(agentBuilder); this.agentBuilder = agentBuilder; } @Override - public ExtendedDoubleUpDownCounterBuilder setAttributesAdvice(List> attributes) { - ((io.opentelemetry.api.incubator.metrics.ExtendedDoubleUpDownCounterBuilder) agentBuilder) + public application.io.opentelemetry.extension.incubator.metrics.ExtendedDoubleUpDownCounterBuilder + setAttributesAdvice( + List> attributes) { + ((ExtendedDoubleUpDownCounterBuilder) agentBuilder) .setAttributesAdvice(Bridging.toAgent(attributes)); return this; } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.31/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_31/incubator/metrics/ApplicationLongCounterBuilder131.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.31/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_31/incubator/metrics/ApplicationLongCounterBuilder131.java index d11d1ec7a921..119018d3e30d 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.31/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_31/incubator/metrics/ApplicationLongCounterBuilder131.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.31/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_31/incubator/metrics/ApplicationLongCounterBuilder131.java @@ -5,32 +5,32 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_31.incubator.metrics; -import application.io.opentelemetry.api.common.AttributeKey; -import application.io.opentelemetry.api.metrics.DoubleCounterBuilder; -import application.io.opentelemetry.extension.incubator.metrics.ExtendedLongCounterBuilder; +import io.opentelemetry.api.incubator.metrics.ExtendedLongCounterBuilder; +import io.opentelemetry.api.metrics.LongCounterBuilder; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.trace.Bridging; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics.ApplicationLongCounterBuilder; import java.util.List; final class ApplicationLongCounterBuilder131 extends ApplicationLongCounterBuilder - implements ExtendedLongCounterBuilder { + implements application.io.opentelemetry.extension.incubator.metrics.ExtendedLongCounterBuilder { - private final io.opentelemetry.api.metrics.LongCounterBuilder agentBuilder; + private final LongCounterBuilder agentBuilder; - ApplicationLongCounterBuilder131(io.opentelemetry.api.metrics.LongCounterBuilder agentBuilder) { + ApplicationLongCounterBuilder131(LongCounterBuilder agentBuilder) { super(agentBuilder); this.agentBuilder = agentBuilder; } @Override - public DoubleCounterBuilder ofDoubles() { + public application.io.opentelemetry.api.metrics.DoubleCounterBuilder ofDoubles() { return new ApplicationDoubleCounterBuilder131(agentBuilder.ofDoubles()); } @Override - public ExtendedLongCounterBuilder setAttributesAdvice(List> attributes) { - ((io.opentelemetry.api.incubator.metrics.ExtendedLongCounterBuilder) agentBuilder) - .setAttributesAdvice(Bridging.toAgent(attributes)); + public application.io.opentelemetry.extension.incubator.metrics.ExtendedLongCounterBuilder + setAttributesAdvice( + List> attributes) { + ((ExtendedLongCounterBuilder) agentBuilder).setAttributesAdvice(Bridging.toAgent(attributes)); return this; } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.31/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_31/incubator/metrics/ApplicationLongGaugeBuilder131.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.31/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_31/incubator/metrics/ApplicationLongGaugeBuilder131.java index 137432f27862..f212adfbfe72 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.31/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_31/incubator/metrics/ApplicationLongGaugeBuilder131.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.31/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_31/incubator/metrics/ApplicationLongGaugeBuilder131.java @@ -5,44 +5,44 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_31.incubator.metrics; -import application.io.opentelemetry.api.common.AttributeKey; -import application.io.opentelemetry.api.common.Attributes; -import application.io.opentelemetry.extension.incubator.metrics.ExtendedLongGaugeBuilder; -import application.io.opentelemetry.extension.incubator.metrics.LongGauge; +import io.opentelemetry.api.incubator.metrics.ExtendedLongGaugeBuilder; +import io.opentelemetry.api.metrics.LongGauge; +import io.opentelemetry.api.metrics.LongGaugeBuilder; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.trace.Bridging; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics.ApplicationLongGaugeBuilder; import java.util.List; final class ApplicationLongGaugeBuilder131 extends ApplicationLongGaugeBuilder - implements ExtendedLongGaugeBuilder { + implements application.io.opentelemetry.extension.incubator.metrics.ExtendedLongGaugeBuilder { - private final io.opentelemetry.api.metrics.LongGaugeBuilder agentBuilder; + private final LongGaugeBuilder agentBuilder; - ApplicationLongGaugeBuilder131(io.opentelemetry.api.metrics.LongGaugeBuilder agentBuilder) { + ApplicationLongGaugeBuilder131(LongGaugeBuilder agentBuilder) { super(agentBuilder); this.agentBuilder = agentBuilder; } @Override - public LongGauge build() { - io.opentelemetry.api.metrics.LongGauge agentLongGauge = agentBuilder.build(); - return new LongGauge() { + public application.io.opentelemetry.extension.incubator.metrics.LongGauge build() { + LongGauge agentLongGauge = agentBuilder.build(); + return new application.io.opentelemetry.extension.incubator.metrics.LongGauge() { @Override public void set(long value) { agentLongGauge.set(value); } @Override - public void set(long value, Attributes attributes) { + public void set(long value, application.io.opentelemetry.api.common.Attributes attributes) { agentLongGauge.set(value, Bridging.toAgent(attributes)); } }; } @Override - public ExtendedLongGaugeBuilder setAttributesAdvice(List> attributes) { - ((io.opentelemetry.api.incubator.metrics.ExtendedLongGaugeBuilder) agentBuilder) - .setAttributesAdvice(Bridging.toAgent(attributes)); + public application.io.opentelemetry.extension.incubator.metrics.ExtendedLongGaugeBuilder + setAttributesAdvice( + List> attributes) { + ((ExtendedLongGaugeBuilder) agentBuilder).setAttributesAdvice(Bridging.toAgent(attributes)); return this; } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.31/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_31/incubator/metrics/ApplicationLongHistogramBuilder131.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.31/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_31/incubator/metrics/ApplicationLongHistogramBuilder131.java index 809064f8021a..2e9ee9e71eea 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.31/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_31/incubator/metrics/ApplicationLongHistogramBuilder131.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.31/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_31/incubator/metrics/ApplicationLongHistogramBuilder131.java @@ -5,34 +5,35 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_31.incubator.metrics; -import application.io.opentelemetry.api.common.AttributeKey; -import application.io.opentelemetry.extension.incubator.metrics.ExtendedLongHistogramBuilder; +import io.opentelemetry.api.incubator.metrics.ExtendedLongHistogramBuilder; +import io.opentelemetry.api.metrics.LongHistogramBuilder; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.trace.Bridging; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics.ApplicationLongHistogramBuilder; import java.util.List; final class ApplicationLongHistogramBuilder131 extends ApplicationLongHistogramBuilder - implements ExtendedLongHistogramBuilder { + implements application.io.opentelemetry.extension.incubator.metrics + .ExtendedLongHistogramBuilder { - private final io.opentelemetry.api.metrics.LongHistogramBuilder agentBuilder; + private final LongHistogramBuilder agentBuilder; - ApplicationLongHistogramBuilder131( - io.opentelemetry.api.metrics.LongHistogramBuilder agentBuilder) { + ApplicationLongHistogramBuilder131(LongHistogramBuilder agentBuilder) { super(agentBuilder); this.agentBuilder = agentBuilder; } @Override - public ExtendedLongHistogramBuilder setExplicitBucketBoundariesAdvice( - List bucketBoundaries) { + public application.io.opentelemetry.extension.incubator.metrics.ExtendedLongHistogramBuilder + setExplicitBucketBoundariesAdvice(List bucketBoundaries) { agentBuilder.setExplicitBucketBoundariesAdvice(bucketBoundaries); return this; } @Override - public ExtendedLongHistogramBuilder setAttributesAdvice(List> attributes) { - ((io.opentelemetry.api.incubator.metrics.ExtendedLongHistogramBuilder) agentBuilder) - .setAttributesAdvice(Bridging.toAgent(attributes)); + public application.io.opentelemetry.extension.incubator.metrics.ExtendedLongHistogramBuilder + setAttributesAdvice( + List> attributes) { + ((ExtendedLongHistogramBuilder) agentBuilder).setAttributesAdvice(Bridging.toAgent(attributes)); return this; } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.31/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_31/incubator/metrics/ApplicationLongUpDownCounterBuilder131.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.31/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_31/incubator/metrics/ApplicationLongUpDownCounterBuilder131.java index f6eecd1679dd..b980382347ce 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.31/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_31/incubator/metrics/ApplicationLongUpDownCounterBuilder131.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.31/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_31/incubator/metrics/ApplicationLongUpDownCounterBuilder131.java @@ -5,32 +5,33 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_31.incubator.metrics; -import application.io.opentelemetry.api.common.AttributeKey; -import application.io.opentelemetry.api.metrics.DoubleUpDownCounterBuilder; -import application.io.opentelemetry.extension.incubator.metrics.ExtendedLongUpDownCounterBuilder; +import io.opentelemetry.api.incubator.metrics.ExtendedLongUpDownCounterBuilder; +import io.opentelemetry.api.metrics.LongUpDownCounterBuilder; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.trace.Bridging; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics.ApplicationLongUpDownCounterBuilder; import java.util.List; final class ApplicationLongUpDownCounterBuilder131 extends ApplicationLongUpDownCounterBuilder - implements ExtendedLongUpDownCounterBuilder { + implements application.io.opentelemetry.extension.incubator.metrics + .ExtendedLongUpDownCounterBuilder { - private final io.opentelemetry.api.metrics.LongUpDownCounterBuilder agentBuilder; + private final LongUpDownCounterBuilder agentBuilder; - ApplicationLongUpDownCounterBuilder131( - io.opentelemetry.api.metrics.LongUpDownCounterBuilder agentBuilder) { + ApplicationLongUpDownCounterBuilder131(LongUpDownCounterBuilder agentBuilder) { super(agentBuilder); this.agentBuilder = agentBuilder; } @Override - public DoubleUpDownCounterBuilder ofDoubles() { + public application.io.opentelemetry.api.metrics.DoubleUpDownCounterBuilder ofDoubles() { return new ApplicationDoubleUpDownCounterBuilder131(agentBuilder.ofDoubles()); } @Override - public ExtendedLongUpDownCounterBuilder setAttributesAdvice(List> attributes) { - ((io.opentelemetry.api.incubator.metrics.ExtendedLongUpDownCounterBuilder) agentBuilder) + public application.io.opentelemetry.extension.incubator.metrics.ExtendedLongUpDownCounterBuilder + setAttributesAdvice( + List> attributes) { + ((ExtendedLongUpDownCounterBuilder) agentBuilder) .setAttributesAdvice(Bridging.toAgent(attributes)); return this; } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.31/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_31/incubator/metrics/ApplicationMeter131.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.31/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_31/incubator/metrics/ApplicationMeter131.java index a82add2467dc..4612fc0f2222 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.31/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_31/incubator/metrics/ApplicationMeter131.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.31/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_31/incubator/metrics/ApplicationMeter131.java @@ -5,38 +5,37 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_31.incubator.metrics; -import application.io.opentelemetry.api.metrics.DoubleGaugeBuilder; -import application.io.opentelemetry.api.metrics.DoubleHistogramBuilder; -import application.io.opentelemetry.api.metrics.LongCounterBuilder; -import application.io.opentelemetry.api.metrics.LongUpDownCounterBuilder; +import io.opentelemetry.api.metrics.Meter; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_15.metrics.ApplicationMeter115; public class ApplicationMeter131 extends ApplicationMeter115 { - private final io.opentelemetry.api.metrics.Meter agentMeter; + private final Meter agentMeter; - protected ApplicationMeter131(io.opentelemetry.api.metrics.Meter agentMeter) { + protected ApplicationMeter131(Meter agentMeter) { super(agentMeter); this.agentMeter = agentMeter; } @Override - public LongCounterBuilder counterBuilder(String name) { + public application.io.opentelemetry.api.metrics.LongCounterBuilder counterBuilder(String name) { return new ApplicationLongCounterBuilder131(agentMeter.counterBuilder(name)); } @Override - public LongUpDownCounterBuilder upDownCounterBuilder(String name) { + public application.io.opentelemetry.api.metrics.LongUpDownCounterBuilder upDownCounterBuilder( + String name) { return new ApplicationLongUpDownCounterBuilder131(agentMeter.upDownCounterBuilder(name)); } @Override - public DoubleHistogramBuilder histogramBuilder(String name) { + public application.io.opentelemetry.api.metrics.DoubleHistogramBuilder histogramBuilder( + String name) { return new ApplicationDoubleHistogramBuilder131(agentMeter.histogramBuilder(name)); } @Override - public DoubleGaugeBuilder gaugeBuilder(String name) { + public application.io.opentelemetry.api.metrics.DoubleGaugeBuilder gaugeBuilder(String name) { return new ApplicationDoubleGaugeBuilder131(agentMeter.gaugeBuilder(name)); } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.32/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_32/incubator/metrics/ApplicationDoubleHistogramBuilder132Incubator.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.32/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_32/incubator/metrics/ApplicationDoubleHistogramBuilder132Incubator.java index 89e04a3b7026..2af76385a7b5 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.32/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_32/incubator/metrics/ApplicationDoubleHistogramBuilder132Incubator.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.32/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_32/incubator/metrics/ApplicationDoubleHistogramBuilder132Incubator.java @@ -5,39 +5,40 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_32.incubator.metrics; -import application.io.opentelemetry.api.common.AttributeKey; -import application.io.opentelemetry.api.metrics.LongHistogramBuilder; -import application.io.opentelemetry.extension.incubator.metrics.ExtendedDoubleHistogramBuilder; +import io.opentelemetry.api.incubator.metrics.ExtendedDoubleHistogramBuilder; +import io.opentelemetry.api.metrics.DoubleHistogramBuilder; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.trace.Bridging; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics.ApplicationDoubleHistogramBuilder; import java.util.List; class ApplicationDoubleHistogramBuilder132Incubator extends ApplicationDoubleHistogramBuilder - implements ExtendedDoubleHistogramBuilder { + implements application.io.opentelemetry.extension.incubator.metrics + .ExtendedDoubleHistogramBuilder { - private final io.opentelemetry.api.metrics.DoubleHistogramBuilder agentBuilder; + private final DoubleHistogramBuilder agentBuilder; - ApplicationDoubleHistogramBuilder132Incubator( - io.opentelemetry.api.metrics.DoubleHistogramBuilder agentBuilder) { + ApplicationDoubleHistogramBuilder132Incubator(DoubleHistogramBuilder agentBuilder) { super(agentBuilder); this.agentBuilder = agentBuilder; } @Override - public LongHistogramBuilder ofLongs() { + public application.io.opentelemetry.api.metrics.LongHistogramBuilder ofLongs() { return new ApplicationLongHistogramBuilder132Incubator(agentBuilder.ofLongs()); } @Override - public ExtendedDoubleHistogramBuilder setExplicitBucketBoundariesAdvice( - List bucketBoundaries) { + public application.io.opentelemetry.extension.incubator.metrics.ExtendedDoubleHistogramBuilder + setExplicitBucketBoundariesAdvice(List bucketBoundaries) { agentBuilder.setExplicitBucketBoundariesAdvice(bucketBoundaries); return this; } @Override - public ExtendedDoubleHistogramBuilder setAttributesAdvice(List> attributes) { - ((io.opentelemetry.api.incubator.metrics.ExtendedDoubleHistogramBuilder) agentBuilder) + public application.io.opentelemetry.extension.incubator.metrics.ExtendedDoubleHistogramBuilder + setAttributesAdvice( + List> attributes) { + ((ExtendedDoubleHistogramBuilder) agentBuilder) .setAttributesAdvice(Bridging.toAgent(attributes)); return this; } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.32/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_32/incubator/metrics/ApplicationLongHistogramBuilder132Incubator.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.32/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_32/incubator/metrics/ApplicationLongHistogramBuilder132Incubator.java index 96a39a978bb3..ef15014205a9 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.32/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_32/incubator/metrics/ApplicationLongHistogramBuilder132Incubator.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.32/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_32/incubator/metrics/ApplicationLongHistogramBuilder132Incubator.java @@ -5,34 +5,35 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_32.incubator.metrics; -import application.io.opentelemetry.api.common.AttributeKey; -import application.io.opentelemetry.extension.incubator.metrics.ExtendedLongHistogramBuilder; +import io.opentelemetry.api.incubator.metrics.ExtendedLongHistogramBuilder; +import io.opentelemetry.api.metrics.LongHistogramBuilder; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.trace.Bridging; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics.ApplicationLongHistogramBuilder; import java.util.List; class ApplicationLongHistogramBuilder132Incubator extends ApplicationLongHistogramBuilder - implements ExtendedLongHistogramBuilder { + implements application.io.opentelemetry.extension.incubator.metrics + .ExtendedLongHistogramBuilder { - private final io.opentelemetry.api.metrics.LongHistogramBuilder agentBuilder; + private final LongHistogramBuilder agentBuilder; - ApplicationLongHistogramBuilder132Incubator( - io.opentelemetry.api.metrics.LongHistogramBuilder agentBuilder) { + ApplicationLongHistogramBuilder132Incubator(LongHistogramBuilder agentBuilder) { super(agentBuilder); this.agentBuilder = agentBuilder; } @Override - public ExtendedLongHistogramBuilder setExplicitBucketBoundariesAdvice( - List bucketBoundaries) { + public application.io.opentelemetry.extension.incubator.metrics.ExtendedLongHistogramBuilder + setExplicitBucketBoundariesAdvice(List bucketBoundaries) { agentBuilder.setExplicitBucketBoundariesAdvice(bucketBoundaries); return this; } @Override - public ExtendedLongHistogramBuilder setAttributesAdvice(List> attributes) { - ((io.opentelemetry.api.incubator.metrics.ExtendedLongHistogramBuilder) agentBuilder) - .setAttributesAdvice(Bridging.toAgent(attributes)); + public application.io.opentelemetry.extension.incubator.metrics.ExtendedLongHistogramBuilder + setAttributesAdvice( + List> attributes) { + ((ExtendedLongHistogramBuilder) agentBuilder).setAttributesAdvice(Bridging.toAgent(attributes)); return this; } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.32/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_32/incubator/metrics/ApplicationMeter132Incubator.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.32/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_32/incubator/metrics/ApplicationMeter132Incubator.java index 422b5c9e4c5d..eb79b2ce1c5a 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.32/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_32/incubator/metrics/ApplicationMeter132Incubator.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.32/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_32/incubator/metrics/ApplicationMeter132Incubator.java @@ -5,20 +5,21 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_32.incubator.metrics; -import application.io.opentelemetry.api.metrics.DoubleHistogramBuilder; +import io.opentelemetry.api.metrics.Meter; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_31.incubator.metrics.ApplicationMeter131; class ApplicationMeter132Incubator extends ApplicationMeter131 { - private final io.opentelemetry.api.metrics.Meter agentMeter; + private final Meter agentMeter; - ApplicationMeter132Incubator(io.opentelemetry.api.metrics.Meter agentMeter) { + ApplicationMeter132Incubator(Meter agentMeter) { super(agentMeter); this.agentMeter = agentMeter; } @Override - public DoubleHistogramBuilder histogramBuilder(String name) { + public application.io.opentelemetry.api.metrics.DoubleHistogramBuilder histogramBuilder( + String name) { return new ApplicationDoubleHistogramBuilder132Incubator(agentMeter.histogramBuilder(name)); } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.32/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_32/metrics/ApplicationDoubleHistogramBuilder132.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.32/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_32/metrics/ApplicationDoubleHistogramBuilder132.java index 8b116a7b01fb..7e3def6ebff8 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.32/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_32/metrics/ApplicationDoubleHistogramBuilder132.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.32/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_32/metrics/ApplicationDoubleHistogramBuilder132.java @@ -5,28 +5,27 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_32.metrics; -import application.io.opentelemetry.api.metrics.DoubleHistogramBuilder; -import application.io.opentelemetry.api.metrics.LongHistogramBuilder; +import io.opentelemetry.api.metrics.DoubleHistogramBuilder; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics.ApplicationDoubleHistogramBuilder; import java.util.List; class ApplicationDoubleHistogramBuilder132 extends ApplicationDoubleHistogramBuilder { - private final io.opentelemetry.api.metrics.DoubleHistogramBuilder agentBuilder; + private final DoubleHistogramBuilder agentBuilder; - ApplicationDoubleHistogramBuilder132( - io.opentelemetry.api.metrics.DoubleHistogramBuilder agentBuilder) { + ApplicationDoubleHistogramBuilder132(DoubleHistogramBuilder agentBuilder) { super(agentBuilder); this.agentBuilder = agentBuilder; } @Override - public LongHistogramBuilder ofLongs() { + public application.io.opentelemetry.api.metrics.LongHistogramBuilder ofLongs() { return new ApplicationLongHistogramBuilder132(agentBuilder.ofLongs()); } @Override - public DoubleHistogramBuilder setExplicitBucketBoundariesAdvice(List bucketBoundaries) { + public application.io.opentelemetry.api.metrics.DoubleHistogramBuilder + setExplicitBucketBoundariesAdvice(List bucketBoundaries) { agentBuilder.setExplicitBucketBoundariesAdvice(bucketBoundaries); return this; } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.32/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_32/metrics/ApplicationLongHistogramBuilder132.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.32/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_32/metrics/ApplicationLongHistogramBuilder132.java index fa494e250ef9..370611410063 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.32/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_32/metrics/ApplicationLongHistogramBuilder132.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.32/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_32/metrics/ApplicationLongHistogramBuilder132.java @@ -5,22 +5,22 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_32.metrics; -import application.io.opentelemetry.api.metrics.LongHistogramBuilder; +import io.opentelemetry.api.metrics.LongHistogramBuilder; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics.ApplicationLongHistogramBuilder; import java.util.List; class ApplicationLongHistogramBuilder132 extends ApplicationLongHistogramBuilder { - private final io.opentelemetry.api.metrics.LongHistogramBuilder agentBuilder; + private final LongHistogramBuilder agentBuilder; - ApplicationLongHistogramBuilder132( - io.opentelemetry.api.metrics.LongHistogramBuilder agentBuilder) { + ApplicationLongHistogramBuilder132(LongHistogramBuilder agentBuilder) { super(agentBuilder); this.agentBuilder = agentBuilder; } @Override - public LongHistogramBuilder setExplicitBucketBoundariesAdvice(List bucketBoundaries) { + public application.io.opentelemetry.api.metrics.LongHistogramBuilder + setExplicitBucketBoundariesAdvice(List bucketBoundaries) { agentBuilder.setExplicitBucketBoundariesAdvice(bucketBoundaries); return this; } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.32/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_32/metrics/ApplicationMeter132.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.32/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_32/metrics/ApplicationMeter132.java index 6958d86a613c..81bb5dc73535 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.32/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_32/metrics/ApplicationMeter132.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.32/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_32/metrics/ApplicationMeter132.java @@ -5,20 +5,21 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_32.metrics; -import application.io.opentelemetry.api.metrics.DoubleHistogramBuilder; +import io.opentelemetry.api.metrics.Meter; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_15.metrics.ApplicationMeter115; public class ApplicationMeter132 extends ApplicationMeter115 { - private final io.opentelemetry.api.metrics.Meter agentMeter; + private final Meter agentMeter; - public ApplicationMeter132(io.opentelemetry.api.metrics.Meter agentMeter) { + public ApplicationMeter132(Meter agentMeter) { super(agentMeter); this.agentMeter = agentMeter; } @Override - public DoubleHistogramBuilder histogramBuilder(String name) { + public application.io.opentelemetry.api.metrics.DoubleHistogramBuilder histogramBuilder( + String name) { return new ApplicationDoubleHistogramBuilder132(agentMeter.histogramBuilder(name)); } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.37/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_37/incubator/metrics/ApplicationDoubleCounterBuilder137.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.37/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_37/incubator/metrics/ApplicationDoubleCounterBuilder137.java index 2d06d6fc4276..aac2dedac17d 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.37/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_37/incubator/metrics/ApplicationDoubleCounterBuilder137.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.37/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_37/incubator/metrics/ApplicationDoubleCounterBuilder137.java @@ -5,27 +5,27 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_37.incubator.metrics; -import application.io.opentelemetry.api.common.AttributeKey; -import application.io.opentelemetry.api.incubator.metrics.ExtendedDoubleCounterBuilder; +import io.opentelemetry.api.incubator.metrics.ExtendedDoubleCounterBuilder; +import io.opentelemetry.api.metrics.DoubleCounterBuilder; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.trace.Bridging; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics.ApplicationDoubleCounterBuilder; import java.util.List; public class ApplicationDoubleCounterBuilder137 extends ApplicationDoubleCounterBuilder - implements ExtendedDoubleCounterBuilder { + implements application.io.opentelemetry.api.incubator.metrics.ExtendedDoubleCounterBuilder { - private final io.opentelemetry.api.metrics.DoubleCounterBuilder agentBuilder; + private final DoubleCounterBuilder agentBuilder; - protected ApplicationDoubleCounterBuilder137( - io.opentelemetry.api.metrics.DoubleCounterBuilder agentBuilder) { + protected ApplicationDoubleCounterBuilder137(DoubleCounterBuilder agentBuilder) { super(agentBuilder); this.agentBuilder = agentBuilder; } @Override - public ExtendedDoubleCounterBuilder setAttributesAdvice(List> attributes) { - ((io.opentelemetry.api.incubator.metrics.ExtendedDoubleCounterBuilder) agentBuilder) - .setAttributesAdvice(Bridging.toAgent(attributes)); + public application.io.opentelemetry.api.incubator.metrics.ExtendedDoubleCounterBuilder + setAttributesAdvice( + List> attributes) { + ((ExtendedDoubleCounterBuilder) agentBuilder).setAttributesAdvice(Bridging.toAgent(attributes)); return this; } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.37/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_37/incubator/metrics/ApplicationDoubleGaugeBuilder137.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.37/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_37/incubator/metrics/ApplicationDoubleGaugeBuilder137.java index d628a9407bff..5ba2f37b53d4 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.37/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_37/incubator/metrics/ApplicationDoubleGaugeBuilder137.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.37/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_37/incubator/metrics/ApplicationDoubleGaugeBuilder137.java @@ -5,34 +5,32 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_37.incubator.metrics; -import application.io.opentelemetry.api.common.AttributeKey; -import application.io.opentelemetry.api.common.Attributes; -import application.io.opentelemetry.api.incubator.metrics.DoubleGauge; -import application.io.opentelemetry.api.incubator.metrics.ExtendedDoubleGaugeBuilder; -import application.io.opentelemetry.api.metrics.LongGaugeBuilder; +import io.opentelemetry.api.incubator.metrics.ExtendedDoubleGaugeBuilder; +import io.opentelemetry.api.metrics.DoubleGauge; +import io.opentelemetry.api.metrics.DoubleGaugeBuilder; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.trace.Bridging; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics.ApplicationDoubleGaugeBuilder; import java.util.List; final class ApplicationDoubleGaugeBuilder137 extends ApplicationDoubleGaugeBuilder - implements ExtendedDoubleGaugeBuilder { + implements application.io.opentelemetry.api.incubator.metrics.ExtendedDoubleGaugeBuilder { - private final io.opentelemetry.api.metrics.DoubleGaugeBuilder agentBuilder; + private final DoubleGaugeBuilder agentBuilder; - ApplicationDoubleGaugeBuilder137(io.opentelemetry.api.metrics.DoubleGaugeBuilder agentBuilder) { + ApplicationDoubleGaugeBuilder137(DoubleGaugeBuilder agentBuilder) { super(agentBuilder); this.agentBuilder = agentBuilder; } @Override - public LongGaugeBuilder ofLongs() { + public application.io.opentelemetry.api.metrics.LongGaugeBuilder ofLongs() { return new ApplicationLongGaugeBuilder137(agentBuilder.ofLongs()); } @Override - public DoubleGauge build() { - io.opentelemetry.api.metrics.DoubleGauge agentDoubleGauge = agentBuilder.build(); - return new DoubleGauge() { + public application.io.opentelemetry.api.incubator.metrics.DoubleGauge build() { + DoubleGauge agentDoubleGauge = agentBuilder.build(); + return new application.io.opentelemetry.api.incubator.metrics.DoubleGauge() { @Override public void set(double value) { @@ -40,16 +38,17 @@ public void set(double value) { } @Override - public void set(double value, Attributes attributes) { + public void set(double value, application.io.opentelemetry.api.common.Attributes attributes) { agentDoubleGauge.set(value, Bridging.toAgent(attributes)); } }; } @Override - public ExtendedDoubleGaugeBuilder setAttributesAdvice(List> attributes) { - ((io.opentelemetry.api.incubator.metrics.ExtendedDoubleGaugeBuilder) agentBuilder) - .setAttributesAdvice(Bridging.toAgent(attributes)); + public application.io.opentelemetry.api.incubator.metrics.ExtendedDoubleGaugeBuilder + setAttributesAdvice( + List> attributes) { + ((ExtendedDoubleGaugeBuilder) agentBuilder).setAttributesAdvice(Bridging.toAgent(attributes)); return this; } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.37/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_37/incubator/metrics/ApplicationDoubleHistogramBuilder137.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.37/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_37/incubator/metrics/ApplicationDoubleHistogramBuilder137.java index a1e8cd332a86..c453a2b55fe6 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.37/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_37/incubator/metrics/ApplicationDoubleHistogramBuilder137.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.37/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_37/incubator/metrics/ApplicationDoubleHistogramBuilder137.java @@ -5,39 +5,39 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_37.incubator.metrics; -import application.io.opentelemetry.api.common.AttributeKey; -import application.io.opentelemetry.api.incubator.metrics.ExtendedDoubleHistogramBuilder; -import application.io.opentelemetry.api.metrics.LongHistogramBuilder; +import io.opentelemetry.api.incubator.metrics.ExtendedDoubleHistogramBuilder; +import io.opentelemetry.api.metrics.DoubleHistogramBuilder; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.trace.Bridging; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics.ApplicationDoubleHistogramBuilder; import java.util.List; public class ApplicationDoubleHistogramBuilder137 extends ApplicationDoubleHistogramBuilder - implements ExtendedDoubleHistogramBuilder { + implements application.io.opentelemetry.api.incubator.metrics.ExtendedDoubleHistogramBuilder { - private final io.opentelemetry.api.metrics.DoubleHistogramBuilder agentBuilder; + private final DoubleHistogramBuilder agentBuilder; - protected ApplicationDoubleHistogramBuilder137( - io.opentelemetry.api.metrics.DoubleHistogramBuilder agentBuilder) { + protected ApplicationDoubleHistogramBuilder137(DoubleHistogramBuilder agentBuilder) { super(agentBuilder); this.agentBuilder = agentBuilder; } @Override - public LongHistogramBuilder ofLongs() { + public application.io.opentelemetry.api.metrics.LongHistogramBuilder ofLongs() { return new ApplicationLongHistogramBuilder137(agentBuilder.ofLongs()); } @Override - public ExtendedDoubleHistogramBuilder setExplicitBucketBoundariesAdvice( - List bucketBoundaries) { + public application.io.opentelemetry.api.incubator.metrics.ExtendedDoubleHistogramBuilder + setExplicitBucketBoundariesAdvice(List bucketBoundaries) { agentBuilder.setExplicitBucketBoundariesAdvice(bucketBoundaries); return this; } @Override - public ExtendedDoubleHistogramBuilder setAttributesAdvice(List> attributes) { - ((io.opentelemetry.api.incubator.metrics.ExtendedDoubleHistogramBuilder) agentBuilder) + public application.io.opentelemetry.api.incubator.metrics.ExtendedDoubleHistogramBuilder + setAttributesAdvice( + List> attributes) { + ((ExtendedDoubleHistogramBuilder) agentBuilder) .setAttributesAdvice(Bridging.toAgent(attributes)); return this; } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.37/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_37/incubator/metrics/ApplicationDoubleUpDownCounterBuilder137.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.37/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_37/incubator/metrics/ApplicationDoubleUpDownCounterBuilder137.java index 0708278eb8ad..846815bfbc2c 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.37/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_37/incubator/metrics/ApplicationDoubleUpDownCounterBuilder137.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.37/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_37/incubator/metrics/ApplicationDoubleUpDownCounterBuilder137.java @@ -5,26 +5,28 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_37.incubator.metrics; -import application.io.opentelemetry.api.common.AttributeKey; -import application.io.opentelemetry.api.incubator.metrics.ExtendedDoubleUpDownCounterBuilder; +import io.opentelemetry.api.incubator.metrics.ExtendedDoubleUpDownCounterBuilder; +import io.opentelemetry.api.metrics.DoubleUpDownCounterBuilder; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.trace.Bridging; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics.ApplicationDoubleUpDownCounterBuilder; import java.util.List; public class ApplicationDoubleUpDownCounterBuilder137 extends ApplicationDoubleUpDownCounterBuilder - implements ExtendedDoubleUpDownCounterBuilder { + implements application.io.opentelemetry.api.incubator.metrics + .ExtendedDoubleUpDownCounterBuilder { - private final io.opentelemetry.api.metrics.DoubleUpDownCounterBuilder agentBuilder; + private final DoubleUpDownCounterBuilder agentBuilder; - protected ApplicationDoubleUpDownCounterBuilder137( - io.opentelemetry.api.metrics.DoubleUpDownCounterBuilder agentBuilder) { + protected ApplicationDoubleUpDownCounterBuilder137(DoubleUpDownCounterBuilder agentBuilder) { super(agentBuilder); this.agentBuilder = agentBuilder; } @Override - public ExtendedDoubleUpDownCounterBuilder setAttributesAdvice(List> attributes) { - ((io.opentelemetry.api.incubator.metrics.ExtendedDoubleUpDownCounterBuilder) agentBuilder) + public application.io.opentelemetry.api.incubator.metrics.ExtendedDoubleUpDownCounterBuilder + setAttributesAdvice( + List> attributes) { + ((ExtendedDoubleUpDownCounterBuilder) agentBuilder) .setAttributesAdvice(Bridging.toAgent(attributes)); return this; } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.37/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_37/incubator/metrics/ApplicationLongCounterBuilder137.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.37/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_37/incubator/metrics/ApplicationLongCounterBuilder137.java index 0199171a6c8d..4ef0c8f66029 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.37/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_37/incubator/metrics/ApplicationLongCounterBuilder137.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.37/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_37/incubator/metrics/ApplicationLongCounterBuilder137.java @@ -5,33 +5,32 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_37.incubator.metrics; -import application.io.opentelemetry.api.common.AttributeKey; -import application.io.opentelemetry.api.incubator.metrics.ExtendedLongCounterBuilder; -import application.io.opentelemetry.api.metrics.DoubleCounterBuilder; +import io.opentelemetry.api.incubator.metrics.ExtendedLongCounterBuilder; +import io.opentelemetry.api.metrics.LongCounterBuilder; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.trace.Bridging; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics.ApplicationLongCounterBuilder; import java.util.List; public class ApplicationLongCounterBuilder137 extends ApplicationLongCounterBuilder - implements ExtendedLongCounterBuilder { + implements application.io.opentelemetry.api.incubator.metrics.ExtendedLongCounterBuilder { - private final io.opentelemetry.api.metrics.LongCounterBuilder agentBuilder; + private final LongCounterBuilder agentBuilder; - protected ApplicationLongCounterBuilder137( - io.opentelemetry.api.metrics.LongCounterBuilder agentBuilder) { + protected ApplicationLongCounterBuilder137(LongCounterBuilder agentBuilder) { super(agentBuilder); this.agentBuilder = agentBuilder; } @Override - public DoubleCounterBuilder ofDoubles() { + public application.io.opentelemetry.api.metrics.DoubleCounterBuilder ofDoubles() { return new ApplicationDoubleCounterBuilder137(agentBuilder.ofDoubles()); } @Override - public ExtendedLongCounterBuilder setAttributesAdvice(List> attributes) { - ((io.opentelemetry.api.incubator.metrics.ExtendedLongCounterBuilder) agentBuilder) - .setAttributesAdvice(Bridging.toAgent(attributes)); + public application.io.opentelemetry.api.incubator.metrics.ExtendedLongCounterBuilder + setAttributesAdvice( + List> attributes) { + ((ExtendedLongCounterBuilder) agentBuilder).setAttributesAdvice(Bridging.toAgent(attributes)); return this; } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.37/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_37/incubator/metrics/ApplicationLongGaugeBuilder137.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.37/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_37/incubator/metrics/ApplicationLongGaugeBuilder137.java index 4bf5a2439168..30f8217baee8 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.37/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_37/incubator/metrics/ApplicationLongGaugeBuilder137.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.37/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_37/incubator/metrics/ApplicationLongGaugeBuilder137.java @@ -5,44 +5,44 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_37.incubator.metrics; -import application.io.opentelemetry.api.common.AttributeKey; -import application.io.opentelemetry.api.common.Attributes; -import application.io.opentelemetry.api.incubator.metrics.ExtendedLongGaugeBuilder; -import application.io.opentelemetry.api.incubator.metrics.LongGauge; +import io.opentelemetry.api.incubator.metrics.ExtendedLongGaugeBuilder; +import io.opentelemetry.api.metrics.LongGauge; +import io.opentelemetry.api.metrics.LongGaugeBuilder; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.trace.Bridging; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics.ApplicationLongGaugeBuilder; import java.util.List; final class ApplicationLongGaugeBuilder137 extends ApplicationLongGaugeBuilder - implements ExtendedLongGaugeBuilder { + implements application.io.opentelemetry.api.incubator.metrics.ExtendedLongGaugeBuilder { - private final io.opentelemetry.api.metrics.LongGaugeBuilder agentBuilder; + private final LongGaugeBuilder agentBuilder; - ApplicationLongGaugeBuilder137(io.opentelemetry.api.metrics.LongGaugeBuilder agentBuilder) { + ApplicationLongGaugeBuilder137(LongGaugeBuilder agentBuilder) { super(agentBuilder); this.agentBuilder = agentBuilder; } @Override - public LongGauge build() { - io.opentelemetry.api.metrics.LongGauge agentLongGauge = agentBuilder.build(); - return new LongGauge() { + public application.io.opentelemetry.api.incubator.metrics.LongGauge build() { + LongGauge agentLongGauge = agentBuilder.build(); + return new application.io.opentelemetry.api.incubator.metrics.LongGauge() { @Override public void set(long value) { agentLongGauge.set(value); } @Override - public void set(long value, Attributes attributes) { + public void set(long value, application.io.opentelemetry.api.common.Attributes attributes) { agentLongGauge.set(value, Bridging.toAgent(attributes)); } }; } @Override - public ExtendedLongGaugeBuilder setAttributesAdvice(List> attributes) { - ((io.opentelemetry.api.incubator.metrics.ExtendedLongGaugeBuilder) agentBuilder) - .setAttributesAdvice(Bridging.toAgent(attributes)); + public application.io.opentelemetry.api.incubator.metrics.ExtendedLongGaugeBuilder + setAttributesAdvice( + List> attributes) { + ((ExtendedLongGaugeBuilder) agentBuilder).setAttributesAdvice(Bridging.toAgent(attributes)); return this; } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.37/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_37/incubator/metrics/ApplicationLongHistogramBuilder137.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.37/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_37/incubator/metrics/ApplicationLongHistogramBuilder137.java index 4160bd8382a7..f76017186a8c 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.37/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_37/incubator/metrics/ApplicationLongHistogramBuilder137.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.37/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_37/incubator/metrics/ApplicationLongHistogramBuilder137.java @@ -5,34 +5,34 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_37.incubator.metrics; -import application.io.opentelemetry.api.common.AttributeKey; -import application.io.opentelemetry.api.incubator.metrics.ExtendedLongHistogramBuilder; +import io.opentelemetry.api.incubator.metrics.ExtendedLongHistogramBuilder; +import io.opentelemetry.api.metrics.LongHistogramBuilder; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.trace.Bridging; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics.ApplicationLongHistogramBuilder; import java.util.List; public class ApplicationLongHistogramBuilder137 extends ApplicationLongHistogramBuilder - implements ExtendedLongHistogramBuilder { + implements application.io.opentelemetry.api.incubator.metrics.ExtendedLongHistogramBuilder { - private final io.opentelemetry.api.metrics.LongHistogramBuilder agentBuilder; + private final LongHistogramBuilder agentBuilder; - protected ApplicationLongHistogramBuilder137( - io.opentelemetry.api.metrics.LongHistogramBuilder agentBuilder) { + protected ApplicationLongHistogramBuilder137(LongHistogramBuilder agentBuilder) { super(agentBuilder); this.agentBuilder = agentBuilder; } @Override - public ExtendedLongHistogramBuilder setExplicitBucketBoundariesAdvice( - List bucketBoundaries) { + public application.io.opentelemetry.api.incubator.metrics.ExtendedLongHistogramBuilder + setExplicitBucketBoundariesAdvice(List bucketBoundaries) { agentBuilder.setExplicitBucketBoundariesAdvice(bucketBoundaries); return this; } @Override - public ExtendedLongHistogramBuilder setAttributesAdvice(List> attributes) { - ((io.opentelemetry.api.incubator.metrics.ExtendedLongHistogramBuilder) agentBuilder) - .setAttributesAdvice(Bridging.toAgent(attributes)); + public application.io.opentelemetry.api.incubator.metrics.ExtendedLongHistogramBuilder + setAttributesAdvice( + List> attributes) { + ((ExtendedLongHistogramBuilder) agentBuilder).setAttributesAdvice(Bridging.toAgent(attributes)); return this; } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.37/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_37/incubator/metrics/ApplicationLongUpDownCounterBuilder137.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.37/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_37/incubator/metrics/ApplicationLongUpDownCounterBuilder137.java index 613366826baa..57dc351462ee 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.37/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_37/incubator/metrics/ApplicationLongUpDownCounterBuilder137.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.37/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_37/incubator/metrics/ApplicationLongUpDownCounterBuilder137.java @@ -5,32 +5,32 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_37.incubator.metrics; -import application.io.opentelemetry.api.common.AttributeKey; -import application.io.opentelemetry.api.incubator.metrics.ExtendedLongUpDownCounterBuilder; -import application.io.opentelemetry.api.metrics.DoubleUpDownCounterBuilder; +import io.opentelemetry.api.incubator.metrics.ExtendedLongUpDownCounterBuilder; +import io.opentelemetry.api.metrics.LongUpDownCounterBuilder; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.trace.Bridging; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics.ApplicationLongUpDownCounterBuilder; import java.util.List; public class ApplicationLongUpDownCounterBuilder137 extends ApplicationLongUpDownCounterBuilder - implements ExtendedLongUpDownCounterBuilder { + implements application.io.opentelemetry.api.incubator.metrics.ExtendedLongUpDownCounterBuilder { - private final io.opentelemetry.api.metrics.LongUpDownCounterBuilder agentBuilder; + private final LongUpDownCounterBuilder agentBuilder; - protected ApplicationLongUpDownCounterBuilder137( - io.opentelemetry.api.metrics.LongUpDownCounterBuilder agentBuilder) { + protected ApplicationLongUpDownCounterBuilder137(LongUpDownCounterBuilder agentBuilder) { super(agentBuilder); this.agentBuilder = agentBuilder; } @Override - public DoubleUpDownCounterBuilder ofDoubles() { + public application.io.opentelemetry.api.metrics.DoubleUpDownCounterBuilder ofDoubles() { return new ApplicationDoubleUpDownCounterBuilder137(agentBuilder.ofDoubles()); } @Override - public ExtendedLongUpDownCounterBuilder setAttributesAdvice(List> attributes) { - ((io.opentelemetry.api.incubator.metrics.ExtendedLongUpDownCounterBuilder) agentBuilder) + public application.io.opentelemetry.api.incubator.metrics.ExtendedLongUpDownCounterBuilder + setAttributesAdvice( + List> attributes) { + ((ExtendedLongUpDownCounterBuilder) agentBuilder) .setAttributesAdvice(Bridging.toAgent(attributes)); return this; } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.37/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_37/incubator/metrics/ApplicationMeter137.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.37/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_37/incubator/metrics/ApplicationMeter137.java index 6ed769ccf49b..e2d17a46a130 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.37/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_37/incubator/metrics/ApplicationMeter137.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.37/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_37/incubator/metrics/ApplicationMeter137.java @@ -5,19 +5,19 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_37.incubator.metrics; -import application.io.opentelemetry.api.metrics.DoubleGaugeBuilder; +import io.opentelemetry.api.metrics.Meter; class ApplicationMeter137 extends BaseApplicationMeter137 { - private final io.opentelemetry.api.metrics.Meter agentMeter; + private final Meter agentMeter; - protected ApplicationMeter137(io.opentelemetry.api.metrics.Meter agentMeter) { + protected ApplicationMeter137(Meter agentMeter) { super(agentMeter); this.agentMeter = agentMeter; } @Override - public DoubleGaugeBuilder gaugeBuilder(String name) { + public application.io.opentelemetry.api.metrics.DoubleGaugeBuilder gaugeBuilder(String name) { return new ApplicationDoubleGaugeBuilder137(agentMeter.gaugeBuilder(name)); } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.37/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_37/incubator/metrics/BaseApplicationMeter137.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.37/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_37/incubator/metrics/BaseApplicationMeter137.java index 3a0c0d3ff608..9b8baa0d65ad 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.37/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_37/incubator/metrics/BaseApplicationMeter137.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.37/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_37/incubator/metrics/BaseApplicationMeter137.java @@ -5,33 +5,33 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_37.incubator.metrics; -import application.io.opentelemetry.api.metrics.DoubleHistogramBuilder; -import application.io.opentelemetry.api.metrics.LongCounterBuilder; -import application.io.opentelemetry.api.metrics.LongUpDownCounterBuilder; +import io.opentelemetry.api.metrics.Meter; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_15.metrics.ApplicationMeter115; // used by both 1.37 and 1.38 public class BaseApplicationMeter137 extends ApplicationMeter115 { - private final io.opentelemetry.api.metrics.Meter agentMeter; + private final Meter agentMeter; - protected BaseApplicationMeter137(io.opentelemetry.api.metrics.Meter agentMeter) { + protected BaseApplicationMeter137(Meter agentMeter) { super(agentMeter); this.agentMeter = agentMeter; } @Override - public LongCounterBuilder counterBuilder(String name) { + public application.io.opentelemetry.api.metrics.LongCounterBuilder counterBuilder(String name) { return new ApplicationLongCounterBuilder137(agentMeter.counterBuilder(name)); } @Override - public LongUpDownCounterBuilder upDownCounterBuilder(String name) { + public application.io.opentelemetry.api.metrics.LongUpDownCounterBuilder upDownCounterBuilder( + String name) { return new ApplicationLongUpDownCounterBuilder137(agentMeter.upDownCounterBuilder(name)); } @Override - public DoubleHistogramBuilder histogramBuilder(String name) { + public application.io.opentelemetry.api.metrics.DoubleHistogramBuilder histogramBuilder( + String name) { return new ApplicationDoubleHistogramBuilder137(agentMeter.histogramBuilder(name)); } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.38/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_38/incubator/metrics/ApplicationDoubleGaugeBuilder138Incubator.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.38/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_38/incubator/metrics/ApplicationDoubleGaugeBuilder138Incubator.java index 4527781fcf65..a4057dd78317 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.38/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_38/incubator/metrics/ApplicationDoubleGaugeBuilder138Incubator.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.38/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_38/incubator/metrics/ApplicationDoubleGaugeBuilder138Incubator.java @@ -5,33 +5,32 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_38.incubator.metrics; -import application.io.opentelemetry.api.common.AttributeKey; -import application.io.opentelemetry.api.incubator.metrics.ExtendedDoubleGaugeBuilder; -import application.io.opentelemetry.api.metrics.LongGaugeBuilder; +import io.opentelemetry.api.incubator.metrics.ExtendedDoubleGaugeBuilder; +import io.opentelemetry.api.metrics.DoubleGaugeBuilder; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.trace.Bridging; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_38.metrics.ApplicationDoubleGaugeBuilder138; import java.util.List; public class ApplicationDoubleGaugeBuilder138Incubator extends ApplicationDoubleGaugeBuilder138 - implements ExtendedDoubleGaugeBuilder { + implements application.io.opentelemetry.api.incubator.metrics.ExtendedDoubleGaugeBuilder { - private final io.opentelemetry.api.metrics.DoubleGaugeBuilder agentBuilder; + private final DoubleGaugeBuilder agentBuilder; - protected ApplicationDoubleGaugeBuilder138Incubator( - io.opentelemetry.api.metrics.DoubleGaugeBuilder agentBuilder) { + protected ApplicationDoubleGaugeBuilder138Incubator(DoubleGaugeBuilder agentBuilder) { super(agentBuilder); this.agentBuilder = agentBuilder; } @Override - public LongGaugeBuilder ofLongs() { + public application.io.opentelemetry.api.metrics.LongGaugeBuilder ofLongs() { return new ApplicationLongGaugeBuilder138Incubator(agentBuilder.ofLongs()); } @Override - public ExtendedDoubleGaugeBuilder setAttributesAdvice(List> attributes) { - ((io.opentelemetry.api.incubator.metrics.ExtendedDoubleGaugeBuilder) agentBuilder) - .setAttributesAdvice(Bridging.toAgent(attributes)); + public application.io.opentelemetry.api.incubator.metrics.ExtendedDoubleGaugeBuilder + setAttributesAdvice( + List> attributes) { + ((ExtendedDoubleGaugeBuilder) agentBuilder).setAttributesAdvice(Bridging.toAgent(attributes)); return this; } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.38/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_38/incubator/metrics/ApplicationLongGaugeBuilder138Incubator.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.38/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_38/incubator/metrics/ApplicationLongGaugeBuilder138Incubator.java index a6321cd85605..8cbcdb4a5de4 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.38/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_38/incubator/metrics/ApplicationLongGaugeBuilder138Incubator.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.38/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_38/incubator/metrics/ApplicationLongGaugeBuilder138Incubator.java @@ -5,27 +5,27 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_38.incubator.metrics; -import application.io.opentelemetry.api.common.AttributeKey; -import application.io.opentelemetry.api.incubator.metrics.ExtendedLongGaugeBuilder; +import io.opentelemetry.api.incubator.metrics.ExtendedLongGaugeBuilder; +import io.opentelemetry.api.metrics.LongGaugeBuilder; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.trace.Bridging; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_38.metrics.ApplicationLongGaugeBuilder138; import java.util.List; public class ApplicationLongGaugeBuilder138Incubator extends ApplicationLongGaugeBuilder138 - implements ExtendedLongGaugeBuilder { + implements application.io.opentelemetry.api.incubator.metrics.ExtendedLongGaugeBuilder { - private final io.opentelemetry.api.metrics.LongGaugeBuilder agentBuilder; + private final LongGaugeBuilder agentBuilder; - protected ApplicationLongGaugeBuilder138Incubator( - io.opentelemetry.api.metrics.LongGaugeBuilder agentBuilder) { + protected ApplicationLongGaugeBuilder138Incubator(LongGaugeBuilder agentBuilder) { super(agentBuilder); this.agentBuilder = agentBuilder; } @Override - public ExtendedLongGaugeBuilder setAttributesAdvice(List> attributes) { - ((io.opentelemetry.api.incubator.metrics.ExtendedLongGaugeBuilder) agentBuilder) - .setAttributesAdvice(Bridging.toAgent(attributes)); + public application.io.opentelemetry.api.incubator.metrics.ExtendedLongGaugeBuilder + setAttributesAdvice( + List> attributes) { + ((ExtendedLongGaugeBuilder) agentBuilder).setAttributesAdvice(Bridging.toAgent(attributes)); return this; } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.38/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_38/incubator/metrics/ApplicationMeter138Incubator.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.38/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_38/incubator/metrics/ApplicationMeter138Incubator.java index 396fdf9785bb..533f15592916 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.38/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_38/incubator/metrics/ApplicationMeter138Incubator.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.38/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_38/incubator/metrics/ApplicationMeter138Incubator.java @@ -5,20 +5,20 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_38.incubator.metrics; -import application.io.opentelemetry.api.metrics.DoubleGaugeBuilder; +import io.opentelemetry.api.metrics.Meter; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_37.incubator.metrics.BaseApplicationMeter137; class ApplicationMeter138Incubator extends BaseApplicationMeter137 { - private final io.opentelemetry.api.metrics.Meter agentMeter; + private final Meter agentMeter; - ApplicationMeter138Incubator(io.opentelemetry.api.metrics.Meter agentMeter) { + ApplicationMeter138Incubator(Meter agentMeter) { super(agentMeter); this.agentMeter = agentMeter; } @Override - public DoubleGaugeBuilder gaugeBuilder(String name) { + public application.io.opentelemetry.api.metrics.DoubleGaugeBuilder gaugeBuilder(String name) { return new ApplicationDoubleGaugeBuilder138Incubator(agentMeter.gaugeBuilder(name)); } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.38/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_38/metrics/ApplicationDoubleGauge138.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.38/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_38/metrics/ApplicationDoubleGauge138.java index 7d0a729a321a..eb7a3f0825ac 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.38/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_38/metrics/ApplicationDoubleGauge138.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.38/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_38/metrics/ApplicationDoubleGauge138.java @@ -5,17 +5,16 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_38.metrics; -import application.io.opentelemetry.api.common.Attributes; -import application.io.opentelemetry.api.metrics.DoubleGauge; -import application.io.opentelemetry.context.Context; +import io.opentelemetry.api.metrics.DoubleGauge; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.context.AgentContextStorage; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.trace.Bridging; -public class ApplicationDoubleGauge138 implements DoubleGauge { +public class ApplicationDoubleGauge138 + implements application.io.opentelemetry.api.metrics.DoubleGauge { - private final io.opentelemetry.api.metrics.DoubleGauge agentDoubleGauge; + private final DoubleGauge agentDoubleGauge; - protected ApplicationDoubleGauge138(io.opentelemetry.api.metrics.DoubleGauge agentDoubleGauge) { + protected ApplicationDoubleGauge138(DoubleGauge agentDoubleGauge) { this.agentDoubleGauge = agentDoubleGauge; } @@ -25,12 +24,15 @@ public void set(double value) { } @Override - public void set(double value, Attributes attributes) { + public void set(double value, application.io.opentelemetry.api.common.Attributes attributes) { agentDoubleGauge.set(value, Bridging.toAgent(attributes)); } @Override - public void set(double value, Attributes attributes, Context applicationContext) { + public void set( + double value, + application.io.opentelemetry.api.common.Attributes attributes, + application.io.opentelemetry.context.Context applicationContext) { agentDoubleGauge.set( value, Bridging.toAgent(attributes), diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.38/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_38/metrics/ApplicationDoubleGaugeBuilder138.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.38/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_38/metrics/ApplicationDoubleGaugeBuilder138.java index e84ff1002a3c..7a00ae3ae6d9 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.38/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_38/metrics/ApplicationDoubleGaugeBuilder138.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.38/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_38/metrics/ApplicationDoubleGaugeBuilder138.java @@ -5,28 +5,27 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_38.metrics; -import application.io.opentelemetry.api.metrics.DoubleGauge; -import application.io.opentelemetry.api.metrics.LongGaugeBuilder; +import io.opentelemetry.api.metrics.DoubleGauge; +import io.opentelemetry.api.metrics.DoubleGaugeBuilder; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics.ApplicationDoubleGaugeBuilder; public class ApplicationDoubleGaugeBuilder138 extends ApplicationDoubleGaugeBuilder { - private final io.opentelemetry.api.metrics.DoubleGaugeBuilder agentBuilder; + private final DoubleGaugeBuilder agentBuilder; - protected ApplicationDoubleGaugeBuilder138( - io.opentelemetry.api.metrics.DoubleGaugeBuilder agentBuilder) { + protected ApplicationDoubleGaugeBuilder138(DoubleGaugeBuilder agentBuilder) { super(agentBuilder); this.agentBuilder = agentBuilder; } @Override - public LongGaugeBuilder ofLongs() { + public application.io.opentelemetry.api.metrics.LongGaugeBuilder ofLongs() { return new ApplicationLongGaugeBuilder138(agentBuilder.ofLongs()); } @Override - public DoubleGauge build() { - io.opentelemetry.api.metrics.DoubleGauge agentDoubleGauge = agentBuilder.build(); + public application.io.opentelemetry.api.metrics.DoubleGauge build() { + DoubleGauge agentDoubleGauge = agentBuilder.build(); return new ApplicationDoubleGauge138(agentDoubleGauge); } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.38/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_38/metrics/ApplicationLongGauge138.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.38/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_38/metrics/ApplicationLongGauge138.java index 9f0eeb488f20..aa735af61e01 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.38/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_38/metrics/ApplicationLongGauge138.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.38/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_38/metrics/ApplicationLongGauge138.java @@ -5,17 +5,15 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_38.metrics; -import application.io.opentelemetry.api.common.Attributes; -import application.io.opentelemetry.api.metrics.LongGauge; -import application.io.opentelemetry.context.Context; +import io.opentelemetry.api.metrics.LongGauge; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.context.AgentContextStorage; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.trace.Bridging; -public class ApplicationLongGauge138 implements LongGauge { +public class ApplicationLongGauge138 implements application.io.opentelemetry.api.metrics.LongGauge { - private final io.opentelemetry.api.metrics.LongGauge agentLongGauge; + private final LongGauge agentLongGauge; - protected ApplicationLongGauge138(io.opentelemetry.api.metrics.LongGauge agentLongGauge) { + protected ApplicationLongGauge138(LongGauge agentLongGauge) { this.agentLongGauge = agentLongGauge; } @@ -25,12 +23,15 @@ public void set(long value) { } @Override - public void set(long value, Attributes attributes) { + public void set(long value, application.io.opentelemetry.api.common.Attributes attributes) { agentLongGauge.set(value, Bridging.toAgent(attributes)); } @Override - public void set(long value, Attributes attributes, Context applicationContext) { + public void set( + long value, + application.io.opentelemetry.api.common.Attributes attributes, + application.io.opentelemetry.context.Context applicationContext) { agentLongGauge.set( value, Bridging.toAgent(attributes), diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.38/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_38/metrics/ApplicationLongGaugeBuilder138.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.38/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_38/metrics/ApplicationLongGaugeBuilder138.java index 4f415436a24f..a171390e1461 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.38/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_38/metrics/ApplicationLongGaugeBuilder138.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.38/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_38/metrics/ApplicationLongGaugeBuilder138.java @@ -5,22 +5,22 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_38.metrics; -import application.io.opentelemetry.api.metrics.LongGauge; +import io.opentelemetry.api.metrics.LongGauge; +import io.opentelemetry.api.metrics.LongGaugeBuilder; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics.ApplicationLongGaugeBuilder; public class ApplicationLongGaugeBuilder138 extends ApplicationLongGaugeBuilder { - private final io.opentelemetry.api.metrics.LongGaugeBuilder agentBuilder; + private final LongGaugeBuilder agentBuilder; - protected ApplicationLongGaugeBuilder138( - io.opentelemetry.api.metrics.LongGaugeBuilder agentBuilder) { + protected ApplicationLongGaugeBuilder138(LongGaugeBuilder agentBuilder) { super(agentBuilder); this.agentBuilder = agentBuilder; } @Override - public LongGauge build() { - io.opentelemetry.api.metrics.LongGauge agentLongGauge = agentBuilder.build(); + public application.io.opentelemetry.api.metrics.LongGauge build() { + LongGauge agentLongGauge = agentBuilder.build(); return new ApplicationLongGauge138(agentLongGauge); } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.38/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_38/metrics/ApplicationMeter138.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.38/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_38/metrics/ApplicationMeter138.java index e9fbb76a5d7b..3ed1daedd45c 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.38/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_38/metrics/ApplicationMeter138.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.38/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_38/metrics/ApplicationMeter138.java @@ -5,20 +5,20 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_38.metrics; -import application.io.opentelemetry.api.metrics.DoubleGaugeBuilder; +import io.opentelemetry.api.metrics.Meter; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_32.metrics.ApplicationMeter132; public class ApplicationMeter138 extends ApplicationMeter132 { - private final io.opentelemetry.api.metrics.Meter agentMeter; + private final Meter agentMeter; - protected ApplicationMeter138(io.opentelemetry.api.metrics.Meter agentMeter) { + protected ApplicationMeter138(Meter agentMeter) { super(agentMeter); this.agentMeter = agentMeter; } @Override - public DoubleGaugeBuilder gaugeBuilder(String name) { + public application.io.opentelemetry.api.metrics.DoubleGaugeBuilder gaugeBuilder(String name) { return new ApplicationDoubleGaugeBuilder138(agentMeter.gaugeBuilder(name)); } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_4/trace/ApplicationTracerBuilder.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_4/trace/ApplicationTracerBuilder.java index 1d34034acc83..c9afae19a543 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_4/trace/ApplicationTracerBuilder.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_4/trace/ApplicationTracerBuilder.java @@ -5,39 +5,38 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_4.trace; -import application.io.opentelemetry.api.trace.Tracer; -import application.io.opentelemetry.api.trace.TracerBuilder; import com.google.errorprone.annotations.CanIgnoreReturnValue; +import io.opentelemetry.api.trace.TracerBuilder; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.trace.ApplicationTracerFactory; -class ApplicationTracerBuilder implements TracerBuilder { +class ApplicationTracerBuilder implements application.io.opentelemetry.api.trace.TracerBuilder { private final ApplicationTracerFactory tracerFactory; - private final io.opentelemetry.api.trace.TracerBuilder agentTracerBuilder; + private final TracerBuilder agentTracerBuilder; public ApplicationTracerBuilder( - ApplicationTracerFactory tracerFactory, - io.opentelemetry.api.trace.TracerBuilder agentTracerBuilder) { + ApplicationTracerFactory tracerFactory, TracerBuilder agentTracerBuilder) { this.tracerFactory = tracerFactory; this.agentTracerBuilder = agentTracerBuilder; } @Override @CanIgnoreReturnValue - public TracerBuilder setSchemaUrl(String schemaUrl) { + public application.io.opentelemetry.api.trace.TracerBuilder setSchemaUrl(String schemaUrl) { agentTracerBuilder.setSchemaUrl(schemaUrl); return this; } @Override @CanIgnoreReturnValue - public TracerBuilder setInstrumentationVersion(String version) { + public application.io.opentelemetry.api.trace.TracerBuilder setInstrumentationVersion( + String version) { agentTracerBuilder.setInstrumentationVersion(version); return this; } @Override - public Tracer build() { + public application.io.opentelemetry.api.trace.Tracer build() { return tracerFactory.newTracer(agentTracerBuilder.build()); } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_4/trace/ApplicationTracerProvider14.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_4/trace/ApplicationTracerProvider14.java index 367e5b6254f2..4a38a1997ae1 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_4/trace/ApplicationTracerProvider14.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_4/trace/ApplicationTracerProvider14.java @@ -5,31 +5,25 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_4.trace; -import application.io.opentelemetry.api.trace.TracerBuilder; +import io.opentelemetry.api.trace.TracerProvider; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.trace.ApplicationTracer; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.trace.ApplicationTracerFactory; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.trace.ApplicationTracerProvider; // this class is used from opentelemetry-api-1.0 via reflection public class ApplicationTracerProvider14 extends ApplicationTracerProvider { - - // Our convention for accessing agent package - @SuppressWarnings("UnnecessarilyFullyQualified") - public ApplicationTracerProvider14( - io.opentelemetry.api.trace.TracerProvider agentTracerProvider) { + public ApplicationTracerProvider14(TracerProvider agentTracerProvider) { this(ApplicationTracer::new, agentTracerProvider); } - // Our convention for accessing agent package - @SuppressWarnings("UnnecessarilyFullyQualified") public ApplicationTracerProvider14( - ApplicationTracerFactory tracerFactory, - io.opentelemetry.api.trace.TracerProvider agentTracerProvider) { + ApplicationTracerFactory tracerFactory, TracerProvider agentTracerProvider) { super(tracerFactory, agentTracerProvider); } @Override - public TracerBuilder tracerBuilder(String instrumentationName) { + public application.io.opentelemetry.api.trace.TracerBuilder tracerBuilder( + String instrumentationName) { return new ApplicationTracerBuilder( tracerFactory, agentTracerProvider.tracerBuilder(instrumentationName)); } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/logs/ApplicationLogger140Incubator.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/logs/ApplicationLogger140Incubator.java index 04762e5d94ce..7d959c1476c6 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/logs/ApplicationLogger140Incubator.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/logs/ApplicationLogger140Incubator.java @@ -5,22 +5,23 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_40.incubator.logs; -import application.io.opentelemetry.api.incubator.logs.ExtendedLogger; +import io.opentelemetry.api.incubator.logs.ExtendedLogger; +import io.opentelemetry.api.logs.Logger; import io.opentelemetry.api.logs.Severity; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_27.logs.ApplicationLogger; -public class ApplicationLogger140Incubator extends ApplicationLogger implements ExtendedLogger { +public class ApplicationLogger140Incubator extends ApplicationLogger + implements application.io.opentelemetry.api.incubator.logs.ExtendedLogger { - private final io.opentelemetry.api.logs.Logger agentLogger; + private final Logger agentLogger; - protected ApplicationLogger140Incubator(io.opentelemetry.api.logs.Logger agentLogger) { + protected ApplicationLogger140Incubator(Logger agentLogger) { super(agentLogger); this.agentLogger = agentLogger; } @Override public boolean isEnabled() { - return ((io.opentelemetry.api.incubator.logs.ExtendedLogger) agentLogger) - .isEnabled(Severity.UNDEFINED_SEVERITY_NUMBER); + return ((ExtendedLogger) agentLogger).isEnabled(Severity.UNDEFINED_SEVERITY_NUMBER); } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/metrics/ApplicationDoubleCounter140Incubator.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/metrics/ApplicationDoubleCounter140Incubator.java index f1a10fc00ca7..1c1081a8af4d 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/metrics/ApplicationDoubleCounter140Incubator.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/metrics/ApplicationDoubleCounter140Incubator.java @@ -5,21 +5,21 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_40.incubator.metrics; -import application.io.opentelemetry.api.incubator.metrics.ExtendedDoubleCounter; +import io.opentelemetry.api.incubator.metrics.ExtendedDoubleCounter; +import io.opentelemetry.api.metrics.DoubleCounter; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics.ApplicationDoubleCounter; final class ApplicationDoubleCounter140Incubator extends ApplicationDoubleCounter - implements ExtendedDoubleCounter { - private final io.opentelemetry.api.metrics.DoubleCounter agentCounter; + implements application.io.opentelemetry.api.incubator.metrics.ExtendedDoubleCounter { + private final DoubleCounter agentCounter; - ApplicationDoubleCounter140Incubator(io.opentelemetry.api.metrics.DoubleCounter agentCounter) { + ApplicationDoubleCounter140Incubator(DoubleCounter agentCounter) { super(agentCounter); this.agentCounter = agentCounter; } @Override public boolean isEnabled() { - return ((io.opentelemetry.api.incubator.metrics.ExtendedDoubleCounter) agentCounter) - .isEnabled(); + return ((ExtendedDoubleCounter) agentCounter).isEnabled(); } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/metrics/ApplicationDoubleCounterBuilder140Incubator.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/metrics/ApplicationDoubleCounterBuilder140Incubator.java index c6bd0a709e0c..be6721ad6fff 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/metrics/ApplicationDoubleCounterBuilder140Incubator.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/metrics/ApplicationDoubleCounterBuilder140Incubator.java @@ -5,12 +5,11 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_40.incubator.metrics; -import application.io.opentelemetry.api.metrics.DoubleCounter; import io.opentelemetry.api.metrics.DoubleCounterBuilder; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_37.incubator.metrics.ApplicationDoubleCounterBuilder137; final class ApplicationDoubleCounterBuilder140Incubator extends ApplicationDoubleCounterBuilder137 { - private final io.opentelemetry.api.metrics.DoubleCounterBuilder agentBuilder; + private final DoubleCounterBuilder agentBuilder; ApplicationDoubleCounterBuilder140Incubator(DoubleCounterBuilder agentBuilder) { super(agentBuilder); @@ -18,7 +17,7 @@ final class ApplicationDoubleCounterBuilder140Incubator extends ApplicationDoubl } @Override - public DoubleCounter build() { + public application.io.opentelemetry.api.metrics.DoubleCounter build() { return new ApplicationDoubleCounter140Incubator(agentBuilder.build()); } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/metrics/ApplicationDoubleGauge140Incubator.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/metrics/ApplicationDoubleGauge140Incubator.java index 492c132c5e58..2d414c01d1fa 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/metrics/ApplicationDoubleGauge140Incubator.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/metrics/ApplicationDoubleGauge140Incubator.java @@ -5,14 +5,14 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_40.incubator.metrics; -import application.io.opentelemetry.api.incubator.metrics.ExtendedDoubleGauge; +import io.opentelemetry.api.incubator.metrics.ExtendedDoubleGauge; import io.opentelemetry.api.metrics.DoubleGauge; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_38.metrics.ApplicationDoubleGauge138; final class ApplicationDoubleGauge140Incubator extends ApplicationDoubleGauge138 - implements ExtendedDoubleGauge { + implements application.io.opentelemetry.api.incubator.metrics.ExtendedDoubleGauge { - private final io.opentelemetry.api.metrics.DoubleGauge agentDoubleGauge; + private final DoubleGauge agentDoubleGauge; ApplicationDoubleGauge140Incubator(DoubleGauge agentDoubleGauge) { super(agentDoubleGauge); @@ -21,7 +21,6 @@ final class ApplicationDoubleGauge140Incubator extends ApplicationDoubleGauge138 @Override public boolean isEnabled() { - return ((io.opentelemetry.api.incubator.metrics.ExtendedDoubleGauge) agentDoubleGauge) - .isEnabled(); + return ((ExtendedDoubleGauge) agentDoubleGauge).isEnabled(); } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/metrics/ApplicationDoubleGaugeBuilder140Incubator.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/metrics/ApplicationDoubleGaugeBuilder140Incubator.java index 0d9f10ec476a..ba0dad069856 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/metrics/ApplicationDoubleGaugeBuilder140Incubator.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/metrics/ApplicationDoubleGaugeBuilder140Incubator.java @@ -5,15 +5,13 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_40.incubator.metrics; -import application.io.opentelemetry.api.metrics.DoubleGauge; -import application.io.opentelemetry.api.metrics.LongGaugeBuilder; import io.opentelemetry.api.metrics.DoubleGaugeBuilder; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_38.incubator.metrics.ApplicationDoubleGaugeBuilder138Incubator; final class ApplicationDoubleGaugeBuilder140Incubator extends ApplicationDoubleGaugeBuilder138Incubator { - private final io.opentelemetry.api.metrics.DoubleGaugeBuilder agentBuilder; + private final DoubleGaugeBuilder agentBuilder; ApplicationDoubleGaugeBuilder140Incubator(DoubleGaugeBuilder agentBuilder) { super(agentBuilder); @@ -21,12 +19,12 @@ final class ApplicationDoubleGaugeBuilder140Incubator } @Override - public LongGaugeBuilder ofLongs() { + public application.io.opentelemetry.api.metrics.LongGaugeBuilder ofLongs() { return new ApplicationLongGaugeBuilder140Incubator(agentBuilder.ofLongs()); } @Override - public DoubleGauge build() { + public application.io.opentelemetry.api.metrics.DoubleGauge build() { return new ApplicationDoubleGauge140Incubator(agentBuilder.build()); } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/metrics/ApplicationDoubleHistogram140Incubator.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/metrics/ApplicationDoubleHistogram140Incubator.java index d2ce4d788dd4..66f4409b09ca 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/metrics/ApplicationDoubleHistogram140Incubator.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/metrics/ApplicationDoubleHistogram140Incubator.java @@ -5,14 +5,14 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_40.incubator.metrics; -import application.io.opentelemetry.api.incubator.metrics.ExtendedDoubleHistogram; +import io.opentelemetry.api.incubator.metrics.ExtendedDoubleHistogram; import io.opentelemetry.api.metrics.DoubleHistogram; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics.ApplicationDoubleHistogram; final class ApplicationDoubleHistogram140Incubator extends ApplicationDoubleHistogram - implements ExtendedDoubleHistogram { + implements application.io.opentelemetry.api.incubator.metrics.ExtendedDoubleHistogram { - private final io.opentelemetry.api.metrics.DoubleHistogram agentHistogram; + private final DoubleHistogram agentHistogram; ApplicationDoubleHistogram140Incubator(DoubleHistogram agentHistogram) { super(agentHistogram); @@ -21,7 +21,6 @@ final class ApplicationDoubleHistogram140Incubator extends ApplicationDoubleHist @Override public boolean isEnabled() { - return ((io.opentelemetry.api.incubator.metrics.ExtendedDoubleHistogram) agentHistogram) - .isEnabled(); + return ((ExtendedDoubleHistogram) agentHistogram).isEnabled(); } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/metrics/ApplicationDoubleHistogramBuilder140Incubator.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/metrics/ApplicationDoubleHistogramBuilder140Incubator.java index 58312d650340..a766efa1f477 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/metrics/ApplicationDoubleHistogramBuilder140Incubator.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/metrics/ApplicationDoubleHistogramBuilder140Incubator.java @@ -5,15 +5,13 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_40.incubator.metrics; -import application.io.opentelemetry.api.metrics.DoubleHistogram; -import application.io.opentelemetry.api.metrics.LongHistogramBuilder; import io.opentelemetry.api.metrics.DoubleHistogramBuilder; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_37.incubator.metrics.ApplicationDoubleHistogramBuilder137; final class ApplicationDoubleHistogramBuilder140Incubator extends ApplicationDoubleHistogramBuilder137 { - private final io.opentelemetry.api.metrics.DoubleHistogramBuilder agentBuilder; + private final DoubleHistogramBuilder agentBuilder; ApplicationDoubleHistogramBuilder140Incubator(DoubleHistogramBuilder agentBuilder) { super(agentBuilder); @@ -21,12 +19,12 @@ final class ApplicationDoubleHistogramBuilder140Incubator } @Override - public LongHistogramBuilder ofLongs() { + public application.io.opentelemetry.api.metrics.LongHistogramBuilder ofLongs() { return new ApplicationLongHistogramBuilder140Incubator(agentBuilder.ofLongs()); } @Override - public DoubleHistogram build() { + public application.io.opentelemetry.api.metrics.DoubleHistogram build() { return new ApplicationDoubleHistogram140Incubator(agentBuilder.build()); } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/metrics/ApplicationDoubleUpDownCounter140Incubator.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/metrics/ApplicationDoubleUpDownCounter140Incubator.java index d82f17378202..6018d4256c37 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/metrics/ApplicationDoubleUpDownCounter140Incubator.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/metrics/ApplicationDoubleUpDownCounter140Incubator.java @@ -5,14 +5,14 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_40.incubator.metrics; -import application.io.opentelemetry.api.incubator.metrics.ExtendedDoubleUpDownCounter; +import io.opentelemetry.api.incubator.metrics.ExtendedDoubleUpDownCounter; import io.opentelemetry.api.metrics.DoubleUpDownCounter; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics.ApplicationDoubleUpDownCounter; final class ApplicationDoubleUpDownCounter140Incubator extends ApplicationDoubleUpDownCounter - implements ExtendedDoubleUpDownCounter { + implements application.io.opentelemetry.api.incubator.metrics.ExtendedDoubleUpDownCounter { - private final io.opentelemetry.api.metrics.DoubleUpDownCounter agentCounter; + private final DoubleUpDownCounter agentCounter; ApplicationDoubleUpDownCounter140Incubator(DoubleUpDownCounter agentCounter) { super(agentCounter); @@ -21,7 +21,6 @@ final class ApplicationDoubleUpDownCounter140Incubator extends ApplicationDouble @Override public boolean isEnabled() { - return ((io.opentelemetry.api.incubator.metrics.ExtendedDoubleUpDownCounter) agentCounter) - .isEnabled(); + return ((ExtendedDoubleUpDownCounter) agentCounter).isEnabled(); } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/metrics/ApplicationDoubleUpDownCounterBuilder140Incubator.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/metrics/ApplicationDoubleUpDownCounterBuilder140Incubator.java index d050ed12641c..a787ab8a8060 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/metrics/ApplicationDoubleUpDownCounterBuilder140Incubator.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/metrics/ApplicationDoubleUpDownCounterBuilder140Incubator.java @@ -5,14 +5,13 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_40.incubator.metrics; -import application.io.opentelemetry.api.metrics.DoubleUpDownCounter; import io.opentelemetry.api.metrics.DoubleUpDownCounterBuilder; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_37.incubator.metrics.ApplicationDoubleUpDownCounterBuilder137; final class ApplicationDoubleUpDownCounterBuilder140Incubator extends ApplicationDoubleUpDownCounterBuilder137 { - private final io.opentelemetry.api.metrics.DoubleUpDownCounterBuilder agentBuilder; + private final DoubleUpDownCounterBuilder agentBuilder; ApplicationDoubleUpDownCounterBuilder140Incubator(DoubleUpDownCounterBuilder agentBuilder) { super(agentBuilder); @@ -20,7 +19,7 @@ final class ApplicationDoubleUpDownCounterBuilder140Incubator } @Override - public DoubleUpDownCounter build() { + public application.io.opentelemetry.api.metrics.DoubleUpDownCounter build() { return new ApplicationDoubleUpDownCounter140Incubator(agentBuilder.build()); } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/metrics/ApplicationLongCounter140Incubator.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/metrics/ApplicationLongCounter140Incubator.java index 7cec97190ce8..2f802cca32d9 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/metrics/ApplicationLongCounter140Incubator.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/metrics/ApplicationLongCounter140Incubator.java @@ -5,13 +5,13 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_40.incubator.metrics; -import application.io.opentelemetry.api.incubator.metrics.ExtendedLongCounter; +import io.opentelemetry.api.incubator.metrics.ExtendedLongCounter; import io.opentelemetry.api.metrics.LongCounter; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics.ApplicationLongCounter; final class ApplicationLongCounter140Incubator extends ApplicationLongCounter - implements ExtendedLongCounter { - private final io.opentelemetry.api.metrics.LongCounter agentCounter; + implements application.io.opentelemetry.api.incubator.metrics.ExtendedLongCounter { + private final LongCounter agentCounter; ApplicationLongCounter140Incubator(LongCounter agentCounter) { super(agentCounter); @@ -20,6 +20,6 @@ final class ApplicationLongCounter140Incubator extends ApplicationLongCounter @Override public boolean isEnabled() { - return ((io.opentelemetry.api.incubator.metrics.ExtendedLongCounter) agentCounter).isEnabled(); + return ((ExtendedLongCounter) agentCounter).isEnabled(); } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/metrics/ApplicationLongCounterBuilder140Incubator.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/metrics/ApplicationLongCounterBuilder140Incubator.java index 1f7eeb4cd72f..f2861dbbf19b 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/metrics/ApplicationLongCounterBuilder140Incubator.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/metrics/ApplicationLongCounterBuilder140Incubator.java @@ -5,13 +5,11 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_40.incubator.metrics; -import application.io.opentelemetry.api.metrics.DoubleCounterBuilder; -import application.io.opentelemetry.api.metrics.LongCounter; import io.opentelemetry.api.metrics.LongCounterBuilder; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_37.incubator.metrics.ApplicationLongCounterBuilder137; final class ApplicationLongCounterBuilder140Incubator extends ApplicationLongCounterBuilder137 { - private final io.opentelemetry.api.metrics.LongCounterBuilder agentBuilder; + private final LongCounterBuilder agentBuilder; ApplicationLongCounterBuilder140Incubator(LongCounterBuilder agentBuilder) { super(agentBuilder); @@ -19,12 +17,12 @@ final class ApplicationLongCounterBuilder140Incubator extends ApplicationLongCou } @Override - public DoubleCounterBuilder ofDoubles() { + public application.io.opentelemetry.api.metrics.DoubleCounterBuilder ofDoubles() { return new ApplicationDoubleCounterBuilder140Incubator(agentBuilder.ofDoubles()); } @Override - public LongCounter build() { + public application.io.opentelemetry.api.metrics.LongCounter build() { return new ApplicationLongCounter140Incubator(agentBuilder.build()); } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/metrics/ApplicationLongGauge140Incubator.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/metrics/ApplicationLongGauge140Incubator.java index da3ced5d4bbf..f19db932983e 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/metrics/ApplicationLongGauge140Incubator.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/metrics/ApplicationLongGauge140Incubator.java @@ -5,14 +5,14 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_40.incubator.metrics; -import application.io.opentelemetry.api.incubator.metrics.ExtendedLongGauge; +import io.opentelemetry.api.incubator.metrics.ExtendedLongGauge; import io.opentelemetry.api.metrics.LongGauge; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_38.metrics.ApplicationLongGauge138; final class ApplicationLongGauge140Incubator extends ApplicationLongGauge138 - implements ExtendedLongGauge { + implements application.io.opentelemetry.api.incubator.metrics.ExtendedLongGauge { - private final io.opentelemetry.api.metrics.LongGauge agentLongGauge; + private final LongGauge agentLongGauge; ApplicationLongGauge140Incubator(LongGauge agentLongGauge) { super(agentLongGauge); @@ -21,6 +21,6 @@ final class ApplicationLongGauge140Incubator extends ApplicationLongGauge138 @Override public boolean isEnabled() { - return ((io.opentelemetry.api.incubator.metrics.ExtendedLongGauge) agentLongGauge).isEnabled(); + return ((ExtendedLongGauge) agentLongGauge).isEnabled(); } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/metrics/ApplicationLongGaugeBuilder140Incubator.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/metrics/ApplicationLongGaugeBuilder140Incubator.java index 658229f4323f..d7b63bff7558 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/metrics/ApplicationLongGaugeBuilder140Incubator.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/metrics/ApplicationLongGaugeBuilder140Incubator.java @@ -5,14 +5,13 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_40.incubator.metrics; -import application.io.opentelemetry.api.metrics.LongGauge; import io.opentelemetry.api.metrics.LongGaugeBuilder; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_38.incubator.metrics.ApplicationLongGaugeBuilder138Incubator; final class ApplicationLongGaugeBuilder140Incubator extends ApplicationLongGaugeBuilder138Incubator { - private final io.opentelemetry.api.metrics.LongGaugeBuilder agentBuilder; + private final LongGaugeBuilder agentBuilder; ApplicationLongGaugeBuilder140Incubator(LongGaugeBuilder agentBuilder) { super(agentBuilder); @@ -20,7 +19,7 @@ final class ApplicationLongGaugeBuilder140Incubator } @Override - public LongGauge build() { + public application.io.opentelemetry.api.metrics.LongGauge build() { return new ApplicationLongGauge140Incubator(agentBuilder.build()); } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/metrics/ApplicationLongHistogram140Incubator.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/metrics/ApplicationLongHistogram140Incubator.java index ceb94b7decbd..192e7c236d79 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/metrics/ApplicationLongHistogram140Incubator.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/metrics/ApplicationLongHistogram140Incubator.java @@ -5,14 +5,14 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_40.incubator.metrics; -import application.io.opentelemetry.api.incubator.metrics.ExtendedLongHistogram; +import io.opentelemetry.api.incubator.metrics.ExtendedLongHistogram; import io.opentelemetry.api.metrics.LongHistogram; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics.ApplicationLongHistogram; final class ApplicationLongHistogram140Incubator extends ApplicationLongHistogram - implements ExtendedLongHistogram { + implements application.io.opentelemetry.api.incubator.metrics.ExtendedLongHistogram { - private final io.opentelemetry.api.metrics.LongHistogram agentHistogram; + private final LongHistogram agentHistogram; ApplicationLongHistogram140Incubator(LongHistogram agentHistogram) { super(agentHistogram); @@ -21,7 +21,6 @@ final class ApplicationLongHistogram140Incubator extends ApplicationLongHistogra @Override public boolean isEnabled() { - return ((io.opentelemetry.api.incubator.metrics.ExtendedLongHistogram) agentHistogram) - .isEnabled(); + return ((ExtendedLongHistogram) agentHistogram).isEnabled(); } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/metrics/ApplicationLongHistogramBuilder140Incubator.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/metrics/ApplicationLongHistogramBuilder140Incubator.java index 76c3b962d796..a999070eb8e0 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/metrics/ApplicationLongHistogramBuilder140Incubator.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/metrics/ApplicationLongHistogramBuilder140Incubator.java @@ -5,13 +5,12 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_40.incubator.metrics; -import application.io.opentelemetry.api.metrics.LongHistogram; import io.opentelemetry.api.metrics.LongHistogramBuilder; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_37.incubator.metrics.ApplicationLongHistogramBuilder137; final class ApplicationLongHistogramBuilder140Incubator extends ApplicationLongHistogramBuilder137 { - private final io.opentelemetry.api.metrics.LongHistogramBuilder agentBuilder; + private final LongHistogramBuilder agentBuilder; ApplicationLongHistogramBuilder140Incubator(LongHistogramBuilder agentBuilder) { super(agentBuilder); @@ -19,7 +18,7 @@ final class ApplicationLongHistogramBuilder140Incubator extends ApplicationLongH } @Override - public LongHistogram build() { + public application.io.opentelemetry.api.metrics.LongHistogram build() { return new ApplicationLongHistogram140Incubator(agentBuilder.build()); } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/metrics/ApplicationLongUpDownCounter140Incubator.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/metrics/ApplicationLongUpDownCounter140Incubator.java index 0ba29e0fbca6..fc6cfc1ead04 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/metrics/ApplicationLongUpDownCounter140Incubator.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/metrics/ApplicationLongUpDownCounter140Incubator.java @@ -5,14 +5,14 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_40.incubator.metrics; -import application.io.opentelemetry.api.incubator.metrics.ExtendedLongUpDownCounter; +import io.opentelemetry.api.incubator.metrics.ExtendedLongUpDownCounter; import io.opentelemetry.api.metrics.LongUpDownCounter; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics.ApplicationLongUpDownCounter; final class ApplicationLongUpDownCounter140Incubator extends ApplicationLongUpDownCounter - implements ExtendedLongUpDownCounter { + implements application.io.opentelemetry.api.incubator.metrics.ExtendedLongUpDownCounter { - private final io.opentelemetry.api.metrics.LongUpDownCounter agentCounter; + private final LongUpDownCounter agentCounter; ApplicationLongUpDownCounter140Incubator(LongUpDownCounter agentCounter) { super(agentCounter); @@ -21,7 +21,6 @@ final class ApplicationLongUpDownCounter140Incubator extends ApplicationLongUpDo @Override public boolean isEnabled() { - return ((io.opentelemetry.api.incubator.metrics.ExtendedLongUpDownCounter) agentCounter) - .isEnabled(); + return ((ExtendedLongUpDownCounter) agentCounter).isEnabled(); } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/metrics/ApplicationLongUpDownCounterBuilder140Incubator.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/metrics/ApplicationLongUpDownCounterBuilder140Incubator.java index 8a64026389c2..f30d4bb5c073 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/metrics/ApplicationLongUpDownCounterBuilder140Incubator.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/metrics/ApplicationLongUpDownCounterBuilder140Incubator.java @@ -5,15 +5,13 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_40.incubator.metrics; -import application.io.opentelemetry.api.metrics.DoubleUpDownCounterBuilder; -import application.io.opentelemetry.api.metrics.LongUpDownCounter; import io.opentelemetry.api.metrics.LongUpDownCounterBuilder; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_37.incubator.metrics.ApplicationLongUpDownCounterBuilder137; final class ApplicationLongUpDownCounterBuilder140Incubator extends ApplicationLongUpDownCounterBuilder137 { - private final io.opentelemetry.api.metrics.LongUpDownCounterBuilder agentBuilder; + private final LongUpDownCounterBuilder agentBuilder; ApplicationLongUpDownCounterBuilder140Incubator(LongUpDownCounterBuilder agentBuilder) { super(agentBuilder); @@ -21,12 +19,12 @@ final class ApplicationLongUpDownCounterBuilder140Incubator } @Override - public DoubleUpDownCounterBuilder ofDoubles() { + public application.io.opentelemetry.api.metrics.DoubleUpDownCounterBuilder ofDoubles() { return new ApplicationDoubleUpDownCounterBuilder140Incubator(agentBuilder.ofDoubles()); } @Override - public LongUpDownCounter build() { + public application.io.opentelemetry.api.metrics.LongUpDownCounter build() { return new ApplicationLongUpDownCounter140Incubator(agentBuilder.build()); } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/metrics/ApplicationMeter140Incubator.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/metrics/ApplicationMeter140Incubator.java index a41e348042f4..e2244201c695 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/metrics/ApplicationMeter140Incubator.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/metrics/ApplicationMeter140Incubator.java @@ -5,39 +5,38 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_40.incubator.metrics; -import application.io.opentelemetry.api.metrics.DoubleGaugeBuilder; -import application.io.opentelemetry.api.metrics.DoubleHistogramBuilder; -import application.io.opentelemetry.api.metrics.LongCounterBuilder; -import application.io.opentelemetry.api.metrics.LongUpDownCounterBuilder; +import io.opentelemetry.api.metrics.Meter; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_37.incubator.metrics.BaseApplicationMeter137; final class ApplicationMeter140Incubator extends BaseApplicationMeter137 { - private final io.opentelemetry.api.metrics.Meter agentMeter; + private final Meter agentMeter; - ApplicationMeter140Incubator(io.opentelemetry.api.metrics.Meter agentMeter) { + ApplicationMeter140Incubator(Meter agentMeter) { super(agentMeter); this.agentMeter = agentMeter; } @Override - public LongCounterBuilder counterBuilder(String name) { + public application.io.opentelemetry.api.metrics.LongCounterBuilder counterBuilder(String name) { return new ApplicationLongCounterBuilder140Incubator(agentMeter.counterBuilder(name)); } @Override - public LongUpDownCounterBuilder upDownCounterBuilder(String name) { + public application.io.opentelemetry.api.metrics.LongUpDownCounterBuilder upDownCounterBuilder( + String name) { return new ApplicationLongUpDownCounterBuilder140Incubator( agentMeter.upDownCounterBuilder(name)); } @Override - public DoubleHistogramBuilder histogramBuilder(String name) { + public application.io.opentelemetry.api.metrics.DoubleHistogramBuilder histogramBuilder( + String name) { return new ApplicationDoubleHistogramBuilder140Incubator(agentMeter.histogramBuilder(name)); } @Override - public DoubleGaugeBuilder gaugeBuilder(String name) { + public application.io.opentelemetry.api.metrics.DoubleGaugeBuilder gaugeBuilder(String name) { return new ApplicationDoubleGaugeBuilder140Incubator(agentMeter.gaugeBuilder(name)); } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/trace/ApplicationSpanBuilder140Incubator.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/trace/ApplicationSpanBuilder140Incubator.java index b3f84b42a659..14b1e8ac6702 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/trace/ApplicationSpanBuilder140Incubator.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/trace/ApplicationSpanBuilder140Incubator.java @@ -5,19 +5,14 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_40.incubator.trace; -import application.io.opentelemetry.api.common.AttributeKey; -import application.io.opentelemetry.api.common.Attributes; -import application.io.opentelemetry.api.incubator.trace.ExtendedSpanBuilder; -import application.io.opentelemetry.api.incubator.trace.SpanCallable; -import application.io.opentelemetry.api.incubator.trace.SpanRunnable; -import application.io.opentelemetry.api.trace.Span; -import application.io.opentelemetry.api.trace.SpanContext; -import application.io.opentelemetry.api.trace.SpanKind; -import application.io.opentelemetry.context.Context; -import application.io.opentelemetry.context.propagation.ContextPropagators; -import application.io.opentelemetry.context.propagation.TextMapGetter; -import application.io.opentelemetry.context.propagation.TextMapPropagator; import com.google.errorprone.annotations.CanIgnoreReturnValue; +import io.opentelemetry.api.incubator.trace.ExtendedSpanBuilder; +import io.opentelemetry.api.trace.SpanBuilder; +import io.opentelemetry.context.Context; +import io.opentelemetry.context.propagation.ContextPropagators; +import io.opentelemetry.context.propagation.TextMapGetter; +import io.opentelemetry.context.propagation.TextMapPropagator; +import io.opentelemetry.context.propagation.TextMapSetter; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.context.AgentContextStorage; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.trace.ApplicationSpan; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.trace.ApplicationSpanBuilder; @@ -28,136 +23,168 @@ import javax.annotation.Nullable; public final class ApplicationSpanBuilder140Incubator extends ApplicationSpanBuilder - implements ExtendedSpanBuilder { + implements application.io.opentelemetry.api.incubator.trace.ExtendedSpanBuilder { - private final io.opentelemetry.api.incubator.trace.ExtendedSpanBuilder agentBuilder; + private final ExtendedSpanBuilder agentBuilder; - public ApplicationSpanBuilder140Incubator(io.opentelemetry.api.trace.SpanBuilder agentBuilder) { + public ApplicationSpanBuilder140Incubator(SpanBuilder agentBuilder) { super(agentBuilder); - this.agentBuilder = (io.opentelemetry.api.incubator.trace.ExtendedSpanBuilder) agentBuilder; + this.agentBuilder = (ExtendedSpanBuilder) agentBuilder; } @Override @CanIgnoreReturnValue - public ExtendedSpanBuilder setParent(Context applicationContext) { - return (ExtendedSpanBuilder) super.setParent(applicationContext); + public application.io.opentelemetry.api.incubator.trace.ExtendedSpanBuilder setParent( + application.io.opentelemetry.context.Context applicationContext) { + return (application.io.opentelemetry.api.incubator.trace.ExtendedSpanBuilder) + super.setParent(applicationContext); } @Override @CanIgnoreReturnValue - public ExtendedSpanBuilder setNoParent() { - return (ExtendedSpanBuilder) super.setNoParent(); + public application.io.opentelemetry.api.incubator.trace.ExtendedSpanBuilder setNoParent() { + return (application.io.opentelemetry.api.incubator.trace.ExtendedSpanBuilder) + super.setNoParent(); } @Override @CanIgnoreReturnValue - public ExtendedSpanBuilder addLink(SpanContext applicationSpanContext) { - return (ExtendedSpanBuilder) super.addLink(applicationSpanContext); + public application.io.opentelemetry.api.incubator.trace.ExtendedSpanBuilder addLink( + application.io.opentelemetry.api.trace.SpanContext applicationSpanContext) { + return (application.io.opentelemetry.api.incubator.trace.ExtendedSpanBuilder) + super.addLink(applicationSpanContext); } @Override @CanIgnoreReturnValue - public ExtendedSpanBuilder addLink( - SpanContext applicationSpanContext, Attributes applicationAttributes) { - return (ExtendedSpanBuilder) super.addLink(applicationSpanContext, applicationAttributes); + public application.io.opentelemetry.api.incubator.trace.ExtendedSpanBuilder addLink( + application.io.opentelemetry.api.trace.SpanContext applicationSpanContext, + application.io.opentelemetry.api.common.Attributes applicationAttributes) { + return (application.io.opentelemetry.api.incubator.trace.ExtendedSpanBuilder) + super.addLink(applicationSpanContext, applicationAttributes); } @Override @CanIgnoreReturnValue - public ExtendedSpanBuilder setAttribute(String key, String value) { - return (ExtendedSpanBuilder) super.setAttribute(key, value); + public application.io.opentelemetry.api.incubator.trace.ExtendedSpanBuilder setAttribute( + String key, String value) { + return (application.io.opentelemetry.api.incubator.trace.ExtendedSpanBuilder) + super.setAttribute(key, value); } @Override @CanIgnoreReturnValue - public ExtendedSpanBuilder setAttribute(String key, long value) { - return (ExtendedSpanBuilder) super.setAttribute(key, value); + public application.io.opentelemetry.api.incubator.trace.ExtendedSpanBuilder setAttribute( + String key, long value) { + return (application.io.opentelemetry.api.incubator.trace.ExtendedSpanBuilder) + super.setAttribute(key, value); } @Override @CanIgnoreReturnValue - public ExtendedSpanBuilder setAttribute(String key, double value) { - return (ExtendedSpanBuilder) super.setAttribute(key, value); + public application.io.opentelemetry.api.incubator.trace.ExtendedSpanBuilder setAttribute( + String key, double value) { + return (application.io.opentelemetry.api.incubator.trace.ExtendedSpanBuilder) + super.setAttribute(key, value); } @Override @CanIgnoreReturnValue - public ExtendedSpanBuilder setAttribute(String key, boolean value) { - return (ExtendedSpanBuilder) super.setAttribute(key, value); + public application.io.opentelemetry.api.incubator.trace.ExtendedSpanBuilder setAttribute( + String key, boolean value) { + return (application.io.opentelemetry.api.incubator.trace.ExtendedSpanBuilder) + super.setAttribute(key, value); } @Override @CanIgnoreReturnValue - public ExtendedSpanBuilder setAttribute(AttributeKey applicationKey, T value) { - return (ExtendedSpanBuilder) super.setAttribute(applicationKey, value); + public application.io.opentelemetry.api.incubator.trace.ExtendedSpanBuilder setAttribute( + application.io.opentelemetry.api.common.AttributeKey applicationKey, T value) { + return (application.io.opentelemetry.api.incubator.trace.ExtendedSpanBuilder) + super.setAttribute(applicationKey, value); } @Override @CanIgnoreReturnValue - public ExtendedSpanBuilder setSpanKind(SpanKind applicationSpanKind) { - return (ExtendedSpanBuilder) super.setSpanKind(applicationSpanKind); + public application.io.opentelemetry.api.incubator.trace.ExtendedSpanBuilder setSpanKind( + application.io.opentelemetry.api.trace.SpanKind applicationSpanKind) { + return (application.io.opentelemetry.api.incubator.trace.ExtendedSpanBuilder) + super.setSpanKind(applicationSpanKind); } @Override @CanIgnoreReturnValue - public ExtendedSpanBuilder setStartTimestamp(long startTimestamp, TimeUnit unit) { - return (ExtendedSpanBuilder) super.setStartTimestamp(startTimestamp, unit); + public application.io.opentelemetry.api.incubator.trace.ExtendedSpanBuilder setStartTimestamp( + long startTimestamp, TimeUnit unit) { + return (application.io.opentelemetry.api.incubator.trace.ExtendedSpanBuilder) + super.setStartTimestamp(startTimestamp, unit); } @Override - public ExtendedSpanBuilder setParentFrom( - ContextPropagators contextPropagators, Map map) { + public application.io.opentelemetry.api.incubator.trace.ExtendedSpanBuilder setParentFrom( + application.io.opentelemetry.context.propagation.ContextPropagators contextPropagators, + Map map) { agentBuilder.setParentFrom(new AgentContextPropagators(contextPropagators), map); return this; } @Override - public T startAndCall(SpanCallable spanCallable) throws E { + public T startAndCall( + application.io.opentelemetry.api.incubator.trace.SpanCallable spanCallable) throws E { return agentBuilder.startAndCall(spanCallable::callInSpan); } @Override public T startAndCall( - SpanCallable spanCallable, BiConsumer biConsumer) throws E { + application.io.opentelemetry.api.incubator.trace.SpanCallable spanCallable, + BiConsumer biConsumer) + throws E { return agentBuilder.startAndCall( spanCallable::callInSpan, (span, throwable) -> biConsumer.accept(new ApplicationSpan(span), throwable)); } @Override - public void startAndRun(SpanRunnable spanRunnable) throws E { + public void startAndRun( + application.io.opentelemetry.api.incubator.trace.SpanRunnable spanRunnable) throws E { agentBuilder.startAndRun(spanRunnable::runInSpan); } @Override public void startAndRun( - SpanRunnable spanRunnable, BiConsumer biConsumer) throws E { + application.io.opentelemetry.api.incubator.trace.SpanRunnable spanRunnable, + BiConsumer biConsumer) + throws E { agentBuilder.startAndRun( spanRunnable::runInSpan, (span, throwable) -> biConsumer.accept(new ApplicationSpan(span), throwable)); } - private static class AgentContextPropagators - implements io.opentelemetry.context.propagation.ContextPropagators { + private static class AgentContextPropagators implements ContextPropagators { - private final ContextPropagators applicationContextPropagators; + private final application.io.opentelemetry.context.propagation.ContextPropagators + applicationContextPropagators; - AgentContextPropagators(ContextPropagators applicationContextPropagators) { + AgentContextPropagators( + application.io.opentelemetry.context.propagation.ContextPropagators + applicationContextPropagators) { this.applicationContextPropagators = applicationContextPropagators; } @Override - public io.opentelemetry.context.propagation.TextMapPropagator getTextMapPropagator() { + public TextMapPropagator getTextMapPropagator() { return new AgentTextMapPropagator(applicationContextPropagators.getTextMapPropagator()); } } - private static class AgentTextMapPropagator - implements io.opentelemetry.context.propagation.TextMapPropagator { + private static class AgentTextMapPropagator implements TextMapPropagator { - private final TextMapPropagator applicationTextMapPropagator; + private final application.io.opentelemetry.context.propagation.TextMapPropagator + applicationTextMapPropagator; - AgentTextMapPropagator(TextMapPropagator applicationTextMapPropagator) { + AgentTextMapPropagator( + application.io.opentelemetry.context.propagation.TextMapPropagator + applicationTextMapPropagator) { this.applicationTextMapPropagator = applicationTextMapPropagator; } @@ -167,24 +194,18 @@ public Collection fields() { } @Override - public void inject( - io.opentelemetry.context.Context context, - @Nullable C c, - io.opentelemetry.context.propagation.TextMapSetter textMapSetter) { + public void inject(Context context, @Nullable C c, TextMapSetter textMapSetter) { applicationTextMapPropagator.inject( AgentContextStorage.toApplicationContext(context), c, textMapSetter::set); } @Override - public io.opentelemetry.context.Context extract( - io.opentelemetry.context.Context context, - @Nullable C c, - io.opentelemetry.context.propagation.TextMapGetter textMapGetter) { + public Context extract(Context context, @Nullable C c, TextMapGetter textMapGetter) { return AgentContextStorage.getAgentContext( applicationTextMapPropagator.extract( AgentContextStorage.toApplicationContext(context), c, - new TextMapGetter() { + new application.io.opentelemetry.context.propagation.TextMapGetter() { @Override public Iterable keys(C c) { diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/trace/ApplicationTracer140Incubator.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/trace/ApplicationTracer140Incubator.java index fc70f2d6a53e..76d345b65909 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/trace/ApplicationTracer140Incubator.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/trace/ApplicationTracer140Incubator.java @@ -5,14 +5,14 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_40.incubator.trace; -import application.io.opentelemetry.api.incubator.trace.ExtendedTracer; -import application.io.opentelemetry.api.trace.SpanBuilder; +import io.opentelemetry.api.incubator.trace.ExtendedTracer; import io.opentelemetry.api.trace.Tracer; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.trace.ApplicationTracer; -final class ApplicationTracer140Incubator extends ApplicationTracer implements ExtendedTracer { +final class ApplicationTracer140Incubator extends ApplicationTracer + implements application.io.opentelemetry.api.incubator.trace.ExtendedTracer { - private final io.opentelemetry.api.trace.Tracer agentTracer; + private final Tracer agentTracer; ApplicationTracer140Incubator(Tracer agentTracer) { super(agentTracer); @@ -20,12 +20,12 @@ final class ApplicationTracer140Incubator extends ApplicationTracer implements E } @Override - public SpanBuilder spanBuilder(String spanName) { + public application.io.opentelemetry.api.trace.SpanBuilder spanBuilder(String spanName) { return new ApplicationSpanBuilder140Incubator(agentTracer.spanBuilder(spanName)); } @Override public boolean isEnabled() { - return ((io.opentelemetry.api.incubator.trace.ExtendedTracer) agentTracer).isEnabled(); + return ((ExtendedTracer) agentTracer).isEnabled(); } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.42/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_42/incubator/logs/ApplicationLogger142Incubator.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.42/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_42/incubator/logs/ApplicationLogger142Incubator.java index b265a80c1aeb..93a349df4713 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.42/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_42/incubator/logs/ApplicationLogger142Incubator.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.42/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_42/incubator/logs/ApplicationLogger142Incubator.java @@ -5,21 +5,21 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_42.incubator.logs; -import application.io.opentelemetry.api.logs.LogRecordBuilder; +import io.opentelemetry.api.logs.Logger; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_40.incubator.logs.ApplicationLogger140Incubator; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_42.logs.ApplicationLogRecordBuilder142; class ApplicationLogger142Incubator extends ApplicationLogger140Incubator { - private final io.opentelemetry.api.logs.Logger agentLogger; + private final Logger agentLogger; - ApplicationLogger142Incubator(io.opentelemetry.api.logs.Logger agentLogger) { + ApplicationLogger142Incubator(Logger agentLogger) { super(agentLogger); this.agentLogger = agentLogger; } @Override - public LogRecordBuilder logRecordBuilder() { + public application.io.opentelemetry.api.logs.LogRecordBuilder logRecordBuilder() { return new ApplicationLogRecordBuilder142(agentLogger.logRecordBuilder()); } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.42/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_42/logs/ApplicationLogRecordBuilder142.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.42/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_42/logs/ApplicationLogRecordBuilder142.java index cbdcb0f98e79..b37b10f78a27 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.42/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_42/logs/ApplicationLogRecordBuilder142.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.42/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_42/logs/ApplicationLogRecordBuilder142.java @@ -5,65 +5,65 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_42.logs; -import application.io.opentelemetry.api.common.KeyValue; -import application.io.opentelemetry.api.common.Value; -import application.io.opentelemetry.api.logs.LogRecordBuilder; +import io.opentelemetry.api.common.KeyValue; +import io.opentelemetry.api.common.Value; +import io.opentelemetry.api.logs.LogRecordBuilder; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_27.logs.ApplicationLogRecordBuilder; import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.List; public class ApplicationLogRecordBuilder142 extends ApplicationLogRecordBuilder - implements LogRecordBuilder { + implements application.io.opentelemetry.api.logs.LogRecordBuilder { - private final io.opentelemetry.api.logs.LogRecordBuilder agentLogRecordBuilder; + private final LogRecordBuilder agentLogRecordBuilder; - public ApplicationLogRecordBuilder142( - io.opentelemetry.api.logs.LogRecordBuilder agentLogRecordBuilder) { + public ApplicationLogRecordBuilder142(LogRecordBuilder agentLogRecordBuilder) { super(agentLogRecordBuilder); this.agentLogRecordBuilder = agentLogRecordBuilder; } @Override - public LogRecordBuilder setBody(Value body) { + public application.io.opentelemetry.api.logs.LogRecordBuilder setBody( + application.io.opentelemetry.api.common.Value body) { agentLogRecordBuilder.setBody(convertValue(body)); return this; } - protected static io.opentelemetry.api.common.Value convertValue(Value value) { + protected static Value convertValue(application.io.opentelemetry.api.common.Value value) { if (value == null) { return null; } switch (value.getType()) { case STRING: - return io.opentelemetry.api.common.Value.of((String) value.getValue()); + return Value.of((String) value.getValue()); case BOOLEAN: - return io.opentelemetry.api.common.Value.of((Boolean) value.getValue()); + return Value.of((Boolean) value.getValue()); case LONG: - return io.opentelemetry.api.common.Value.of((Long) value.getValue()); + return Value.of((Long) value.getValue()); case DOUBLE: - return io.opentelemetry.api.common.Value.of((Double) value.getValue()); + return Value.of((Double) value.getValue()); case ARRAY: @SuppressWarnings("unchecked") // type is checked before casting - List> values = (List>) value.getValue(); - List> convertedValues = new ArrayList<>(); - for (Value source : values) { + List> values = + (List>) value.getValue(); + List> convertedValues = new ArrayList<>(); + for (application.io.opentelemetry.api.common.Value source : values) { convertedValues.add(convertValue(source)); } - return io.opentelemetry.api.common.Value.of(convertedValues); + return Value.of(convertedValues); case KEY_VALUE_LIST: @SuppressWarnings("unchecked") // type is checked before casting - List keyValueList = (List) value.getValue(); - io.opentelemetry.api.common.KeyValue[] convertedKeyValueList = - new io.opentelemetry.api.common.KeyValue[keyValueList.size()]; + List keyValueList = + (List) value.getValue(); + KeyValue[] convertedKeyValueList = new KeyValue[keyValueList.size()]; int i = 0; - for (KeyValue source : keyValueList) { + for (application.io.opentelemetry.api.common.KeyValue source : keyValueList) { convertedKeyValueList[i++] = - io.opentelemetry.api.common.KeyValue.of( - source.getKey(), convertValue(source.getValue())); + KeyValue.of(source.getKey(), convertValue(source.getValue())); } - return io.opentelemetry.api.common.Value.of(convertedKeyValueList); + return Value.of(convertedKeyValueList); case BYTES: ByteBuffer byteBuffer = (ByteBuffer) value.getValue(); byte[] bytes = new byte[byteBuffer.remaining()]; diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.42/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_42/logs/ApplicationLogger142.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.42/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_42/logs/ApplicationLogger142.java index e702b600217b..7cb329e83bd8 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.42/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_42/logs/ApplicationLogger142.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.42/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_42/logs/ApplicationLogger142.java @@ -5,20 +5,20 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_42.logs; -import application.io.opentelemetry.api.logs.LogRecordBuilder; +import io.opentelemetry.api.logs.Logger; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_27.logs.ApplicationLogger; class ApplicationLogger142 extends ApplicationLogger { - private final io.opentelemetry.api.logs.Logger agentLogger; + private final Logger agentLogger; - ApplicationLogger142(io.opentelemetry.api.logs.Logger agentLogger) { + ApplicationLogger142(Logger agentLogger) { super(agentLogger); this.agentLogger = agentLogger; } @Override - public LogRecordBuilder logRecordBuilder() { + public application.io.opentelemetry.api.logs.LogRecordBuilder logRecordBuilder() { return new ApplicationLogRecordBuilder142(agentLogger.logRecordBuilder()); } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.47/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_47/incubator/logs/ApplicationLogRecordBuilder147Incubator.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.47/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_47/incubator/logs/ApplicationLogRecordBuilder147Incubator.java index aa9823cada4d..4bc5e085b6df 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.47/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_47/incubator/logs/ApplicationLogRecordBuilder147Incubator.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.47/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_47/incubator/logs/ApplicationLogRecordBuilder147Incubator.java @@ -5,24 +5,24 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_47.incubator.logs; -import application.io.opentelemetry.api.incubator.logs.ExtendedLogRecordBuilder; +import io.opentelemetry.api.incubator.logs.ExtendedLogRecordBuilder; +import io.opentelemetry.api.logs.LogRecordBuilder; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_42.logs.ApplicationLogRecordBuilder142; public class ApplicationLogRecordBuilder147Incubator extends ApplicationLogRecordBuilder142 - implements ExtendedLogRecordBuilder { + implements application.io.opentelemetry.api.incubator.logs.ExtendedLogRecordBuilder { - private final io.opentelemetry.api.logs.LogRecordBuilder agentLogRecordBuilder; + private final LogRecordBuilder agentLogRecordBuilder; - ApplicationLogRecordBuilder147Incubator( - io.opentelemetry.api.logs.LogRecordBuilder agentLogRecordBuilder) { + ApplicationLogRecordBuilder147Incubator(LogRecordBuilder agentLogRecordBuilder) { super(agentLogRecordBuilder); this.agentLogRecordBuilder = agentLogRecordBuilder; } @Override - public ExtendedLogRecordBuilder setEventName(String eventName) { - ((io.opentelemetry.api.incubator.logs.ExtendedLogRecordBuilder) agentLogRecordBuilder) - .setEventName(eventName); + public application.io.opentelemetry.api.incubator.logs.ExtendedLogRecordBuilder setEventName( + String eventName) { + ((ExtendedLogRecordBuilder) agentLogRecordBuilder).setEventName(eventName); return this; } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.47/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_47/incubator/logs/ApplicationLogger147Incubator.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.47/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_47/incubator/logs/ApplicationLogger147Incubator.java index f0440ba49e5c..760e7be160b7 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.47/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_47/incubator/logs/ApplicationLogger147Incubator.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.47/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_47/incubator/logs/ApplicationLogger147Incubator.java @@ -5,28 +5,29 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_47.incubator.logs; -import application.io.opentelemetry.api.incubator.logs.ExtendedLogRecordBuilder; -import application.io.opentelemetry.api.incubator.logs.ExtendedLogger; +import io.opentelemetry.api.incubator.logs.ExtendedLogger; +import io.opentelemetry.api.logs.Logger; import io.opentelemetry.api.logs.Severity; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_27.logs.ApplicationLogger; -class ApplicationLogger147Incubator extends ApplicationLogger implements ExtendedLogger { +class ApplicationLogger147Incubator extends ApplicationLogger + implements application.io.opentelemetry.api.incubator.logs.ExtendedLogger { - private final io.opentelemetry.api.logs.Logger agentLogger; + private final Logger agentLogger; - ApplicationLogger147Incubator(io.opentelemetry.api.logs.Logger agentLogger) { + ApplicationLogger147Incubator(Logger agentLogger) { super(agentLogger); this.agentLogger = agentLogger; } @Override public boolean isEnabled() { - return ((io.opentelemetry.api.incubator.logs.ExtendedLogger) agentLogger) - .isEnabled(Severity.UNDEFINED_SEVERITY_NUMBER); + return ((ExtendedLogger) agentLogger).isEnabled(Severity.UNDEFINED_SEVERITY_NUMBER); } @Override - public ExtendedLogRecordBuilder logRecordBuilder() { + public application.io.opentelemetry.api.incubator.logs.ExtendedLogRecordBuilder + logRecordBuilder() { return new ApplicationLogRecordBuilder147Incubator(agentLogger.logRecordBuilder()); } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.47/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_47/incubator/trace/ApplicationTracer147Incubator.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.47/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_47/incubator/trace/ApplicationTracer147Incubator.java index 93fe283622ae..89d6513c874e 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.47/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_47/incubator/trace/ApplicationTracer147Incubator.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.47/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_47/incubator/trace/ApplicationTracer147Incubator.java @@ -5,13 +5,13 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_47.incubator.trace; -import application.io.opentelemetry.api.incubator.trace.ExtendedSpanBuilder; -import application.io.opentelemetry.api.incubator.trace.ExtendedTracer; +import io.opentelemetry.api.incubator.trace.ExtendedTracer; import io.opentelemetry.api.trace.Tracer; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.trace.ApplicationTracer; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_40.incubator.trace.ApplicationSpanBuilder140Incubator; -final class ApplicationTracer147Incubator extends ApplicationTracer implements ExtendedTracer { +final class ApplicationTracer147Incubator extends ApplicationTracer + implements application.io.opentelemetry.api.incubator.trace.ExtendedTracer { private final Tracer agentTracer; @@ -21,12 +21,13 @@ final class ApplicationTracer147Incubator extends ApplicationTracer implements E } @Override - public ExtendedSpanBuilder spanBuilder(String spanName) { + public application.io.opentelemetry.api.incubator.trace.ExtendedSpanBuilder spanBuilder( + String spanName) { return new ApplicationSpanBuilder140Incubator(agentTracer.spanBuilder(spanName)); } @Override public boolean isEnabled() { - return ((io.opentelemetry.api.incubator.trace.ExtendedTracer) agentTracer).isEnabled(); + return ((ExtendedTracer) agentTracer).isEnabled(); } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.50/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_50/incubator/logs/ApplicationLogRecordBuilder150Incubator.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.50/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_50/incubator/logs/ApplicationLogRecordBuilder150Incubator.java index 09dc9320be80..5687fbeb7435 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.50/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_50/incubator/logs/ApplicationLogRecordBuilder150Incubator.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.50/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_50/incubator/logs/ApplicationLogRecordBuilder150Incubator.java @@ -8,14 +8,11 @@ import static application.io.opentelemetry.api.incubator.common.ExtendedAttributeType.EXTENDED_ATTRIBUTES; import static java.util.logging.Level.FINE; -import application.io.opentelemetry.api.common.AttributeKey; -import application.io.opentelemetry.api.common.Attributes; -import application.io.opentelemetry.api.common.Value; -import application.io.opentelemetry.api.incubator.common.ExtendedAttributeKey; -import application.io.opentelemetry.api.incubator.common.ExtendedAttributes; -import application.io.opentelemetry.api.incubator.logs.ExtendedLogRecordBuilder; -import application.io.opentelemetry.api.logs.Severity; -import application.io.opentelemetry.context.Context; +import io.opentelemetry.api.incubator.common.ExtendedAttributeKey; +import io.opentelemetry.api.incubator.common.ExtendedAttributes; +import io.opentelemetry.api.incubator.common.ExtendedAttributesBuilder; +import io.opentelemetry.api.incubator.logs.ExtendedLogRecordBuilder; +import io.opentelemetry.api.logs.LogRecordBuilder; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.context.AgentContextStorage; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.trace.Bridging; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_27.logs.LogBridging; @@ -26,105 +23,120 @@ import javax.annotation.Nullable; public class ApplicationLogRecordBuilder150Incubator extends ApplicationLogRecordBuilder150 - implements ExtendedLogRecordBuilder { + implements application.io.opentelemetry.api.incubator.logs.ExtendedLogRecordBuilder { private static final Logger logger = Logger.getLogger(ApplicationLogRecordBuilder150Incubator.class.getName()); - private final io.opentelemetry.api.incubator.logs.ExtendedLogRecordBuilder agentLogRecordBuilder; + private final ExtendedLogRecordBuilder agentLogRecordBuilder; - ApplicationLogRecordBuilder150Incubator( - io.opentelemetry.api.logs.LogRecordBuilder agentLogRecordBuilder) { + ApplicationLogRecordBuilder150Incubator(LogRecordBuilder agentLogRecordBuilder) { super(agentLogRecordBuilder); - this.agentLogRecordBuilder = - (io.opentelemetry.api.incubator.logs.ExtendedLogRecordBuilder) agentLogRecordBuilder; + this.agentLogRecordBuilder = (ExtendedLogRecordBuilder) agentLogRecordBuilder; } @Override - public ExtendedLogRecordBuilder setEventName(String eventName) { + public application.io.opentelemetry.api.incubator.logs.ExtendedLogRecordBuilder setEventName( + String eventName) { agentLogRecordBuilder.setEventName(eventName); return this; } @Override - public ExtendedLogRecordBuilder setTimestamp(long timestamp, TimeUnit unit) { + public application.io.opentelemetry.api.incubator.logs.ExtendedLogRecordBuilder setTimestamp( + long timestamp, TimeUnit unit) { agentLogRecordBuilder.setTimestamp(timestamp, unit); return this; } @Override - public ExtendedLogRecordBuilder setTimestamp(Instant instant) { + public application.io.opentelemetry.api.incubator.logs.ExtendedLogRecordBuilder setTimestamp( + Instant instant) { agentLogRecordBuilder.setTimestamp(instant); return this; } @Override - public ExtendedLogRecordBuilder setObservedTimestamp(long timestamp, TimeUnit unit) { + public application.io.opentelemetry.api.incubator.logs.ExtendedLogRecordBuilder + setObservedTimestamp(long timestamp, TimeUnit unit) { agentLogRecordBuilder.setObservedTimestamp(timestamp, unit); return this; } @Override - public ExtendedLogRecordBuilder setObservedTimestamp(Instant instant) { + public application.io.opentelemetry.api.incubator.logs.ExtendedLogRecordBuilder + setObservedTimestamp(Instant instant) { agentLogRecordBuilder.setObservedTimestamp(instant); return this; } @Override - public ExtendedLogRecordBuilder setContext(Context applicationContext) { + public application.io.opentelemetry.api.incubator.logs.ExtendedLogRecordBuilder setContext( + application.io.opentelemetry.context.Context applicationContext) { agentLogRecordBuilder.setContext(AgentContextStorage.getAgentContext(applicationContext)); return this; } @Override - public ExtendedLogRecordBuilder setSeverity(Severity severity) { + public application.io.opentelemetry.api.incubator.logs.ExtendedLogRecordBuilder setSeverity( + application.io.opentelemetry.api.logs.Severity severity) { agentLogRecordBuilder.setSeverity(LogBridging.toAgent(severity)); return this; } @Override - public ExtendedLogRecordBuilder setSeverityText(String severityText) { + public application.io.opentelemetry.api.incubator.logs.ExtendedLogRecordBuilder setSeverityText( + String severityText) { agentLogRecordBuilder.setSeverityText(severityText); return this; } @Override - public ExtendedLogRecordBuilder setBody(String body) { + public application.io.opentelemetry.api.incubator.logs.ExtendedLogRecordBuilder setBody( + String body) { agentLogRecordBuilder.setBody(body); return this; } @Override - public ExtendedLogRecordBuilder setBody(Value body) { + public application.io.opentelemetry.api.incubator.logs.ExtendedLogRecordBuilder setBody( + application.io.opentelemetry.api.common.Value body) { agentLogRecordBuilder.setBody(convertValue(body)); return this; } @Override - public ExtendedLogRecordBuilder setAllAttributes(Attributes applicationAttributes) { + public application.io.opentelemetry.api.incubator.logs.ExtendedLogRecordBuilder setAllAttributes( + application.io.opentelemetry.api.common.Attributes applicationAttributes) { agentLogRecordBuilder.setAllAttributes(Bridging.toAgent(applicationAttributes)); return this; } @Override - public ExtendedLogRecordBuilder setAllAttributes(ExtendedAttributes attributes) { + public application.io.opentelemetry.api.incubator.logs.ExtendedLogRecordBuilder setAllAttributes( + application.io.opentelemetry.api.incubator.common.ExtendedAttributes attributes) { agentLogRecordBuilder.setAllAttributes(convertExtendedAttributes(attributes)); return this; } @Override - public ExtendedLogRecordBuilder setAttribute(AttributeKey key, @Nullable T value) { - return (ExtendedLogRecordBuilder) super.setAttribute(key, value); + public application.io.opentelemetry.api.incubator.logs.ExtendedLogRecordBuilder setAttribute( + application.io.opentelemetry.api.common.AttributeKey key, @Nullable T value) { + return (application.io.opentelemetry.api.incubator.logs.ExtendedLogRecordBuilder) + super.setAttribute(key, value); } @Override @SuppressWarnings("unchecked") // converting ExtendedAttributeKey loses generic type - public ExtendedLogRecordBuilder setAttribute(ExtendedAttributeKey key, T value) { - io.opentelemetry.api.incubator.common.ExtendedAttributeKey agentKey = - convertExtendedAttributeKey(key); + public application.io.opentelemetry.api.incubator.logs.ExtendedLogRecordBuilder setAttribute( + application.io.opentelemetry.api.incubator.common.ExtendedAttributeKey key, T value) { + ExtendedAttributeKey agentKey = convertExtendedAttributeKey(key); if (agentKey != null) { if (key.getType() == EXTENDED_ATTRIBUTES) { // this cast is safe because T is ExtendedAttributes in this case - value = (T) convertExtendedAttributes((ExtendedAttributes) value); + value = + (T) + convertExtendedAttributes( + (application.io.opentelemetry.api.incubator.common.ExtendedAttributes) value); } agentLogRecordBuilder.setAttribute(agentKey, value); } @@ -132,23 +144,24 @@ public ExtendedLogRecordBuilder setAttribute(ExtendedAttributeKey key, T } @Override - public ExtendedLogRecordBuilder setException(Throwable throwable) { + public application.io.opentelemetry.api.incubator.logs.ExtendedLogRecordBuilder setException( + Throwable throwable) { agentLogRecordBuilder.setException(throwable); return this; } @SuppressWarnings({"unchecked", "rawtypes"}) // converting ExtendedAttributeKey loses generic type - private static io.opentelemetry.api.incubator.common.ExtendedAttributes convertExtendedAttributes( - ExtendedAttributes applicationAttributes) { - io.opentelemetry.api.incubator.common.ExtendedAttributesBuilder agentAttributes = - io.opentelemetry.api.incubator.common.ExtendedAttributes.builder(); + private static ExtendedAttributes convertExtendedAttributes( + application.io.opentelemetry.api.incubator.common.ExtendedAttributes applicationAttributes) { + ExtendedAttributesBuilder agentAttributes = ExtendedAttributes.builder(); applicationAttributes.forEach( (key, value) -> { - io.opentelemetry.api.incubator.common.ExtendedAttributeKey agentKey = - convertExtendedAttributeKey(key); + ExtendedAttributeKey agentKey = convertExtendedAttributeKey(key); if (agentKey != null) { if (key.getType() == EXTENDED_ATTRIBUTES) { - value = convertExtendedAttributes((ExtendedAttributes) value); + value = + convertExtendedAttributes( + (application.io.opentelemetry.api.incubator.common.ExtendedAttributes) value); } agentAttributes.put(agentKey, value); } @@ -160,36 +173,27 @@ private static io.opentelemetry.api.incubator.common.ExtendedAttributes convertE "rawtypes", // converting ExtendedAttributeKey loses generic type "deprecation" // need to support applications still using EXTENDED_ATTRIBUTES }) - private static io.opentelemetry.api.incubator.common.ExtendedAttributeKey - convertExtendedAttributeKey(ExtendedAttributeKey applicationKey) { + private static ExtendedAttributeKey convertExtendedAttributeKey( + application.io.opentelemetry.api.incubator.common.ExtendedAttributeKey applicationKey) { switch (applicationKey.getType()) { case STRING: - return io.opentelemetry.api.incubator.common.ExtendedAttributeKey.stringKey( - applicationKey.getKey()); + return ExtendedAttributeKey.stringKey(applicationKey.getKey()); case BOOLEAN: - return io.opentelemetry.api.incubator.common.ExtendedAttributeKey.booleanKey( - applicationKey.getKey()); + return ExtendedAttributeKey.booleanKey(applicationKey.getKey()); case LONG: - return io.opentelemetry.api.incubator.common.ExtendedAttributeKey.longKey( - applicationKey.getKey()); + return ExtendedAttributeKey.longKey(applicationKey.getKey()); case DOUBLE: - return io.opentelemetry.api.incubator.common.ExtendedAttributeKey.doubleKey( - applicationKey.getKey()); + return ExtendedAttributeKey.doubleKey(applicationKey.getKey()); case STRING_ARRAY: - return io.opentelemetry.api.incubator.common.ExtendedAttributeKey.stringArrayKey( - applicationKey.getKey()); + return ExtendedAttributeKey.stringArrayKey(applicationKey.getKey()); case BOOLEAN_ARRAY: - return io.opentelemetry.api.incubator.common.ExtendedAttributeKey.booleanArrayKey( - applicationKey.getKey()); + return ExtendedAttributeKey.booleanArrayKey(applicationKey.getKey()); case LONG_ARRAY: - return io.opentelemetry.api.incubator.common.ExtendedAttributeKey.longArrayKey( - applicationKey.getKey()); + return ExtendedAttributeKey.longArrayKey(applicationKey.getKey()); case DOUBLE_ARRAY: - return io.opentelemetry.api.incubator.common.ExtendedAttributeKey.doubleArrayKey( - applicationKey.getKey()); + return ExtendedAttributeKey.doubleArrayKey(applicationKey.getKey()); case EXTENDED_ATTRIBUTES: - return io.opentelemetry.api.incubator.common.ExtendedAttributeKey.extendedAttributesKey( - applicationKey.getKey()); + return ExtendedAttributeKey.extendedAttributesKey(applicationKey.getKey()); } logger.log(FINE, "unexpected attribute key type: {0}", applicationKey.getType()); return null; diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.50/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_50/incubator/logs/ApplicationLogger150Incubator.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.50/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_50/incubator/logs/ApplicationLogger150Incubator.java index 6265e6f466c3..3e49494df769 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.50/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_50/incubator/logs/ApplicationLogger150Incubator.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.50/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_50/incubator/logs/ApplicationLogger150Incubator.java @@ -5,28 +5,29 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_50.incubator.logs; -import application.io.opentelemetry.api.incubator.logs.ExtendedLogRecordBuilder; -import application.io.opentelemetry.api.incubator.logs.ExtendedLogger; +import io.opentelemetry.api.incubator.logs.ExtendedLogger; +import io.opentelemetry.api.logs.Logger; import io.opentelemetry.api.logs.Severity; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_27.logs.ApplicationLogger; -public class ApplicationLogger150Incubator extends ApplicationLogger implements ExtendedLogger { +public class ApplicationLogger150Incubator extends ApplicationLogger + implements application.io.opentelemetry.api.incubator.logs.ExtendedLogger { - private final io.opentelemetry.api.logs.Logger agentLogger; + private final Logger agentLogger; - public ApplicationLogger150Incubator(io.opentelemetry.api.logs.Logger agentLogger) { + public ApplicationLogger150Incubator(Logger agentLogger) { super(agentLogger); this.agentLogger = agentLogger; } @Override public boolean isEnabled() { - return ((io.opentelemetry.api.incubator.logs.ExtendedLogger) agentLogger) - .isEnabled(Severity.UNDEFINED_SEVERITY_NUMBER); + return ((ExtendedLogger) agentLogger).isEnabled(Severity.UNDEFINED_SEVERITY_NUMBER); } @Override - public ExtendedLogRecordBuilder logRecordBuilder() { + public application.io.opentelemetry.api.incubator.logs.ExtendedLogRecordBuilder + logRecordBuilder() { return new ApplicationLogRecordBuilder150Incubator(agentLogger.logRecordBuilder()); } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.50/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_50/logs/ApplicationLogRecordBuilder150.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.50/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_50/logs/ApplicationLogRecordBuilder150.java index 7a78f78a2e65..730236f6af4a 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.50/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_50/logs/ApplicationLogRecordBuilder150.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.50/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_50/logs/ApplicationLogRecordBuilder150.java @@ -5,22 +5,21 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_50.logs; -import application.io.opentelemetry.api.logs.LogRecordBuilder; +import io.opentelemetry.api.logs.LogRecordBuilder; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_42.logs.ApplicationLogRecordBuilder142; public class ApplicationLogRecordBuilder150 extends ApplicationLogRecordBuilder142 - implements LogRecordBuilder { + implements application.io.opentelemetry.api.logs.LogRecordBuilder { - private final io.opentelemetry.api.logs.LogRecordBuilder agentLogRecordBuilder; + private final LogRecordBuilder agentLogRecordBuilder; - protected ApplicationLogRecordBuilder150( - io.opentelemetry.api.logs.LogRecordBuilder agentLogRecordBuilder) { + protected ApplicationLogRecordBuilder150(LogRecordBuilder agentLogRecordBuilder) { super(agentLogRecordBuilder); this.agentLogRecordBuilder = agentLogRecordBuilder; } @Override - public LogRecordBuilder setEventName(String eventName) { + public application.io.opentelemetry.api.logs.LogRecordBuilder setEventName(String eventName) { agentLogRecordBuilder.setEventName(eventName); return this; } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.50/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_50/logs/ApplicationLogger150.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.50/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_50/logs/ApplicationLogger150.java index 9556af85a944..ba8ebd022a7f 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.50/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_50/logs/ApplicationLogger150.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.50/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_50/logs/ApplicationLogger150.java @@ -5,20 +5,20 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_50.logs; -import application.io.opentelemetry.api.logs.LogRecordBuilder; +import io.opentelemetry.api.logs.Logger; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_27.logs.ApplicationLogger; class ApplicationLogger150 extends ApplicationLogger { - private final io.opentelemetry.api.logs.Logger agentLogger; + private final Logger agentLogger; - ApplicationLogger150(io.opentelemetry.api.logs.Logger agentLogger) { + ApplicationLogger150(Logger agentLogger) { super(agentLogger); this.agentLogger = agentLogger; } @Override - public LogRecordBuilder logRecordBuilder() { + public application.io.opentelemetry.api.logs.LogRecordBuilder logRecordBuilder() { return new ApplicationLogRecordBuilder150(agentLogger.logRecordBuilder()); } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.52/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_52/incubator/logs/ApplicationLogger152Incubator.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.52/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_52/incubator/logs/ApplicationLogger152Incubator.java index 21044d19dbc8..0e5318bf6a63 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.52/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_52/incubator/logs/ApplicationLogger152Incubator.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.52/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_52/incubator/logs/ApplicationLogger152Incubator.java @@ -5,32 +5,33 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_52.incubator.logs; -import application.io.opentelemetry.api.incubator.logs.ExtendedLogger; -import application.io.opentelemetry.api.logs.Severity; -import application.io.opentelemetry.context.Context; +import io.opentelemetry.api.incubator.logs.ExtendedLogger; +import io.opentelemetry.api.logs.Logger; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.context.AgentContextStorage; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_27.logs.LogBridging; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_50.incubator.logs.ApplicationLogger150Incubator; @SuppressWarnings("deprecation") // isEnabled() in ExtendedLogger has been deprecated class ApplicationLogger152Incubator extends ApplicationLogger150Incubator - implements ExtendedLogger { + implements application.io.opentelemetry.api.incubator.logs.ExtendedLogger { - private final io.opentelemetry.api.incubator.logs.ExtendedLogger agentLogger; + private final ExtendedLogger agentLogger; - ApplicationLogger152Incubator(io.opentelemetry.api.logs.Logger agentLogger) { + ApplicationLogger152Incubator(Logger agentLogger) { super(agentLogger); - this.agentLogger = (io.opentelemetry.api.incubator.logs.ExtendedLogger) agentLogger; + this.agentLogger = (ExtendedLogger) agentLogger; } @Override - public boolean isEnabled(Severity severity, Context applicationContext) { + public boolean isEnabled( + application.io.opentelemetry.api.logs.Severity severity, + application.io.opentelemetry.context.Context applicationContext) { return agentLogger.isEnabled( LogBridging.toAgent(severity), AgentContextStorage.getAgentContext(applicationContext)); } @Override - public boolean isEnabled(Severity severity) { + public boolean isEnabled(application.io.opentelemetry.api.logs.Severity severity) { return agentLogger.isEnabled(LogBridging.toAgent(severity)); } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.56/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_56/incubator/ApplicationOpenTelemetry156Incubator.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.56/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_56/incubator/ApplicationOpenTelemetry156Incubator.java index fff94b8f092b..221419c27b48 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.56/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_56/incubator/ApplicationOpenTelemetry156Incubator.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.56/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_56/incubator/ApplicationOpenTelemetry156Incubator.java @@ -5,42 +5,40 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_56.incubator; -import application.io.opentelemetry.api.OpenTelemetry; -import application.io.opentelemetry.api.incubator.ExtendedOpenTelemetry; -import application.io.opentelemetry.api.incubator.config.ConfigProvider; import io.opentelemetry.api.GlobalOpenTelemetry; +import io.opentelemetry.api.OpenTelemetry; +import io.opentelemetry.api.incubator.ExtendedOpenTelemetry; +import io.opentelemetry.api.incubator.config.ConfigProvider; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_27.ApplicationOpenTelemetry127; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_56.incubator.config.ApplicationConfigProvider156Incubator; import javax.annotation.Nullable; public final class ApplicationOpenTelemetry156Incubator extends ApplicationOpenTelemetry127 - implements ExtendedOpenTelemetry { + implements application.io.opentelemetry.api.incubator.ExtendedOpenTelemetry { // Accessed with reflection @Nullable @SuppressWarnings("unused") - public static final OpenTelemetry INSTANCE = create(); + public static final application.io.opentelemetry.api.OpenTelemetry INSTANCE = create(); - private final ConfigProvider configProvider; + private final application.io.opentelemetry.api.incubator.config.ConfigProvider configProvider; @Nullable private static ApplicationOpenTelemetry156Incubator create() { - io.opentelemetry.api.OpenTelemetry openTelemetry = GlobalOpenTelemetry.get(); - if (openTelemetry instanceof io.opentelemetry.api.incubator.ExtendedOpenTelemetry) { + OpenTelemetry openTelemetry = GlobalOpenTelemetry.get(); + if (openTelemetry instanceof ExtendedOpenTelemetry) { return new ApplicationOpenTelemetry156Incubator( - ((io.opentelemetry.api.incubator.ExtendedOpenTelemetry) openTelemetry) - .getConfigProvider()); + ((ExtendedOpenTelemetry) openTelemetry).getConfigProvider()); } return null; } - public ApplicationOpenTelemetry156Incubator( - io.opentelemetry.api.incubator.config.ConfigProvider configProvider) { + public ApplicationOpenTelemetry156Incubator(ConfigProvider configProvider) { this.configProvider = new ApplicationConfigProvider156Incubator(configProvider); } @Override - public ConfigProvider getConfigProvider() { + public application.io.opentelemetry.api.incubator.config.ConfigProvider getConfigProvider() { return configProvider; } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.56/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_56/incubator/config/ApplicationConfigProvider156Incubator.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.56/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_56/incubator/config/ApplicationConfigProvider156Incubator.java index 9165adde7019..217b4f457a7e 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.56/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_56/incubator/config/ApplicationConfigProvider156Incubator.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.56/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_56/incubator/config/ApplicationConfigProvider156Incubator.java @@ -5,16 +5,16 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_56.incubator.config; -import application.io.opentelemetry.api.incubator.config.ConfigProvider; -import application.io.opentelemetry.api.incubator.config.DeclarativeConfigProperties; +import io.opentelemetry.api.incubator.config.ConfigProvider; import javax.annotation.Nullable; -public final class ApplicationConfigProvider156Incubator implements ConfigProvider { +public final class ApplicationConfigProvider156Incubator + implements application.io.opentelemetry.api.incubator.config.ConfigProvider { - private final DeclarativeConfigProperties declarativeConfigProperties; + private final application.io.opentelemetry.api.incubator.config.DeclarativeConfigProperties + declarativeConfigProperties; - public ApplicationConfigProvider156Incubator( - io.opentelemetry.api.incubator.config.ConfigProvider configProvider) { + public ApplicationConfigProvider156Incubator(ConfigProvider configProvider) { this.declarativeConfigProperties = new ApplicationDeclarativeConfigProperties156Incubator( configProvider.getInstrumentationConfig()); @@ -22,7 +22,8 @@ public ApplicationConfigProvider156Incubator( @Nullable @Override - public DeclarativeConfigProperties getInstrumentationConfig() { + public application.io.opentelemetry.api.incubator.config.DeclarativeConfigProperties + getInstrumentationConfig() { return declarativeConfigProperties; } } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.56/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_56/incubator/config/ApplicationDeclarativeConfigProperties156Incubator.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.56/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_56/incubator/config/ApplicationDeclarativeConfigProperties156Incubator.java index 73e84975b85f..69d219799e7e 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.56/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_56/incubator/config/ApplicationDeclarativeConfigProperties156Incubator.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.56/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_56/incubator/config/ApplicationDeclarativeConfigProperties156Incubator.java @@ -5,21 +5,18 @@ package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_56.incubator.config; -import application.io.opentelemetry.api.incubator.config.DeclarativeConfigException; -import application.io.opentelemetry.api.incubator.config.DeclarativeConfigProperties; -import application.io.opentelemetry.common.ComponentLoader; +import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties; import java.util.List; import java.util.Set; import java.util.stream.Collectors; import javax.annotation.Nullable; public final class ApplicationDeclarativeConfigProperties156Incubator - implements DeclarativeConfigProperties { - private final io.opentelemetry.api.incubator.config.DeclarativeConfigProperties - instrumentationConfig; + implements application.io.opentelemetry.api.incubator.config.DeclarativeConfigProperties { + private final DeclarativeConfigProperties instrumentationConfig; public ApplicationDeclarativeConfigProperties156Incubator( - io.opentelemetry.api.incubator.config.DeclarativeConfigProperties instrumentationConfig) { + DeclarativeConfigProperties instrumentationConfig) { this.instrumentationConfig = instrumentationConfig; } @@ -91,16 +88,17 @@ public List getScalarList(String name, Class scalarType, List defau @Nullable @Override - public DeclarativeConfigProperties getStructured(String name) { - io.opentelemetry.api.incubator.config.DeclarativeConfigProperties config = - instrumentationConfig.getStructured(name); + public application.io.opentelemetry.api.incubator.config.DeclarativeConfigProperties + getStructured(String name) { + DeclarativeConfigProperties config = instrumentationConfig.getStructured(name); return config == null ? null : new ApplicationDeclarativeConfigProperties156Incubator(config); } @Nullable @Override - public List getStructuredList(String name) { - List structuredList = + public List + getStructuredList(String name) { + List structuredList = instrumentationConfig.getStructuredList(name); if (structuredList == null) { return null; @@ -117,8 +115,8 @@ public Set getPropertyKeys() { } @Override - public ComponentLoader getComponentLoader() { - throw new DeclarativeConfigException( + public application.io.opentelemetry.common.ComponentLoader getComponentLoader() { + throw new application.io.opentelemetry.api.incubator.config.DeclarativeConfigException( "getComponentLoader is not supported in application code. " + "It is only used to set up the OpenTelemetry SDK in the agent."); } diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.59/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_59/ValueBridging159.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.59/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_59/ValueBridging159.java index 3e4ff9dfd013..bfd9c5e8e453 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.59/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_59/ValueBridging159.java +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.59/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_59/ValueBridging159.java @@ -7,9 +7,8 @@ import static java.util.logging.Level.FINE; -import application.io.opentelemetry.api.common.KeyValue; -import application.io.opentelemetry.api.common.Value; -import application.io.opentelemetry.api.common.ValueType; +import io.opentelemetry.api.common.KeyValue; +import io.opentelemetry.api.common.Value; import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.List; @@ -37,67 +36,69 @@ private static Object toAgentValue(@Nullable Object applicationValue) { if (applicationValue == null) { return null; } - if (!(applicationValue instanceof Value)) { - logger.log(FINE, "Expected Value but got: {0}", applicationValue.getClass().getName()); + if (!(applicationValue instanceof application.io.opentelemetry.api.common.Value)) { + logger.log( + FINE, + "Expected application.io.opentelemetry.api.common.Value but got: {0}", + applicationValue.getClass().getName()); return null; } - return convertValue((Value) applicationValue); + return convertValue((application.io.opentelemetry.api.common.Value) applicationValue); } // Unchecked casts are safe because we switch on the type and cast accordingly @SuppressWarnings("unchecked") @Nullable - private static io.opentelemetry.api.common.Value convertValue(Value applicationValue) { - ValueType type = applicationValue.getType(); + private static Value convertValue( + application.io.opentelemetry.api.common.Value applicationValue) { + application.io.opentelemetry.api.common.ValueType type = applicationValue.getType(); switch (type) { case STRING: - return io.opentelemetry.api.common.Value.of((String) applicationValue.getValue()); + return Value.of((String) applicationValue.getValue()); case BOOLEAN: - return io.opentelemetry.api.common.Value.of((Boolean) applicationValue.getValue()); + return Value.of((Boolean) applicationValue.getValue()); case LONG: - return io.opentelemetry.api.common.Value.of((Long) applicationValue.getValue()); + return Value.of((Long) applicationValue.getValue()); case DOUBLE: - return io.opentelemetry.api.common.Value.of((Double) applicationValue.getValue()); + return Value.of((Double) applicationValue.getValue()); case BYTES: ByteBuffer buffer = (ByteBuffer) applicationValue.getValue(); byte[] bytes = new byte[buffer.remaining()]; buffer.get(bytes); - return io.opentelemetry.api.common.Value.of(bytes); + return Value.of(bytes); case ARRAY: - List> applicationArray = (List>) applicationValue.getValue(); - List> agentArray = new ArrayList<>(); - for (Value element : applicationArray) { - io.opentelemetry.api.common.Value agentElement = convertValue(element); + List> applicationArray = + (List>) applicationValue.getValue(); + List> agentArray = new ArrayList<>(); + for (application.io.opentelemetry.api.common.Value element : applicationArray) { + Value agentElement = convertValue(element); if (agentElement != null) { agentArray.add(agentElement); } } - return io.opentelemetry.api.common.Value.of(agentArray); + return Value.of(agentArray); case KEY_VALUE_LIST: - List applicationKvList = (List) applicationValue.getValue(); - io.opentelemetry.api.common.KeyValue[] agentKvArray = - new io.opentelemetry.api.common.KeyValue[applicationKvList.size()]; + List applicationKvList = + (List) applicationValue.getValue(); + KeyValue[] agentKvArray = new KeyValue[applicationKvList.size()]; int i = 0; - for (KeyValue applicationKv : applicationKvList) { - io.opentelemetry.api.common.Value agentKvValue = - convertValue(applicationKv.getValue()); + for (application.io.opentelemetry.api.common.KeyValue applicationKv : applicationKvList) { + Value agentKvValue = convertValue(applicationKv.getValue()); if (agentKvValue != null) { - agentKvArray[i++] = - io.opentelemetry.api.common.KeyValue.of(applicationKv.getKey(), agentKvValue); + agentKvArray[i++] = KeyValue.of(applicationKv.getKey(), agentKvValue); } } // Trim array if unexpected Value types were encountered if (i < agentKvArray.length) { - io.opentelemetry.api.common.KeyValue[] trimmed = - new io.opentelemetry.api.common.KeyValue[i]; + KeyValue[] trimmed = new KeyValue[i]; System.arraycopy(agentKvArray, 0, trimmed, 0, i); - return io.opentelemetry.api.common.Value.of(trimmed); + return Value.of(trimmed); } - return io.opentelemetry.api.common.Value.of(agentKvArray); + return Value.of(agentKvArray); case EMPTY: - return io.opentelemetry.api.common.Value.empty(); + return Value.empty(); } - logger.log(FINE, "unexpected Value type: {0}", type); + logger.log(FINE, "unexpected application.io.opentelemetry.api.common.Value type: {0}", type); return null; } } diff --git a/instrumentation/opentelemetry-extension-annotations-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/extensionannotations/WithSpanInstrumentationModule.java b/instrumentation/opentelemetry-extension-annotations-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/extensionannotations/WithSpanInstrumentationModule.java index 50645fb28985..3894a29f80f9 100644 --- a/instrumentation/opentelemetry-extension-annotations-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/extensionannotations/WithSpanInstrumentationModule.java +++ b/instrumentation/opentelemetry-extension-annotations-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/extensionannotations/WithSpanInstrumentationModule.java @@ -12,10 +12,6 @@ import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; import java.util.List; -/** - * Instrumentation for methods annotated with {@link - * application.io.opentelemetry.extension.annotations.WithSpan} annotation. - */ @AutoService(InstrumentationModule.class) public class WithSpanInstrumentationModule extends InstrumentationModule { diff --git a/instrumentation/opentelemetry-extension-kotlin-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/extensionkotlin/ContextExtensionInstrumentation.java b/instrumentation/opentelemetry-extension-kotlin-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/extensionkotlin/ContextExtensionInstrumentation.java index 0d8e36e90102..666f7aeed893 100644 --- a/instrumentation/opentelemetry-extension-kotlin-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/extensionkotlin/ContextExtensionInstrumentation.java +++ b/instrumentation/opentelemetry-extension-kotlin-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/extensionkotlin/ContextExtensionInstrumentation.java @@ -8,8 +8,7 @@ import static net.bytebuddy.matcher.ElementMatchers.named; import static net.bytebuddy.matcher.ElementMatchers.takesArgument; -import application.io.opentelemetry.context.Context; -import application.io.opentelemetry.context.ImplicitContextKeyed; +import io.opentelemetry.context.Context; import io.opentelemetry.extension.kotlin.ContextExtensionsKt; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer; @@ -53,10 +52,10 @@ public static class ContextAdvice { @Nullable @Advice.OnMethodEnter(skipOn = Advice.OnNonDefaultValue.class) - public static CoroutineContext enter(@Advice.Argument(0) Context applicationContext) { + public static CoroutineContext enter( + @Advice.Argument(0) application.io.opentelemetry.context.Context applicationContext) { if (applicationContext != null) { - io.opentelemetry.context.Context agentContext = - AgentContextStorage.getAgentContext(applicationContext); + Context agentContext = AgentContextStorage.getAgentContext(applicationContext); return ContextExtensionsKt.asContextElement(agentContext); } return null; @@ -77,11 +76,12 @@ public static class ImplicitContextKeyedAdvice { @Nullable @Advice.OnMethodEnter(skipOn = Advice.OnNonDefaultValue.class) public static CoroutineContext enter( - @Advice.Argument(0) ImplicitContextKeyed implicitContextKeyed) { + @Advice.Argument(0) + application.io.opentelemetry.context.ImplicitContextKeyed implicitContextKeyed) { if (implicitContextKeyed != null) { - Context applicationContext = Context.current().with(implicitContextKeyed); - io.opentelemetry.context.Context agentContext = - AgentContextStorage.getAgentContext(applicationContext); + application.io.opentelemetry.context.Context applicationContext = + application.io.opentelemetry.context.Context.current().with(implicitContextKeyed); + Context agentContext = AgentContextStorage.getAgentContext(applicationContext); return ContextExtensionsKt.asContextElement(agentContext); } return null; @@ -101,10 +101,10 @@ public static class GetOpenTelemetryContextAdvice { @Nullable @Advice.OnMethodEnter(skipOn = Advice.OnNonDefaultValue.class) - public static Context enter(@Advice.Argument(0) CoroutineContext coroutineContext) { + public static application.io.opentelemetry.context.Context enter( + @Advice.Argument(0) CoroutineContext coroutineContext) { if (coroutineContext != null) { - io.opentelemetry.context.Context agentContext = - ContextExtensionsKt.getOpenTelemetryContext(coroutineContext); + Context agentContext = ContextExtensionsKt.getOpenTelemetryContext(coroutineContext); return AgentContextStorage.toApplicationContext(agentContext); } return null; @@ -113,8 +113,9 @@ public static Context enter(@Advice.Argument(0) CoroutineContext coroutineContex @Nullable @AssignReturned.ToReturned @Advice.OnMethodExit(onThrowable = Throwable.class) - public static Context onExit( - @Advice.Return Context originalResult, @Advice.Enter @Nullable Context context) { + public static application.io.opentelemetry.context.Context onExit( + @Advice.Return application.io.opentelemetry.context.Context originalResult, + @Advice.Enter @Nullable application.io.opentelemetry.context.Context context) { return context != null ? context : originalResult; } } diff --git a/instrumentation/opentelemetry-instrumentation-annotations-1.16/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/instrumentationannotations/AnnotationInstrumentationModule.java b/instrumentation/opentelemetry-instrumentation-annotations-1.16/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/instrumentationannotations/AnnotationInstrumentationModule.java index 3b61339de0ae..55edabe7fe6b 100644 --- a/instrumentation/opentelemetry-instrumentation-annotations-1.16/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/instrumentationannotations/AnnotationInstrumentationModule.java +++ b/instrumentation/opentelemetry-instrumentation-annotations-1.16/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/instrumentationannotations/AnnotationInstrumentationModule.java @@ -8,18 +8,12 @@ import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed; import static java.util.Arrays.asList; -import application.io.opentelemetry.instrumentation.annotations.AddingSpanAttributes; -import application.io.opentelemetry.instrumentation.annotations.WithSpan; import com.google.auto.service.AutoService; import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; import java.util.List; import net.bytebuddy.matcher.ElementMatcher; -/** - * Instrumentation for methods annotated with {@link WithSpan} and {@link AddingSpanAttributes} - * annotations. - */ @AutoService(InstrumentationModule.class) public class AnnotationInstrumentationModule extends InstrumentationModule { diff --git a/instrumentation/opentelemetry-instrumentation-annotations-1.16/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/instrumentationannotations/AnnotationSingletons.java b/instrumentation/opentelemetry-instrumentation-annotations-1.16/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/instrumentationannotations/AnnotationSingletons.java index 840ccf8bd6ab..14426f0b7499 100644 --- a/instrumentation/opentelemetry-instrumentation-annotations-1.16/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/instrumentationannotations/AnnotationSingletons.java +++ b/instrumentation/opentelemetry-instrumentation-annotations-1.16/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/instrumentationannotations/AnnotationSingletons.java @@ -7,7 +7,6 @@ import static java.util.logging.Level.FINE; -import application.io.opentelemetry.instrumentation.annotations.WithSpan; import io.opentelemetry.api.GlobalOpenTelemetry; import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.context.Context; @@ -42,7 +41,10 @@ public final class AnnotationSingletons { try { inheritContextMethodHandle = MethodHandles.publicLookup() - .findVirtual(WithSpan.class, "inheritContext", MethodType.methodType(boolean.class)); + .findVirtual( + application.io.opentelemetry.instrumentation.annotations.WithSpan.class, + "inheritContext", + MethodType.methodType(boolean.class)); } catch (NoSuchMethodException | IllegalAccessException ignore) { // ignore } @@ -93,7 +95,9 @@ private static SpanKind spanKindFromMethodRequest(MethodRequest request) { } private static SpanKind spanKindFromMethod(Method method) { - WithSpan annotation = method.getDeclaredAnnotation(WithSpan.class); + application.io.opentelemetry.instrumentation.annotations.WithSpan annotation = + method.getDeclaredAnnotation( + application.io.opentelemetry.instrumentation.annotations.WithSpan.class); if (annotation == null) { return SpanKind.INTERNAL; } @@ -115,7 +119,9 @@ private static String spanNameFromMethodRequest(MethodRequest request) { } private static String spanNameFromMethod(Method method) { - WithSpan annotation = method.getDeclaredAnnotation(WithSpan.class); + application.io.opentelemetry.instrumentation.annotations.WithSpan annotation = + method.getDeclaredAnnotation( + application.io.opentelemetry.instrumentation.annotations.WithSpan.class); String spanName = annotation.value(); if (spanName.isEmpty()) { spanName = SpanNames.fromMethod(method); @@ -132,7 +138,9 @@ private static boolean inheritContextFromMethod(Method method) { return true; } - WithSpan annotation = method.getDeclaredAnnotation(WithSpan.class); + application.io.opentelemetry.instrumentation.annotations.WithSpan annotation = + method.getDeclaredAnnotation( + application.io.opentelemetry.instrumentation.annotations.WithSpan.class); try { return (boolean) inheritContextMethodHandle.invoke(annotation); } catch (Throwable ignore) { diff --git a/instrumentation/opentelemetry-instrumentation-api/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/instrumentationapi/HttpRouteStateInstrumentation.java b/instrumentation/opentelemetry-instrumentation-api/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/instrumentationapi/HttpRouteStateInstrumentation.java index ca0f0fc54027..a8884b772f8b 100644 --- a/instrumentation/opentelemetry-instrumentation-api/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/instrumentationapi/HttpRouteStateInstrumentation.java +++ b/instrumentation/opentelemetry-instrumentation-api/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/instrumentationapi/HttpRouteStateInstrumentation.java @@ -8,8 +8,7 @@ import static net.bytebuddy.matcher.ElementMatchers.named; import static net.bytebuddy.matcher.ElementMatchers.takesArgument; -import application.io.opentelemetry.api.trace.Span; -import application.io.opentelemetry.context.Context; +import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.internal.HttpRouteState; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer; @@ -45,12 +44,11 @@ public void transform(TypeTransformer transformer) { public static class UpdateAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) public static void onEnter( - @Advice.Argument(0) Context applicationContext, + @Advice.Argument(0) application.io.opentelemetry.context.Context applicationContext, @Advice.Argument(1) int updatedBySourceOrder, @Advice.Argument(2) String route) { - io.opentelemetry.context.Context agentContext = - AgentContextStorage.getAgentContext(applicationContext); + Context agentContext = AgentContextStorage.getAgentContext(applicationContext); HttpRouteState agentRouteState = HttpRouteState.fromContextOrNull(agentContext); if (agentRouteState == null) { @@ -65,10 +63,10 @@ public static void onEnter( public static class UpdateSpanAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) public static void onEnter( - @Advice.Argument(0) Context applicationContext, @Advice.Argument(1) Span applicationSpan) { + @Advice.Argument(0) application.io.opentelemetry.context.Context applicationContext, + @Advice.Argument(1) application.io.opentelemetry.api.trace.Span applicationSpan) { - io.opentelemetry.context.Context agentContext = - AgentContextStorage.getAgentContext(applicationContext); + Context agentContext = AgentContextStorage.getAgentContext(applicationContext); HttpRouteState.updateSpan(agentContext, Bridging.toAgentOrNull(applicationSpan)); } } diff --git a/instrumentation/opentelemetry-instrumentation-api/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/instrumentationapi/SpanKeyBridging.java b/instrumentation/opentelemetry-instrumentation-api/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/instrumentationapi/SpanKeyBridging.java index 7877f3f21918..6e024c0a760e 100644 --- a/instrumentation/opentelemetry-instrumentation-api/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/instrumentationapi/SpanKeyBridging.java +++ b/instrumentation/opentelemetry-instrumentation-api/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/instrumentationapi/SpanKeyBridging.java @@ -5,47 +5,67 @@ package io.opentelemetry.javaagent.instrumentation.instrumentationapi; -import application.io.opentelemetry.instrumentation.api.internal.SpanKey; +import io.opentelemetry.instrumentation.api.internal.SpanKey; import java.util.HashMap; import java.util.Map; import javax.annotation.Nullable; public final class SpanKeyBridging { - private static final Map + private static final Map< + application.io.opentelemetry.instrumentation.api.internal.SpanKey, SpanKey> agentSpanKeys = createMapping(); - private static Map + private static Map createMapping() { - Map map = new HashMap<>(); - map.put(SpanKey.KIND_SERVER, io.opentelemetry.instrumentation.api.internal.SpanKey.KIND_SERVER); - map.put(SpanKey.KIND_CLIENT, io.opentelemetry.instrumentation.api.internal.SpanKey.KIND_CLIENT); + Map map = + new HashMap<>(); map.put( - SpanKey.KIND_CONSUMER, io.opentelemetry.instrumentation.api.internal.SpanKey.KIND_CONSUMER); + application.io.opentelemetry.instrumentation.api.internal.SpanKey.KIND_SERVER, + SpanKey.KIND_SERVER); map.put( - SpanKey.KIND_PRODUCER, io.opentelemetry.instrumentation.api.internal.SpanKey.KIND_PRODUCER); + application.io.opentelemetry.instrumentation.api.internal.SpanKey.KIND_CLIENT, + SpanKey.KIND_CLIENT); + map.put( + application.io.opentelemetry.instrumentation.api.internal.SpanKey.KIND_CONSUMER, + SpanKey.KIND_CONSUMER); + map.put( + application.io.opentelemetry.instrumentation.api.internal.SpanKey.KIND_PRODUCER, + SpanKey.KIND_PRODUCER); - map.put(SpanKey.HTTP_SERVER, io.opentelemetry.instrumentation.api.internal.SpanKey.HTTP_SERVER); - map.put(SpanKey.RPC_SERVER, io.opentelemetry.instrumentation.api.internal.SpanKey.RPC_SERVER); + map.put( + application.io.opentelemetry.instrumentation.api.internal.SpanKey.HTTP_SERVER, + SpanKey.HTTP_SERVER); + map.put( + application.io.opentelemetry.instrumentation.api.internal.SpanKey.RPC_SERVER, + SpanKey.RPC_SERVER); - map.put(SpanKey.HTTP_CLIENT, io.opentelemetry.instrumentation.api.internal.SpanKey.HTTP_CLIENT); - map.put(SpanKey.RPC_CLIENT, io.opentelemetry.instrumentation.api.internal.SpanKey.RPC_CLIENT); - map.put(SpanKey.DB_CLIENT, io.opentelemetry.instrumentation.api.internal.SpanKey.DB_CLIENT); + map.put( + application.io.opentelemetry.instrumentation.api.internal.SpanKey.HTTP_CLIENT, + SpanKey.HTTP_CLIENT); + map.put( + application.io.opentelemetry.instrumentation.api.internal.SpanKey.RPC_CLIENT, + SpanKey.RPC_CLIENT); + map.put( + application.io.opentelemetry.instrumentation.api.internal.SpanKey.DB_CLIENT, + SpanKey.DB_CLIENT); - map.put(SpanKey.PRODUCER, io.opentelemetry.instrumentation.api.internal.SpanKey.PRODUCER); map.put( - SpanKey.CONSUMER_RECEIVE, - io.opentelemetry.instrumentation.api.internal.SpanKey.CONSUMER_RECEIVE); + application.io.opentelemetry.instrumentation.api.internal.SpanKey.PRODUCER, + SpanKey.PRODUCER); + map.put( + application.io.opentelemetry.instrumentation.api.internal.SpanKey.CONSUMER_RECEIVE, + SpanKey.CONSUMER_RECEIVE); map.put( - SpanKey.CONSUMER_PROCESS, - io.opentelemetry.instrumentation.api.internal.SpanKey.CONSUMER_PROCESS); + application.io.opentelemetry.instrumentation.api.internal.SpanKey.CONSUMER_PROCESS, + SpanKey.CONSUMER_PROCESS); return map; } @Nullable - public static io.opentelemetry.instrumentation.api.internal.SpanKey toAgentOrNull( - SpanKey applicationSpanKey) { + public static SpanKey toAgentOrNull( + application.io.opentelemetry.instrumentation.api.internal.SpanKey applicationSpanKey) { return agentSpanKeys.get(applicationSpanKey); } diff --git a/instrumentation/opentelemetry-instrumentation-api/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/instrumentationapi/SpanKeyInstrumentation.java b/instrumentation/opentelemetry-instrumentation-api/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/instrumentationapi/SpanKeyInstrumentation.java index 786961e088eb..88a9b60e42bf 100644 --- a/instrumentation/opentelemetry-instrumentation-api/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/instrumentationapi/SpanKeyInstrumentation.java +++ b/instrumentation/opentelemetry-instrumentation-api/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/instrumentationapi/SpanKeyInstrumentation.java @@ -8,9 +8,9 @@ import static net.bytebuddy.matcher.ElementMatchers.named; import static net.bytebuddy.matcher.ElementMatchers.takesArgument; -import application.io.opentelemetry.api.trace.Span; -import application.io.opentelemetry.context.Context; -import application.io.opentelemetry.instrumentation.api.internal.SpanKey; +import io.opentelemetry.api.trace.Span; +import io.opentelemetry.context.Context; +import io.opentelemetry.instrumentation.api.internal.SpanKey; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer; import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.context.AgentContextStorage; @@ -46,21 +46,20 @@ public static class StoreInContextAdvice { @Nullable @Advice.OnMethodEnter(skipOn = Advice.OnNonDefaultValue.class) - public static Context onEnter( - @Advice.This SpanKey applicationSpanKey, - @Advice.Argument(0) Context applicationContext, - @Advice.Argument(1) Span applicationSpan) { + public static application.io.opentelemetry.context.Context onEnter( + @Advice.This + application.io.opentelemetry.instrumentation.api.internal.SpanKey applicationSpanKey, + @Advice.Argument(0) application.io.opentelemetry.context.Context applicationContext, + @Advice.Argument(1) application.io.opentelemetry.api.trace.Span applicationSpan) { - io.opentelemetry.instrumentation.api.internal.SpanKey agentSpanKey = - SpanKeyBridging.toAgentOrNull(applicationSpanKey); + SpanKey agentSpanKey = SpanKeyBridging.toAgentOrNull(applicationSpanKey); if (agentSpanKey == null) { return null; } - io.opentelemetry.context.Context agentContext = - AgentContextStorage.getAgentContext(applicationContext); + Context agentContext = AgentContextStorage.getAgentContext(applicationContext); - io.opentelemetry.api.trace.Span agentSpan = Bridging.toAgentOrNull(applicationSpan); + Span agentSpan = Bridging.toAgentOrNull(applicationSpan); if (agentSpan == null) { // if application span can not be bridged to agent span, this could happen when it is not // created through bridged GlobalOpenTelemetry, we'll let the original method run and @@ -68,17 +67,17 @@ public static Context onEnter( return null; } - io.opentelemetry.context.Context newAgentContext = - agentSpanKey.storeInContext(agentContext, agentSpan); + Context newAgentContext = agentSpanKey.storeInContext(agentContext, agentSpan); return AgentContextStorage.toApplicationContext(newAgentContext); } @AssignReturned.ToReturned @Advice.OnMethodExit(suppress = Throwable.class) - public static Context onExit( - @Advice.Return Context originalResult, - @Advice.Enter @Nullable Context newApplicationContext) { + public static application.io.opentelemetry.context.Context onExit( + @Advice.Return application.io.opentelemetry.context.Context originalResult, + @Advice.Enter @Nullable + application.io.opentelemetry.context.Context newApplicationContext) { return newApplicationContext != null ? newApplicationContext : originalResult; } } @@ -88,19 +87,19 @@ public static class FromContextOrNullAdvice { @Nullable @Advice.OnMethodEnter(skipOn = Advice.OnNonDefaultValue.class) - public static Span onEnter( - @Advice.This SpanKey applicationSpanKey, @Advice.Argument(0) Context applicationContext) { + public static application.io.opentelemetry.api.trace.Span onEnter( + @Advice.This + application.io.opentelemetry.instrumentation.api.internal.SpanKey applicationSpanKey, + @Advice.Argument(0) application.io.opentelemetry.context.Context applicationContext) { - io.opentelemetry.instrumentation.api.internal.SpanKey agentSpanKey = - SpanKeyBridging.toAgentOrNull(applicationSpanKey); + SpanKey agentSpanKey = SpanKeyBridging.toAgentOrNull(applicationSpanKey); if (agentSpanKey == null) { return null; } - io.opentelemetry.context.Context agentContext = - AgentContextStorage.getAgentContext(applicationContext); + Context agentContext = AgentContextStorage.getAgentContext(applicationContext); - io.opentelemetry.api.trace.Span agentSpan = agentSpanKey.fromContextOrNull(agentContext); + Span agentSpan = agentSpanKey.fromContextOrNull(agentContext); if (agentSpan == null) { // Bridged agent span was not found. Run the original method, there could be an unbridged // span stored in the application context. @@ -112,8 +111,9 @@ public static Span onEnter( @AssignReturned.ToReturned @Advice.OnMethodExit(suppress = Throwable.class) - public static Span onExit( - @Advice.Return Span originalResult, @Advice.Enter @Nullable Span applicationSpan) { + public static application.io.opentelemetry.api.trace.Span onExit( + @Advice.Return application.io.opentelemetry.api.trace.Span originalResult, + @Advice.Enter @Nullable application.io.opentelemetry.api.trace.Span applicationSpan) { return applicationSpan != null ? applicationSpan : originalResult; } } diff --git a/instrumentation/reactor/reactor-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/v3_1/operator/ContextPropagationOperatorInstrumentation.java b/instrumentation/reactor/reactor-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/v3_1/operator/ContextPropagationOperatorInstrumentation.java index cfaed961c8e1..37ba5fcce87a 100644 --- a/instrumentation/reactor/reactor-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/v3_1/operator/ContextPropagationOperatorInstrumentation.java +++ b/instrumentation/reactor/reactor-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/v3_1/operator/ContextPropagationOperatorInstrumentation.java @@ -13,7 +13,6 @@ import static net.bytebuddy.matcher.ElementMatchers.returns; import static net.bytebuddy.matcher.ElementMatchers.takesArgument; -import application.io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.reactor.v3_1.ContextPropagationOperator; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer; @@ -74,7 +73,7 @@ public static boolean methodEnter() { @Advice.OnMethodExit(suppress = Throwable.class) public static reactor.util.context.Context methodExit( @Advice.Argument(0) reactor.util.context.Context reactorContext, - @Advice.Argument(1) Context applicationContext) { + @Advice.Argument(1) application.io.opentelemetry.context.Context applicationContext) { return ContextPropagationOperator.storeOpenTelemetryContext( reactorContext, AgentContextStorage.getAgentContext(applicationContext)); } @@ -89,9 +88,9 @@ public static boolean methodEnter() { @AssignReturned.ToReturned @Advice.OnMethodExit(suppress = Throwable.class) - public static Context methodExit( + public static application.io.opentelemetry.context.Context methodExit( @Advice.Argument(0) reactor.util.context.Context reactorContext, - @Advice.Argument(1) Context defaultContext) { + @Advice.Argument(1) application.io.opentelemetry.context.Context defaultContext) { io.opentelemetry.context.Context agentContext = ContextPropagationOperator.getOpenTelemetryContext(reactorContext, null); diff --git a/instrumentation/reactor/reactor-3.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/v3_4/operator/ContextPropagationOperator34Instrumentation.java b/instrumentation/reactor/reactor-3.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/v3_4/operator/ContextPropagationOperator34Instrumentation.java index cba8cf7e0f43..ed7816d968b7 100644 --- a/instrumentation/reactor/reactor-3.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/v3_4/operator/ContextPropagationOperator34Instrumentation.java +++ b/instrumentation/reactor/reactor-3.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/v3_4/operator/ContextPropagationOperator34Instrumentation.java @@ -12,7 +12,7 @@ import static net.bytebuddy.matcher.ElementMatchers.returns; import static net.bytebuddy.matcher.ElementMatchers.takesArgument; -import application.io.opentelemetry.context.Context; +import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.reactor.v3_1.ContextPropagationOperator; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer; @@ -52,11 +52,11 @@ public static boolean methodEnter() { @AssignReturned.ToReturned @Advice.OnMethodExit(suppress = Throwable.class) - public static Context methodExit( + public static application.io.opentelemetry.context.Context methodExit( @Advice.Argument(0) ContextView reactorContext, - @Advice.Argument(1) Context defaultContext) { + @Advice.Argument(1) application.io.opentelemetry.context.Context defaultContext) { - io.opentelemetry.context.Context agentContext = + Context agentContext = ContextPropagationOperator.getOpenTelemetryContextFromContextView(reactorContext, null); if (agentContext == null) { return defaultContext; diff --git a/instrumentation/spring/spring-webflux/spring-webflux-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/v5_3/internal/TraceWebClientSubscriber.java b/instrumentation/spring/spring-webflux/spring-webflux-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/v5_3/internal/TraceWebClientSubscriber.java index 49dbb19077b1..5c98e279f5a0 100644 --- a/instrumentation/spring/spring-webflux/spring-webflux-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/v5_3/internal/TraceWebClientSubscriber.java +++ b/instrumentation/spring/spring-webflux/spring-webflux-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/v5_3/internal/TraceWebClientSubscriber.java @@ -23,8 +23,8 @@ final class TraceWebClientSubscriber implements CoreSubscriber { private final ClientRequest request; private final CoreSubscriber actual; private final reactor.util.context.Context reactorContext; - private final io.opentelemetry.context.Context otelClientContext; - private final io.opentelemetry.context.Context otelParentContext; + private final Context otelClientContext; + private final Context otelParentContext; TraceWebClientSubscriber( Instrumenter instrumenter,