open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Follow static import convention (#254) 

* Follow static import convention

* Follow decorator static field name convention
This commit is contained in:
Trask Stalnaker 2020-03-19 13:52:20 -07:00 committed by GitHub
parent 07c5923f20
commit d4740894d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 45 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
instrumentation/elasticsearch/elasticsearch-rest-6.4/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch6_4/RestResponseListener.java
View File

@ -15,7 +15,8 @@
*/
package io.opentelemetry.auto.instrumentation.elasticsearch6_4;
import io.opentelemetry.auto.instrumentation.elasticsearch.ElasticsearchRestClientDecorator;
import static io.opentelemetry.auto.instrumentation.elasticsearch.ElasticsearchRestClientDecorator.DECORATE;
import io.opentelemetry.trace.Span;
import org.elasticsearch.client.Response;
import org.elasticsearch.client.ResponseListener;
@ -33,25 +34,25 @@ public class RestResponseListener implements ResponseListener {
@Override
public void onSuccess(final Response response) {
if (response.getHost() != null) {
ElasticsearchRestClientDecorator.DECORATE.onResponse(span, response);
DECORATE.onResponse(span, response);
}
try {
listener.onSuccess(response);
} finally {
ElasticsearchRestClientDecorator.DECORATE.beforeFinish(span);
DECORATE.beforeFinish(span);
span.end();
}
}
@Override
public void onFailure(final Exception e) {
ElasticsearchRestClientDecorator.DECORATE.onError(span, e);
DECORATE.onError(span, e);
try {
listener.onFailure(e);
} finally {
ElasticsearchRestClientDecorator.DECORATE.beforeFinish(span);
DECORATE.beforeFinish(span);
span.end();
}
}

4
instrumentation/hibernate/hibernate-3.3/src/main/java/io/opentelemetry/auto/instrumentation/hibernate/core/v3_3/QueryInstrumentation.java
View File

@ -15,7 +15,7 @@
*/
package io.opentelemetry.auto.instrumentation.hibernate.core.v3_3;
import static io.opentelemetry.auto.instrumentation.hibernate.HibernateDecorator.DECORATOR;
import static io.opentelemetry.auto.instrumentation.hibernate.HibernateDecorator.DECORATE;
import static io.opentelemetry.auto.tooling.bytebuddy.matcher.AgentElementMatchers.implementsInterface;
import static java.util.Collections.singletonMap;
import static net.bytebuddy.matcher.ElementMatchers.isMethod;
@ -76,7 +76,7 @@ public class QueryInstrumentation extends AbstractHibernateInstrumentation {
SessionMethodUtils.startScopeFrom(
contextStore, query, "hibernate.query." + name, null, true);
if (spanWithScope != null) {
DECORATOR.onStatement(spanWithScope.getSpan(), query.getQueryString());
DECORATE.onStatement(spanWithScope.getSpan(), query.getQueryString());
}
return spanWithScope;
}

6
instrumentation/hibernate/hibernate-3.3/src/main/java/io/opentelemetry/auto/instrumentation/hibernate/core/v3_3/SessionFactoryInstrumentation.java
View File

@ -15,7 +15,7 @@
*/
package io.opentelemetry.auto.instrumentation.hibernate.core.v3_3;
import static io.opentelemetry.auto.instrumentation.hibernate.HibernateDecorator.DECORATOR;
import static io.opentelemetry.auto.instrumentation.hibernate.HibernateDecorator.DECORATE;
import static io.opentelemetry.auto.instrumentation.hibernate.HibernateDecorator.TRACER;
import static io.opentelemetry.auto.tooling.bytebuddy.matcher.AgentElementMatchers.hasInterface;
import static io.opentelemetry.auto.tooling.bytebuddy.matcher.AgentElementMatchers.implementsInterface;
@ -76,8 +76,8 @@ public class SessionFactoryInstrumentation extends AbstractHibernateInstrumentat
public static void openSession(@Advice.Return final Object session) {
final Span span = TRACER.spanBuilder("hibernate.session").startSpan();
DECORATOR.afterStart(span);
DECORATOR.onConnection(span, session);
DECORATE.afterStart(span);
DECORATE.onConnection(span, session);
if (session instanceof Session) {
final ContextStore<Session, Span> contextStore =

6
instrumentation/hibernate/hibernate-3.3/src/main/java/io/opentelemetry/auto/instrumentation/hibernate/core/v3_3/SessionInstrumentation.java
View File

@ -15,7 +15,7 @@
*/
package io.opentelemetry.auto.instrumentation.hibernate.core.v3_3;
import static io.opentelemetry.auto.instrumentation.hibernate.HibernateDecorator.DECORATOR;
import static io.opentelemetry.auto.instrumentation.hibernate.HibernateDecorator.DECORATE;
import static io.opentelemetry.auto.instrumentation.hibernate.SessionMethodUtils.SCOPE_ONLY_METHODS;
import static io.opentelemetry.auto.tooling.bytebuddy.matcher.AgentElementMatchers.hasInterface;
import static io.opentelemetry.auto.tooling.bytebuddy.matcher.AgentElementMatchers.implementsInterface;
@ -142,8 +142,8 @@ public class SessionInstrumentation extends AbstractHibernateInstrumentation {
return;
}
DECORATOR.onError(sessionSpan, throwable);
DECORATOR.beforeFinish(sessionSpan);
DECORATE.onError(sessionSpan, throwable);
DECORATE.beforeFinish(sessionSpan);
sessionSpan.end();
}
}

4
instrumentation/hibernate/hibernate-4.0/src/main/java/io/opentelemetry/auto/instrumentation/hibernate/core/v4_0/QueryInstrumentation.java
View File

@ -15,7 +15,7 @@
*/
package io.opentelemetry.auto.instrumentation.hibernate.core.v4_0;
import static io.opentelemetry.auto.instrumentation.hibernate.HibernateDecorator.DECORATOR;
import static io.opentelemetry.auto.instrumentation.hibernate.HibernateDecorator.DECORATE;
import static io.opentelemetry.auto.tooling.bytebuddy.matcher.AgentElementMatchers.implementsInterface;
import static java.util.Collections.singletonMap;
import static net.bytebuddy.matcher.ElementMatchers.isMethod;
@ -76,7 +76,7 @@ public class QueryInstrumentation extends AbstractHibernateInstrumentation {
SessionMethodUtils.startScopeFrom(
contextStore, query, "hibernate.query." + name, null, true);
if (spanWithScope != null) {
DECORATOR.onStatement(spanWithScope.getSpan(), query.getQueryString());
DECORATE.onStatement(spanWithScope.getSpan(), query.getQueryString());
}
return spanWithScope;
}

6
instrumentation/hibernate/hibernate-4.0/src/main/java/io/opentelemetry/auto/instrumentation/hibernate/core/v4_0/SessionFactoryInstrumentation.java
View File

@ -15,7 +15,7 @@
*/
package io.opentelemetry.auto.instrumentation.hibernate.core.v4_0;
import static io.opentelemetry.auto.instrumentation.hibernate.HibernateDecorator.DECORATOR;
import static io.opentelemetry.auto.instrumentation.hibernate.HibernateDecorator.DECORATE;
import static io.opentelemetry.auto.instrumentation.hibernate.HibernateDecorator.TRACER;
import static io.opentelemetry.auto.tooling.bytebuddy.matcher.AgentElementMatchers.implementsInterface;
import static java.util.Collections.singletonMap;
@ -67,8 +67,8 @@ public class SessionFactoryInstrumentation extends AbstractHibernateInstrumentat
public static void openSession(@Advice.Return final SharedSessionContract session) {
final Span span = TRACER.spanBuilder("hibernate.session").startSpan();
DECORATOR.afterStart(span);
DECORATOR.onConnection(span, session);
DECORATE.afterStart(span);
DECORATE.onConnection(span, session);
final ContextStore<SharedSessionContract, Span> contextStore =
InstrumentationContext.get(SharedSessionContract.class, Span.class);

6
instrumentation/hibernate/hibernate-4.0/src/main/java/io/opentelemetry/auto/instrumentation/hibernate/core/v4_0/SessionInstrumentation.java
View File

@ -15,7 +15,7 @@
*/
package io.opentelemetry.auto.instrumentation.hibernate.core.v4_0;
import static io.opentelemetry.auto.instrumentation.hibernate.HibernateDecorator.DECORATOR;
import static io.opentelemetry.auto.instrumentation.hibernate.HibernateDecorator.DECORATE;
import static io.opentelemetry.auto.instrumentation.hibernate.SessionMethodUtils.SCOPE_ONLY_METHODS;
import static io.opentelemetry.auto.tooling.bytebuddy.matcher.AgentElementMatchers.hasInterface;
import static io.opentelemetry.auto.tooling.bytebuddy.matcher.AgentElementMatchers.implementsInterface;
@ -131,8 +131,8 @@ public class SessionInstrumentation extends AbstractHibernateInstrumentation {
return;
}
DECORATOR.onError(sessionSpan, throwable);
DECORATOR.beforeFinish(sessionSpan);
DECORATE.onError(sessionSpan, throwable);
DECORATE.beforeFinish(sessionSpan);
sessionSpan.end();
}
}

2
instrumentation/hibernate/hibernate-common/src/main/java/io/opentelemetry/auto/instrumentation/hibernate/HibernateDecorator.java
View File

@ -25,7 +25,7 @@ import java.util.List;
import java.util.Set;
public class HibernateDecorator extends OrmClientDecorator {
public static final HibernateDecorator DECORATOR = new HibernateDecorator();
public static final HibernateDecorator DECORATE = new HibernateDecorator();
// TODO use tracer names *.hibernate-3.3, *.hibernate-4.0, *.hibernate-4.3 respectively in each
// module
public static final Tracer TRACER =

12
instrumentation/hibernate/hibernate-common/src/main/java/io/opentelemetry/auto/instrumentation/hibernate/SessionMethodUtils.java
View File

@ -15,7 +15,7 @@
*/
package io.opentelemetry.auto.instrumentation.hibernate;
import static io.opentelemetry.auto.instrumentation.hibernate.HibernateDecorator.DECORATOR;
import static io.opentelemetry.auto.instrumentation.hibernate.HibernateDecorator.DECORATE;
import static io.opentelemetry.auto.instrumentation.hibernate.HibernateDecorator.TRACER;
import io.opentelemetry.auto.bootstrap.CallDepthThreadLocalMap;
@ -52,8 +52,8 @@ public class SessionMethodUtils {
if (createSpan) {
final Span span = TRACER.spanBuilder(operationName).setParent(sessionSpan).startSpan();
DECORATOR.afterStart(span);
DECORATOR.onOperation(span, entity);
DECORATE.afterStart(span);
DECORATE.onOperation(span, entity);
return new SpanWithScope(span, TRACER.withSpan(span));
} else {
return new SpanWithScope(null, TRACER.withSpan(sessionSpan));
@ -73,11 +73,11 @@ public class SessionMethodUtils {
final Span span = spanWithScope.getSpan();
if (span != null) {
DECORATOR.onError(span, throwable);
DECORATE.onError(span, throwable);
if (entity != null) {
DECORATOR.onOperation(span, entity);
DECORATE.onOperation(span, entity);
}
DECORATOR.beforeFinish(span);
DECORATE.beforeFinish(span);
span.end();
}
spanWithScope.closeScope();

7
instrumentation/servlet/src/main/java/io/opentelemetry/auto/instrumentation/servlet/filter/FilterInstrumentation.java
View File

@ -15,6 +15,7 @@
*/
package io.opentelemetry.auto.instrumentation.servlet.filter;
import static io.opentelemetry.auto.instrumentation.servlet.filter.FilterDecorator.DECORATE;
import static io.opentelemetry.auto.instrumentation.servlet.filter.FilterDecorator.TRACER;
import static io.opentelemetry.auto.tooling.ClassLoaderMatcher.hasClassesNamed;
import static io.opentelemetry.auto.tooling.bytebuddy.matcher.AgentElementMatchers.implementsInterface;
@ -85,7 +86,7 @@ public final class FilterInstrumentation extends Instrumenter.Default {
}
final Span span = TRACER.spanBuilder("servlet.filter").startSpan();
FilterDecorator.DECORATE.afterStart(span);
DECORATE.afterStart(span);
// Here we use "this" instead of "the method target" to distinguish abstract filter instances.
span.setAttribute(MoreTags.RESOURCE_NAME, filter.getClass().getSimpleName() + ".doFilter");
@ -100,8 +101,8 @@ public final class FilterInstrumentation extends Instrumenter.Default {
return;
}
final Span span = spanWithScope.getSpan();
FilterDecorator.DECORATE.onError(span, throwable);
FilterDecorator.DECORATE.beforeFinish(span);
DECORATE.onError(span, throwable);
DECORATE.beforeFinish(span);
span.end();
spanWithScope.closeScope();
}

3
instrumentation/sparkjava-2.3/src/main/java/io/opentelemetry/auto/instrumentation/sparkjava/RoutesInstrumentation.java
View File

@ -15,6 +15,7 @@
*/
package io.opentelemetry.auto.instrumentation.sparkjava;
import static io.opentelemetry.auto.instrumentation.sparkjava.RoutesInstrumentation.TracerHolder.TRACER;
import static java.util.Collections.singletonMap;
import static net.bytebuddy.matcher.ElementMatchers.isPublic;
import static net.bytebuddy.matcher.ElementMatchers.named;
@ -80,7 +81,7 @@ public class RoutesInstrumentation extends Instrumenter.Default {
public static void routeMatchEnricher(
@Advice.Argument(0) final HttpMethod method, @Advice.Return final RouteMatch routeMatch) {
final Span span = TracerHolder.TRACER.getCurrentSpan();
final Span span = TRACER.getCurrentSpan();
if (span != null && routeMatch != null) {
final String resourceName = method.name().toUpperCase() + " " + routeMatch.getMatchUri();
span.updateName(resourceName);

2
instrumentation/spring-data-1.8/src/main/java/io/opentelemetry/auto/instrumentation/springdata/SpringDataDecorator.java
View File

@ -23,7 +23,7 @@ import io.opentelemetry.trace.Tracer;
import java.lang.reflect.Method;
public final class SpringDataDecorator extends ClientDecorator {
public static final SpringDataDecorator DECORATOR = new SpringDataDecorator();
public static final SpringDataDecorator DECORATE = new SpringDataDecorator();
public static final Tracer TRACER =
OpenTelemetry.getTracerFactory().get("io.opentelemetry.auto.spring-data-1.8");

10
instrumentation/spring-data-1.8/src/main/java/io/opentelemetry/auto/instrumentation/springdata/SpringRepositoryInstrumentation.java
View File

@ -15,7 +15,7 @@
*/
package io.opentelemetry.auto.instrumentation.springdata;
import static io.opentelemetry.auto.instrumentation.springdata.SpringDataDecorator.DECORATOR;
import static io.opentelemetry.auto.instrumentation.springdata.SpringDataDecorator.DECORATE;
import static io.opentelemetry.auto.instrumentation.springdata.SpringDataDecorator.TRACER;
import static java.util.Collections.singletonMap;
import static net.bytebuddy.matcher.ElementMatchers.isConstructor;
@ -119,8 +119,8 @@ public final class SpringRepositoryInstrumentation extends Instrumenter.Default
}
final Span span = TRACER.spanBuilder("repository.operation").startSpan();
DECORATOR.afterStart(span);
DECORATOR.onOperation(span, invokedMethod);
DECORATE.afterStart(span);
DECORATE.onOperation(span, invokedMethod);
final Scope scope = TRACER.withSpan(span);
@ -128,10 +128,10 @@ public final class SpringRepositoryInstrumentation extends Instrumenter.Default
try {
result = methodInvocation.proceed();
} catch (final Throwable t) {
DECORATOR.onError(span, t);
DECORATE.onError(span, t);
throw t;
} finally {
DECORATOR.beforeFinish(span);
DECORATE.beforeFinish(span);
span.end();
scope.close();
}

8
testing/src/main/groovy/io/opentelemetry/auto/test/utils/TraceUtils.groovy
View File

@ -29,7 +29,7 @@ import java.util.concurrent.Callable
class TraceUtils {
private static final BaseDecorator DECORATOR = new BaseDecorator() {
private static final BaseDecorator DECORATE = new BaseDecorator() {
protected String getSpanType() {
return null
@ -45,17 +45,17 @@ class TraceUtils {
@SneakyThrows
static <T> T runUnderTrace(final String rootOperationName, final Callable<T> r) {
final Span span = TRACER.spanBuilder(rootOperationName).startSpan()
DECORATOR.afterStart(span)
DECORATE.afterStart(span)
Scope scope = TRACER.withSpan(span)
try {
return r.call()
} catch (final Exception e) {
DECORATOR.onError(span, e)
DECORATE.onError(span, e)
throw e
} finally {
DECORATOR.beforeFinish(span)
DECORATE.beforeFinish(span)
span.end()
scope.close()
}