Skip to content

Commit 879c1fc

Browse files
vasanttejavasantteja
authored
Merge branch 'main' into kafka-connect
2 parents 9a583ea + a9347e6 commit 879c1fc

File tree

178 files changed

+4530
-1493
lines changed

Some content is hidden

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

178 files changed

+4530
-1493
lines changed

‎.fossa.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,9 @@ targets:
100100
- type: gradle
101101
path: ./
102102
target: ':instrumentation:external-annotations:javaagent'
103+
- type: gradle
104+
path: ./
105+
target: ':instrumentation:failsafe-3.0:library'
103106
- type: gradle
104107
path: ./
105108
target: ':instrumentation:finagle-http-23.11:javaagent'

‎.github/workflows/documentation-disable-list-audit.yml‎ renamed to ‎.github/workflows/documentation-synchronization-audit.yml‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: opentelemetry.io documentation disable list audit
1+
name: Documentation Synchronization Audit (opentelemetry.io)
22

33
on:
44
schedule:
@@ -11,6 +11,8 @@ permissions:
1111
jobs:
1212
crawl:
1313
runs-on: ubuntu-latest
14+
outputs:
15+
audit-output: ${{ steps.audit.outputs.AUDIT_OUTPUT }}
1416
steps:
1517
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
1618

@@ -26,7 +28,20 @@ jobs:
2628
run: ./gradlew :instrumentation-docs:runAnalysis
2729

2830
- name: Run doc site audit
29-
run: ./gradlew :instrumentation-docs:docSiteAudit
31+
id: audit
32+
run: |
33+
if ! output=$(./gradlew :instrumentation-docs:docSiteAudit 2>&1); then
34+
echo "AUDIT_FAILED=true" >> $GITHUB_OUTPUT
35+
echo "AUDIT_OUTPUT<<EOF" >> $GITHUB_OUTPUT
36+
# Extract only the content between our custom markers
37+
echo "$output" | sed -n '/=== AUDIT_FAILURE_START ===/,/=== AUDIT_FAILURE_END ===/p' | \
38+
sed '/=== AUDIT_FAILURE_START ===/d' | \
39+
sed '/=== AUDIT_FAILURE_END ===/d' >> $GITHUB_OUTPUT
40+
echo "EOF" >> $GITHUB_OUTPUT
41+
exit 1
42+
else
43+
echo "AUDIT_FAILED=false" >> $GITHUB_OUTPUT
44+
fi
3045
3146
workflow-notification:
3247
permissions:
@@ -38,3 +53,4 @@ jobs:
3853
uses: ./.github/workflows/reusable-workflow-notification.yml
3954
with:
4055
success: ${{ needs.crawl.result == 'success' }}
56+
failure-details: ${{ needs.crawl.outputs.audit-output }}

‎.github/workflows/publish-smoke-test-fake-backend-images.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@ jobs:
6767
java-version-file: .java-version
6868

6969
- name: Login to GitHub package registry
70-
uses: azure/docker-login@15c4aadf093404726ab2ff205b2cdd33fa6d054c # v2
70+
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
7171
with:
72-
login-server: ghcr.io
72+
registry: ghcr.io
7373
username: ${{ github.repository_owner }}
7474
password: ${{ secrets.GITHUB_TOKEN }}
7575

‎.github/workflows/release-update-cloudfoundry-index.yml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,10 @@ jobs:
3131
- name: create working branch
3232
run: git checkout -b otelbot/cloudfoundry-${{ github.run_number }}-${{ github.run_attempt }}
3333

34-
- name: install xq (which is part of yq)
35-
run: |
36-
sudo apt-get install jq python3-pip
37-
pip install yq==3.4.3
38-
3934
- name: update index.yml
4035
run: |
4136
wget https://repo1.maven.org/maven2/io/opentelemetry/javaagent/opentelemetry-javaagent/maven-metadata.xml
42-
xq -r .metadata.versioning.versions.version[] maven-metadata.xml | sed -E 's/(.*)/\1: https:\/\/repo1.maven.org\/maven2\/io\/opentelemetry\/javaagent\/opentelemetry-javaagent\/\1\/opentelemetry-javaagent-\1.jar/' > index.yml
37+
grep -oP '(?<=<version>)[^<]+' maven-metadata.xml | sed -E 's/(.*)/\1: https:\/\/repo1.maven.org\/maven2\/io\/opentelemetry\/javaagent\/opentelemetry-javaagent\/\1\/opentelemetry-javaagent-\1.jar/' > index.yml
4338
4439
- name: display changes
4540
run: git diff

