Merge branch 'main' into kafka-exporter

open-telemetry · Nov 23, 2023 · 3f75463 · 3f75463
2 parents 125906d + 7487fcb
commit 3f75463
Show file tree

Hide file tree

Showing 150 changed files with 5,052 additions and 1,027 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -13,14 +13,17 @@ body:
         - aws-xray
         - aws-xray-propagator
         - consistent-sampling
+        - disk-buffering
         - jfr-connection
         - jfr-events
         - jmx-metrics
         - maven-extension
         - micrometer-meter-provider
         - noop-api
+        - processors
         - prometheus-client-bridge
         - resource-providers
+        - runtime-attach
         - samplers
         - static-instrumenter
   - type: textarea

diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -13,14 +13,17 @@ body:
         - aws-xray
         - aws-xray-propagator
         - consistent-sampling
+        - disk-buffering
         - jfr-connection
         - jfr-events
         - jmx-metrics
         - maven-extension
         - micrometer-meter-provider
         - noop-api
+        - processors
         - prometheus-client-bridge
         - resource-providers
+        - runtime-attach
         - samplers
         - static-instrumenter
   - type: textarea

diff --git a/.github/component_owners.yml b/.github/component_owners.yml
@@ -25,11 +25,7 @@ components:
   disk-buffering:
     - LikeTheSalad
     - zeitlinger
-  samplers:
-    - iNikem
-    - trask
   jfr-connection:
-    - trask
     - breedx-splk
     - jeanbisutti
     - dsgrieve
@@ -47,14 +43,18 @@ components:
     - HaloFour
   noop-api:
     - jack-berg
+  processors:
+    - LikeTheSalad
+    - breedx-splk
   prometheus-collector:
     - jkwatson
   resource-providers:
     - breedx-splk
     - mateuszrzeszutek
     - laurit
   runtime-attach:
-    - iNikem
     - jeanbisutti
+  samplers:
+    - trask
   static-instrumenter:
     - anosek-an
diff --git a/.github/config/markdown-link-check-config.json b/.github/config/markdown-link-check-config.json
@@ -2,10 +2,10 @@
   "retryOn429": true,
   "ignorePatterns": [
     {
-      "pattern": "^https://github\\.com/open-telemetry/opentelemetry-java-contrib/network/updates$"
+      "pattern": "^https://developer\\.mend\\.io/github/open-telemetry/opentelemetry-java-contrib$"
     },
     {
-      "pattern": "^https://github.com/open-telemetry/opentelemetry-java-contrib/pulls/app%2Fdependabot$"
+      "pattern": "^https://github.com/open-telemetry/opentelemetry-java-contrib/pulls/app%2Frenovate"
     }
   ]
 }
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
diff --git a/.github/renovate.json5 b/.github/renovate.json5
@@ -0,0 +1,60 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:base"
+  ],
+  "packageRules": [
+    {
+      "matchPackageNames": [
+        "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha"
+      ],
+      // 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 (but there's never any
+      // stable version of opentelemetry-instrumentation-bom-alpha so this logic doesn't apply
+      "ignoreUnstable": false
+    },
+    {
+      "matchPackagePrefixes": ["ch.qos.logback:"],
+      "groupName": "logback packages"
+    },
+    {
+      "matchPackagePrefixes": ["io.micrometer:"],
+      "groupName": "micrometer packages"
+    },
+    {
+      "matchPackagePrefixes": ["com.gradle.enterprise"],
+      "groupName": "gradle enterprise packages"
+    },
+    {
+      // junit-pioneer 2+ requires Java 11+
+      "matchPackageNames": ["org.junit-pioneer:junit-pioneer"],
+      "matchUpdateTypes": ["major"],
+      "enabled": false
+    },
+    {
+      // mockito 5+ requires Java 11+
+      "matchPackagePrefixes": ["org.mockito:"],
+      "matchUpdateTypes": ["major"],
+      "enabled": false
+    },
+    {
+      // pinned version for compatibility
+      "matchPackageNames": ["io.micrometer:micrometer-core"],
+      "matchCurrentVersion": "1.1.0",
+      "enabled": false
+    },
+    {
+      // pinned version for compatibility
+      "matchPackageNames": ["io.micrometer:micrometer-core"],
+      "matchCurrentVersion": "1.1.0",
+      "enabled": false
+    },
+    {
+      // pinned version for compatibility
+      "matchPackagePrefixes": ["org.apache.maven:"],
+      "matchCurrentVersion": "3.5.0",
+      "enabled": false
+    }
+  ]
+}
diff --git a/.github/scripts/draft-change-log-entries.sh b/.github/scripts/draft-change-log-entries.sh
@@ -35,6 +35,8 @@ component_names["jmx-metrics/"]="JMX metrics"
 component_names["maven-extension/"]="Maven extension"
 component_names["micrometer-meter-provider/"]="Micrometer MeterProvider"
 component_names["noop-api/"]="No-op API"
