Skip to content

Commit 6f38420

Browse files
authored
Merge branch 'main' into lzchen-patch-12
2 parents 2bc3080 + 77a8443 commit 6f38420

File tree

4 files changed

+28
-8
lines changed

4 files changed

+28
-8
lines changed

.github/ISSUE_TEMPLATE/bug_report.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,3 +66,11 @@ body:
6666
options:
6767
- "No"
6868
- "Yes"
69+
70+
- type: dropdown
71+
attributes:
72+
label: Tip
73+
description: This element is static, used to render a helpful sub-heading for end-users and community members to help prioritize issues. Please leave as is.
74+
options:
75+
- <sub>[React](https://github.blog/news-insights/product-news/add-reactions-to-pull-requests-issues-and-comments/) with 👍 to help prioritize this issue. Please use comments to provide useful context, avoiding `+1` or `me too`, to help us triage it. Learn more [here](https://opentelemetry.io/community/end-user/issue-participation/).</sub>
76+
default: 0

.github/ISSUE_TEMPLATE/feature_request.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,3 +48,11 @@ body:
4848
options:
4949
- "No"
5050
- "Yes"
51+
52+
- type: dropdown
53+
attributes:
54+
label: Tip
55+
description: This element is static, used to render a helpful sub-heading for end-users and community members to help prioritize issues. Please leave as is.
56+
options:
57+
- <sub>[React](https://github.blog/news-insights/product-news/add-reactions-to-pull-requests-issues-and-comments/) with 👍 to help prioritize this issue. Please use comments to provide useful context, avoiding `+1` or `me too`, to help us triage it. Learn more [here](https://opentelemetry.io/community/end-user/issue-participation/).</sub>
58+
default: 0

.github/workflows/benchmarks.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,18 @@ jobs:
1111
sdk-benchmarks:
1212
permissions:
1313
contents: write # required for pushing to gh-pages
14-
runs-on: equinix-bare-metal
14+
runs-on: oracle-bare-metal-64cpu-512gb-x86-64
15+
container:
16+
image: python:3.13-slim
1517
steps:
18+
- name: Install Git # since Git isn't available in the container image used above
19+
run: |
20+
apt-get update
21+
apt-get install -y git
22+
- name: Make repo safe for Git inside container
23+
run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
1624
- name: Checkout Core Repo @ SHA - ${{ github.sha }}
1725
uses: actions/checkout@v4
18-
- name: Set up Python
19-
uses: actions/setup-python@v5
20-
with:
21-
python-version: "3.13"
22-
architecture: 'x64'
2326
- name: Install tox
2427
run: pip install tox-uv
2528
- name: Run tox

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# OpenTelemetry Python
22
[![Slack](https://img.shields.io/badge/slack-@cncf/otel/python-brightgreen.svg?logo=slack)](https://cloud-native.slack.com/archives/C01PD4HUVBL)
33
[![Build Status 0](https://github.com/open-telemetry/opentelemetry-python/actions/workflows/test_0.yml/badge.svg?branch=main)](https://github.com/open-telemetry/opentelemetry-python/actions/workflows/test_0.yml)
4-
[![Build Status 1](https://github.com/open-telemetry/opentelemetry-python/actions/workflows/test_1.yml/badge.svg?branch=main)](https://github.com/open-telemetry/opentelemetry-python/actions/workflows/test_1.yml)
54
[![Minimum Python Version](https://img.shields.io/badge/python-3.9+-blue.svg)](https://www.python.org/downloads/)
65
[![Release](https://img.shields.io/github/v/release/open-telemetry/opentelemetry-python?include_prereleases&style=)](https://github.com/open-telemetry/opentelemetry-python/releases/)
76
[![Read the Docs](https://readthedocs.org/projects/opentelemetry-python/badge/?version=latest)](https://opentelemetry-python.readthedocs.io/en/latest/)
7+
[![OpenSSF Best Practices](https://www.bestpractices.dev/projects/11060/badge)](https://www.bestpractices.dev/projects/11060)
88

99
## Project Status
1010

@@ -103,14 +103,14 @@ Meeting notes are available as a public [Google doc](https://docs.google.com/doc
103103
### Maintainers
104104

105105
- [Aaron Abbott](https://github.com/aabmass), Google
106-
- [Diego Hurtado](https://github.com/ocelotl), Lightstep
107106
- [Leighton Chen](https://github.com/lzchen), Microsoft
108107
- [Riccardo Magliocchetti](https://github.com/xrmx), Elastic
109108

110109
For more information about the maintainer role, see the [community repository](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#maintainer).
111110

112111
### Approvers
113112

113+
- [Dylan Russell](https://github.com/dylanrussell), Google
114114
- [Emídio Neto](https://github.com/emdneto), PicPay
115115
- [Jeremy Voss](https://github.com/jeremydvoss), Microsoft
116116
- [Owais Lone](https://github.com/owais), Splunk
@@ -125,6 +125,7 @@ For more information about the approver role, see the [community repository](htt
125125

126126
- [Alex Boten](https://github.com/codeboten)
127127
- [Chris Kleinknecht](https://github.com/c24t)
128+
- [Diego Hurtado](https://github.com/ocelotl), Lightstep
128129
- [Owais Lone](https://github.com/owais)
129130
- [Reiley Yang](https://github.com/reyang)
130131
- [Srikanth Chekuri](https://github.com/srikanthccv)

0 commit comments

Comments
 (0)