Skip to content

Commit 8b718e0

Browse files
committed
Merge branch 'main' of https://github.com/open-telemetry/opentelemetry-java into type-specific-exemplar-reservoirs
2 parents b574b8b + 59e310d commit 8b718e0

File tree

61 files changed

+208
-78
lines changed

Some content is hidden

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

61 files changed

+208
-78
lines changed

.github/workflows/codeql.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
4646

4747
- name: Initialize CodeQL
48-
uses: github/codeql-action/init@64d10c13136e1c5bce3e5fbde8d4906eeaafc885 # v3.30.6
48+
uses: github/codeql-action/init@f443b600d91635bebf5b0d9ebc620189c0d6fba5 # v4.30.8
4949
with:
5050
languages: ${{ matrix.language }}
5151
# using "linked" helps to keep up with the latest Kotlin support
@@ -60,6 +60,6 @@ jobs:
6060
run: ./gradlew assemble --no-build-cache --no-daemon
6161

6262
- name: Perform CodeQL analysis
63-
uses: github/codeql-action/analyze@64d10c13136e1c5bce3e5fbde8d4906eeaafc885 # v3.30.6
63+
uses: github/codeql-action/analyze@f443b600d91635bebf5b0d9ebc620189c0d6fba5 # v4.30.8
6464
with:
6565
category: "/language:${{matrix.language}}"

.github/workflows/ossf-scorecard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,6 @@ jobs:
4242
# Upload the results to GitHub's code scanning dashboard (optional).
4343
# Commenting out will disable upload of results to your repo's Code Scanning dashboard
4444
- name: "Upload to code-scanning"
45-
uses: github/codeql-action/upload-sarif@64d10c13136e1c5bce3e5fbde8d4906eeaafc885 # v3.30.6
45+
uses: github/codeql-action/upload-sarif@f443b600d91635bebf5b0d9ebc620189c0d6fba5 # v4.30.8
4646
with:
4747
sarif_file: results.sarif

CHANGELOG.md

Lines changed: 79 additions & 0 deletions

README.md

Lines changed: 34 additions & 34 deletions

buildSrc/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ dependencies {
5454
implementation("com.google.auto.value:auto-value-annotations:1.11.0")
5555
// When updating, update above in plugins too
5656
implementation("com.diffplug.spotless:spotless-plugin-gradle:8.0.0")
57-
implementation("com.gradle.develocity:com.gradle.develocity.gradle.plugin:4.2.1")
57+
implementation("com.gradle.develocity:com.gradle.develocity.gradle.plugin:4.2.2")
5858
implementation("com.squareup:javapoet:1.13.0")
5959
implementation("com.squareup.wire:wire-compiler")
6060
implementation("com.squareup.wire:wire-gradle-plugin")
@@ -65,7 +65,7 @@ dependencies {
6565
implementation("net.ltgt.gradle:gradle-errorprone-plugin:4.3.0")
6666
implementation("net.ltgt.gradle:gradle-nullaway-plugin:2.3.0")
6767
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.20")
68-
implementation("org.owasp:dependency-check-gradle:12.1.6")
68+
implementation("org.owasp:dependency-check-gradle:12.1.7")
6969
implementation("ru.vyarus:gradle-animalsniffer-plugin:2.0.1")
7070
}
7171

buildSrc/src/main/kotlin/otel.jacoco-conventions.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ plugins {
55
}
66

77
jacoco {
8-
toolVersion = "0.8.13"
8+
toolVersion = "0.8.14"
99
}
1010

1111
// https://docs.gradle.org/current/samples/sample_jvm_multi_project_with_code_coverage.html

buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ java {
4242

4343
checkstyle {
4444
configDirectory.set(file("$rootDir/buildscripts/"))
45-
toolVersion = "12.0.0"
45+
toolVersion = "12.0.1"
4646
isIgnoreFailures = false
4747
configProperties["rootDir"] = rootDir
4848
}

context/src/main/java/io/opentelemetry/context/StrictContextStorage.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,7 @@ static PendingScopes create() {
252252
thread.setName("weak-ref-cleaner-strictcontextstorage");
253253
thread.setPriority(Thread.MIN_PRIORITY);
254254
thread.setDaemon(true);
255+
thread.setContextClassLoader(null);
255256
thread.start();
256257
}
257258

dependencyManagement/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ val opencensusVersion = "0.31.1"
1818
val prometheusServerVersion = "1.3.10"
1919
val armeriaVersion = "1.33.4"
2020
val junitVersion = "5.13.4"
21-
val okhttpVersion = "5.2.0"
21+
val okhttpVersion = "5.2.1"
2222

2323
val DEPENDENCY_BOMS = listOf(
2424
// for some reason boms show up as runtime dependencies in license and vulnerability scans
@@ -30,7 +30,7 @@ val DEPENDENCY_BOMS = listOf(
3030
"com.google.guava:guava-bom:33.5.0-jre",
3131
"com.google.protobuf:protobuf-bom:4.32.1",
3232
"com.squareup.okhttp3:okhttp-bom:$okhttpVersion",
33-
"com.squareup.okio:okio-bom:3.16.0", // applies to transitive dependencies of okhttp
33+
"com.squareup.okio:okio-bom:3.16.1", // applies to transitive dependencies of okhttp
3434
"io.grpc:grpc-bom:1.76.0",
3535
"io.netty:netty-bom:4.2.6.Final",
3636
"io.zipkin.brave:brave-bom:6.3.0",
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Comparing source compatibility of opentelemetry-api-1.55.0.jar against opentelemetry-api-1.54.0.jar
2+
No changes.

0 commit comments

Comments
 (0)