Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
7e74d2f
fix(deps): update armeria packages to v1.29.2 (main) (patch) (#11785)
renovate[bot] Jul 10, 2024
6ec0f1f
fix(deps): update dependency io.quarkus:quarkus-bom to v3.12.2 (main)…
renovate[bot] Jul 10, 2024
fa72a65
chore(deps): update plugin io.quarkus to v3.12.2 (main) (#11789)
renovate[bot] Jul 10, 2024
948a58e
Spring autoconf deps (#11784)
zeitlinger Jul 10, 2024
e36fc46
GraalVM native support for the OpenTelemetry annotations (#11757)
jeanbisutti Jul 10, 2024
9bbfe7f
Use config properties for spring starter (http server) (#11667)
zeitlinger Jul 10, 2024
54622be
Update @EnableOpenTelemetry javadoc (#11799)
jeanbisutti Jul 11, 2024
814669b
chore(deps): update github/codeql-action action to v3.25.12 (main) (#…
renovate[bot] Jul 12, 2024
e09af4e
fix(deps): update dependency io.grpc:grpc-bom to v1.65.1 (main) (#11804)
renovate[bot] Jul 12, 2024
c1c76a1
fix(deps): update dockerjavaversion to v3.4.0 (main) (minor) (#11802)
renovate[bot] Jul 12, 2024
e5af139
rename spring autoconfigure to autoconfigure-2 (#11800)
zeitlinger Jul 12, 2024
7739335
make spring starter stable (#11763)
zeitlinger Jul 12, 2024
59238e3
chore(deps): update dependency gradle to v8.9 (main) (#11798)
renovate[bot] Jul 12, 2024
746ef01
chore(deps): update ubuntu docker tag to v24 (main) (#11771)
renovate[bot] Jul 12, 2024
4cdd771
Fix http.server.active_requests metric with async requests (#11638)
laurit Jul 15, 2024
6075737
Rename spring-boot-autoconfigure artifacts (#11815)
trask Jul 15, 2024
425c17f
grpc support request/response size
crossoverJie Jul 16, 2024
29259dc
fix ci
crossoverJie Jul 16, 2024
06aa680
fix ci
crossoverJie Jul 16, 2024
7960777
fix ci
crossoverJie Jul 16, 2024
2916323
fix(deps): update dependency org.owasp:dependency-check-gradle to v10…
renovate[bot] Jul 16, 2024
9a6909a
fix(deps): update dependency commons-codec:commons-codec to v1.17.1 (…
renovate[bot] Jul 16, 2024
09ad619
Remove unneeded groovy dependencies from lambda tests (#11828)
jaydeluca Jul 16, 2024
428aa28
Restructure to have a single spring-boot-autoconfigure artifact (#11826)
trask Jul 16, 2024
d2a2cad
chore(deps): update gradle/actions action to v3.5.0 (main) (#11824)
renovate[bot] Jul 16, 2024
2ea4e61
Update change log for v2.6.0 release (#11816)
trask Jul 16, 2024
9ecf796
Update version to 2.7.0-SNAPSHOT (#11839)
opentelemetrybot Jul 16, 2024
e8948d8
fix test
crossoverJie Jul 17, 2024
7954240
fix ci
crossoverJie Jul 17, 2024
ef9b84e
fix muzzle
crossoverJie Jul 17, 2024
d063d33
fix muzzle
crossoverJie Jul 17, 2024
30f7c9c
fix muzzle
crossoverJie Jul 17, 2024
9dff355
fix ci
crossoverJie Jul 17, 2024
7fe3980
Merge remote-tracking branch 'otel-origin/main' into grpc-req-res-size
crossoverJie Jul 17, 2024
5c455e8
fix ci
crossoverJie Jul 17, 2024
5c7f329
fix ci
crossoverJie Jul 17, 2024
1b3ff26
fix ci
crossoverJie Jul 17, 2024
38fc1c3
fix ci
crossoverJie Jul 17, 2024
330f9f3
fix ci
crossoverJie Jul 17, 2024
33ec39e
fix(deps): update testcontainers-java monorepo to v1.20.0 (main) (min…
renovate[bot] Jul 18, 2024
e849b5b
fix(deps): update quarkus packages to v3.12.3 (main) (patch) (#11842)
renovate[bot] Jul 18, 2024
534eb2f
Merge change log updates from release/v2.6.x (#11840)
opentelemetrybot Jul 18, 2024
a3b66bd
Update api diff after release (#11850)
trask Jul 18, 2024
0dd479b
Merge remote-tracking branch 'otel-origin/main' into grpc-req-res-size
crossoverJie Jul 18, 2024
4bf7656
fix ci
crossoverJie Jul 18, 2024
9d0f339
revert ci
crossoverJie Jul 18, 2024
a3251af
revert ci
crossoverJie Jul 18, 2024
3f8c53c
fix muzzle
crossoverJie Jul 18, 2024
5048258
fix muzzle
crossoverJie Jul 18, 2024
59adfd6
fix muzzle
crossoverJie Jul 18, 2024
145185e
Add span baggage processor (#11697)
SylvainJuge Jul 19, 2024
57d9c49
Fix ClickHouse tracing when database name not included in connection …
jaydeluca Jul 19, 2024
409a8d4
fix muzzle
crossoverJie Jul 20, 2024
91544da
fix(deps): update dependency io.netty:netty-bom to v4.1.112.final (ma…
renovate[bot] Jul 22, 2024
74244c8
chore(deps): update github/codeql-action action to v3.25.13 (main) (#…
renovate[bot] Jul 22, 2024
7e71ccd
fix(deps): update dependency org.springframework.boot:spring-boot-sta…
renovate[bot] Jul 22, 2024
3f852f4
fix(deps): update errorproneversion to v2.29.2 (main) (minor) (#11836)
renovate[bot] Jul 22, 2024
ec5a905
chore(deps): update bellsoft/liberica-openjdk-alpine docker tag to v2…
renovate[bot] Jul 22, 2024
5084309
use static import asList
crossoverJie Jul 22, 2024
2a35b8d
fix(deps): update dependency org.apache.commons:commons-lang3 to v3.1…
renovate[bot] Jul 22, 2024
751c848
fix(deps): update dependency com.gradle.develocity:com.gradle.develoc…
renovate[bot] Jul 22, 2024
b1e4c32
chore(deps): update plugin com.gradle.develocity to v3.17.6 (main) (#…
renovate[bot] Jul 22, 2024
e1ae8e3
chore(deps): update docker/login-action action to v3.3.0 (main) (#11877)
renovate[bot] Jul 22, 2024
460bd3f
Consolidate github action renovate PRs (#11829)
trask Jul 23, 2024
6676d78
fix with cr
crossoverJie Jul 24, 2024
4f69c46
Merge remote-tracking branch 'otel-origin/main' into grpc-req-res-size
crossoverJie Jul 24, 2024
360f658
remove client&server prefix.
crossoverJie Jul 31, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .github/renovate.json5
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,19 @@
// https://github.com/renovatebot/renovate/discussions/8399#discussioncomment-305798
"separateMinorPatch": true,
"packageRules": [
{
// this is to reduce the number of renovate PRs by consolidating them into a weekly batch
"matchManagers": ["github-actions"],
"extends": ["schedule:weekly"],
"groupName": "github actions",
"separateMinorPatch": false // overrides separateMinorPatch specified above
},
{
"matchPackageNames": [
"io.opentelemetry.contrib:opentelemetry-aws-resources",
"io.opentelemetry.contrib:opentelemetry-aws-xray-propagator",
"io.opentelemetry.contrib:opentelemetry-gcp-resources",
"io.opentelemetry.contrib:opentelemetry-baggage-processor",
"io.opentelemetry.proto:opentelemetry-proto",
"io.opentelemetry.semconv:opentelemetry-semconv"
],
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/auto-update-otel-sdk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ jobs:
java-version-file: .java-version

- name: Setup Gradle
uses: gradle/actions/setup-gradle@dbbdc275be76ac10734476cc723d82dfe7ec6eda # v3.4.2
uses: gradle/actions/setup-gradle@d9c87d481d55275bb5441eef3fe0e46805f9ef70 # v3.5.0

- name: Update license report
run: ./gradlew generateLicenseReport
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/build-common.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
java-version-file: .java-version

- name: Setup Gradle
uses: gradle/actions/setup-gradle@dbbdc275be76ac10734476cc723d82dfe7ec6eda # v3.4.2
uses: gradle/actions/setup-gradle@d9c87d481d55275bb5441eef3fe0e46805f9ef70 # v3.5.0
with:
cache-read-only: ${{ inputs.cache-read-only }}
# gradle enterprise is used for the build cache
Expand All @@ -54,7 +54,7 @@ jobs:
steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7

- uses: gradle/actions/wrapper-validation@dbbdc275be76ac10734476cc723d82dfe7ec6eda # v3.4.2
- uses: gradle/actions/wrapper-validation@d9c87d481d55275bb5441eef3fe0e46805f9ef70 # v3.5.0

license-check:
runs-on: ubuntu-latest
Expand All @@ -71,7 +71,7 @@ jobs:
java-version-file: .java-version

- name: Setup Gradle
uses: gradle/actions/setup-gradle@dbbdc275be76ac10734476cc723d82dfe7ec6eda # v3.4.2
uses: gradle/actions/setup-gradle@d9c87d481d55275bb5441eef3fe0e46805f9ef70 # v3.5.0
with:
cache-read-only: ${{ inputs.cache-read-only }}
# gradle enterprise is used for the build cache
Expand All @@ -93,7 +93,7 @@ jobs:
then
echo "Licenses are up-to-date."
else
echo "Licenses are not up-to-date, please run './gradlew generateLicenseReport' locally and commit."
echo "Licenses are not up-to-date, please run './gradlew generateLicenseReport --no-build-cache' locally and commit."
echo
echo "$(git diff --cached --stat licenses)"
echo
Expand Down Expand Up @@ -145,7 +145,7 @@ jobs:
sed -i "s/org.gradle.jvmargs=/org.gradle.jvmargs=-Xmx3g /" gradle.properties

- name: Setup Gradle
uses: gradle/actions/setup-gradle@dbbdc275be76ac10734476cc723d82dfe7ec6eda # v3.4.2
uses: gradle/actions/setup-gradle@d9c87d481d55275bb5441eef3fe0e46805f9ef70 # v3.5.0
with:
cache-read-only: ${{ inputs.cache-read-only }}
# gradle enterprise is used for the build cache
Expand Down Expand Up @@ -250,7 +250,7 @@ jobs:
run: .github/scripts/deadlock-detector.sh

- name: Setup Gradle
uses: gradle/actions/setup-gradle@dbbdc275be76ac10734476cc723d82dfe7ec6eda # v3.4.2
uses: gradle/actions/setup-gradle@d9c87d481d55275bb5441eef3fe0e46805f9ef70 # v3.5.0
with:
# only push cache for one matrix option since github action cache space is limited
cache-read-only: ${{ inputs.cache-read-only || matrix.test-java-version != 11 || matrix.vm != 'hotspot' }}
Expand Down Expand Up @@ -349,7 +349,7 @@ jobs:
java-version-file: .java-version

- name: Set up Gradle cache
uses: gradle/actions/setup-gradle@dbbdc275be76ac10734476cc723d82dfe7ec6eda # v3.4.2
uses: gradle/actions/setup-gradle@d9c87d481d55275bb5441eef3fe0e46805f9ef70 # v3.5.0
with:
# only push cache for one matrix option per OS since github action cache space is limited
cache-read-only: ${{ inputs.cache-read-only || matrix.smoke-test-suite != 'tomcat' }}
Expand Down Expand Up @@ -402,7 +402,7 @@ jobs:
java-version-file: .java-version

- name: Setup Gradle
uses: gradle/actions/setup-gradle@dbbdc275be76ac10734476cc723d82dfe7ec6eda # v3.4.2
uses: gradle/actions/setup-gradle@d9c87d481d55275bb5441eef3fe0e46805f9ef70 # v3.5.0
with:
cache-read-only: ${{ inputs.cache-read-only }}

Expand All @@ -425,7 +425,7 @@ jobs:
java-version-file: .java-version

- name: Set up Gradle cache
uses: gradle/actions/setup-gradle@dbbdc275be76ac10734476cc723d82dfe7ec6eda # v3.4.2
uses: gradle/actions/setup-gradle@d9c87d481d55275bb5441eef3fe0e46805f9ef70 # v3.5.0
with:
cache-read-only: ${{ inputs.cache-read-only }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ jobs:
java-version-file: .java-version

- name: Setup Gradle
uses: gradle/actions/setup-gradle@dbbdc275be76ac10734476cc723d82dfe7ec6eda # v3.4.2
uses: gradle/actions/setup-gradle@d9c87d481d55275bb5441eef3fe0e46805f9ef70 # v3.5.0
with:
# gradle enterprise is used for the build cache
gradle-home-cache-excludes: caches/build-cache-1
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/codeql-daily.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,22 +30,22 @@ jobs:
java-version-file: .java-version

- name: Initialize CodeQL
uses: github/codeql-action/init@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11
uses: github/codeql-action/init@2d790406f505036ef40ecba973cc774a50395aac # v3.25.13
with:
languages: java
# using "latest" helps to keep up with the latest Kotlin support
# see https://github.com/github/codeql-action/issues/1555#issuecomment-1452228433
tools: latest

- name: Setup Gradle
uses: gradle/actions/setup-gradle@dbbdc275be76ac10734476cc723d82dfe7ec6eda # v3.4.2
uses: gradle/actions/setup-gradle@d9c87d481d55275bb5441eef3fe0e46805f9ef70 # v3.5.0

- name: Build
# skipping build cache is needed so that all modules will be analyzed
run: ./gradlew assemble -x javadoc --no-build-cache --no-daemon

- name: Perform CodeQL analysis
uses: github/codeql-action/analyze@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11
uses: github/codeql-action/analyze@2d790406f505036ef40ecba973cc774a50395aac # v3.25.13

workflow-notification:
needs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/overhead-benchmark-daily.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
rsync -avv gh-pages/benchmark-overhead/results/ benchmark-overhead/results/

- name: Setup Gradle
uses: gradle/actions/setup-gradle@dbbdc275be76ac10734476cc723d82dfe7ec6eda # v3.4.2
uses: gradle/actions/setup-gradle@d9c87d481d55275bb5441eef3fe0e46805f9ef70 # v3.5.0

- name: Run tests
working-directory: benchmark-overhead
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/owasp-dependency-check-daily.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
run: |
sed -i "s/org.gradle.jvmargs=/org.gradle.jvmargs=-Xmx3g /" gradle.properties

- uses: gradle/actions/setup-gradle@dbbdc275be76ac10734476cc723d82dfe7ec6eda # v3.4.2
- uses: gradle/actions/setup-gradle@d9c87d481d55275bb5441eef3fe0e46805f9ef70 # v3.5.0

- run: ./gradlew :javaagent:dependencyCheckAnalyze
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-smoke-test-early-jdk8-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
java-version-file: .java-version

- name: Setup Gradle
uses: gradle/actions/setup-gradle@dbbdc275be76ac10734476cc723d82dfe7ec6eda # v3.4.2
uses: gradle/actions/setup-gradle@d9c87d481d55275bb5441eef3fe0e46805f9ef70 # v3.5.0
with:
cache-read-only: true
# gradle enterprise is used for the build cache
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pr-smoke-test-fake-backend-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
java-version-file: .java-version

- name: Setup Gradle
uses: gradle/actions/setup-gradle@dbbdc275be76ac10734476cc723d82dfe7ec6eda # v3.4.2
uses: gradle/actions/setup-gradle@d9c87d481d55275bb5441eef3fe0e46805f9ef70 # v3.5.0
with:
cache-read-only: true
# gradle enterprise is used for the build cache
Expand All @@ -52,7 +52,7 @@ jobs:
java-version-file: .java-version

- name: Setup Gradle
uses: gradle/actions/setup-gradle@dbbdc275be76ac10734476cc723d82dfe7ec6eda # v3.4.2
uses: gradle/actions/setup-gradle@d9c87d481d55275bb5441eef3fe0e46805f9ef70 # v3.5.0
with:
cache-read-only: true

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-smoke-test-servlet-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
java-version-file: .java-version

- name: Set up Gradle cache
uses: gradle/actions/setup-gradle@dbbdc275be76ac10734476cc723d82dfe7ec6eda # v3.4.2
uses: gradle/actions/setup-gradle@d9c87d481d55275bb5441eef3fe0e46805f9ef70 # v3.5.0
with:
cache-read-only: true

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-smoke-test-early-jdk8-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
run: echo "TAG=$(date '+%Y%m%d').$GITHUB_RUN_ID" >> $GITHUB_ENV

- name: Setup Gradle
uses: gradle/actions/setup-gradle@dbbdc275be76ac10734476cc723d82dfe7ec6eda # v3.4.2
uses: gradle/actions/setup-gradle@d9c87d481d55275bb5441eef3fe0e46805f9ef70 # v3.5.0

- name: Build Docker image
run: ./gradlew :smoke-tests:images:early-jdk8:dockerPush -PextraTag=${{ env.TAG }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-smoke-test-fake-backend-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
run: echo "TAG=$(date '+%Y%m%d').$GITHUB_RUN_ID" >> $GITHUB_ENV

- name: Setup Gradle
uses: gradle/actions/setup-gradle@dbbdc275be76ac10734476cc723d82dfe7ec6eda # v3.4.2
uses: gradle/actions/setup-gradle@d9c87d481d55275bb5441eef3fe0e46805f9ef70 # v3.5.0

- name: Build Docker image
run: ./gradlew :smoke-tests:images:fake-backend:jib -Djib.httpTimeout=120000 -Djib.console=plain -PextraTag=${{ env.TAG }}
Expand Down Expand Up @@ -68,7 +68,7 @@ jobs:
run: echo "TAG=$(date '+%Y%m%d').$GITHUB_RUN_ID" >> $GITHUB_ENV

- name: Setup Gradle
uses: gradle/actions/setup-gradle@dbbdc275be76ac10734476cc723d82dfe7ec6eda # v3.4.2
uses: gradle/actions/setup-gradle@d9c87d481d55275bb5441eef3fe0e46805f9ef70 # v3.5.0

- name: Build Docker image
run: ./gradlew :smoke-tests:images:fake-backend:dockerPush -PextraTag=${{ env.TAG }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-smoke-test-servlet-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,14 +60,14 @@ jobs:
java-version-file: .java-version

- name: Login to GitHub package registry
uses: docker/login-action@0d4c9c5ea7693da7b068278f7b52bda2a190a446 # v3.2.0
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Set up Gradle cache
uses: gradle/actions/setup-gradle@dbbdc275be76ac10734476cc723d82dfe7ec6eda # v3.4.2
uses: gradle/actions/setup-gradle@d9c87d481d55275bb5441eef3fe0e46805f9ef70 # v3.5.0
with:
# only push cache for one matrix option per OS since github action cache space is limited
cache-read-only: ${{ matrix.smoke-test-suite != 'tomcat' }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ jobs:
java-version-file: .java-version

- name: Setup Gradle
uses: gradle/actions/setup-gradle@dbbdc275be76ac10734476cc723d82dfe7ec6eda # v3.4.2
uses: gradle/actions/setup-gradle@d9c87d481d55275bb5441eef3fe0e46805f9ef70 # v3.5.0

- name: Build and publish artifacts
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/reusable-muzzle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
java-version-file: .java-version

- name: Setup Gradle
uses: gradle/actions/setup-gradle@dbbdc275be76ac10734476cc723d82dfe7ec6eda # v3.4.2
uses: gradle/actions/setup-gradle@d9c87d481d55275bb5441eef3fe0e46805f9ef70 # v3.5.0
with:
cache-read-only: ${{ inputs.cache-read-only }}

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/reusable-smoke-test-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:

- name: Login to GitHub package registry
if: inputs.publish
uses: docker/login-action@0d4c9c5ea7693da7b068278f7b52bda2a190a446 # v3.2.0
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
Expand All @@ -61,7 +61,7 @@ jobs:
run: echo "TAG=$(date '+%Y%m%d').$GITHUB_RUN_ID" >> $GITHUB_ENV

- name: Set up Gradle cache
uses: gradle/actions/setup-gradle@dbbdc275be76ac10734476cc723d82dfe7ec6eda # v3.4.2
uses: gradle/actions/setup-gradle@d9c87d481d55275bb5441eef3fe0e46805f9ef70 # v3.5.0
with:
cache-read-only: ${{ inputs.cache-read-only }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/reusable-test-indy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
key: ${{ runner.os }}-test-latest-cache-pnpm-modules

- name: Setup Gradle
uses: gradle/actions/setup-gradle@dbbdc275be76ac10734476cc723d82dfe7ec6eda # v3.4.2
uses: gradle/actions/setup-gradle@d9c87d481d55275bb5441eef3fe0e46805f9ef70 # v3.5.0
with:
cache-read-only: ${{ inputs.cache-read-only }}
# gradle enterprise is used for the build cache
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/reusable-test-latest-deps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
run: .github/scripts/deadlock-detector.sh

- name: Setup Gradle
uses: gradle/actions/setup-gradle@dbbdc275be76ac10734476cc723d82dfe7ec6eda # v3.4.2
uses: gradle/actions/setup-gradle@d9c87d481d55275bb5441eef3fe0e46805f9ef70 # v3.5.0
with:
cache-read-only: ${{ inputs.cache-read-only }}
# gradle enterprise is used for the build cache
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scorecard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,6 @@ jobs:

# Upload the results to GitHub's code scanning dashboard.
- name: "Upload to code-scanning"
uses: github/codeql-action/upload-sarif@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11
uses: github/codeql-action/upload-sarif@2d790406f505036ef40ecba973cc774a50395aac # v3.25.13
with:
sarif_file: results.sarif
46 changes: 46 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,52 @@

## Unreleased

## Version 2.6.0 (2024-07-17)

The Spring Boot Starter (`opentelemetry-spring-boot-starter`) is now stable.

### Migration notes

- The `opentelemetry-spring-boot` and `opentelemetry-spring-boot-3` artifacts have been merged
into a single artifact named `opentelemetry-spring-boot-autoconfigure`
which supports both Spring Boot 2 and Spring Boot 3
- Two experimental HTTP metrics have been renamed:
- `http.server.request.size` → `http.server.request.body.size`,
- `http.server.response.size` → `http.server.response.body.size`

### 🌟 New javaagent instrumentation

- Javalin
([#11587](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/11587))
- ClickHouse
([#11660](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/11660))

### 📈 Enhancements

- Support HTTP client instrumentation configuration in Spring starter
([#11620](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/11620))
- Influxdb client: don't fill `db.statement` for create/drop database and write operations
([#11557](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/11557))
- Support `otel.instrumentation.common.default-enabled` in the Spring starter
([#11746](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/11746))
- Support Jetty HTTP client 12
([#11519](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/11519))
- Add Pulsar `messaging.producer.duration` metric
([#11591](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/11591))
- Improve instrumentation suppression behavior
([#11640](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/11640))
- Propagate OpenTelemetry context through custom AWS client context for Lambda direct calls
([#11675](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/11675))
- Spring Native support for `@WithSpan`
([#11757](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/11757))
- Support HTTP server instrumentation config properties in the Spring starter
([#11667](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/11667))

### 🛠️ Bug fixes

- Fix `http.server.active_requests` metric with async requests
([#11638](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/11638))

## Version 1.33.4 (2024-06-19)

### 📈 Enhancements
Expand Down
2 changes: 1 addition & 1 deletion benchmark-overhead-jmh/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ plugins {
}

dependencies {
jmhImplementation("org.springframework.boot:spring-boot-starter-web:3.3.1")
jmhImplementation("org.springframework.boot:spring-boot-starter-web:3.3.2")
}

tasks {
Expand Down
2 changes: 1 addition & 1 deletion benchmark-overhead/Dockerfile-petclinic-base
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ RUN git checkout 8aa4d49
RUN ./mvnw package -Dmaven.test.skip=true
RUN cp target/spring-petclinic-rest*.jar /app/spring-petclinic-rest.jar

FROM bellsoft/liberica-openjdk-alpine:21.0.3
FROM bellsoft/liberica-openjdk-alpine:21.0.4
COPY --from=app-build /app/spring-petclinic-rest.jar /app/spring-petclinic-rest.jar
WORKDIR /app
EXPOSE 9966
Expand Down
4 changes: 2 additions & 2 deletions benchmark-overhead/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ repositories {
dependencies {
implementation(enforcedPlatform("org.junit:junit-bom:5.10.3"))

testImplementation("org.testcontainers:testcontainers:1.19.8")
testImplementation("org.testcontainers:postgresql:1.19.8")
testImplementation("org.testcontainers:testcontainers:1.20.0")
testImplementation("org.testcontainers:postgresql:1.20.0")
testImplementation("org.junit.jupiter:junit-jupiter-api")
testImplementation("org.junit.jupiter:junit-jupiter-params")
testImplementation("com.squareup.okhttp3:okhttp:4.12.0")
Expand Down
Binary file modified benchmark-overhead/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 2 additions & 2 deletions benchmark-overhead/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=a4b4158601f8636cdeeab09bd76afb640030bb5b144aafe261a5e8af027dc612
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
distributionSha256Sum=d725d707bfabd4dfdc958c624003b3c80accc03f7037b5122c4b1d0ef15cecab
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
Loading