Merge branch 'main' into aerospike-client-instrumentation

Author: Abhishekkr3003

.github/CODEOWNERS

@@ -1,6 +1,6 @@
 #
 # Learn about membership in OpenTelemetry community:
-#  https://github.com/open-telemetry/community/blob/main/community-membership.md
+#  https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md
 # 
 #
 # Learn about CODEOWNERS file format: 

.github/graal-native-docker-compose.yaml

@@ -0,0 +1,31 @@
+services:
+  mongodb:
+    image: mongo:4.0
+    ports:
+      - "27017:27017"
+
+  zookeeper:
+    image: confluentinc/cp-zookeeper:6.2.10
+    environment:
+      ZOOKEEPER_CLIENT_PORT: 2181
+      ZOOKEEPER_TICK_TIME: 2000
+    ports:
+      - "22181:2181"
+
+  kafka:
+    image: confluentinc/cp-kafka:6.2.10
+    ports:
+      - 9094:9094
+    depends_on:
+      - zookeeper
+    environment:
+      KAFKA_BROKER_ID: 1
+      KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
+      KAFKA_LISTENERS: INTERNAL://0.0.0.0:9092,OUTSIDE://0.0.0.0:9094
+      KAFKA_ADVERTISED_LISTENERS: INTERNAL://kafka:9092,OUTSIDE://localhost:9094
+      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: INTERNAL:PLAINTEXT,OUTSIDE:PLAINTEXT
+      KAFKA_INTER_BROKER_LISTENER_NAME: INTERNAL
+      KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
+      KAFKA_DEFAULT_REPLICATION_FACTOR: 1
+      KAFKA_TRANSACTION_STATE_LOG_MIN_ISR: 1
+      KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR: 1

.github/labeler.yml

