Merge branch 'refs/heads/main' into messaging_semconv_update

Author: cbos

.fossa.yml

@@ -76,6 +76,9 @@ targets:
     - type: gradle
       path: ./
       target: ':instrumentation:apache-shenyu-2.4:javaagent'
+    - type: gradle
+      path: ./
+      target: ':instrumentation:avaje-jex-3.0:javaagent'
     - type: gradle
       path: ./
       target: ':instrumentation:c3p0-0.9:javaagent'
@@ -271,9 +274,6 @@ targets:
     - type: gradle
       path: ./
       target: ':instrumentation:tapestry-5.4:javaagent'
-    - type: gradle
-      path: ./
-      target: ':instrumentation:tomcat:tomcat-jdbc'
     - type: gradle
       path: ./
       target: ':instrumentation:twilio-6.6:javaagent'
@@ -426,10 +426,10 @@ targets:
       target: ':instrumentation:elasticsearch:elasticsearch-rest-7.0:library'
     - type: gradle
       path: ./
-      target: ':instrumentation:elasticsearch:elasticsearch-rest-common:javaagent'
+      target: ':instrumentation:elasticsearch:elasticsearch-rest-common-5.0:javaagent'
     - type: gradle
       path: ./
-      target: ':instrumentation:elasticsearch:elasticsearch-rest-common:library'
+      target: ':instrumentation:elasticsearch:elasticsearch-rest-common-5.0:library'
     - type: gradle
       path: ./
       target: ':instrumentation:elasticsearch:elasticsearch-transport-5.0:javaagent'
@@ -694,12 +694,6 @@ targets:
     - type: gradle
       path: ./
       target: ':instrumentation:netty:netty-3.8:javaagent'
-    - type: gradle
-      path: ./
-      target: ':instrumentation:netty:netty-4-common:javaagent'
-    - type: gradle
-      path: ./
-      target: ':instrumentation:netty:netty-4-common:library'
     - type: gradle
       path: ./
       target: ':instrumentation:netty:netty-4.0:javaagent'
@@ -712,6 +706,12 @@ targets:
     - type: gradle
       path: ./
       target: ':instrumentation:netty:netty-common:library'
+    - type: gradle
+      path: ./
+      target: ':instrumentation:netty:netty-common-4.0:javaagent'
+    - type: gradle
+      path: ./
+      target: ':instrumentation:netty:netty-common-4.0:library'
     - type: gradle
       path: ./
       target: ':instrumentation:okhttp:okhttp-2.2:javaagent'
@@ -724,6 +724,9 @@ targets:
     - type: gradle
       path: ./
       target: ':instrumentation:opensearch:opensearch-rest-1.0:javaagent'
+    - type: gradle
+      path: ./
+      target: ':instrumentation:opensearch:opensearch-rest-3.0:javaagent'
     - type: gradle
       path: ./
       target: ':instrumentation:opensearch:opensearch-rest-common:javaagent'
@@ -763,6 +766,9 @@ targets:
     - type: gradle
       path: ./
       target: ':instrumentation:opentelemetry-api:opentelemetry-api-1.47:javaagent'
+    - type: gradle
+      path: ./
+      target: ':instrumentation:opentelemetry-api:opentelemetry-api-1.50:javaagent'
     - type: gradle
       path: ./
       target: ':instrumentation:pekko:pekko-actor-1.0:javaagent'
@@ -895,6 +901,9 @@ targets:
     - type: gradle
       path: ./
       target: ':instrumentation:spring:spring-kafka-2.7:library'
+    - type: gradle
+      path: ./
+      target: ':instrumentation:spring:spring-pulsar-1.0:javaagent'
     - type: gradle
       path: ./
       target: ':instrumentation:spring:spring-rabbit-1.0:javaagent'
@@ -937,6 +946,9 @@ targets:
     - type: gradle
       path: ./
       target: ':instrumentation:tomcat:tomcat-common:javaagent'
+    - type: gradle
+      path: ./
+      target: ':instrumentation:tomcat:tomcat-jdbc:javaagent'
     - type: gradle
       path: ./
       target: ':instrumentation:vertx:vertx-kafka-client-3.6:javaagent'
