Merge branch 'main' into any-metrics-blog-post

open-telemetry · Nov 29, 2023 · f16bed8 · f16bed8
2 parents 1823fd3 + d3adfe7
commit f16bed8
Show file tree

Hide file tree

Showing 10 changed files with 699 additions and 248 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -16,11 +16,12 @@
 * @open-telemetry/docs-approvers
 
 # content owners
-content-modules/opamp-spec               @open-telemetry/docs-approvers @open-telemetry/opamp-spec-approvers
-content-modules/opentelemetry-proto      @open-telemetry/docs-approvers @open-telemetry/specs-approvers
-content-modules/opentelemetry-specification  @open-telemetry/docs-approvers @open-telemetry/specs-approvers
-content-modules/semantic-conventions     @open-telemetry/docs-approvers @open-telemetry/specs-semconv-approvers
-content/en/blog/                         @open-telemetry/docs-approvers @open-telemetry/blog-approvers
+content-modules/                         @open-telemetry/docs-maintainers
+content-modules/opamp-spec               @open-telemetry/docs-maintainers @open-telemetry/opamp-spec-approvers
+content-modules/opentelemetry-proto      @open-telemetry/docs-maintainers @open-telemetry/specs-approvers
+content-modules/opentelemetry-specification  @open-telemetry/docs-maintainers @open-telemetry/specs-approvers
+content-modules/semantic-conventions     @open-telemetry/docs-maintainers @open-telemetry/specs-semconv-approvers
+content/en/blog/                         @open-telemetry/docs-maintainers
 content/en/community/end-user/           @open-telemetry/docs-approvers @open-telemetry/end-user-wg
 content/en/docs/collector                @open-telemetry/docs-approvers @open-telemetry/collector-approvers
 content/en/docs/demo                     @open-telemetry/docs-approvers @open-telemetry/demo-approvers

diff --git a/.github/workflows/pr-actions.yml b/.github/workflows/pr-actions.yml
@@ -20,18 +20,21 @@ jobs:
       contains(github.event.comment.body, '/fix:format')
     permissions:
       contents: write
+      pull-requests: write
 
     steps:
       - name: Context info
         run: |
           echo $PR_NUM
           echo $COMMENT
 
+      - uses: actions/checkout@v4
+
       - name: Write start comment
         run: |
           gh pr comment $PR_NUM -b "You triggered fix:format action run at $GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID"
-
-      - uses: actions/checkout@v4
+        env:
+          GH_TOKEN: ${{ github.token }}
 
       - run: gh pr checkout $PR_NUM -b "pr-action-${RANDOM}"
         env:
@@ -63,12 +66,12 @@ jobs:
             echo current_branch=$current_branch
             # gh pr checkout sets some git configs that we can use to make sure
             # we push to the right repo & to the right branch
-            push_remote=$(git config --get branch.${current_branch}.pushremote)
-            echo push_remote=$push_remote
-            push_remote_branch=$(git config --get branch.${current_branch}.merge)
-            echo push_remote_branch=$push_remote_branch
+            remote_repo=$(git config --get branch.${current_branch}.remote)
+            echo remote_repo=$remote_repo
+            remote_branch=$(git config --get branch.${current_branch}.merge)
+            echo remote_branch=$remote_branch
             git commit -m 'Results from /fix:format'
-            git push ${push_remote} HEAD:${push_remote_branch}
+            git push ${remote_repo} HEAD:${remote_branch}
           else
             echo "No changes to commit"
           fi
@@ -79,6 +82,8 @@ jobs:
         if: ${{ failure() || cancelled() }}
         run: |
           gh pr comment $PR_NUM -b "fix:format run failed, please check $GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID for details"
+        env:
+          GH_TOKEN: ${{ github.token }}
 
   fix-refcache:
     name: /fix:refcache
@@ -99,11 +104,14 @@ jobs:
           echo $PR_NUM
           echo $COMMENT
 