‎.github/workflows/reusable-workflow-notification.yml‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ on:
88
success:
99
type: boolean
1010
required: true
11+
failure-details:
12+
type: string
13+
required: false
1114

1215
permissions:
1316
contents: read
@@ -31,14 +34,19 @@ jobs:
3134
echo $number
3235
echo ${{ inputs.success }}
3336
37+
# Prepare the issue body with failure details if available
38+
if [[ -n "${{ inputs.failure-details }}" ]]; then
39+
issue_body="See [$GITHUB_WORKFLOW #$GITHUB_RUN_NUMBER](https://github.com/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID)."$'\n\n'"## Failure Details"$'\n\n'"${{ inputs.failure-details }}"
40+
else
41+
issue_body="See [$GITHUB_WORKFLOW #$GITHUB_RUN_NUMBER](https://github.com/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID)."
42+
fi
43+
3444
if [[ $number ]]; then
3545
if [[ "${{ inputs.success }}" == "true" ]]; then
3646
gh issue close $number
3747
else
38-
gh issue comment $number \
39-
--body "See [$GITHUB_WORKFLOW #$GITHUB_RUN_NUMBER](https://github.com/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID)."
48+
gh issue comment $number --body "$issue_body"
4049
fi
4150
elif [[ "${{ inputs.success }}" == "false" ]]; then
42-
gh issue create --title "Workflow failed: $GITHUB_WORKFLOW (#$GITHUB_RUN_NUMBER)" \
43-
--body "See [$GITHUB_WORKFLOW #$GITHUB_RUN_NUMBER](https://github.com/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID)."
51+
gh issue create --title "Workflow failed: $GITHUB_WORKFLOW (#$GITHUB_RUN_NUMBER)" --body "$issue_body"
4452
fi

‎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.5")
16+
jmhImplementation("org.springframework.boot:spring-boot-starter-web:3.5.6")
1717
}
1818

1919
tasks {

‎benchmark-overhead/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionSha256Sum=8fad3d78296ca518113f3d29016617c7f9367dc005f932bd9d93bf45ba46072b
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
3+
distributionSha256Sum=a17ddd85a26b6a7f5ddb71ff8b05fc5104c0202c6e64782429790c933686c806
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
55
networkTimeout=10000
66
validateDistributionUrl=true
77
zipStoreBase=GRADLE_USER_HOME

‎benchmark-overhead/gradlew‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,6 @@ case "$( uname )" in #(
114114
NONSTOP* ) nonstop=true ;;
115115
esac
116116

117-
CLASSPATH="\\\"\\\""
118117

119118

120119
# Determine the Java command to use to start the JVM.
@@ -172,7 +171,6 @@ fi
172171
# For Cygwin or MSYS, switch paths to Windows format before running java
173172
if "$cygwin" || "$msys" ; then
174173
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
175-
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
176174

177175
JAVACMD=$( cygpath --unix "$JAVACMD" )
178176

@@ -212,7 +210,6 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
212210

213211
set -- \
214212
"-Dorg.gradle.appname=$APP_BASE_NAME" \
215-
-classpath "$CLASSPATH" \
216213
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
217214
"$@"
218215

‎benchmark-overhead/gradlew.bat‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,10 @@ goto fail
7070
:execute
7171
@rem Setup the command line
7272

73-
set CLASSPATH=
7473

7574

7675
@rem Execute Gradle
77-
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
76+
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
7877

7978
:end
8079
@rem End local scope for the variables with windows NT shell

‎conventions/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ dependencies {
5555

5656
// When updating, update above in plugins too
5757
implementation("com.diffplug.spotless:spotless-plugin-gradle:7.2.1")
58-
implementation("com.google.guava:guava:33.4.8-jre")
58+
implementation("com.google.guava:guava:33.5.0-jre")
5959
implementation("com.gradleup.shadow:shadow-gradle-plugin:9.1.0")
6060
implementation("org.apache.httpcomponents:httpclient:4.5.14")
6161
implementation("com.gradle.develocity:com.gradle.develocity.gradle.plugin:4.2")
@@ -73,5 +73,5 @@ dependencies {
7373
testImplementation(enforcedPlatform("org.junit:junit-bom:5.13.4"))
7474
testImplementation("org.junit.jupiter:junit-jupiter-api")
7575
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
76-
testImplementation("org.assertj:assertj-core:3.27.4")
76+
testImplementation("org.assertj:assertj-core:3.27.5")
7777
}

0 commit comments

Comments
 (0)