Skip to content

Commit ba0b163

Browse files
trasktrask
authored
Add base versions to four common javaagent modules (hibernate, jedis, jms, redisson) (#18423)
1 parent aea335b commit ba0b163

96 files changed

Lines changed: 158 additions & 158 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.

‎.fossa.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,7 @@ targets:
513513
target: ':instrumentation:hibernate:hibernate-6.0:javaagent'
514514
- type: gradle
515515
path: ./
516-
target: ':instrumentation:hibernate:hibernate-common:javaagent'
516+
target: ':instrumentation:hibernate:hibernate-common-3.3:javaagent'
517517
- type: gradle
518518
path: ./
519519
target: ':instrumentation:hibernate:hibernate-procedure-call-4.3:javaagent'
@@ -591,7 +591,7 @@ targets:
591591
target: ':instrumentation:jedis:jedis-4.0:javaagent'
592592
- type: gradle
593593
path: ./
594-
target: ':instrumentation:jedis:jedis-common:javaagent'
594+
target: ':instrumentation:jedis:jedis-common-1.4:javaagent'
595595
- type: gradle
596596
path: ./
597597
target: ':instrumentation:jetty:jetty-11.0:javaagent'
@@ -624,10 +624,10 @@ targets:
624624
target: ':instrumentation:jms:jms-3.0:javaagent'
625625
- type: gradle
626626
path: ./
627-
target: ':instrumentation:jms:jms-common:bootstrap'
627+
target: ':instrumentation:jms:jms-common-1.1:bootstrap'
628628
- type: gradle
629629
path: ./
630-
target: ':instrumentation:jms:jms-common:javaagent'
630+
target: ':instrumentation:jms:jms-common-1.1:javaagent'
631631
- type: gradle
632632
path: ./
633633
target: ':instrumentation:jsf:jsf-common-jakarta:javaagent'
@@ -882,7 +882,7 @@ targets:
882882
target: ':instrumentation:redisson:redisson-3.17:javaagent'
883883
- type: gradle
884884
path: ./
885-
target: ':instrumentation:redisson:redisson-common:javaagent'
885+
target: ':instrumentation:redisson:redisson-common-3.0:javaagent'
886886
- type: gradle
887887
path: ./
888888
target: ':instrumentation:restlet:restlet-1.1:javaagent'

‎instrumentation/hibernate/hibernate-3.3/javaagent/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ muzzle {
2121
dependencies {
2222
library("org.hibernate:hibernate-core:3.3.0.GA")
2323

24-
implementation(project(":instrumentation:hibernate:hibernate-common:javaagent"))
24+
implementation(project(":instrumentation:hibernate:hibernate-common-3.3:javaagent"))
2525

2626
testInstrumentation(project(":instrumentation:jdbc:javaagent"))
2727
// Added to ensure cross compatibility:

‎instrumentation/hibernate/hibernate-3.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/v3_3/CriteriaInstrumentation.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
import io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge;
1717
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
1818
import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
19-
import io.opentelemetry.javaagent.instrumentation.hibernate.HibernateOperation;
20-
import io.opentelemetry.javaagent.instrumentation.hibernate.HibernateOperationScope;
21-
import io.opentelemetry.javaagent.instrumentation.hibernate.SessionInfo;
19+
import io.opentelemetry.javaagent.instrumentation.hibernate.common.v3_3.HibernateOperation;
20+
import io.opentelemetry.javaagent.instrumentation.hibernate.common.v3_3.HibernateOperationScope;
21+
import io.opentelemetry.javaagent.instrumentation.hibernate.common.v3_3.SessionInfo;
2222
import net.bytebuddy.asm.Advice;
2323
import net.bytebuddy.description.type.TypeDescription;
2424
import net.bytebuddy.matcher.ElementMatcher;

‎instrumentation/hibernate/hibernate-3.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/v3_3/Hibernate3Singletons.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77

88
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
99
import io.opentelemetry.instrumentation.api.util.VirtualField;
10-
import io.opentelemetry.javaagent.instrumentation.hibernate.HibernateInstrumenterFactory;
11-
import io.opentelemetry.javaagent.instrumentation.hibernate.HibernateOperation;
12-
import io.opentelemetry.javaagent.instrumentation.hibernate.SessionInfo;
10+
import io.opentelemetry.javaagent.instrumentation.hibernate.common.v3_3.HibernateInstrumenterFactory;
11+
import io.opentelemetry.javaagent.instrumentation.hibernate.common.v3_3.HibernateOperation;
12+
import io.opentelemetry.javaagent.instrumentation.hibernate.common.v3_3.SessionInfo;
1313
import org.hibernate.Criteria;
1414
import org.hibernate.Query;
1515
import org.hibernate.Transaction;

‎instrumentation/hibernate/hibernate-3.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/v3_3/QueryInstrumentation.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
99
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.implementsInterface;
10-
import static io.opentelemetry.javaagent.instrumentation.hibernate.OperationNameUtil.getOperationNameForQuery;
10+
import static io.opentelemetry.javaagent.instrumentation.hibernate.common.v3_3.OperationNameUtil.getOperationNameForQuery;
1111
import static io.opentelemetry.javaagent.instrumentation.hibernate.v3_3.Hibernate3Singletons.QUERY_SESSION_INFO;
1212
import static io.opentelemetry.javaagent.instrumentation.hibernate.v3_3.Hibernate3Singletons.instrumenter;
1313
import static net.bytebuddy.matcher.ElementMatchers.named;
@@ -17,9 +17,9 @@
1717
import io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge;
1818
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
1919
import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
20-
import io.opentelemetry.javaagent.instrumentation.hibernate.HibernateOperation;
21-
import io.opentelemetry.javaagent.instrumentation.hibernate.HibernateOperationScope;
22-
import io.opentelemetry.javaagent.instrumentation.hibernate.SessionInfo;
20+
import io.opentelemetry.javaagent.instrumentation.hibernate.common.v3_3.HibernateOperation;
21+
import io.opentelemetry.javaagent.instrumentation.hibernate.common.v3_3.HibernateOperationScope;
22+
import io.opentelemetry.javaagent.instrumentation.hibernate.common.v3_3.SessionInfo;
2323
import net.bytebuddy.asm.Advice;
2424
import net.bytebuddy.description.type.TypeDescription;
2525
import net.bytebuddy.matcher.ElementMatcher;

‎instrumentation/hibernate/hibernate-3.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/v3_3/SessionInstrumentation.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
99
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.implementsInterface;
10-
import static io.opentelemetry.javaagent.instrumentation.hibernate.OperationNameUtil.getEntityName;
11-
import static io.opentelemetry.javaagent.instrumentation.hibernate.OperationNameUtil.getSessionMethodOperationName;
10+
import static io.opentelemetry.javaagent.instrumentation.hibernate.common.v3_3.OperationNameUtil.getEntityName;
11+
import static io.opentelemetry.javaagent.instrumentation.hibernate.common.v3_3.OperationNameUtil.getSessionMethodOperationName;
1212
import static io.opentelemetry.javaagent.instrumentation.hibernate.v3_3.Hibernate3Singletons.CRITERIA_SESSION_INFO;
1313
import static io.opentelemetry.javaagent.instrumentation.hibernate.v3_3.Hibernate3Singletons.QUERY_SESSION_INFO;
1414
import static io.opentelemetry.javaagent.instrumentation.hibernate.v3_3.Hibernate3Singletons.TRANSACTION_SESSION_INFO;
@@ -23,9 +23,9 @@
2323
import io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge;
2424
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
2525
import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
26-
import io.opentelemetry.javaagent.instrumentation.hibernate.HibernateOperation;
27-
import io.opentelemetry.javaagent.instrumentation.hibernate.HibernateOperationScope;
28-
import io.opentelemetry.javaagent.instrumentation.hibernate.SessionInfo;
26+
import io.opentelemetry.javaagent.instrumentation.hibernate.common.v3_3.HibernateOperation;
27+
import io.opentelemetry.javaagent.instrumentation.hibernate.common.v3_3.HibernateOperationScope;
28+
import io.opentelemetry.javaagent.instrumentation.hibernate.common.v3_3.SessionInfo;
2929
import net.bytebuddy.asm.Advice;
3030
import net.bytebuddy.description.type.TypeDescription;
3131
import net.bytebuddy.matcher.ElementMatcher;

‎instrumentation/hibernate/hibernate-3.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/v3_3/SessionUtil.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
package io.opentelemetry.javaagent.instrumentation.hibernate.v3_3;
77

88
import io.opentelemetry.instrumentation.api.util.VirtualField;
9-
import io.opentelemetry.javaagent.instrumentation.hibernate.SessionInfo;
9+
import io.opentelemetry.javaagent.instrumentation.hibernate.common.v3_3.SessionInfo;
1010
import javax.annotation.Nullable;
1111
import org.hibernate.Session;
1212
import org.hibernate.StatelessSession;

‎instrumentation/hibernate/hibernate-3.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/v3_3/TransactionInstrumentation.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
import io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge;
1717
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
1818
import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
19-
import io.opentelemetry.javaagent.instrumentation.hibernate.HibernateOperation;
20-
import io.opentelemetry.javaagent.instrumentation.hibernate.HibernateOperationScope;
21-
import io.opentelemetry.javaagent.instrumentation.hibernate.SessionInfo;
19+
import io.opentelemetry.javaagent.instrumentation.hibernate.common.v3_3.HibernateOperation;
20+
import io.opentelemetry.javaagent.instrumentation.hibernate.common.v3_3.HibernateOperationScope;
21+
import io.opentelemetry.javaagent.instrumentation.hibernate.common.v3_3.SessionInfo;
2222
import net.bytebuddy.asm.Advice;
2323
import net.bytebuddy.description.type.TypeDescription;
2424
import net.bytebuddy.matcher.ElementMatcher;

‎instrumentation/hibernate/hibernate-4.0/javaagent/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ muzzle {
1414
dependencies {
1515
compileOnly("org.hibernate:hibernate-core:4.0.0.Final")
1616

17-
implementation(project(":instrumentation:hibernate:hibernate-common:javaagent"))
17+
implementation(project(":instrumentation:hibernate:hibernate-common-3.3:javaagent"))
1818

1919
testInstrumentation(project(":instrumentation:jdbc:javaagent"))
2020
// Added to ensure cross compatibility:

‎instrumentation/hibernate/hibernate-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/CriteriaInstrumentation.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
import io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge;
1717
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
1818
import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
19-
import io.opentelemetry.javaagent.instrumentation.hibernate.HibernateOperation;
20-
import io.opentelemetry.javaagent.instrumentation.hibernate.HibernateOperationScope;
21-
import io.opentelemetry.javaagent.instrumentation.hibernate.SessionInfo;
19+
import io.opentelemetry.javaagent.instrumentation.hibernate.common.v3_3.HibernateOperation;
20+
import io.opentelemetry.javaagent.instrumentation.hibernate.common.v3_3.HibernateOperationScope;
21+
import io.opentelemetry.javaagent.instrumentation.hibernate.common.v3_3.SessionInfo;
2222
import javax.annotation.Nullable;
2323
import net.bytebuddy.asm.Advice;
2424
import net.bytebuddy.description.type.TypeDescription;

0 commit comments

Comments
 (0)