Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into request-content-len…
Browse files Browse the repository at this point in the history 
…gth-apache-httpclient
  • Loading branch information
@anuragagarwal561994
anuragagarwal561994 committed Jan 17, 2023
2 parents 1cf0ea7 + 0ace238 commit d64d59d
Show file tree
Hide file tree
Showing 170 changed files with 4,234 additions and 772 deletions.
7 changes: 7 additions & 0 deletions .github/dependabot.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,3 +72,10 @@ updates:
schedule:
interval: "daily"
open-pull-requests-limit: 10

- package-ecosystem: "gradle"
directory: "/benchmark-overhead"
rebase-strategy: "disabled"
schedule:
interval: "daily"
open-pull-requests-limit: 10
46 changes: 46 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,52 @@

## Unreleased

## Version 1.22.1 (2023-01-14)

- Fix potential startup failure
([#7567](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/7567))

## Version 1.22.0 (2023-01-12)

### 📈 Enhancements

- Add resource injection for getResourceAsStream
([#7476](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/7476))
- GRPC: Adds peer socket address when the client call is ready
([#7451](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/7451))
- Make OpenTelemetryAppender.Builder public
([#7521](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/7521))
- Disable internal TaskScheduler spans in Spring Kafka instrumentation
([#7553](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/7553))
- Support Spring Web MVC in library instrumentation
([#7552](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/7552))
- Instrument JMS 3.0 (Jakarta)
([#7418](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/7418))
- Shade `application.io.opentelemetry` in agent extension class loader
([#7519](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/7519))
- Use new reactor contextWrite when available (from reactor 3.4.0)
([#7538](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/7538))
- Make config file available in early agent initialization phase
([#7550](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/7550))
- Support Spring JMS 6.0
([#7438](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/7438))

### 🛠️ Bug fixes

- Preserve original exception in jetty http client wrappers
([#7455](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/7455))
- Propagate original exception through kafka wrapper
([#7452](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/7452))
- Fix class file load error when using spring-guice together with spring-web instrumentation
([#7447](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/7447))
- Fix NPE in servlet AsyncListener on OpenLiberty
([#7498](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/7498))

### 🧰 Tooling

- Muzzle logs should be logged using the io.opentelemetry.* logger name
([#7446](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/7446))

## Version 1.21.0 (2022-12-13)

### 📈 Enhancements
Expand Down
23 changes: 13 additions & 10 deletions benchmark-overhead/build.gradle.kts
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id("java")
id("com.diffplug.spotless") version "6.9.0"
id("com.diffplug.spotless") version "6.13.0"
}

spotless {
Expand All @@ -16,15 +16,18 @@ repositories {
}

dependencies {
testImplementation("org.testcontainers:testcontainers:1.16.2")
testImplementation("org.testcontainers:postgresql:1.15.3")
testImplementation("org.junit.jupiter:junit-jupiter-api:5.9.0")
testImplementation("org.junit.jupiter:junit-jupiter-params:5.9.0")
testImplementation("com.squareup.okhttp3:okhttp:4.9.1")
testImplementation("org.jooq:joox:1.6.2")
testImplementation("com.jayway.jsonpath:json-path:2.6.0")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.9.0")
testImplementation("org.slf4j:slf4j-simple:2.0.0")
implementation(enforcedPlatform("org.junit:junit-bom:5.9.2"))

testImplementation("org.testcontainers:testcontainers:1.17.6")
testImplementation("org.testcontainers:postgresql:1.17.6")
testImplementation("org.junit.jupiter:junit-jupiter-api")
testImplementation("org.junit.jupiter:junit-jupiter-params")
testImplementation("com.squareup.okhttp3:okhttp:4.10.0")
testImplementation("org.jooq:joox:2.0.0")
testImplementation("com.jayway.jsonpath:json-path:2.7.0")
testImplementation("org.slf4j:slf4j-simple:2.0.6")

testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
}

tasks {
Expand Down
10 changes: 5 additions & 5 deletions conventions/build.gradle.kts
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
`kotlin-dsl`
// When updating, update below in dependencies too
id("com.diffplug.spotless") version "6.12.1"
id("com.diffplug.spotless") version "6.13.0"
}

spotless {
Expand Down Expand Up @@ -43,8 +43,8 @@ dependencies {
implementation("gradle.plugin.com.google.protobuf:protobuf-gradle-plugin:0.8.18")
implementation("gradle.plugin.com.github.johnrengelman:shadow:7.1.2")
implementation("org.apache.httpcomponents:httpclient:4.5.14")
implementation("org.gradle:test-retry-gradle-plugin:1.5.0")
implementation("org.owasp:dependency-check-gradle:7.4.3")
implementation("com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.12.1")
implementation("org.owasp:dependency-check-gradle:8.0.0")
implementation("ru.vyarus:gradle-animalsniffer-plugin:1.6.0")
// When updating, also update dependencyManagement/build.gradle.kts
implementation("net.bytebuddy:byte-buddy-gradle-plugin:1.12.20")
Expand All @@ -54,8 +54,8 @@ dependencies {
implementation("net.ltgt.gradle:gradle-nullaway-plugin:1.5.0")
implementation("me.champeau.gradle:japicmp-gradle-plugin:0.4.1")

testImplementation(enforcedPlatform("org.junit:junit-bom:5.9.1"))
testImplementation(enforcedPlatform("org.junit:junit-bom:5.9.2"))
testImplementation("org.junit.jupiter:junit-jupiter-api")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
testImplementation("org.assertj:assertj-core:3.23.1")
testImplementation("org.assertj:assertj-core:3.24.1")
}
8 changes: 4 additions & 4 deletions conventions/src/main/kotlin/otel.java-conventions.gradle.kts
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import com.gradle.enterprise.gradleplugin.testretry.retry
import io.opentelemetry.instrumentation.gradle.OtelJavaExtension
import org.gradle.api.tasks.testing.logging.TestExceptionFormat
import java.time.Duration
Expand All @@ -9,8 +10,6 @@ plugins {
codenarc
idea

id("org.gradle.test-retry")

id("otel.errorprone-conventions")
id("otel.spotless-conventions")
id("org.owasp.dependencycheck")
Expand Down Expand Up @@ -293,9 +292,10 @@ tasks.withType<Test>().configureEach {
timeout.set(Duration.ofMinutes(15))

retry {
val retryTests = System.getenv("CI") != null || rootProject.hasProperty("retryTests")
// You can see tests that were retried by this mechanism in the collected test reports and build scans.
maxRetries.set(if (retryTests) 5 else 0)
if (System.getenv().containsKey("CI") || rootProject.hasProperty("retryTests")) {
maxRetries.set(5)
}
}

reports {
Expand Down
14 changes: 7 additions & 7 deletions dependencyManagement/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,16 @@ val DEPENDENCY_BOMS = listOf(
"com.fasterxml.jackson:jackson-bom:2.14.1",
"com.google.guava:guava-bom:31.1-jre",
"org.apache.groovy:groovy-bom:${groovyVersion}",
"io.opentelemetry:opentelemetry-bom:1.21.0",
"io.opentelemetry:opentelemetry-bom-alpha:1.21.0-alpha",
"org.junit:junit-bom:5.9.1",
"io.opentelemetry:opentelemetry-bom:1.22.0",
"io.opentelemetry:opentelemetry-bom-alpha:1.22.0-alpha",
"org.junit:junit-bom:5.9.2",
"org.testcontainers:testcontainers-bom:1.17.6",
"org.spockframework:spock-bom:2.3-groovy-4.0"
"org.spockframework:spock-bom:2.4-M1-groovy-4.0"
)

val autoServiceVersion = "1.0.1"
val autoValueVersion = "1.10.1"
val errorProneVersion = "2.17.0"
val errorProneVersion = "2.18.0"
val byteBuddyVersion = "1.12.20"
val asmVersion = "9.4"
val jmhVersion = "1.36"
Expand Down Expand Up @@ -80,7 +80,7 @@ val DEPENDENCIES = listOf(
"com.github.stefanbirkner:system-lambda:1.2.1",
"com.github.stefanbirkner:system-rules:1.19.0",
"uk.org.webcompere:system-stubs-jupiter:2.0.1",
"com.uber.nullaway:nullaway:0.10.6",
"com.uber.nullaway:nullaway:0.10.8",
"commons-beanutils:commons-beanutils:1.9.4",
"commons-cli:commons-cli:1.5.0",
"commons-codec:commons-codec:1.15",
Expand All @@ -94,7 +94,7 @@ val DEPENDENCIES = listOf(
"io.netty:netty:3.10.6.Final",
"io.opentelemetry.contrib:opentelemetry-aws-xray-propagator:1.21.0-alpha",
"io.opentelemetry.proto:opentelemetry-proto:0.19.0-alpha",
"org.assertj:assertj-core:3.23.1",
"org.assertj:assertj-core:3.24.1",
"org.awaitility:awaitility:4.2.0",
"com.google.code.findbugs:annotations:3.0.1u2",
"com.google.code.findbugs:jsr305:3.0.2",
Expand Down
2 changes: 2 additions & 0 deletions docs/apidiffs/1.22.0_vs_1.21.0/opentelemetry-instrumentation-annotations.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Comparing source compatibility of against
No changes.
2 changes: 2 additions & 0 deletions docs/apidiffs/1.22.0_vs_1.21.0/opentelemetry-instrumentation-api.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Comparing source compatibility of against
No changes.
7 changes: 4 additions & 3 deletions docs/supported-libraries.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,14 +108,15 @@ These are the supported libraries and frameworks:
| [Servlet](https://javaee.github.io/javaee-spec/javadocs/javax/servlet/package-summary.html) | 2.2+ | N/A | [HTTP Server Spans], [HTTP Server Metrics] |
| [Spark Web Framework](https://github.com/perwendel/spark) | 2.3+ | N/A | Provides `http.route` [2] |
| [Spring Boot](https://spring.io/projects/spring-boot) | | [opentelemetry-spring-boot-resources](../instrumentation/spring/spring-boot-resources/library) | none |
| [Spring Batch](https://spring.io/projects/spring-batch) | 3.0+ | N/A | none |
| [Spring Batch](https://spring.io/projects/spring-batch) | 3.0+ (not including 5.0+ yet) | N/A | none |
| [Spring Data](https://spring.io/projects/spring-data) | 1.8+ | N/A | none |
| [Spring Integration](https://spring.io/projects/spring-integration) | 4.1+ | [opentelemetry-spring-integration-4.1](../instrumentation/spring/spring-integration-4.1/library) | [Messaging Spans] |
| [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] |
| [Spring JMS](https://docs.spring.io/spring-framework/docs/current/reference/html/integration.html#jms) | 2.0+ | N/A | [Messaging Spans] |
| [Spring Kafka](https://spring.io/projects/spring-kafka) | 2.7+ | [opentelemetry-spring-kafka-2.7](../instrumentation/spring/spring-kafka-2.7/library) | [Messaging Spans] |
| [Spring RabbitMQ](https://spring.io/projects/spring-amqp) | 1.0+ | N/A | [Messaging Spans] |
| [Spring Scheduling](https://docs.spring.io/spring/docs/current/javadoc-api/org/springframework/scheduling/package-summary.html) | 3.1+ | N/A | none |
| [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] |
| [Spring Web MVC](https://docs.spring.io/spring/docs/current/javadoc-api/org/springframework/web/servlet/mvc/package-summary.html) | 3.1+ | [opentelemetry-spring-webmvc-5.3](../instrumentation/spring/spring-webmvc/spring-webmvc-5.3/library) | [HTTP Server Spans], [HTTP Server Metrics] |
| [Spring Web MVC](https://docs.spring.io/spring/docs/current/javadoc-api/org/springframework/web/servlet/mvc/package-summary.html) | 3.1+ | [opentelemetry-spring-webmvc-5.3](../instrumentation/spring/spring-webmvc/spring-webmvc-5.3/library),<br>[opentelemetry-spring-webmvc-6.0](../instrumentation/spring/spring-webmvc/spring-webmvc-6.0/library) | [HTTP Server Spans], [HTTP Server Metrics] |
| [Spring Web Services](https://spring.io/projects/spring-ws) | 2.0+ | N/A | none |
| [Spring WebFlux](https://docs.spring.io/spring/docs/current/javadoc-api/org/springframework/web/reactive/package-summary.html) | 5.0+ | [opentelemetry-spring-webflux-5.0](../instrumentation/spring/spring-webflux-5.0/library) | [HTTP Client Spans], [HTTP Client Metrics], |
| [Spymemcached](https://github.com/couchbase/spymemcached) | 2.12+ | N/A | [Database Client Spans] |
Expand Down
Loading

0 comments on commit d64d59d

Please sign in to comment.