@@ -946,9 +958,6 @@ targets:
     - type: gradle
       path: ./
       target: ':instrumentation:vertx:vertx-rx-java-3.5:javaagent'
-    - type: gradle
-      path: ./
-      target: ':instrumentation:vertx:vertx-sql-client-4.0:javaagent'
     - type: gradle
       path: ./
       target: ':instrumentation:vertx:vertx-web-3.0:javaagent'
@@ -1011,7 +1020,7 @@ targets:
       target: ':instrumentation:kafka:kafka-clients:kafka-clients-2.6:library'
     - type: gradle
       path: ./
-      target: ':instrumentation:kafka:kafka-clients:kafka-clients-common:library'
+      target: ':instrumentation:kafka:kafka-clients:kafka-clients-common-0.11:library'
     - type: gradle
       path: ./
       target: ':instrumentation:log4j:log4j-context-data:log4j-context-data-2.17:javaagent'
@@ -1102,9 +1111,21 @@ targets:
     - type: gradle
       path: ./
       target: ':instrumentation:vertx:vertx-http-client:vertx-http-client-4.0:javaagent'
+    - type: gradle
+      path: ./
+      target: ':instrumentation:vertx:vertx-http-client:vertx-http-client-5.0:javaagent'
     - type: gradle
       path: ./
       target: ':instrumentation:vertx:vertx-http-client:vertx-http-client-common:javaagent'
+    - type: gradle
+      path: ./
+      target: ':instrumentation:vertx:vertx-sql-client:vertx-sql-client-4.0:javaagent'
+    - type: gradle
+      path: ./
+      target: ':instrumentation:vertx:vertx-sql-client:vertx-sql-client-5.0:javaagent'
+    - type: gradle
+      path: ./
+      target: ':instrumentation:vertx:vertx-sql-client:vertx-sql-client-common:javaagent'
 
 experimental:
   gradle:

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

@@ -1,6 +1,6 @@
 services:
   mongodb:
-    image: mongo:4.0
+    image: mongo:4.2
     ports:
       - "27017:27017"
 

.github/renovate.json5

