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

spring -> spring.jpa 

Moved spring to spring.jpa to make room for other spring data integrations.
This commit is contained in:
dougqh 2019-09-25 15:59:43 -04:00
parent 64e3ebca88
commit d0cf564f07
8 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dd-java-agent/instrumentation/hibernate/core-4.3/src/test/groovy/SpringJpaTest.groovy
View File

@ -1,9 +1,9 @@
import datadog.trace.agent.test.AgentTestRunner import datadog.trace.agent.test.AgentTestRunner
import org.springframework.context.annotation.AnnotationConfigApplicationContext import org.springframework.context.annotation.AnnotationConfigApplicationContext
import spock.lang.Shared import spock.lang.Shared
import spring.Customer import spring.jpa.Customer
import spring.CustomerRepository import spring.jpa.CustomerRepository
import spring.PersistenceConfig import spring.jpa.PersistenceConfig
/** /**

2
dd-java-agent/instrumentation/hibernate/core-4.3/src/test/java/spring/Customer.java → dd-java-agent/instrumentation/hibernate/core-4.3/src/test/java/spring/jpa/Customer.java
View File

@ -1,4 +1,4 @@
package spring; package spring.jpa;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.GeneratedValue; import javax.persistence.GeneratedValue;

2
dd-java-agent/instrumentation/hibernate/core-4.3/src/test/java/spring/CustomerRepository.java → dd-java-agent/instrumentation/hibernate/core-4.3/src/test/java/spring/jpa/CustomerRepository.java
View File

@ -1,4 +1,4 @@
package spring; package spring.jpa;
import java.util.List; import java.util.List;
import org.springframework.data.repository.CrudRepository; import org.springframework.data.repository.CrudRepository;

6
dd-java-agent/instrumentation/hibernate/core-4.3/src/test/java/spring/PersistenceConfig.java → dd-java-agent/instrumentation/hibernate/core-4.3/src/test/java/spring/jpa/PersistenceConfig.java
View File

@ -1,4 +1,4 @@
package spring; package spring.jpa;
import java.util.Properties; import java.util.Properties;
import javax.sql.DataSource; import javax.sql.DataSource;
@ -11,7 +11,7 @@ import org.springframework.orm.jpa.vendor.Database;
import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter; import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
import org.springframework.transaction.PlatformTransactionManager; import org.springframework.transaction.PlatformTransactionManager;
@EnableJpaRepositories(basePackages = "spring") @EnableJpaRepositories(basePackages = "spring/jpa")
public class PersistenceConfig { public class PersistenceConfig {
@Bean(name = "transactionManager") @Bean(name = "transactionManager")
@ -30,7 +30,7 @@ public class PersistenceConfig {
final LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean(); final LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean();
em.setDataSource(dataSource()); em.setDataSource(dataSource());
em.setPackagesToScan("spring"); em.setPackagesToScan("spring/jpa");
em.setJpaVendorAdapter(vendorAdapter); em.setJpaVendorAdapter(vendorAdapter);
em.setJpaProperties(additionalProperties()); em.setJpaProperties(additionalProperties());

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

@ -2,9 +2,9 @@
import datadog.trace.agent.test.AgentTestRunner import datadog.trace.agent.test.AgentTestRunner
import io.opentracing.tag.Tags import io.opentracing.tag.Tags
import org.springframework.context.annotation.AnnotationConfigApplicationContext import org.springframework.context.annotation.AnnotationConfigApplicationContext
import spring.Customer import spring.jpa.Customer
import spring.CustomerRepository import spring.jpa.CustomerRepository
import spring.PersistenceConfig import spring.jpa.PersistenceConfig
class SpringJpaTest extends AgentTestRunner { class SpringJpaTest extends AgentTestRunner {
def "test CRUD"() { def "test CRUD"() {

2
dd-java-agent/instrumentation/spring-data/src/test/java/spring/Customer.java → dd-java-agent/instrumentation/spring-data/src/test/java/spring/jpa/Customer.java
View File

@ -1,6 +1,6 @@
// This file includes software developed at SignalFx // This file includes software developed at SignalFx
package spring; package spring.jpa;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.GeneratedValue; import javax.persistence.GeneratedValue;

2
dd-java-agent/instrumentation/spring-data/src/test/java/spring/CustomerRepository.java → dd-java-agent/instrumentation/spring-data/src/test/java/spring/jpa/CustomerRepository.java
View File

@ -1,6 +1,6 @@
// This file includes software developed at SignalFx // This file includes software developed at SignalFx
package spring; package spring.jpa;
import java.util.List; import java.util.List;
import org.springframework.data.repository.CrudRepository; import org.springframework.data.repository.CrudRepository;

6
dd-java-agent/instrumentation/spring-data/src/test/java/spring/PersistenceConfig.java → dd-java-agent/instrumentation/spring-data/src/test/java/spring/jpa/PersistenceConfig.java
View File

@ -1,6 +1,6 @@
// This file includes software developed at SignalFx // This file includes software developed at SignalFx
package spring; package spring.jpa;
import javax.sql.DataSource; import javax.sql.DataSource;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
@ -12,7 +12,7 @@ import org.springframework.orm.jpa.vendor.Database;
import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter; import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
import org.springframework.transaction.PlatformTransactionManager; import org.springframework.transaction.PlatformTransactionManager;
@EnableJpaRepositories(basePackages = "spring") @EnableJpaRepositories(basePackages = "spring/jpa")
public class PersistenceConfig { public class PersistenceConfig {
@Bean(name = "transactionManager") @Bean(name = "transactionManager")
@ -31,7 +31,7 @@ public class PersistenceConfig {
final LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean(); final LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean();
em.setDataSource(dataSource()); em.setDataSource(dataSource());
em.setPackagesToScan("spring"); em.setPackagesToScan("spring/jpa");
em.setJpaVendorAdapter(vendorAdapter); em.setJpaVendorAdapter(vendorAdapter);
return em; return em;
} }