Skip to content

Commit 0accc5e

Browse files
authored
Merge branch 'main' into dependabot/gradle/java/java-other-44553fa4da
2 parents 498ea2e + be7c42b commit 0accc5e

File tree

8 files changed

+14
-14
lines changed

8 files changed

+14
-14
lines changed

.github/workflows/ci-java.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
java-version: 17
3232

3333
- name: Setup Gradle
34-
uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0
34+
uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
3535
with:
3636
add-job-summary-as-pr-comment: on-failure # Valid values are 'never' (default), 'always', and 'on-failure'
3737

.github/workflows/close-stale.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
pull-requests: write
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/stale@3a9db7e6a41a89f618792c92c0e97cc736e1b13f # v10.0.0
16+
- uses: actions/stale@5f858e3efba33a5ca4407a664cc011ad407f2008 # v10.1.0
1717
with:
1818
repo-token: ${{ secrets.GITHUB_TOKEN }}
1919
stale-issue-message: 'This issue was marked stale. It will be closed in 30 days without additional activity.'

.github/workflows/codeql.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868

6969
# Initializes the CodeQL tools for scanning.
7070
- name: Initialize CodeQL
71-
uses: github/codeql-action/init@3599b3baa15b485a2e49ef411a7a4bb2452e7f93 # v3.29.5
71+
uses: github/codeql-action/init@f443b600d91635bebf5b0d9ebc620189c0d6fba5 # v3.29.5
7272
with:
7373
languages: ${{ matrix.target.language }}
7474
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -82,7 +82,7 @@ jobs:
8282
# Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
8383
# If this step fails, then you should remove it and run the build manually (see below)
8484
- name: Autobuild
85-
uses: github/codeql-action/autobuild@3599b3baa15b485a2e49ef411a7a4bb2452e7f93 # v3.29.5
85+
uses: github/codeql-action/autobuild@f443b600d91635bebf5b0d9ebc620189c0d6fba5 # v3.29.5
8686
with:
8787
working-directory: ${{ matrix.target.directory }}
8888
# There are no array literals in GHA that is why we need to use fromJson.
@@ -106,7 +106,7 @@ jobs:
106106
if: ${{ matrix.target.language == 'java' }}
107107

108108
- name: Setup Gradle
109-
uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0
109+
uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
110110

111111
- name: build Java
112112
run: ./gradlew build --no-build-cache
@@ -126,6 +126,6 @@ jobs:
126126
if: ${{ matrix.target.language == 'csharp' }}
127127

128128
- name: Perform CodeQL Analysis
129-
uses: github/codeql-action/analyze@3599b3baa15b485a2e49ef411a7a4bb2452e7f93 # v3.29.5
129+
uses: github/codeql-action/analyze@f443b600d91635bebf5b0d9ebc620189c0d6fba5 # v3.29.5
130130
with:
131131
category: "/language:${{matrix.target.language}}"

.github/workflows/layer-publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ jobs:
9494
with:
9595
name: ${{ inputs.artifact-name }}
9696

97-
- uses: aws-actions/configure-aws-credentials@a03048d87541d1d9fcf2ecf528a4a65ba9bd7838 # v5.0.0
97+
- uses: aws-actions/configure-aws-credentials@00943011d9042930efac3dcd3a170e4273319bc8 # v5.1.0
9898
with:
9999
role-to-assume: ${{ inputs.role-arn || secrets.OTEL_LAMBDA_LAYER_PUBLISH_ROLE_ARN || secrets.PROD_LAMBDA_ROLE_ARN }}
100100
role-duration-seconds: 1200

.github/workflows/ossf-scorecard.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
with:
2424
persist-credentials: false
2525

26-
- uses: ossf/scorecard-action@05b42c624433fc40578a4040d5cf5e36ddca8cde # v2.4.2
26+
- uses: ossf/scorecard-action@4eaacf0543bb3f2c246792bd56e8cdeffafb205a # v2.4.3
2727
with:
2828
results_file: results.sarif
2929
results_format: sarif
@@ -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@3599b3baa15b485a2e49ef411a7a4bb2452e7f93 # v3.29.5
45+
uses: github/codeql-action/upload-sarif@f443b600d91635bebf5b0d9ebc620189c0d6fba5 # v3.29.5
4646
with:
4747
sarif_file: results.sarif

.github/workflows/release-layer-java.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
java-version: 17
3838

3939
- name: Setup Gradle
40-
uses: gradle/actions/setup-gradle@v4
40+
uses: gradle/actions/setup-gradle@v5
4141

4242
- name: Execute Gradle build
4343
run: |

java/dependencyManagement/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ plugins {
99
data class DependencySet(val group: String, val version: String, val modules: List<String>)
1010

1111
val DEPENDENCY_BOMS = listOf(
12-
"io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.19.0-alpha",
12+
"io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.20.1-alpha",
1313
"org.apache.logging.log4j:log4j-bom:2.24.3",
1414
"software.amazon.awssdk:bom:2.35.5"
1515
)
@@ -18,9 +18,9 @@ val DEPENDENCIES = listOf(
1818
"com.amazonaws:aws-lambda-java-core:1.4.0",
1919
"com.amazonaws:aws-lambda-java-events:3.16.1",
2020
"com.squareup.okhttp3:okhttp:5.2.1",
21-
"io.opentelemetry.javaagent:opentelemetry-javaagent:2.19.0",
21+
"io.opentelemetry.javaagent:opentelemetry-javaagent:2.20.1",
2222
"io.opentelemetry:opentelemetry-sdk-extension-aws:1.19.0",
23-
"io.opentelemetry.contrib:opentelemetry-aws-resources:1.49.0-alpha",
23+
"io.opentelemetry.contrib:opentelemetry-aws-resources:1.50.0-alpha",
2424
)
2525

2626
javaPlatform {

ruby/src/otel/layer/Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ source 'https://rubygems.org'
22

33
gem 'opentelemetry-sdk', '~> 1.9.0'
44
gem 'opentelemetry-exporter-otlp', '~> 0.30.0'
5-
gem 'opentelemetry-instrumentation-all', '~> 0.82.0'
5+
gem 'opentelemetry-instrumentation-all', '~> 0.85.0'

0 commit comments

Comments
 (0)