@@ -1,9 +1,8 @@
 {
   $schema: 'https://docs.renovatebot.com/renovate-schema.json',
   extends: [
-    'config:recommended',
-    'docker:pinDigests',
-    'helpers:pinGitHubActionDigests',
+    'config:best-practices',
+    'helpers:pinGitHubActionDigestsToSemver',
   ],
   ignorePaths: [
     'instrumentation/**',
@@ -28,9 +27,11 @@
     },
     {
       matchPackageNames: [
+        'io.opentelemetry.contrib:opentelemetry-azure-resources',
         'io.opentelemetry.contrib:opentelemetry-aws-resources',
         'io.opentelemetry.contrib:opentelemetry-aws-xray-propagator',
         'io.opentelemetry.contrib:opentelemetry-gcp-resources',
+        'io.opentelemetry.contrib:opentelemetry-cloudfoundry-resources',
         'io.opentelemetry.contrib:opentelemetry-baggage-processor',
         'io.opentelemetry.proto:opentelemetry-proto',
         'io.opentelemetry.semconv:opentelemetry-semconv',
@@ -78,6 +79,12 @@
         'com.gradleup.shadow{/,}**',
       ],
     },
+    {
+      groupName: 'guava packages',
+      matchPackageNames: [
+        'com.google.guava{/,}**',
+      ],
+    },
     {
       groupName: 'jackson packages',
       matchPackageNames: [
@@ -322,8 +329,8 @@
     {
       customType: 'regex',
       datasourceTemplate: 'pypi',
-      fileMatch: [
-        '^.github/workflows/',
+      managerFilePatterns: [
+        '/^.github/workflows//',
       ],
       matchStrings: [
         'pip install (?<depName>[^=]+)==(?<currentValue>[^\\s]+)',
@@ -332,8 +339,8 @@
     {
       customType: 'regex',
       datasourceTemplate: 'npm',
-      fileMatch: [
-        '^.github/workflows/',
+      managerFilePatterns: [
+        '/^.github/workflows//',
       ],
       matchStrings: [
         'npx (?<depName>[^@]+)@(?<currentValue>[^\\s]+)',

.github/repository-settings.md

@@ -23,91 +23,53 @@ settings](https://github.com/open-telemetry/community/blob/main/docs/how-to-conf
     Read repository contents and packages permissions
   - Allow GitHub Actions to create and approve pull requests: UNCHECKED
 
-## Rules > Rulesets
-
-### `main` and release branches
-
-- Targeted branches:
-  - `main`
-  - `release/*`
-- Branch rules
-  - Restrict deletions: CHECKED
-  - Require a pull request before merging: CHECKED
-    - Required approvals: 1
-    - Require review from Code Owners: CHECKED
-    - Allowed merge methods: Squash
-  - Require status checks to pass
-    - Do not require status checks on creation: CHECKED
-    - Status checks that are required
-      - EasyCLA
-      - `required-status-check`
-      - `gradle-wrapper-validation`
-  - Block force pushes: CHECKED
-  - Require code scanning results: CHECKED
-    - CodeQL
-      - Security alerts: High or higher
-      - Alerts: Errors
-
-> [!NOTE]
-> This repository can't "require linear history" because there is an old merge commit on `main`
-> (and so also on the release branches).
-
-### `cloudfoundry` branch
-
-- Targeted branches:
-  - `cloudfoundry`
-- Branch rules
-  - Restrict deletions: CHECKED
-  - Require linear history: CHECKED
-  - Require a pull request before merging: CHECKED
-    - Required approvals: 1
-    - Require review from Code Owners: CHECKED
-    - Allowed merge methods: Squash
-  - Require status checks to pass
-    - EasyCLA
-  - Block force pushes: CHECKED
-
-### `gh-pages` branch
-
-- Targeted branches:
-  - `gh-pages`
-- Branch rules
-  - Restrict deletions: CHECKED
-  - Require linear history: CHECKED
-  - Block force pushes: CHECKED
-
-### Old-style release branches
-
-- Targeted branches:
-  - `v0.*`
-  - `v1.*`
-- Branch rules
-  - Restrict creations: CHECKED
-  - Restrict updates: CHECKED
-  - Restrict deletions: CHECKED
-
-### Restrict branch creation
-
-- Targeted branches
-  - Exclude:
-    - `release/*`
-    - `renovate/**/*`
-    - `otelbot/**/*`
-    - `revert-*/**/*` (these are created when using the GitHub UI to revert a PR)
-- Restrict creations: CHECKED
-
-### Restrict updating tags
-
-- Targeted tags
-  - All tags
-- Restrict updates: CHECKED
-- Restrict deletions: CHECKED
-
 ## Branch protections
 
-### `main`, `release/*`, `cloudfoundry`
+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
+
+  (PR jobs take too long, and leaving this unchecked has not been a significant problem)
+
+- Status checks that are required:
+
+  - EasyCLA
+  - required-status-check
+  - gradle-wrapper-validation
+  - CodeQL
+
+### `release/*`
+
+Same settings as above for [`main`](#main).
+
+### `v0.*` and `v1.*` (old-style release branches)
+
+- Lock branch: CHECKED
+
+- Do not allow bypassing the above settings: CHECKED
+
+### `cloudfoundry`
+
+Same settings as above for [`main`](#main),
+except for the `required-status-check` required status check.
+
+### `renovate/**/*` and `otelbot/**/*`
+
+Same settings as
+for [`dependabot/**/*`](https://github.com/open-telemetry/community/blob/main/docs/how-to-configure-new-repository.md#branch-protection-rule-dependabot)
+
+### `gh-pages`
+
+- Everything UNCHECKED
 
-- Restrict who can push to matching branches: CHECKED
+  (This branch is currently only used for directly pushing benchmarking results from the
+  [Nightly overhead benchmark](https://github.com/open-telemetry/opentelemetry-java-instrumentation/actions/workflows/nightly-benchmark-overhead.yml)
+  job)
 
 ## Code security and analysis
 
@@ -132,6 +94,7 @@ settings](https://github.com/open-telemetry/community/blob/main/docs/how-to-conf
 
 - `FOSSA_API_KEY`
 - `OTELBOT_PRIVATE_KEY`
+- `OTELBOT_JAVA_INSTRUMENTATION_PRIVATE_KEY`
 
 ### Organization variables