Skip to content

Commit e849d2f

Browse files
anuraagaanuraaga
committed
Merge branch 'main' of github.com:open-telemetry/opentelemetry-java-instrumentation into aws-sdk-bedrock
2 parents 5648989 + 353ec10 commit e849d2f

File tree

73 files changed

+976
-198
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+976
-198
lines changed

‎.fossa.yml

+3
Original file line numberDiff line numberDiff line change
@@ -895,6 +895,9 @@ targets:
895895
- type: gradle
896896
path: ./
897897
target: ':instrumentation:spring:spring-kafka-2.7:library'
898+
- type: gradle
899+
path: ./
900+
target: ':instrumentation:spring:spring-pulsar-1.0:javaagent'
898901
- type: gradle
899902
path: ./
900903
target: ':instrumentation:spring:spring-rabbit-1.0:javaagent'

‎dependencyManagement/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ plugins {
55
data class DependencySet(val group: String, val version: String, val modules: List<String>)
66

77
// this line is managed by .github/scripts/update-sdk-version.sh
8-
val otelSdkVersion = "1.47.0"
8+
val otelSdkVersion = "1.48.0"
99
val otelContribVersion = "1.44.0-alpha"
1010
val otelSdkAlphaVersion = otelSdkVersion.replaceFirst("(-SNAPSHOT)?$".toRegex(), "-alpha$1")
1111

‎docs/supported-libraries.md

+8-3
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ These are the supported libraries and frameworks:
101101
| [Log4j 1](https://logging.apache.org/log4j/1.2/) | 1.2+ | N/A | none |
102102
| [Log4j 2](https://logging.apache.org/log4j/2.x/) | 2.11+ | [opentelemetry-log4j-appender-2.17](../instrumentation/log4j/log4j-appender-2.17/library),<br>[opentelemetry-log4j-context-data-2.17-autoconfigure](../instrumentation/log4j/log4j-context-data/log4j-context-data-2.17/library-autoconfigure) | none |
103103
| [Logback](http://logback.qos.ch/) | 1.0+ | [opentelemetry-logback-appender-1.0](../instrumentation/logback/logback-appender-1.0/library),<br>[opentelemetry-logback-mdc-1.0](../instrumentation/logback/logback-mdc-1.0/library) | none |
104-
| [Micrometer](https://micrometer.io/) | 1.5+ | [opentelemetry-micrometer-1.5](../instrumentation/micrometer/micrometer-1.5/library) | none |
104+
| [Micrometer](https://micrometer.io/) | 1.5+ (disabled by default) | [opentelemetry-micrometer-1.5](../instrumentation/micrometer/micrometer-1.5/library) | none |
105105
| [MongoDB Driver](https://mongodb.github.io/mongo-java-driver/) | 3.1+ | [opentelemetry-mongo-3.1](../instrumentation/mongo/mongo-3.1/library) | [Database Client Spans], [Database Client Metrics]&nbsp;[6] |
106106
| [MyBatis](https://mybatis.org/mybatis-3/) | 3.2+ | N/A | none |
107107
| [Netty HTTP codec [5]](https://github.com/netty/netty) | 3.8+ | [opentelemetry-netty-4.1](../instrumentation/netty/netty-4.1/library) | [HTTP Client Spans], [HTTP Client Metrics], [HTTP Server Spans], [HTTP Server Metrics] |
@@ -138,6 +138,7 @@ These are the supported libraries and frameworks:
138138
| [Spring Integration](https://spring.io/projects/spring-integration) | 4.1+ (not including 6.0+ yet) | [opentelemetry-spring-integration-4.1](../instrumentation/spring/spring-integration-4.1/library) | [Messaging Spans] |
139139
| [Spring JMS](https://docs.spring.io/spring-framework/docs/current/reference/html/integration.html#jms) | 2.0+ | N/A | [Messaging Spans] |
140140
| [Spring Kafka](https://spring.io/projects/spring-kafka) | 2.7+ | [opentelemetry-spring-kafka-2.7](../instrumentation/spring/spring-kafka-2.7/library) | [Messaging Spans] |
141+
| [Spring Pulsar](https://spring.io/projects/spring-pulsar) | 1.0+ | | [Messaging Spans] |
141142
| [Spring RabbitMQ](https://spring.io/projects/spring-amqp) | 1.0+ | N/A | [Messaging Spans] |
142143
| [Spring RestTemplate](https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/web/client/package-summary.html) | 3.1+ | [opentelemetry-spring-web-3.1](../instrumentation/spring/spring-web/spring-web-3.1/library) | [HTTP Client Spans], [HTTP Client Metrics] |
143144
| [Spring RMI](https://docs.spring.io/spring-framework/docs/4.0.x/javadoc-api/org/springframework/remoting/rmi/package-summary.html) | 4.0+ | N/A | [RPC Client Spans], [RPC Server Spans] |
@@ -229,12 +230,16 @@ These are the JVMs and operating systems that the integration tests are run agai
229230

230231
## Disabled instrumentations
231232

232-
Some instrumentations can produce too many spans and make traces very noisy.
233+
Some instrumentations can produce too many spans and metrics and thus create a lot of noise.
233234
For this reason, the following instrumentations are disabled by default:
234235

235236
- `jdbc-datasource` which creates spans whenever the `java.sql.DataSource#getConnection` method is called.
236237
- `dropwizard-metrics` which might create a very low quality metrics data, because of lack of label/attribute support
237238
in the Dropwizard metrics API.
239+
- `micrometer` which might create high number of metrics due to being broadly used in libraries.
238240

239241
To enable them, add the `otel.instrumentation.<name>.enabled` system property:
240-
`-Dotel.instrumentation.jdbc-datasource.enabled=true`
242+
243+
- `-Dotel.instrumentation.jdbc-datasource.enabled=true`
244+
- `-Dotel.instrumentation.dropwizard-metrics.enabled=true`
245+
- `-Dotel.instrumentation.micrometer.enabled=true`

‎examples/distro/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ subprojects {
2727
ext {
2828
versions = [
2929
// this line is managed by .github/scripts/update-sdk-version.sh
30-
opentelemetrySdk : "1.47.0",
30+
opentelemetrySdk : "1.48.0",
3131

3232
// these lines are managed by .github/scripts/update-version.sh
3333
opentelemetryJavaagent : "2.14.0-SNAPSHOT",

‎examples/extension/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ version '1.0'
2323
ext {
2424
versions = [
2525
// this line is managed by .github/scripts/update-sdk-version.sh
26-
opentelemetrySdk : "1.47.0",
26+
opentelemetrySdk : "1.48.0",
2727

2828
// these lines are managed by .github/scripts/update-version.sh
2929
opentelemetryJavaagent : "2.14.0-SNAPSHOT",

‎instrumentation/akka/akka-actor-2.3/javaagent/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ dependencies {
3030
compileOnly("com.typesafe.akka:akka-actor_2.11:2.3.2") // first version in maven central
3131
testImplementation("com.typesafe.akka:akka-actor_2.11:2.3.2") // first version in maven central
3232

33-
latestDepTestLibrary("com.typesafe.akka:akka-actor_2.13:+")
33+
latestDepTestLibrary("com.typesafe.akka:akka-actor_2.13:latest.release")
3434
}
3535

3636
if (findProperty("testLatestDeps") as Boolean) {

‎instrumentation/akka/akka-http-10.0/javaagent/build.gradle.kts

+4-4
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,17 @@ dependencies {
3838
testInstrumentation(project(":instrumentation:akka:akka-actor-fork-join-2.5:javaagent"))
3939
testInstrumentation(project(":instrumentation:scala-fork-join-2.8:javaagent"))
4040

41-
latestDepTestLibrary("com.typesafe.akka:akka-http_2.13:+")
42-
latestDepTestLibrary("com.typesafe.akka:akka-stream_2.13:+")
41+
latestDepTestLibrary("com.typesafe.akka:akka-http_2.13:latest.release")
42+
latestDepTestLibrary("com.typesafe.akka:akka-stream_2.13:latest.release")
4343
}
4444

4545
testing {
4646
suites {
4747
val javaRouteTest by registering(JvmTestSuite::class) {
4848
dependencies {
4949
if (findProperty("testLatestDeps") as Boolean) {
50-
implementation("com.typesafe.akka:akka-http_2.13:+")
51-
implementation("com.typesafe.akka:akka-stream_2.13:+")
50+
implementation("com.typesafe.akka:akka-http_2.13:latest.release")
51+
implementation("com.typesafe.akka:akka-stream_2.13:latest.release")
5252
} else {
5353
implementation("com.typesafe.akka:akka-http_2.12:10.2.0")
5454
implementation("com.typesafe.akka:akka-stream_2.12:2.6.21")

‎instrumentation/apache-dubbo-2.7/javaagent/build.gradle.kts

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ testing {
2828
dependencies {
2929
implementation(project(":instrumentation:apache-dubbo-2.7:testing"))
3030
if (latestDepTest) {
31-
implementation("org.apache.dubbo:dubbo:+")
32-
implementation("org.apache.dubbo:dubbo-config-api:+")
31+
implementation("org.apache.dubbo:dubbo:latest.release")
32+
implementation("org.apache.dubbo:dubbo-config-api:latest.release")
3333
} else {
3434
implementation("org.apache.dubbo:dubbo:2.7.0")
3535
implementation("org.apache.dubbo:dubbo-config-api:2.7.0")

‎instrumentation/aws-sdk/aws-sdk-2.2/javaagent/build.gradle.kts

+2-2
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ testing {
134134
val s3PresignerTest by registering(JvmTestSuite::class) {
135135
dependencies {
136136
if (latestDepTest) {
137-
implementation("software.amazon.awssdk:s3:+")
137+
implementation("software.amazon.awssdk:s3:latest.release")
138138
} else {
139139
implementation("software.amazon.awssdk:s3:2.10.12")
140140
}
@@ -146,7 +146,7 @@ testing {
146146
dependencies {
147147
implementation(project(":instrumentation:aws-sdk:aws-sdk-2.2:testing"))
148148
if (findProperty("testLatestDeps") as Boolean) {
149-
implementation("software.amazon.awssdk:bedrockruntime:+")
149+
implementation("software.amazon.awssdk:bedrockruntime:latest.release")
150150
} else {
151151
// First release with Converse API
152152
implementation("software.amazon.awssdk:bedrockruntime:2.25.63")

‎instrumentation/aws-sdk/aws-sdk-2.2/library/build.gradle.kts

+6-6
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ testing {
3737
implementation(project(":instrumentation:aws-sdk:aws-sdk-2.2:testing"))
3838
compileOnly("software.amazon.awssdk:sqs:2.2.0")
3939
if (findProperty("testLatestDeps") as Boolean) {
40-
implementation("software.amazon.awssdk:aws-core:+")
41-
implementation("software.amazon.awssdk:aws-json-protocol:+")
42-
implementation("software.amazon.awssdk:dynamodb:+")
43-
implementation("software.amazon.awssdk:lambda:+")
40+
implementation("software.amazon.awssdk:aws-core:latest.release")
41+
implementation("software.amazon.awssdk:aws-json-protocol:latest.release")
42+
implementation("software.amazon.awssdk:dynamodb:latest.release")
43+
implementation("software.amazon.awssdk:lambda:latest.release")
4444
} else {
4545
implementation("software.amazon.awssdk:aws-core:2.2.0")
4646
implementation("software.amazon.awssdk:aws-json-protocol:2.2.0")
@@ -55,7 +55,7 @@ testing {
5555
implementation(project())
5656
implementation(project(":instrumentation:aws-sdk:aws-sdk-2.2:testing"))
5757
if (findProperty("testLatestDeps") as Boolean) {
58-
implementation("software.amazon.awssdk:lambda:+")
58+
implementation("software.amazon.awssdk:lambda:latest.release")
5959
} else {
6060
implementation("software.amazon.awssdk:lambda:2.17.0")
6161
}
@@ -67,7 +67,7 @@ testing {
6767
implementation(project())
6868
implementation(project(":instrumentation:aws-sdk:aws-sdk-2.2:testing"))
6969
if (findProperty("testLatestDeps") as Boolean) {
70-
implementation("software.amazon.awssdk:bedrockruntime:+")
70+
implementation("software.amazon.awssdk:bedrockruntime:latest.release")
7171
} else {
7272
implementation("software.amazon.awssdk:bedrockruntime:2.25.63")
7373
}

‎instrumentation/azure-core/azure-core-1.36/javaagent/build.gradle.kts

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ testing {
4646
val testAzure by registering(JvmTestSuite::class) {
4747
dependencies {
4848
if (latestDepTest) {
49-
implementation("com.azure:azure-core:+")
50-
implementation("com.azure:azure-core-test:+")
49+
implementation("com.azure:azure-core:latest.release")
50+
implementation("com.azure:azure-core-test:latest.release")
5151
} else {
5252
implementation("com.azure:azure-core:1.36.0")
5353
implementation("com.azure:azure-core-test:1.16.2")

‎instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/build.gradle.kts

+2-2
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ testing {
8181
val elasticsearch7Test by registering(JvmTestSuite::class) {
8282
dependencies {
8383
if (latestDepTest) {
84-
implementation("org.elasticsearch.client:transport:+")
85-
implementation("org.elasticsearch.plugin:transport-netty4-client:+")
84+
implementation("org.elasticsearch.client:transport:latest.release")
85+
implementation("org.elasticsearch.plugin:transport-netty4-client:latest.release")
8686
} else {
8787
implementation("org.elasticsearch.client:transport:7.0.0")
8888
implementation("org.elasticsearch.plugin:transport-netty4-client:7.0.0")

‎instrumentation/finatra-2.9/javaagent/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ dependencies {
4444
// Required for older versions of finatra on JDKs >= 11
4545
testImplementation("com.sun.activation:javax.activation:1.2.0")
4646

47-
finatraLatest("com.twitter:finatra-http_2.13:+") {
47+
finatraLatest("com.twitter:finatra-http_2.13:latest.release") {
4848
exclude("io.netty", "netty-transport-native-epoll")
4949
}
5050
}

‎instrumentation/gwt-2.0/javaagent/build.gradle.kts

+4-4
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ sourceSets {
3333
dependencies {
3434
// these are needed for compileGwt task
3535
if (findProperty("testLatestDeps") as Boolean) {
36-
compileOnly("org.gwtproject:gwt-user:+")
37-
compileOnly("org.gwtproject:gwt-dev:+")
38-
compileOnly("org.gwtproject:gwt-servlet:+")
39-
testImplementation("org.gwtproject:gwt-servlet:+")
36+
compileOnly("org.gwtproject:gwt-user:latest.release")
37+
compileOnly("org.gwtproject:gwt-dev:latest.release")
38+
compileOnly("org.gwtproject:gwt-servlet:latest.release")
39+
testImplementation("org.gwtproject:gwt-servlet:latest.release")
4040
} else {
4141
compileOnly("com.google.gwt:gwt-user:2.0.0")
4242
compileOnly("com.google.gwt:gwt-dev:2.0.0")

0 commit comments

Comments
 (0)