Skip to content

Commit ca7eb61

Browse files
trasktrask
committed
Merge remote-tracking branch 'upstream/main' into pr/6381
2 parents 1008aef + 53353ac commit ca7eb61

File tree

38 files changed

+8746
-87
lines changed

38 files changed

+8746
-87
lines changed

‎.github/workflows/release.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,10 +110,12 @@ jobs:
110110
env:
111111
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
112112
run: |
113+
sdk_version=$(grep -Po "val otelSdkVersion = \"\K[0-9]+.[0-9]+.[0-9]+" dependencyManagement/build.gradle.kts)
114+
113115
# conditional blocks not indented because of the heredoc
114116
if [[ $VERSION == *.0 ]]; then
115117
cat > /tmp/release-notes.txt << EOF
116-
This release targets the OpenTelemetry SDK $VERSION.
118+
This release targets the OpenTelemetry SDK $sdk_version.
117119
118120
Note that many artifacts have the \`-alpha\` suffix attached to their version number, reflecting that they are still alpha quality and will continue to have breaking changes. Please see the [VERSIONING.md](https://github.com/open-telemetry/opentelemetry-java-instrumentation/blob/main/VERSIONING.md#opentelemetry-java-instrumentation-versioning) for more details.
119121

‎benchmark-overhead-jmh/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ plugins {
88
}
99

1010
dependencies {
11-
jmhImplementation("org.springframework.boot:spring-boot-starter-web:3.0.2")
11+
jmhImplementation("org.springframework.boot:spring-boot-starter-web:3.0.3")
1212
}
1313

1414
tasks {

‎conventions/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ dependencies {
6363
// When updating, also update dependencyManagement/build.gradle.kts
6464
implementation("net.bytebuddy:byte-buddy-gradle-plugin:1.14.0")
6565
implementation("gradle.plugin.io.morethan.jmhreport:gradle-jmh-report:0.9.0")
66-
implementation("me.champeau.jmh:jmh-gradle-plugin:0.6.8")
66+
implementation("me.champeau.jmh:jmh-gradle-plugin:0.7.0")
6767
implementation("net.ltgt.gradle:gradle-errorprone-plugin:3.0.1")
6868
implementation("net.ltgt.gradle:gradle-nullaway-plugin:1.5.0")
6969
implementation("me.champeau.gradle:japicmp-gradle-plugin:0.4.1")

‎dependencyManagement/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ val DEPENDENCIES = listOf(
9595
"commons-logging:commons-logging:1.2",
9696
"commons-validator:commons-validator:1.7",
9797
"io.netty:netty:3.10.6.Final",
98-
"io.opentelemetry.contrib:opentelemetry-aws-xray-propagator:1.22.0-alpha",
98+
"io.opentelemetry.contrib:opentelemetry-aws-xray-propagator:1.23.0-alpha",
9999
"io.opentelemetry.proto:opentelemetry-proto:0.19.0-alpha",
100100
"org.assertj:assertj-core:3.24.2",
101101
"org.awaitility:awaitility:4.2.0",

‎docs/supported-libraries.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ These are the supported libraries and frameworks:
7777
| [JDBC](https://docs.oracle.com/javase/8/docs/api/java/sql/package-summary.html) | Java 8+ | [opentelemetry-jdbc](../instrumentation/jdbc/library) | [Database Client Spans] |
7878
| [Jedis](https://github.com/xetorthio/jedis) | 1.4+ | N/A | [Database Client Spans] |
7979
| [JMS](https://javaee.github.io/javaee-spec/javadocs/javax/jms/package-summary.html) | 1.1+ | N/A | [Messaging Spans] |
80+
| [Jodd Http](https://javadoc.io/doc/org.jodd/jodd-http/latest/index.html) | 4.2+ | N/A | [HTTP Client Spans], [HTTP Client Metrics] |
8081
| [JSP](https://javaee.github.io/javaee-spec/javadocs/javax/servlet/jsp/package-summary.html) | 2.3+ | N/A | none |
8182
| [Kotlin Coroutines](https://kotlinlang.org/docs/coroutines-overview.html) | 1.0+ | N/A | Context propagation |
8283
| [Ktor](https://github.com/ktorio/ktor) | 1.0+ | [opentelemetry-ktor-1.0](../instrumentation/ktor/ktor-1.0/library),<br>[opentelemetry-ktor-2.0](../instrumentation/ktor/ktor-2.0/library) | [HTTP Server Spans], [HTTP Server Metrics] |
@@ -101,7 +102,7 @@ These are the supported libraries and frameworks:
101102
| [Rediscala](https://github.com/etaty/rediscala) | 1.8+ | N/A | [Database Client Spans] |
102103
| [Redisson](https://github.com/redisson/redisson) | 3.0+ | N/A | [Database Client Spans] |
103104
| [RESTEasy](https://resteasy.github.io/) | 3.0+ | N/A | Provides `http.route` [2], Controller Spans [3] |
104-
| [Restlet](https://restlet.github.io/) | 1.0+ | [opentelemetry-restlet-1.1](../instrumentation/restlet/restlet-1.1/library),<br>[opentelemetry-restlet-2.0](../instrumentation/restlet/restlet-2.0/library) | [HTTP Server Spans], [HTTP Server Metrics] |
105+
| [Restlet](https://restlet.github.io/) | 1.0+ | [opentelemetry-restlet-1.1](../instrumentation/restlet/restlet-1.1/library),<br>[opentelemetry-restlet-2.0](../instrumentation/restlet/restlet-2.0/library) | [HTTP Server Spans], [HTTP Server Metrics] |
105106
| [RMI](https://docs.oracle.com/en/java/javase/11/docs/api/java.rmi/java/rmi/package-summary.html) | Java 8+ | | [RPC Client Spans], [RPC Server Spans] |
106107
| [RxJava](https://github.com/ReactiveX/RxJava) | 1.0+ | [opentelemetry-rxjava-1.0](../instrumentation/rxjava/rxjava-1.0/library),<br>[opentelemetry-rxjava-2.0](../instrumentation/rxjava/rxjava-2.0/library),<br>[opentelemetry-rxjava-3.0](../instrumentation/rxjava/rxjava-3.0/library),<br>[opentelemetry-rxjava-3.1.1](../instrumentation/rxjava/rxjava-3.1.1/library) | Context propagation |
107108
| [Scala ForkJoinPool](https://www.scala-lang.org/api/2.12.0/scala/concurrent/forkjoin/package$$ForkJoinPool$.html) | 2.8+ | N/A | Context propagation |

‎gradle-plugins/settings.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
pluginManagement {
22
plugins {
33
id("com.gradle.plugin-publish") version "1.1.0"
4-
id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
4+
id("io.github.gradle-nexus.publish-plugin") version "1.2.0"
55
}
66
}

‎instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/JaxrsAnnotationsInstrumentation.java‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
package io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0;
77

8-
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
98
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasSuperMethod;
109
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasSuperType;
1110
import static io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0.JaxrsAnnotationsSingletons.instrumenter;
@@ -37,10 +36,6 @@
3736
import net.bytebuddy.matcher.ElementMatcher;
3837

3938
public class JaxrsAnnotationsInstrumentation implements TypeInstrumentation {
40-
@Override
41-
public ElementMatcher<ClassLoader> classLoaderOptimization() {
42-
return hasClassesNamed("javax.ws.rs.Path");
43-
}
4439

4540
@Override
4641
public ElementMatcher<TypeDescription> typeMatcher() {

‎instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/JaxrsAnnotationsInstrumentationModule.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public JaxrsAnnotationsInstrumentationModule() {
2323
// require jax-rs 2
2424
@Override
2525
public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
26-
return hasClassesNamed("javax.ws.rs.container.AsyncResponse");
26+
return hasClassesNamed("javax.ws.rs.core.Configurable");
2727
}
2828

2929
@Override

‎instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/JaxrsAnnotationsInstrumentation.java‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
package io.opentelemetry.javaagent.instrumentation.jaxrs.v3_0;
77

8-
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
98
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasSuperMethod;
109
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasSuperType;
1110
import static io.opentelemetry.javaagent.instrumentation.jaxrs.v3_0.JaxrsAnnotationsSingletons.instrumenter;
@@ -37,10 +36,6 @@
3736
import net.bytebuddy.matcher.ElementMatcher;
3837

3938
public class JaxrsAnnotationsInstrumentation implements TypeInstrumentation {
40-
@Override
41-
public ElementMatcher<ClassLoader> classLoaderOptimization() {
42-
return hasClassesNamed("jakarta.ws.rs.Path");
43-
}
4439

4540
@Override
4641
public ElementMatcher<TypeDescription> typeMatcher() {

‎instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/JaxrsAnnotationsInstrumentationModule.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public JaxrsAnnotationsInstrumentationModule() {
2323
// require jax-rs 3
2424
@Override
2525
public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
26-
return hasClassesNamed("jakarta.ws.rs.container.AsyncResponse");
26+
return hasClassesNamed("jakarta.ws.rs.Path");
2727
}
2828

2929
@Override

0 commit comments

Comments
 (0)