+      - uses: actions/checkout@v4
+
       - name: Write start comment
         run: |
           gh pr comment $PR_NUM -b "You triggered fix:refcache action run at $GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID"
+        env:
+          GH_TOKEN: ${{ github.token }}
 
-      - uses: actions/checkout@v4
       # By providing a branch name the checkout will not break if a branch with the
       # same name exists already upstream (e.g. patch-X)
       - run: gh pr checkout $PR_NUM -b "pr-action-${RANDOM}"
@@ -137,12 +145,12 @@ jobs:
             echo current_branch=$current_branch
             # gh pr checkout sets some git configs that we can use to make sure
             # we push to the right repo & to the right branch
-            push_remote=$(git config --get branch.${current_branch}.pushremote)
-            echo push_remote=$push_remote
-            push_remote_branch=$(git config --get branch.${current_branch}.merge)
-            echo push_remote_branch=$push_remote_branch
-            git commit -m 'Results from /fix:recache'
-            git push ${push_remote} HEAD:${push_remote_branch}
+            remote_repo=$(git config --get branch.${current_branch}.remote)
+            echo remote_repo=$remote_repo
+            remote_branch=$(git config --get branch.${current_branch}.merge)
+            echo remote_branch=$remote_branch
+            git commit -m 'Results from /fix:refcache'
+            git push ${remote_repo} HEAD:${remote_branch}
           else
             echo "No changes to commit"
           fi
@@ -153,3 +161,5 @@ jobs:
         if: ${{ failure() || cancelled() }}
         run: |
           gh pr comment $PR_NUM -b "fix:recache run failed, please check $GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID for details"
+        env:
+          GH_TOKEN: ${{ github.token }}
diff --git a/README.md b/README.md
@@ -74,11 +74,29 @@ schedule.
 Meeting notes are available as a public [Google doc][]. If you have trouble
 accessing the doc, please get in touch on [Slack][].
 
-Roles:
+Here is a list of community roles with current and previous members:
 
 - Approvers: [@open-telemetry/docs-approvers][]
+
+  - [Fabrizio Ferri-Benedetti](https://github.com/theletterf), Splunk
+  - [Michael Hausenblas](https://github.com/mhausenblas), Amazon
+
 - Maintainers: [@open-telemetry/docs-maintainers][]
-- Blog approvers: [@open-telemetry/blog-approvers][]
+
+  - [Austin Parker](https://github.com/austinlparker), Honeycomb
+  - [Patrice Chalin](https://github.com/chalin), CNCF
+  - [Phillip Carter](https://github.com/cartermp), Honeycomb
+  - [Severin Neumann](https://github.com/svrnm), Cisco
+
+- Emeritus approvers:
+
+  - [Paul Bruce](https://github.com/paulsbruce)
+
+- Emeritus maintainers:
+
+  - [Steve Flanders](https://github.com/flands)
+  - [Morgan McLean](https://github.com/mtwo)
+  - [jparsana](https://github.com/jparsana)
 
 Learn more about roles in the [community repository][]. Thanks to [all who have
 already contributed][contributors]!
@@ -91,8 +109,6 @@ already contributed][contributors]!
 [adding to the registry]: https://opentelemetry.io/ecosystem/registry/adding/
 [let us know]:
   https://github.com/open-telemetry/opentelemetry.io/issues/new/choose
-[@open-telemetry/blog-approvers]:
-  https://github.com/orgs/open-telemetry/teams/blog-approvers
 [@open-telemetry/docs-approvers]:
   https://github.com/orgs/open-telemetry/teams/docs-approvers
 [@open-telemetry/docs-maintainers]:

diff --git a/content/en/docs/collector/_index.md b/content/en/docs/collector/_index.md
@@ -3,7 +3,7 @@ title: Collector
 description: Vendor-agnostic way to receive, process and export telemetry data.
 aliases: [collector/about]
 cascade:
-  vers: 0.89.0
+  vers: 0.90.0
 weight: 10
 ---