Skip to content

Commit 83f1fda

Browse files
authored
Merge branch 'main' into catch-names
2 parents 4cceaa8 + ec3d575 commit 83f1fda

417 files changed

Lines changed: 429 additions & 428 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

docs/contributing/style-guide.md

Lines changed: 13 additions & 9 deletions

instrumentation/activej-http-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/activejhttp/ActivejHttpServerSingletons.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
1111
import io.opentelemetry.javaagent.bootstrap.internal.JavaagentHttpServerInstrumenters;
1212

13-
public final class ActivejHttpServerSingletons {
13+
public class ActivejHttpServerSingletons {
1414

1515
private static final String INSTRUMENTATION_NAME = "io.opentelemetry.activej-http-6.0";
1616

instrumentation/activej-http-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/activejhttp/PromiseWrapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import io.activej.promise.Promise;
1313
import io.opentelemetry.context.Context;
1414

15-
public final class PromiseWrapper {
15+
public class PromiseWrapper {
1616

1717
public static Promise<HttpResponse> wrap(
1818
Promise<HttpResponse> promise, HttpRequest httpRequest, Context context) {

instrumentation/akka/akka-actor-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaactor/AkkaSchedulerTaskWrapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import io.opentelemetry.context.Context;
99
import javax.annotation.Nullable;
1010

11-
public final class AkkaSchedulerTaskWrapper {
11+
public class AkkaSchedulerTaskWrapper {
1212
@Nullable private static final Class<?> RUN_ON_CLOSE_TASK_CLASS = getRunOnCloseTaskClass();
1313

1414
@Nullable

instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/AkkaHttpClientUtil.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import java.lang.invoke.MethodType;
1414
import javax.annotation.Nullable;
1515

16-
public final class AkkaHttpClientUtil {
16+
public class AkkaHttpClientUtil {
1717
@Nullable private static final MethodHandle actorSystemAccessor = findActorSystemAccessor();
1818

1919
@Nullable

instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/FutureWrapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import scala.runtime.AbstractFunction1;
1414
import scala.util.Try;
1515

16-
public final class FutureWrapper {
16+
public class FutureWrapper {
1717

1818
public static <T> Future<T> wrap(
1919
Future<T> future, ExecutionContext executionContext, Context context) {

instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/AkkaHttpServerSingletons.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import io.opentelemetry.javaagent.bootstrap.internal.JavaagentHttpServerInstrumenters;
1212
import io.opentelemetry.javaagent.instrumentation.akkahttp.AkkaHttpUtil;
1313

14-
public final class AkkaHttpServerSingletons {
14+
public class AkkaHttpServerSingletons {
1515

1616
private static final Instrumenter<HttpRequest, HttpResponse> instrumenter;
1717

instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/route/AkkaRouteUtil.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import akka.http.scaladsl.server.PathMatcher;
99
import io.opentelemetry.instrumentation.api.util.VirtualField;
1010

11-
public final class AkkaRouteUtil {
11+
public class AkkaRouteUtil {
1212

1313
public static final VirtualField<PathMatcher<?>, String> PREFIX =
1414
VirtualField.find(PathMatcher.class, String.class);

instrumentation/alibaba-druid-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/alibabadruid/v1_0/DruidSingletons.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import io.opentelemetry.api.GlobalOpenTelemetry;
99
import io.opentelemetry.instrumentation.alibabadruid.v1_0.DruidTelemetry;
1010

11-
public final class DruidSingletons {
11+
public class DruidSingletons {
1212

1313
private static final DruidTelemetry druidTelemetry =
1414
DruidTelemetry.create(GlobalOpenTelemetry.get());

instrumentation/apache-dbcp-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachedbcp/v2_0/ApacheDbcpSingletons.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import io.opentelemetry.api.GlobalOpenTelemetry;
99
import io.opentelemetry.instrumentation.apachedbcp.v2_0.ApacheDbcpTelemetry;
1010

11-
public final class ApacheDbcpSingletons {
11+
public class ApacheDbcpSingletons {
1212

1313
private static final ApacheDbcpTelemetry apacheDbcpTelemetry =
1414
ApacheDbcpTelemetry.create(GlobalOpenTelemetry.get());

0 commit comments

Comments
 (0)