Merge branch 'main' into main

Author: ghareeb-falazi

.fossa.yml

@@ -73,6 +73,9 @@ targets:
     - type: gradle
       path: ./
       target: ':instrumentation:apache-dubbo-2.7:library-autoconfigure'
+    - type: gradle
+      path: ./
+      target: ':instrumentation:apache-elasticjob-3.0:javaagent'
     - type: gradle
       path: ./
       target: ':instrumentation:apache-httpasyncclient-4.1:javaagent'
@@ -190,6 +193,9 @@ targets:
     - type: gradle
       path: ./
       target: ':instrumentation:jdbc:library'
+    - type: gradle
+      path: ./
+      target: ':instrumentation:jfinal-3.2:javaagent'
     - type: gradle
       path: ./
       target: ':instrumentation:jmx-metrics:javaagent'
@@ -829,6 +835,9 @@ targets:
     - type: gradle
       path: ./
       target: ':instrumentation:opentelemetry-api:opentelemetry-api-1.52:javaagent'
+    - type: gradle
+      path: ./
+      target: ':instrumentation:opentelemetry-api:opentelemetry-api-1.56:javaagent'
     - type: gradle
       path: ./
       target: ':instrumentation:pekko:pekko-actor-1.0:javaagent'

.github/renovate.json5

@@ -7,23 +7,18 @@
   ignorePaths: [
     'instrumentation/**',
   ],
