Merge branch 'main' into mongo-metadata

Author: jaydeluca

.fossa.yml

@@ -928,6 +928,9 @@ targets:
     - type: gradle
       path: ./
       target: ':instrumentation:servlet:servlet-3.0:javaagent'
+    - type: gradle
+      path: ./
+      target: ':instrumentation:servlet:servlet-3.0:library'
     - type: gradle
       path: ./
       target: ':instrumentation:servlet:servlet-5.0:javaagent'
@@ -939,7 +942,10 @@ targets:
       target: ':instrumentation:servlet:servlet-common:javaagent'
     - type: gradle
       path: ./
-      target: ':instrumentation:servlet:servlet-javax-common:javaagent'
+      target: ':instrumentation:servlet:servlet-common:library'
+    - type: gradle
+      path: ./
+      target: ':instrumentation:servlet:servlet-javax-common:library'
     - type: gradle
       path: ./
       target: ':instrumentation:spring:spring-batch-3.0:javaagent'

.github/scripts/check-package-names.sh

@@ -19,6 +19,9 @@ for dir in $(find instrumentation -name "*.java" | grep library/src/main/java |
   if [[ "$module_name" == "oshi" ]]; then
     continue
   fi
+  if [[ "$module_name" == "servlet-common" ]]; then
+    continue
+  fi
 
   # these are possibly problematic
   if [[ "$dir" == "instrumentation/grpc-1.6/library/src/main/java/io/grpc/override" ]]; then

.github/workflows/build-daily.yml

@@ -31,6 +31,44 @@ jobs:
   markdown-lint-check:
     uses: ./.github/workflows/reusable-markdown-lint-check.yml
 
+  publish-snapshots:
+    needs:
+      - common
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+
+      - name: Free disk space
+        run: .github/scripts/gha-free-disk-space.sh
+
+      - name: Set up JDK for running Gradle
+        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: Build and publish artifact snapshots
+        env:
+          DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
+          SONATYPE_USER: ${{ secrets.SONATYPE_USER }}
+          SONATYPE_KEY: ${{ secrets.SONATYPE_KEY }}
+          GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
+          GPG_PASSWORD: ${{ secrets.GPG_PASSWORD }}
+        run: ./gradlew assemble spdxSbom publishToSonatype
+
+      - name: Build and publish gradle plugin snapshots
+        env:
+          DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
+          SONATYPE_USER: ${{ secrets.SONATYPE_USER }}
+          SONATYPE_KEY: ${{ secrets.SONATYPE_KEY }}
+          GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
+          GPG_PASSWORD: ${{ secrets.GPG_PASSWORD }}
+        run: ./gradlew build publishToSonatype
+        working-directory: gradle-plugins
+
   workflow-notification:
     permissions:
       contents: read
@@ -40,6 +78,7 @@ jobs:
       - test-latest-deps
       - muzzle
       - link-check
+      - publish-snapshots
     if: always()
     uses: ./.github/workflows/reusable-workflow-notification.yml
     with:
@@ -48,5 +87,6 @@ jobs:
           needs.common.result == 'success' &&
           needs.test-latest-deps.result == 'success' &&
           needs.muzzle.result == 'success' &&
-          needs.link-check.result == 'success'
+          needs.link-check.result == 'success' &&
+          needs.publish-snapshots.result == 'success'
         }}

.github/workflows/build.yml

@@ -45,44 +45,3 @@ jobs:
     # release branches are excluded
     if: "!startsWith(github.ref_name, 'release/')"
     uses: ./.github/workflows/reusable-markdown-lint-check.yml
-
-  publish-snapshots:
-    needs:
-      # 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
-    if: github.ref_name == 'main' && github.repository == 'open-telemetry/opentelemetry-java-instrumentation'
-    steps:
-      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
-
-      - name: Free disk space
-        run: .github/scripts/gha-free-disk-space.sh
-
-      - name: Set up JDK for running Gradle
-        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: Build and publish artifact snapshots
-        env:
-          DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
-          SONATYPE_USER: ${{ secrets.SONATYPE_USER }}
-          SONATYPE_KEY: ${{ secrets.SONATYPE_KEY }}
-          GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
-          GPG_PASSWORD: ${{ secrets.GPG_PASSWORD }}
-        run: ./gradlew assemble spdxSbom publishToSonatype
-
-      - name: Build and publish gradle plugin snapshots
-        env:
-          DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
-          SONATYPE_USER: ${{ secrets.SONATYPE_USER }}
-          SONATYPE_KEY: ${{ secrets.SONATYPE_KEY }}
-          GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
-          GPG_PASSWORD: ${{ secrets.GPG_PASSWORD }}
-        run: ./gradlew build publishToSonatype
-        working-directory: gradle-plugins

.github/workflows/issue-management-stale-action.yml

@@ -56,13 +56,13 @@ jobs:
           operations-per-run: 1000
 
       # Action #3: Handle stale PRs
-      # - After 180 days inactive: Adds "stale" label + warning comment
+      # - After 90 days inactive: Adds "stale" label + warning comment
       # - After 14 more days inactive: Closes
       - uses: actions/stale@5f858e3efba33a5ca4407a664cc011ad407f2008 # v10.1.0
         with:
           days-before-issue-stale: -1
           days-before-issue-close: -1
-          days-before-pr-stale: 180
+          days-before-pr-stale: 90
           days-before-pr-close: 14
           stale-pr-label: stale
           stale-pr-message: >

.github/workflows/pr-automation-comments.yml

@@ -42,7 +42,7 @@ jobs:
                 "",
                 "### Checklist",
                 "- [ ] Migration notes added to the PR description",
-                "- [ ] Breaking change is documented in the changelog entry for the next release",
+                "- [ ] Breaking change is documented in the "Unreleased" section of the [Changelog](https://github.com/open-telemetry/opentelemetry-java-instrumentation/blob/main/CHANGELOG.md), preferably as part of this PR.",
                 "- [ ] Consider if this change requires a major version bump",
                 "",
                 "Your migration notes will be included in the release notes to help users upgrade smoothly. The more detailed and helpful they are, the better the user experience will be.",

.mise/tasks/lint/markdown.sh

@@ -1,10 +1,10 @@
 #!/usr/bin/env bash
 #MISE description="Lint markdown files"
-#MISE flag "--fix" help="Automatically fix issues"
+#USAGE flag "--fix" help="Automatically fix issues"
 
 set -e
 
-if [ "${usage_fix}" = "true" ]; then
+if [ "${usage_fix:-false}" = "true" ]; then
   markdownlint-cli2 --fix "**/*.md" "#**/build" "#CHANGELOG.md" "#licenses/licenses.md"
 else
   markdownlint-cli2 "**/*.md" "#**/build" "#CHANGELOG.md" "#licenses/licenses.md"

benchmark-overhead-jmh/build.gradle.kts

@@ -1,4 +1,3 @@
-import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import me.champeau.jmh.JMHTask
 import net.ltgt.gradle.errorprone.errorprone
 
@@ -44,7 +43,7 @@ tasks {
   val jmhStartFlightRecording = gradle.startParameter.projectProperties.get("jmh.startFlightRecording")
 
   named<JMHTask>("jmh") {
-    val shadowTask = project(":javaagent").tasks.named<ShadowJar>("shadowJar").get()
+    val shadowTask = project(":javaagent").tasks.named<Jar>("shadowJar").get()
     inputs.files(layout.files(shadowTask))
 
     // note: without an exporter, toSpanData() won't even be called