Skip to content

Commit 9032990

Browse files
authored
Merge branch 'main' into add_redis_client_only_instrumentation
2 parents 0fa915b + 6587485 commit 9032990

File tree

258 files changed

+9149
-2887
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

258 files changed

+9149
-2887
lines changed

.github/component_owners.yml

+3
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ components:
1111
- oxeye-nikolay
1212
- nikosokolik
1313

14+
instrumentation/opentelemetry-instrumentation-asyncclick:
15+
- jomcgi
16+
1417
instrumentation/opentelemetry-instrumentation-kafka-python:
1518
- nozik
1619

.github/workflows/core_contrib_test_0.yml

+47-3
Original file line numberDiff line numberDiff line change
@@ -525,6 +525,28 @@ jobs:
525525
- name: Run tests
526526
run: tox -e py38-test-instrumentation-boto -- -ra
527527

528+
py38-test-instrumentation-asyncclick:
529+
name: instrumentation-asyncclick
530+
runs-on: ubuntu-latest
531+
steps:
532+
- name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }}
533+
uses: actions/checkout@v4
534+
with:
535+
repository: open-telemetry/opentelemetry-python-contrib
536+
ref: ${{ env.CONTRIB_REPO_SHA }}
537+
538+
- name: Set up Python 3.8
539+
uses: actions/setup-python@v5
540+
with:
541+
python-version: "3.8"
542+
architecture: "x64"
543+
544+
- name: Install tox
545+
run: pip install tox-uv
546+
547+
- name: Run tests
548+
run: tox -e py38-test-instrumentation-asyncclick -- -ra
549+
528550
py38-test-instrumentation-click:
529551
name: instrumentation-click
530552
runs-on: ubuntu-latest
@@ -877,8 +899,30 @@ jobs:
877899
- name: Run tests
878900
run: tox -e py38-test-instrumentation-requests -- -ra
879901

880-
py38-test-instrumentation-starlette:
881-
name: instrumentation-starlette
902+
py38-test-instrumentation-starlette-oldest:
903+
name: instrumentation-starlette-oldest
904+
runs-on: ubuntu-latest
905+
steps:
906+
- name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }}
907+
uses: actions/checkout@v4
908+
with:
909+
repository: open-telemetry/opentelemetry-python-contrib
910+
ref: ${{ env.CONTRIB_REPO_SHA }}
911+
912+
- name: Set up Python 3.8
913+
uses: actions/setup-python@v5
914+
with:
915+
python-version: "3.8"
916+
architecture: "x64"
917+
918+
- name: Install tox
919+
run: pip install tox-uv
920+
921+
- name: Run tests
922+
run: tox -e py38-test-instrumentation-starlette-oldest -- -ra
923+
924+
py38-test-instrumentation-starlette-latest:
925+
name: instrumentation-starlette-latest
882926
runs-on: ubuntu-latest
883927
steps:
884928
- name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }}
@@ -897,7 +941,7 @@ jobs:
897941
run: pip install tox-uv
898942

899943
- name: Run tests
900-
run: tox -e py38-test-instrumentation-starlette -- -ra
944+
run: tox -e py38-test-instrumentation-starlette-latest -- -ra
901945

902946
py38-test-instrumentation-jinja2:
903947
name: instrumentation-jinja2

.github/workflows/lint_0.yml

+18
Original file line numberDiff line numberDiff line change
@@ -322,6 +322,24 @@ jobs:
322322
- name: Run tests
323323
run: tox -e lint-instrumentation-boto
324324

325+
lint-instrumentation-asyncclick:
326+
name: instrumentation-asyncclick
327+
runs-on: ubuntu-latest
328+
steps:
329+
- name: Checkout repo @ SHA - ${{ github.sha }}
330+
uses: actions/checkout@v4
331+
332+
- name: Set up Python 3.13
333+
uses: actions/setup-python@v5
334+
with:
335+
python-version: "3.13"
336+
337+
- name: Install tox
338+
run: pip install tox-uv
339+
340+
- name: Run tests
341+
run: tox -e lint-instrumentation-asyncclick
342+
325343
lint-instrumentation-click:
326344
name: instrumentation-click
327345
runs-on: ubuntu-latest

.github/workflows/ossf-scorecard.yml

+47
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
name: OSSF Scorecard
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
schedule:
8+
- cron: "10 6 * * 1" # once a week
9+
workflow_dispatch:
10+
11+
permissions: read-all
12+
13+
jobs:
14+
analysis:
15+
runs-on: ubuntu-latest
16+
permissions:
17+
# Needed for Code scanning upload
18+
security-events: write
19+
# Needed for GitHub OIDC token if publish_results is true
20+
id-token: write
21+
steps:
22+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
23+
with:
24+
persist-credentials: false
25+
26+
- uses: ossf/scorecard-action@f49aabe0b5af0936a0987cfb85d86b75731b0186 # v2.4.1
27+
with:
28+
results_file: results.sarif
29+
results_format: sarif
30+
publish_results: true
31+
32+
# Upload the results as artifacts (optional). Commenting out will disable
33+
# uploads of run results in SARIF format to the repository Actions tab.
34+
# https://docs.github.com/en/actions/advanced-guides/storing-workflow-data-as-artifacts
35+
- name: "Upload artifact"
36+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
37+
with:
38+
name: SARIF file
39+
path: results.sarif
40+
retention-days: 5
41+
42+
# Upload the results to GitHub's code scanning dashboard (optional).
43+
# Commenting out will disable upload of results to your repo's Code Scanning dashboard
44+
- name: "Upload to code-scanning"
45+
uses: github/codeql-action/upload-sarif@5f8171a638ada777af81d42b55959a643bb29017 # v3.28.12
46+
with:
47+
sarif_file: results.sarif

.github/workflows/package-prepare-patch-release.yml

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ on:
1010
- opentelemetry-sdk-extension-aws
1111
- opentelemetry-instrumentation-openai-v2
1212
- opentelemetry-instrumentation-vertexai
13+
- opentelemetry-instrumentation-google-genai
1314
description: 'Package to be released'
1415
required: true
1516
run-name: "[Package][${{ inputs.package }}] Prepare patch release"

.github/workflows/package-prepare-release.yml

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ on:
1010
- opentelemetry-sdk-extension-aws
1111
- opentelemetry-instrumentation-openai-v2
1212
- opentelemetry-instrumentation-vertexai
13+
- opentelemetry-instrumentation-google-genai
1314
description: 'Package to be released'
1415
required: true
1516

.github/workflows/package-release.yml

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ on:
1010
- opentelemetry-sdk-extension-aws
1111
- opentelemetry-instrumentation-openai-v2
1212
- opentelemetry-instrumentation-vertexai
13+
- opentelemetry-instrumentation-google-genai
1314
description: 'Package to be released'
1415
required: true
1516
run-name: "[Package][${{ inputs.package }}] Release"

0 commit comments

Comments
 (0)