-  // needed in order to get patch-only updates in package rules below
-  // unfortunately you can't combine updateTypes and separateMinorPatch in the same package rule
-  // so we have to apply it globally here, see
-  // https://github.com/renovatebot/renovate/discussions/8399#discussioncomment-305798
-  separateMinorPatch: true,
   packageRules: [
     {
       // this is to reduce the number of renovate PRs
       matchManagers: [
         'github-actions',
         'dockerfile',
+        'custom.regex',
       ],
       extends: [
         'schedule:weekly',
       ],
       groupName: 'weekly update',
-      separateMinorPatch: false,  // overrides separateMinorPatch specified above
     },
     {
       matchPackageNames: [
@@ -43,6 +38,14 @@
       ignoreUnstable: false,
       allowedVersions: '!/\\-SNAPSHOT$/',
     },
+    {
+      // currently using gradle plugin org.playframework.play 3.1.0 milestone releases
+      // but don't want to pick up SNAPSHOT releases
+      matchPackageNames: [
+        'org.playframework.play:**',
+      ],
+      allowedVersions: '!/\\-SNAPSHOT$/',
+    },
     {
       groupName: 'quarkus packages',
       matchPackageNames: [
@@ -143,11 +146,7 @@
       matchPackageNames: [
         'uk.org.webcompere:system-stubs-jupiter',
       ],
-      matchUpdateTypes: [
-        'major',
-        'minor',
-      ],
-      enabled: false,
+      allowedVersions: '/^2\\.0\\./',
     },
     {
       // wiremock 3+ requires Java 11+
@@ -190,7 +189,22 @@
       enabled: false,
     },
     {
-      // intentionally using Spring Boot 2 in these smoke tests
+      // intentionally using Spring Boot 2 to make sure the earliest version is supported
+      matchFileNames: [
+        'smoke-tests/images/spring-boot/build.gradle.kts',
+        'smoke-tests-otel-starter/spring-boot-2/build.gradle.kts',
+        'smoke-tests-otel-starter/spring-boot-common/build.gradle.kts',
+        'smoke-tests-otel-starter/spring-boot-reactive-2/build.gradle.kts',
+        'smoke-tests-otel-starter/spring-boot-reactive-common/build.gradle.kts',
+        'smoke-tests-otel-starter/spring-smoke-testing/build.gradle.kts',
+      ],
+      matchPackageNames: [
+        'org.springframework.boot:spring-boot-dependencies:**',
+      ],
+      enabled: false
+    },
+    {
+      // Spring Boot 2 smoke tests are intentionally using slf4j 1.x
       matchFileNames: [
         'smoke-tests/images/spring-boot/build.gradle.kts',
         'smoke-tests-otel-starter/spring-boot-2/build.gradle.kts',
@@ -201,7 +215,6 @@
       ],
       matchPackageNames: [
         'org.slf4j:slf4j-api',
-        'org.springframework.boot:**',
       ],
       matchUpdateTypes: [
         'major',
@@ -218,11 +231,7 @@
       matchPackageNames: [
         'ch.qos.logback:**',
       ],
-      matchUpdateTypes: [
-        'major',
-        'minor',
-      ],
-      enabled: false,
+      allowedVersions: '/^1\\.2\\./',
     },
     {
       // intentionally using slf4j 1 in this smoke tests
@@ -253,18 +262,26 @@
       ],
     },
     {
-      // intentionally aligning both netty 4.0 and 4.1 version in this convention
+      // intentionally aligning netty 4.0 versions in this convention
       matchFileNames: [
         'conventions/src/main/kotlin/otel.java-conventions.gradle.kts',
       ],
       matchPackageNames: [
         'io.netty:netty-bom',
       ],
-      matchUpdateTypes: [
-        'major',
-        'minor',
+      matchCurrentVersion: '/^4\\.0\\./',
+      allowedVersions: '/^4\\.0\\./',
+    },
+    {
+      // intentionally aligning netty 4.1 versions in this convention
+      matchFileNames: [
+        'conventions/src/main/kotlin/otel.java-conventions.gradle.kts',
       ],
-      enabled: false,
+      matchPackageNames: [
+        'io.netty:netty-bom',
+      ],
+      matchCurrentVersion: '/^4\\.1\\./',
+      allowedVersions: '/^4\\.1\\./',
     },
     {
       // intentionally using scala 2.11 in otel.scala-conventions.gradle.kts
@@ -274,14 +291,10 @@
       matchPackageNames: [
         'org.scala-lang:scala-library',
       ],
-      matchUpdateTypes: [
-        'major',
-        'minor',
-      ],
-      enabled: false,
+      allowedVersions: '/^2\\.11\\./',
     },
     {
-      // intentionally using Java 11 in some examples
+      // intentionally testing against specific major Java versions
       matchPackageNames: [
         'eclipse-temurin',
       ],
@@ -319,27 +332,10 @@
       matchFileNames: [
         'dependencyManagement/build.gradle.kts',
       ],
-      matchUpdateTypes: [
-        'major',
-        'minor',
-      ],
-      enabled: false,
       matchPackageNames: [
         'ch.qos.logback:**',
       ],
-    },
-    {
-      // intentionally using Spring Boot 2 in dependency management (for Java 8 support)
-      matchFileNames: [
-        'dependencyManagement/build.gradle.kts',
-      ],
-      matchUpdateTypes: [
-        'major',
-      ],
-      enabled: false,
-      matchPackageNames: [
-        'org.springframework.boot:spring-boot-dependencies:**',
-      ],
+      allowedVersions: '/^1\\.3\\./',
     },
     {
       // pinned version to Jetty 8 (Servlet 3.0) for compatibility
@@ -370,6 +366,17 @@
       depNameTemplate: 'java',
       extractVersionTemplate: '^(?<version>\\d+)',
     },
+    {
+      customType: 'regex',
+      datasourceTemplate: 'docker',
+      managerFilePatterns: [
+        '**/build.gradle.kts',
+      ],
+      matchStrings: [
+        '"(?<depName>eclipse-temurin):(?<currentValue>[^"@]+)@(?<currentDigest>sha256:[0-9a-f]+)"',
+        '"(?<depName>ibm-semeru-runtimes):(?<currentValue>[^"@]+)@(?<currentDigest>sha256:[0-9a-f]+)"',
+      ],
+    },
     {
       customType: 'regex',
       datasourceTemplate: 'pypi',

.github/workflows/build-daily-no-build-cache.yml

@@ -29,8 +29,8 @@ jobs:
   # muzzle is not included here because it doesn't use gradle cache anyway and so is already covered
   # by the normal daily build
 
-  # link-check and misspell-check are not included here because they don't use gradle cache
-  # anyway and so are already covered by the normal daily build
+  # link-check is not included here because it doesn't use gradle cache anyway and so is already
+  # covered by the normal daily build
 
   workflow-notification:
     permissions:

.github/workflows/build-daily.yml

@@ -34,9 +34,6 @@ jobs:
   markdown-lint-check:
     uses: ./.github/workflows/reusable-markdown-lint-check.yml
 
-  misspell-check:
-    uses: ./.github/workflows/reusable-misspell-check.yml
-
   workflow-notification:
     permissions:
       contents: read
@@ -46,7 +43,6 @@ jobs:
       - test-latest-deps
       - muzzle
       - link-check
-      - misspell-check
     if: always()
     uses: ./.github/workflows/reusable-workflow-notification.yml
     with:
@@ -55,6 +51,5 @@ jobs:
           needs.common.result == 'success' &&
           needs.test-latest-deps.result == 'success' &&
           needs.muzzle.result == 'success' &&
-          needs.link-check.result == 'success' &&
-          needs.misspell-check.result == 'success'
+          needs.link-check.result == 'success'
         }}

.github/workflows/build-pull-request.yml

@@ -53,9 +53,6 @@ jobs:
   markdown-lint-check:
     uses: ./.github/workflows/reusable-markdown-lint-check.yml
 
-  misspell-check:
-    uses: ./.github/workflows/reusable-misspell-check.yml
-
   required-status-check:
     # test-latest-deps is not included in the required status checks
     # because any time a new library version is released to maven central
@@ -71,7 +68,6 @@ jobs:
       - muzzle
       - shell-script-check
       - markdown-lint-check
-      - misspell-check
     runs-on: ubuntu-latest
     if: always()
     steps:
@@ -82,8 +78,7 @@ jobs:
             (
               needs.muzzle.result != 'success' ||
               needs.shell-script-check.result != 'success' ||
-              needs.markdown-lint-check.result != 'success' ||
-              needs.misspell-check.result != 'success'
+              needs.markdown-lint-check.result != 'success'
             )
           )
         run: exit 1 # fail

.github/workflows/build.yml

@@ -51,16 +51,9 @@ jobs:
     if: "!startsWith(github.ref_name, 'release/')"
     uses: ./.github/workflows/reusable-markdown-lint-check.yml
 
-  misspell-check:
-    # release branches are excluded to avoid unnecessary maintenance if new misspellings are added
-    # to the misspell dictionary
-    if: "!startsWith(github.ref_name, 'release/')"
-    uses: ./.github/workflows/reusable-misspell-check.yml
-
   publish-snapshots:
     needs:
-      # intentionally not blocking snapshot publishing on test-latest-deps, muzzle,
-      # link-check, or misspell-check
+      # intentionally not blocking snapshot publishing on test-latest-deps, muzzle, or link-check
       - common
     runs-on: ubuntu-latest
     # skipping release branches because the versions in those branches are not snapshots

.github/workflows/documentation-synchronization-audit.yml

@@ -18,7 +18,7 @@ jobs:
       - uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
         with:
           distribution: temurin
-          java-version: 17
+          java-version-file: .java-version
 
       - name: Set up gradle
         uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0

.github/workflows/release.yml

@@ -201,6 +201,9 @@ jobs:
           echo "prior-version=$PRIOR_VERSION" >> $GITHUB_OUTPUT
 
   documentation-audit:
+    permissions:
+      contents: read
+      issues: write
     needs:
       - release
     uses: ./.github/workflows/documentation-synchronization-audit.yml
@@ -249,6 +252,14 @@ jobs:
             sleep 60
           done
 
+      - uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
+        with:
+          distribution: temurin
+          java-version-file: .java-version
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
+
       - name: Update apidiff baseline
         env:
           VERSION: ${{ needs.release.outputs.version }}