@@ -0,0 +1,10 @@
+test native:
+- all:
+  - changed-files:
+      - any-glob-to-any-file:
+          - instrumentation/logback/logback-appender-10/library/**
+          - instrumentation/jdbc/library/**
+          - instrumentation/spring/**
+          - smoke-tests-otel-starter/**
+          - dependencyManagement/build.gradle.kts
+      - all-globs-to-all-files: '!instrumentation/spring/**/javaagent/**'

.github/renovate.json5

@@ -4,8 +4,35 @@
     "config:base"
   ],
   "ignorePaths": ["instrumentation/**"],
-  "baseBranches": ["main", "release/v1.32.x"],
+  // 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 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"
+      ],
+      // Renovate's default behavior is only to update from unstable -> unstable if it's for the
+      // major.minor.patch, under the assumption that you would want to update to the stable version
+      // of that release instead of the unstable version for a future release
+      // (TODO remove once the artifacts above release stable versions)
+      "ignoreUnstable": false,
+      "allowedVersions": "!/\\-SNAPSHOT$/"
+    },
     {
       "matchPackagePrefixes": ["ch.qos.logback:"],
       "groupName": "logback packages"
@@ -19,8 +46,8 @@
       "groupName": "quarkus packages"
     },
     {
-      "matchPackagePrefixes": ["com.gradle.enterprise"],
-      "groupName": "gradle enterprise packages"
+      "matchPackagePrefixes": ["com.gradle.develocity"],
+      "groupName": "gradle develocity packages"
     },
     {
       "matchPackagePrefixes": ["org.eclipse.jetty:"],
@@ -42,6 +69,10 @@
       "matchPackagePrefixes": ["com.fasterxml.jackson"],
       "groupName": "jackson packages"
     },
+    {
+      "matchPackagePrefixes": ["com.gradleup.shadow"],
+      "groupName": "gradle shadow packages"
+    },
     {
       // prevent update to 2.4-groovy-4.0-SNAPSHOT
       "matchPackageNames": ["org.spockframework:spock-bom"],
@@ -77,9 +108,31 @@
     },
     {
       // intentionally using Spring Boot 2 in this smoke tests
-      "matchFileNames": ["smoke-tests/images/spring-boot/build.gradle.kts"],
-      "matchPackageNames": ["org.springframework.boot", "org.springframework.boot:spring-boot-dependencies"],
-      "matchUpdateTypes": ["major"],
+      // new versions of Spring Boot 3 are tested with
+      // https://github.com/open-telemetry/opentelemetry-java-instrumentation/blob/dc4330e0a3060bd7d8c4090ad0b8fc4727e68113/settings.gradle.kts#L43-L45
+      "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.slf4j:slf4j-api",
+        "org.springframework.boot:org.springframework.boot.gradle.plugin", // this is for plugin id "org.springframework.boot"
+        "org.springframework.boot:spring-boot-dependencies"],
+      "matchUpdateTypes": ["major", "minor"],
+      "enabled": false,
+    },
+    {
+      // intentionally using Spring Boot 2 in this smoke tests
+      "matchFileNames": [
+        "smoke-tests-otel-starter/spring-boot-2/build.gradle.kts",
+        "smoke-tests-otel-starter/spring-boot-reactive-2/build.gradle.kts"
+      ],
+      "matchPackageNames": ["ch.qos.logback:logback-classic"],
+      "matchUpdateTypes": ["minor"],
       "enabled": false,
     },
     {
@@ -96,6 +149,14 @@
       "matchUpdateTypes": ["major"],
       "enabled": false
     },
+    {
+      // intentionally pinning specifically to guice 5 in the play smoke test
+      // until we are able to test against the latest version of play
+      "matchFileNames": ["smoke-tests/images/play/build.gradle.kts"],
+      "matchPackagePrefixes": ["com.google.inject:", "com.google.inject.extensions:"],
+      "matchUpdateTypes": ["major"],
+      "enabled": false
+    },
     {
       // intentionally aligning both netty 4.0 and 4.1 version in this convention
       "matchFileNames": ["conventions/src/main/kotlin/otel.java-conventions.gradle.kts"],
@@ -106,7 +167,7 @@
     {
       // intentionally using scala 2.11 in otel.scala-conventions.gradle.kts
       "matchFileNames": ["conventions/src/main/kotlin/otel.scala-conventions.gradle.kts"],
-      "matchPackagePrefixes": ["org.scala-lang:scala-library"],
+      "matchPackageNames": ["org.scala-lang:scala-library"],
       "matchUpdateTypes": ["major", "minor"],
       "enabled": false
     },

.github/repository-settings.md

@@ -20,6 +20,11 @@ settings](https://github.com/open-telemetry/community/blob/main/docs/how-to-conf
 
 ## Branch protections
 
+The order of branch protection rules
+[can be important](https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/managing-a-branch-protection-rule#about-branch-protection-rules).
+The branch protection rules below should be added before the `**/**` branch protection rule
+(this may require deleting the `**/**` rule and recreating it at the end).
+
 ### `main`
 
 - Require branches to be up to date before merging: UNCHECKED
@@ -59,8 +64,6 @@ for [`dependabot/**/**`](https://github.com/open-telemetry/community/blob/main/d
 
 ## Secrets and variables > Actions
 
-- `GE_CACHE_PASSWORD`
-- `GE_CACHE_USERNAME`
 - `GPG_PASSWORD` - stored in OpenTelemetry-Java 1Password
 - `GPG_PRIVATE_KEY` - stored in OpenTelemetry-Java 1Password
 - `GRADLE_ENTERPRISE_ACCESS_KEY` - owned by [@trask](https://github.com/trask)

.github/scripts/generate-release-contributors.sh

@@ -78,13 +78,11 @@ query($q: String!, $endCursor: String) {
   | sed 's/^\["//' \
   | sed 's/".*//')
 
-# TODO (trask) can remove dependabot line after next release
 echo "$contributors1" "$contributors2" \
   | sed 's/ /\n/g' \
   | sort -uf \
   | grep -v linux-foundation-easycla \
   | grep -v github-actions \
-  | grep -v dependabot \
   | grep -v renovate \
   | grep -v opentelemetrybot \
   | sed 's/^/@/'

.github/scripts/update-version.sh

@@ -21,3 +21,5 @@ sed -Ei "s/(opentelemetryJavaagentAlpha *: )\"[^\"]*\"/\1\"$alpha_version\"/" ex
 
 sed -Ei "s/(io.opentelemetry.instrumentation.muzzle-generation\" version )\"[^\"]*\"/\1\"$alpha_version\"/" examples/extension/build.gradle
 sed -Ei "s/(io.opentelemetry.instrumentation.muzzle-check\" version )\"[^\"]*\"/\1\"$alpha_version\"/" examples/extension/build.gradle
+
+sed -Ei "1 s/(Comparing source compatibility of [a-z-]+)-[0-9]+\.[0-9]+\.[0-9]+(-SNAPSHOT)?.jar/\1-$version.jar/" docs/apidiffs/current_vs_latest/*.txt

.github/workflows/auto-update-otel-sdk.yml

@@ -14,7 +14,7 @@ jobs:
       latest-version: ${{ steps.check-versions.outputs.latest-version }}
       already-opened: ${{ steps.check-versions.outputs.already-opened }}
     steps:
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - id: check-versions
         name: Check versions
@@ -52,7 +52,7 @@ jobs:
     needs:
       - check-versions
     steps:
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: Update version
         env:
@@ -66,15 +66,16 @@ jobs:
         run: .github/scripts/gha-free-disk-space.sh
 
       - name: Set up JDK for running Gradle
-        uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
+        uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
         with:
           distribution: temurin
-          java-version: 17.0.6
+          java-version-file: .java-version
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@473878a77f1b98e2b5ac4af93489d1656a80a5ed # v4.2.0
 
       - name: Update license report
-        uses: gradle/gradle-build-action@3b1b3b9a2104c2b47fbae53f3938079c00c9bb87 # v3.0.0
-        with:
-          arguments: generateLicenseReport
+        run: ./gradlew generateLicenseReport
 
       - name: Undo license report clean
         if: failure()
@@ -92,7 +93,9 @@ jobs:
           branch="opentelemetrybot/update-opentelemetry-sdk-to-${VERSION}"
 
           git checkout -b $branch
-          git commit -a -m "$message"
+          git add -u
+          git add licenses
+          git commit -m "$message"
           git push --set-upstream origin $branch
           gh pr create --title "$message" \
                        --body "$body" \

.github/workflows/backport.yml

@@ -21,7 +21,7 @@ jobs:
             exit 1
           fi
 
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           # history is needed to run git cherry-pick below
           fetch-depth: 0