+component_names["processors/"]="Telemetry processors"
+component_names["extended-tracer/"]="Extended Tracer"
 component_names["prometheus-client-bridge/"]="Prometheus client bridge"
 component_names["runtime-attach/"]="Runtime attach"
 component_names["resource-providers/"]="Resource providers"
@@ -48,7 +50,7 @@ for component in */ ; do
   component_name=${component_names[$component]:=$component}
   commits=$(git log --reverse \
           --perl-regexp \
-          --author='^(?!dependabot\[bot\] )' \
+          --author='^(?!renovate\[bot\] )' \
           --pretty=format:"- %s" \
           "$range" \
           "$component")

diff --git a/.github/scripts/generate-release-contributors.sh b/.github/scripts/generate-release-contributors.sh
@@ -79,11 +79,13 @@ 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/^/@/'
diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
@@ -16,7 +16,7 @@ jobs:
             exit 1
           fi
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           # history is needed to run git cherry-pick below
           fetch-depth: 0

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -16,7 +16,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set up JDK for running Gradle
         uses: actions/setup-java@v3
@@ -44,7 +44,7 @@ jobs:
           - 20
       fail-fast: false
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - id: setup-test-java
         name: Set up JDK ${{ matrix.test-java-version }} for running tests
@@ -75,7 +75,7 @@ jobs:
   integration-test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set up JDK for running Gradle
         uses: actions/setup-java@v3
@@ -127,7 +127,7 @@ jobs:
       - integration-test
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set up JDK for running Gradle
         uses: actions/setup-java@v3

diff --git a/.github/workflows/codeql-daily.yml b/.github/workflows/codeql-daily.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set up Java 17
         uses: actions/setup-java@v3

diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
@@ -11,6 +11,6 @@ jobs:
   validation:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
-      - uses: gradle/wrapper-validation-action@v1.0.6
+      - uses: gradle/wrapper-validation-action@v1.1.0
diff --git a/.github/workflows/issue-management-feedback-label.yml b/.github/workflows/issue-management-feedback-label.yml
@@ -11,7 +11,7 @@ jobs:
       github.event.comment.user.login == github.event.issue.user.login
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Remove label
         env:

diff --git a/.github/workflows/prepare-patch-release.yml b/.github/workflows/prepare-patch-release.yml
@@ -6,7 +6,7 @@ jobs:
   prepare-patch-release:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - run: |
           if [[ ! $GITHUB_REF_NAME =~ ^release/v[0-9]+\.[0-9]+\.x$ ]]; then

diff --git a/.github/workflows/prepare-release-branch.yml b/.github/workflows/prepare-release-branch.yml
@@ -6,7 +6,7 @@ jobs:
   prereqs:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Verify prerequisites
         run: |
@@ -25,7 +25,7 @@ jobs:
     needs:
       - prereqs
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Create release branch
         run: |
@@ -74,7 +74,7 @@ jobs:
     needs:
       - prereqs
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set environment variables
         run: |

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -6,7 +6,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set up JDK for running Gradle
         uses: actions/setup-java@v3
@@ -29,7 +29,7 @@ jobs:
   integration-test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set up JDK for running Gradle
         uses: actions/setup-java@v3
@@ -63,7 +63,7 @@ jobs:
             exit 1
           fi
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set environment variables
         run: |
@@ -92,7 +92,7 @@ jobs:
 
         # check out main branch to verify there won't be problems with merging the change log
         # at the end of this workflow
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: main
 
@@ -107,7 +107,7 @@ jobs:
           fi
 
         # back to the release branch
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           # tags are needed for the generate-release-contributors.sh script
           fetch-depth: 0
@@ -187,7 +187,7 @@ jobs:
     needs:
       - release
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Copy change log section from release branch
         env:
@@ -196,7 +196,7 @@ jobs:
           sed -n "0,/^## Version $VERSION /d;/^## Version /q;p" CHANGELOG.md \
             > /tmp/changelog-section.md
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: main
 

diff --git a/.github/workflows/reusable-markdown-link-check.yml b/.github/workflows/reusable-markdown-link-check.yml
@@ -7,7 +7,7 @@ jobs:
   markdown-link-check:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Install markdown-link-check
         # TODO(jack-berg): use latest when config file reading bug is fixed: https://github.com/tcort/markdown-link-check/issues/246