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

operationName -> resourceName 

Addressing review comments: operationName -> resourceName

This was vestige of the original SignalFX code
This commit is contained in:
dougqh 2019-09-26 14:56:50 -04:00
parent d192811419
commit ac557ed4ee
2 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dd-java-agent/instrumentation/spring-data/src/main/java/datadog/trace/instrumentation/springdata/SpringDataDecorator.java
View File

@ -2,7 +2,9 @@
package datadog.trace.instrumentation.springdata; package datadog.trace.instrumentation.springdata;
import datadog.opentracing.DDSpan;
import datadog.trace.agent.decorator.ClientDecorator; import datadog.trace.agent.decorator.ClientDecorator;
import datadog.trace.api.interceptor.MutableSpan;
import io.opentracing.Span; import io.opentracing.Span;
import java.lang.reflect.Method; import java.lang.reflect.Method;
@ -13,7 +15,7 @@ public final class SpringDataDecorator extends ClientDecorator {
@Override @Override
protected String service() { protected String service() {
return "spring-data"; return null;
} }
@Override @Override
@ -36,12 +38,9 @@ public final class SpringDataDecorator extends ClientDecorator {
assert method != null; assert method != null;
if (method != null) { if (method != null) {
final Class<?> clazz = method.getDeclaringClass(); if ( span instanceof MutableSpan ) {
final String methodName = method.getName(); ((MutableSpan)span).setResourceName(spanNameForMethod(method));
final String className = clazz.getSimpleName(); }
final String operationName = className + "." + methodName;
span.setOperationName(operationName);
} }
return span; return span;
} }

20
dd-java-agent/instrumentation/spring-data/src/test/groovy/SpringJpaTest.groovy
View File

@ -25,8 +25,8 @@ class SpringJpaTest extends AgentTestRunner {
assertTraces(1) { assertTraces(1) {
trace(0, 2) { trace(0, 2) {
span(0) { span(0) {
operationName "JpaRepository.findAll" operationName "repository.operation"
serviceName "spring-data" resourceName "JpaRepository.findAll"
errored false errored false
tags { tags {
"$Tags.COMPONENT.key" "spring-data" "$Tags.COMPONENT.key" "spring-data"
@ -52,8 +52,8 @@ class SpringJpaTest extends AgentTestRunner {
assertTraces(1) { assertTraces(1) {
trace(0, 2) { trace(0, 2) {
span(0) { span(0) {
operationName "CrudRepository.save" operationName "repository.operation"
serviceName "spring-data" resourceName "CrudRepository.save"
errored false errored false
tags { tags {
"$Tags.COMPONENT.key" "spring-data" "$Tags.COMPONENT.key" "spring-data"
@ -79,8 +79,8 @@ class SpringJpaTest extends AgentTestRunner {
assertTraces(1) { assertTraces(1) {
trace(0, 3) { trace(0, 3) {
span(0) { span(0) {
operationName "CrudRepository.save" operationName "repository.operation"
serviceName "spring-data" resourceName "CrudRepository.save"
errored false errored false
tags { tags {
"$Tags.COMPONENT.key" "spring-data" "$Tags.COMPONENT.key" "spring-data"
@ -112,8 +112,8 @@ class SpringJpaTest extends AgentTestRunner {
assertTraces(1) { assertTraces(1) {
trace(0, 2) { trace(0, 2) {
span(0) { span(0) {
operationName "JpaCustomerRepository.findByLastName" operationName "repository.operation"
serviceName "spring-data" resourceName "JpaCustomerRepository.findByLastName"
errored false errored false
tags { tags {
"$Tags.COMPONENT.key" "spring-data" "$Tags.COMPONENT.key" "spring-data"
@ -137,8 +137,8 @@ class SpringJpaTest extends AgentTestRunner {
assertTraces(1) { assertTraces(1) {
trace(0, 3) { trace(0, 3) {
span(0) { span(0) {
operationName "CrudRepository.delete" operationName "repository.operation"
serviceName "spring-data" resourceName "CrudRepository.delete"
errored false errored false
tags { tags {
"$Tags.COMPONENT.key" "spring-data" "$Tags.COMPONENT.key" "spring-data"