Skip to content

Commit a29759a

Browse files
Merge branch 'main' into add_metric_annotation_instrument
2 parents e6f7a10 + 1115cda commit a29759a

File tree

122 files changed

+4096
-454
lines changed

Some content is hidden

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

122 files changed

+4096
-454
lines changed

.github/renovate.json5

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,16 @@
143143
],
144144
enabled: false,
145145
},
146+
{
147+
// wiremock 3+ requires Java 11+
148+
matchUpdateTypes: [
149+
'major',
150+
],
151+
enabled: false,
152+
matchPackageNames: [
153+
'com.github.tomakehurst:wiremock-jre8'
154+
],
155+
},
146156
{
147157
// intentionally using Spring Boot 2 in this smoke tests
148158
// new versions of Spring Boot 3 are tested with

.github/workflows/auto-license-report.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
- id: create-patch
4444
name: Create patch file
4545
run: |
46-
git add -N licenses
46+
git add -N --ignore-removal licenses
4747
git diff > patch
4848
if [ -s patch ]; then
4949
echo "exists=true" >> "$GITHUB_OUTPUT"

.github/workflows/auto-update-pull-request.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ jobs:
7070
if: steps.unzip-patch.outputs.exists == 'true'
7171
run: |
7272
git apply "${{ runner.temp }}/patch"
73+
git add licenses
7374
git commit -a -m "./gradlew ${{ steps.gradle-task.outputs.name }}"
7475
git push
7576

.github/workflows/codeql.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,12 @@ jobs:
3838

3939
# don't need to free disk space (which takes time) since running on larger machine
4040

41+
- name: Set up JDK 11
42+
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
43+
with:
44+
distribution: temurin
45+
java-version: 11
46+
4147
- name: Set up JDK for running Gradle
4248
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
4349
with:

benchmark-overhead-jmh/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ otelJava {
1313
}
1414

1515
dependencies {
16-
jmhImplementation("org.springframework.boot:spring-boot-starter-web:3.5.3")
16+
jmhImplementation("org.springframework.boot:spring-boot-starter-web:3.5.4")
1717
}
1818

1919
tasks {

benchmark-overhead/Dockerfile.petclinic

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM eclipse-temurin:11.0.27_6-jdk@sha256:2fd4e5e0ba72f725016e757a5688ce14fda6a792da566fca62ef6ff73f50df35 as app-build
1+
FROM eclipse-temurin:11.0.27_6-jdk@sha256:cbc64d6d1a253561c029fd951575c449d70558063d5f898ab0b6213bc1fb0109 as app-build
22

33
# This is the base image that will contain a built version of the spring-petclinic-rest
44
# application. Installing the dependencies and maven compiling the application is time
@@ -13,7 +13,7 @@ RUN git checkout 8aa4d49
1313
RUN ./mvnw package -Dmaven.test.skip=true
1414
RUN cp target/spring-petclinic-rest*.jar /app/spring-petclinic-rest.jar
1515

16-
FROM bellsoft/liberica-openjdk-alpine:21.0.7@sha256:143e4c24da2872fad6803fcbde5d335bbbe47dddb8ebf20fd916c02bdc7f463b
16+
FROM bellsoft/liberica-openjdk-alpine:21.0.8@sha256:c4052811bba52c7a06ebde235c839108bf723dfab3c65066f61145a252480b16
1717
COPY --from=app-build /app/spring-petclinic-rest.jar /app/spring-petclinic-rest.jar
1818
WORKDIR /app
1919
EXPOSE 9966

benchmark-overhead/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
id("java")
3-
id("com.diffplug.spotless") version "7.1.0"
3+
id("com.diffplug.spotless") version "7.2.1"
44
}
55

66
spotless {
@@ -16,7 +16,7 @@ repositories {
1616
}
1717

1818
dependencies {
19-
implementation(enforcedPlatform("org.junit:junit-bom:5.13.3"))
19+
implementation(enforcedPlatform("org.junit:junit-bom:5.13.4"))
2020

2121
testImplementation("org.testcontainers:testcontainers:1.21.3")
2222
testImplementation("org.testcontainers:postgresql:1.21.3")

conventions/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
22
`kotlin-dsl`
33
// When updating, update below in dependencies too
4-
id("com.diffplug.spotless") version "7.1.0"
4+
id("com.diffplug.spotless") version "7.2.1"
55
}
66

77
spotless {
@@ -54,7 +54,7 @@ dependencies {
5454
implementation("org.apache.maven:maven-aether-provider:3.3.9")
5555

5656
// When updating, update above in plugins too
57-
implementation("com.diffplug.spotless:spotless-plugin-gradle:7.1.0")
57+
implementation("com.diffplug.spotless:spotless-plugin-gradle:7.2.1")
5858
implementation("com.google.guava:guava:33.4.8-jre")
5959
implementation("gradle.plugin.com.google.protobuf:protobuf-gradle-plugin:0.8.18")
6060
implementation("com.gradleup.shadow:shadow-gradle-plugin:8.3.8")
@@ -71,7 +71,7 @@ dependencies {
7171
implementation("net.ltgt.gradle:gradle-nullaway-plugin:2.2.0")
7272
implementation("me.champeau.gradle:japicmp-gradle-plugin:0.4.6")
7373

74-
testImplementation(enforcedPlatform("org.junit:junit-bom:5.13.3"))
74+
testImplementation(enforcedPlatform("org.junit:junit-bom:5.13.4"))
7575
testImplementation("org.junit.jupiter:junit-jupiter-api")
7676
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
7777
testImplementation("org.assertj:assertj-core:3.27.3")

dependencyManagement/build.gradle.kts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ data class DependencySet(val group: String, val version: String, val modules: Li
66

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

1212
// Need both BOM and groovy jars
13-
val groovyVersion = "4.0.27"
13+
val groovyVersion = "4.0.28"
1414

1515
// We don't force libraries we instrument to new versions since we compile and test against specific
1616
// old baseline versions but we do try to force those libraries' transitive dependencies to new
@@ -27,7 +27,7 @@ val DEPENDENCY_BOMS = listOf(
2727
// for some reason boms show up as runtime dependencies in license and vulnerability scans
2828
// even if they are only used by test dependencies, so not using junit bom since it is LGPL
2929

30-
"com.fasterxml.jackson:jackson-bom:2.19.1",
30+
"com.fasterxml.jackson:jackson-bom:2.19.2",
3131
"com.squareup.okio:okio-bom:3.15.0", // see https://github.com/open-telemetry/opentelemetry-java/issues/5637
3232
"com.google.guava:guava-bom:33.4.8-jre",
3333
"org.apache.groovy:groovy-bom:${groovyVersion}",
@@ -81,7 +81,7 @@ val CORE_DEPENDENCIES = listOf(
8181
// There are dependencies included here that appear to have no usages, but are maintained at
8282
// this top level to help consistently satisfy large numbers of transitive dependencies.
8383
val DEPENDENCIES = listOf(
84-
"org.junit.jupiter:junit-jupiter-api:5.13.3",
84+
"org.junit.jupiter:junit-jupiter-api:5.13.4",
8585
"org.spockframework:spock-core:2.4-M6-groovy-4.0",
8686
"org.spockframework:spock-junit4:2.4-M6-groovy-4.0",
8787

@@ -93,7 +93,7 @@ val DEPENDENCIES = listOf(
9393
"com.uber.nullaway:nullaway:0.12.7",
9494
"commons-beanutils:commons-beanutils:1.11.0",
9595
"commons-cli:commons-cli:1.9.0",
96-
"commons-codec:commons-codec:1.18.0",
96+
"commons-codec:commons-codec:1.19.0",
9797
"commons-collections:commons-collections:3.2.2",
9898
"commons-digester:commons-digester:2.1",
9999
"commons-fileupload:commons-fileupload:1.6.0",
@@ -121,7 +121,7 @@ val DEPENDENCIES = listOf(
121121
"org.objenesis:objenesis:3.4",
122122
"javax.validation:validation-api:2.0.1.Final",
123123
"org.snakeyaml:snakeyaml-engine:2.10",
124-
"org.elasticmq:elasticmq-rest-sqs_2.13:1.6.12"
124+
"org.elasticmq:elasticmq-rest-sqs_2.13:1.6.14"
125125
)
126126

127127
javaPlatform {

docs/advanced-configuration-options.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ This feature is designed for integrating client-side monitoring.
4545
We plan to integrate OpenTelemetry's own client-side monitoring solution by default once it's available
4646
(see the [browser instrumentation proposal](https://github.com/open-telemetry/community/blob/main/projects/browser-phase-1.md)).
4747

48-
| System property | Environment variable | Purpose |
49-
|-----------------------------------------|-----------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
50-
| otel.experimental.javascript-snippet | OTEL_EXPERIMENTAL_JAVASCRIPT_SNIPPET | JavaScript code to inject into HTML responses before the closing `</head>` tag. The value should be a complete JavaScript snippet including `<script>` tags if needed, e.g. `-Dotel.experimental.javascript-snippet="<script>console.log('Hello world!');</script>"` |
48+
| System property | Environment variable | Purpose |
49+
|--------------------------------------|--------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
50+
| otel.experimental.javascript-snippet | OTEL_EXPERIMENTAL_JAVASCRIPT_SNIPPET | JavaScript code to inject into HTML responses before the closing `</head>` tag. The value should be a complete JavaScript snippet including `<script>` tags if needed, e.g. `-Dotel.experimental.javascript-snippet="<script>console.log('Hello world!');</script>"` |
5151

5252
**Important notes:**
5353

0 commit comments

Comments
 (0)