Merge branch 'main' into modernize-junit

Author: trask

.github/CODEOWNERS

@@ -1,10 +1,6 @@
 #
 # Learn about membership in OpenTelemetry community:
-# https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md
-#
-#
-# Learn about CODEOWNERS file format:
-#  https://help.github.com/en/articles/about-code-owners
+#  https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md
 #
 
 * @open-telemetry/java-contrib-approvers

.github/component_owners.yml

@@ -98,3 +98,6 @@ components:
   ibm-mq-metrics:
     - breedx-splk
     - atoulme
+  dynamic-control:
+    - jackshirazi
+    - LikeTheSalad

.github/config/lychee.toml

@@ -1,3 +1,6 @@
+# Lychee configuration file
+# See https://lychee.cli.rs/config/
+
 timeout = 30
 retry_wait_time = 5
 max_retries = 6

.github/copilot-instructions.md

@@ -63,4 +63,4 @@ When implementing changes or new features:
 1. Follow all [Style Guide](../docs/style-guide.md) conventions and the Code Review Priorities above
 2. Run tests to ensure they still pass (use `./gradlew test` and `./gradlew integrationTest` as needed)
 3. **Always run `./gradlew spotlessApply`** after making code changes to ensure proper formatting
-4. Run markdown lint to ensure it still passes: `npx markdownlint-cli@0.45.0 -c .github/config/markdownlint.yml **/*.md`
+4. Run markdown lint to ensure it still passes: `npx markdownlint-cli@0.46.0 -c .github/config/markdownlint.yml **/*.md`

.github/renovate.json5

@@ -3,6 +3,7 @@
   extends: [
     'config:best-practices',
     'helpers:pinGitHubActionDigestsToSemver',
+    'customManagers:githubActionsVersions',
   ],
   ignorePaths: [], // overwrite default ignore which includes **/test/**
                    // used to update docker image versions used in Java test files
@@ -52,6 +53,7 @@
       // 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
       ignoreUnstable: false,
+      allowedVersions: '!/\\-SNAPSHOT$/',
     },
     {
       // prevent 3.0.1u2 -> 3.0.1
@@ -62,6 +64,9 @@
     },
     {
       // disruptor 4+ requires Java 11+
+      matchFileNames: [
+        'inferred-spans/build.gradle.kts',
+      ],
       matchPackageNames: [
         'com.lmax:disruptor',
       ],
@@ -81,6 +86,19 @@
       ],
       enabled: false,
     },
+    {
+      // caffeine 3+ requires Java 11+
+      matchFileNames: [
+        'aws-xray/build.gradle.kts',
+      ],
+      matchPackageNames: [
+        'com.github.ben-manes.caffeine:caffeine',
+      ],
+      matchUpdateTypes: [
+        'major',
+      ],
+      enabled: false,
+    },
     {
       // junit-pioneer 2+ requires Java 11+
       matchPackageNames: [
@@ -103,6 +121,9 @@
     },
     {
       // agrona 1.23+ requires Java 17+
+      matchFileNames: [
+        'inferred-spans/build.gradle.kts',
+      ],
       matchPackageNames: [
         'org.agrona:agrona',
       ],
@@ -125,6 +146,9 @@
     },
     {
       // pinned version for compatibility
+      matchFileNames: [
+        'micrometer-meter-provider/build.gradle.kts',
+      ],
       matchPackageNames: [
         'io.micrometer:micrometer-core',
       ],
@@ -133,6 +157,9 @@
     },
     {
       // pinned version for compatibility
+      matchFileNames: [
+        'maven-extension/build.gradle.kts',
+      ],
       matchCurrentVersion: '3.5.0',
       enabled: false,
       matchPackageNames: [
@@ -179,6 +206,9 @@
     },
     {
       // pinned version for compatibility with java 8 JFR parsing
+      matchFileNames: [
+        'jfr-connection/build.gradle.kts',
+      ],
       matchUpdateTypes: [
         'major',
       ],
@@ -230,7 +260,7 @@
         '.github/workflows/**',
       ],
       matchStrings: [
-        '(?<currentValue>\\d+) # renovate: datasource=java-version',
+        '(?<currentValue>\\d+) # renovate\\(java-version\\)',
       ],
       depNameTemplate: 'java',
       extractVersionTemplate: '^(?<version>\\d+)',
@@ -242,8 +272,9 @@
         '**/build.gradle.kts',
       ],
       matchStrings: [
-        '"https://github.com/(?<depName>[^/]+/[^/]+)/zipball/(?<currentValue>.+?)"',
+        '"(?<currentValue>.+?)" // renovate\\(github-releases\\): (?<depName>[^\\s]+)',
       ],
+      versioningTemplate: 'semver',
     },
     {
       customType: 'regex',

.github/repository-settings.md

@@ -15,3 +15,28 @@ private admin repo.
   - Maximum pull requests to merge: 5
   - Only merge non-failing pull requests: CHECKED
   - Status check timeout: 60 minutes
+
+## Secrets and variables > Actions
+
+### Repository secrets
+
+- `GPG_PASSWORD` - stored in OpenTelemetry-Java 1Password
+- `GPG_PRIVATE_KEY` - stored in OpenTelemetry-Java 1Password
+- `NVD_API_KEY` - stored in OpenTelemetry-Java 1Password
+  - Generated at https://nvd.nist.gov/developers/request-an-api-key
+  - Key is associated with [@trask](https://github.com/trask)'s gmail address
+- `SONATYPE_KEY` - owned by [@trask](https://github.com/trask)
+- `SONATYPE_USER` - owned by [@trask](https://github.com/trask)
+
+### Organization secrets
+
+- `CODECOV_TOKEN`
+- `DEVELOCITY_ACCESS_KEY` (scoped only to Java repos)
+- `FOSSA_API_KEY`
+- `OTELBOT_JAVA_CONTRIB_PRIVATE_KEY` (scoped only to this repo)
+- `OTELBOT_PRIVATE_KEY`
+
+### Organization variables
+
+- `OSSF_SCORECARD_APP_ID`
+- `OTELBOT_APP_ID`

.github/scripts/assign-issue-owners.js

@@ -0,0 +1,62 @@
+const fs = require('fs');
+const { parse } = require('yaml');
+const { Octokit } = require('@octokit/rest');
+
+async function main() {
+  // Get inputs from environment
+  const token = process.env.GITHUB_TOKEN;
+  const labelName = process.env.LABEL_NAME;
+  const issueNumber = parseInt(process.env.ISSUE_NUMBER);
+  const owner = process.env.REPO_OWNER;
+  const repo = process.env.REPO_NAME;
+
+  if (!labelName.startsWith('component:')) {
+    console.error('Label does not match expected pattern');
+    process.exit(1);
+  }
+
+  const componentName = labelName.replace('component:', '');
+  console.log(`Processing component: ${componentName}`);
+
+  // Read and parse component_owners.yml
+  const yamlContent = fs.readFileSync('.github/component_owners.yml', 'utf8');
+  const data = parse(yamlContent);
+
+  if (!data || !data.components) {
+    console.error('Invalid component_owners.yml structure');
+    process.exit(1);
+  }
+
+  const components = data.components;
+
+  if (!(componentName in components)) {
+    console.error(`Component '${componentName}' not found in component_owners.yml`);
+    process.exit(1);
+  }
+
+  const owners = components[componentName];
+
+  if (!owners || owners.length === 0) {
+    console.error(`No owners found for component '${componentName}'`);
+    process.exit(1);
+  }
+
+  console.log(`Found owners: ${owners.join(', ')}`);
+
+  // Assign the issue to the owners
+  const octokit = new Octokit({ auth: token });
+
+  await octokit.rest.issues.addAssignees({
+    owner,
+    repo,
+    issue_number: issueNumber,
+    assignees: owners
+  });
+
+  console.log(`Successfully assigned issue #${issueNumber} to ${owners.join(', ')}`);
+}
+
+main().catch(error => {
+  console.error(error);
+  process.exit(1);
+});

.github/scripts/draft-change-log-entries.sh

@@ -1,4 +1,6 @@
-#!/bin/bash -e
+#!/usr/bin/env bash
+
+set -e
 
 version=$("$(dirname "$0")/get-version.sh")
 
@@ -29,6 +31,7 @@ component_names["aws-xray/"]="AWS X-Ray SDK support"
 component_names["aws-xray-propagator/"]="AWS X-Ray propagator"
 component_names["azure-resources/"]="Azure resources"
 component_names["baggage-processor/"]="Baggage processor"
+component_names["cel-sampler/"]="Common Expression Language sampler"
 component_names["cloudfoundry-resources/"]="CloudFoundry resources"
 component_names["compressors/"]="Compressors"
 component_names["consistent-sampling/"]="Consistent sampling"

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

@@ -72,7 +72,7 @@ query($q: String!, $endCursor: String) {
   }
 }
 ' --jq '.data.search.edges.[].node.body' \
-  | grep -oE "#[0-9]{3,}$|#[0-9]{3,}[^0-9<]|$GITHUB_REPOSITORY/issues/[0-9]{3,}" \
+  | grep -oE "#[0-9]{3,}$|#[0-9]{3,}[^0-9<&#;]|$GITHUB_REPOSITORY/issues/[0-9]{3,}" \
   | grep -oE "[0-9]{3,}" \
   | xargs -I{} gh issue view {} --json 'author,url' --jq '[.author.login,.url]' \
   | grep -v '/pull/' \
@@ -83,8 +83,11 @@ query($q: String!, $endCursor: String) {
 echo $contributors1 $contributors2 \
   | sed 's/ /\n/g' \
   | sort -uf \
-  | grep -v linux-foundation-easycla \
+  | grep -v copilot-pull-request-reviewer \
+  | grep -v copilot-swe-agent \
   | grep -v github-actions \
+  | grep -v github-advanced-security \
+  | grep -v linux-foundation-easycla \
   | grep -v renovate \
   | grep -v otelbot \
   | sed 's/^/@/'