Skip to content

Commit 9610c24

Browse files
martincostellomartincostello
authored
Merge branch 'main' into gh-4064-process
2 parents 98947b2 + a545405 commit 9610c24

237 files changed

Lines changed: 6638 additions & 1507 deletions

File tree

Some content is hidden

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

‎.github/workflows/Component.BuildTest.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ jobs:
190190
token: ${{ secrets.CODECOV_TOKEN }}
191191

192192
- name: Publish ${{ steps.resolve-project.outputs.name }} NuGet packages to Artifacts
193-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
193+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
194194
# Only publish packages from the first job, which should be net462 for Windows in most cases, which is preferred for .NET Framework support
195195
if: matrix.os == 'windows-latest' && inputs.pack && strategy.job-index == 0
196196
with:

‎.github/workflows/ci-Exporter.OneCollector-Integration.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,6 @@ jobs:
3939
version: ${{ matrix.version }}
4040
test-filter: OneCollectorIntegrationTests
4141
env-var-name: OTEL_ONECOLLECTOR_INSTRUMENTATION_KEY
42-
checkout-ref: refs/pull/${{ github.event.pull_request.number }}/merge
42+
checkout-ref: ${{ github.event.pull_request.merge_commit_sha || github.event.pull_request.head.sha }}
4343
secrets:
4444
instrumentation-key: ${{ secrets.OTEL_ONECOLLECTOR_INSTRUMENTATION_KEY }}

‎.github/workflows/ci.yml‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -468,16 +468,6 @@ jobs:
468468
project-name: OpenTelemetry.Instrumentation.StackExchangeRedis
469469
code-cov-name: Instrumentation.StackExchangeRedis
470470

471-
build-test-instrumentation-stackexchangeredis-integration:
472-
needs: detect-changes
473-
if: |
474-
contains(needs.detect-changes.outputs.changes, 'instrumentation-stackexchangeredis')
475-
|| contains(needs.detect-changes.outputs.changes, 'build')
476-
|| contains(needs.detect-changes.outputs.changes, 'shared')
477-
uses: ./.github/workflows/integration.yml
478-
with:
479-
job: redis-integration-test
480-
481471
build-test-instrumentation-wcf:
482472
needs: detect-changes
483473
if: |
@@ -712,7 +702,6 @@ jobs:
712702
build-test-instrumentation-servicefabricremoting,
713703
build-test-instrumentation-sqlclient,
714704
build-test-instrumentation-stackexchangeredis,
715-
build-test-instrumentation-stackexchangeredis-integration,
716705
build-test-instrumentation-wcf,
717706
build-test-opamp-client,
718707
build-test-persistentstorage,

‎.github/workflows/codeql-analysis-steps.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@ jobs:
3535
show-progress: false
3636

3737
- name: Initialize CodeQL
38-
uses: github/codeql-action/init@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1
38+
uses: github/codeql-action/init@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4.35.2
3939
with:
4040
build-mode: none
4141
languages: ${{ matrix.language }}
4242
config-file: ./.github/codeql/codeql-config.yml
4343

4444
- name: Perform CodeQL Analysis
45-
uses: github/codeql-action/analyze@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1
45+
uses: github/codeql-action/analyze@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4.35.2
4646
with:
4747
category: '/language:${{ matrix.language }}'
4848

‎.github/workflows/core-version-update.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ jobs:
2525
if: needs.automation.outputs.enabled
2626

2727
steps:
28-
- uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 # v3.0.0
28+
- uses: actions/create-github-app-token@1b10c78c7865c340bc4f6099eb2f838309f1e8c3 # v3.1.1
2929
id: otelbot-token
3030
with:
31-
app-id: ${{ vars.OTELBOT_DOTNET_CONTRIB_APP_ID }}
31+
client-id: ${{ vars.OTELBOT_DOTNET_CONTRIB_APP_ID }}
3232
private-key: ${{ secrets.OTELBOT_DOTNET_CONTRIB_PRIVATE_KEY }}
3333
permission-contents: write
3434
permission-pull-requests: write

‎.github/workflows/integration.yml‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Integration Build OpenTelemetry.Instrumentation.StackExchangeRedis
1+
name: Integration Tests
22

33
on:
44
workflow_call:
@@ -11,20 +11,6 @@ permissions:
1111
contents: read
1212

1313
jobs:
14-
redis-integration-test:
15-
if: inputs.job == 'all' || inputs.job == 'redis-integration-test'
16-
runs-on: ubuntu-24.04
17-
strategy:
18-
fail-fast: false
19-
matrix:
20-
version: [net8.0, net10.0]
21-
steps:
22-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
23-
24-
- name: Run redis docker compose
25-
run: docker compose --file=test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/docker-compose.yml "--file=build/docker-compose.${TARGET_FRAMEWORK}.yml" --project-directory=. up --exit-code-from=tests --build
26-
env:
27-
TARGET_FRAMEWORK: ${{ matrix.version }}
2814

2915
kafka-integration-test:
3016
if: inputs.job == 'all' || inputs.job == 'kafka-integration-test'

‎.github/workflows/ossf-scorecard.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
# uploads of run results in SARIF format to the repository Actions tab.
3434
# https://docs.github.com/en/actions/advanced-guides/storing-workflow-data-as-artifacts
3535
- name: "Upload artifact"
36-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
36+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
3737
with:
3838
name: SARIF file
3939
path: results.sarif
@@ -42,6 +42,6 @@ jobs:
4242
# Upload the results to GitHub's code scanning dashboard (optional).
4343
# Commenting out will disable upload of results to your repo's Code Scanning dashboard
4444
- name: "Upload to code-scanning"
45-
uses: github/codeql-action/upload-sarif@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1
45+
uses: github/codeql-action/upload-sarif@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4.35.2
4646
with:
4747
sarif_file: results.sarif

‎.github/workflows/post-release.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ jobs:
2828
if: needs.automation.outputs.enabled
2929

3030
steps:
31-
- uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 # v3.0.0
31+
- uses: actions/create-github-app-token@1b10c78c7865c340bc4f6099eb2f838309f1e8c3 # v3.1.1
3232
id: otelbot-token
3333
with:
34-
app-id: ${{ vars.OTELBOT_DOTNET_CONTRIB_APP_ID }}
34+
client-id: ${{ vars.OTELBOT_DOTNET_CONTRIB_APP_ID }}
3535
private-key: ${{ secrets.OTELBOT_DOTNET_CONTRIB_PRIVATE_KEY }}
3636
permission-contents: write
3737
permission-pull-requests: write

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

Lines changed: 33 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,29 @@ permissions:
8484
jobs:
8585
automation:
8686
uses: ./.github/workflows/automation.yml
87+
88+
# Partial combination of simplified child jobs condition to avoid running jobs at all
89+
if: |
90+
github.event_name == 'workflow_dispatch'
91+
||
92+
(
93+
github.event_name == 'pull_request' &&
94+
github.event.action == 'closed' &&
95+
github.event.pull_request.merged == true &&
96+
startsWith(github.event.pull_request.title, '[release] Prepare release ')
97+
)
98+
||
99+
(
100+
github.event_name == 'issue_comment' &&
101+
github.event.issue.pull_request &&
102+
startsWith(github.event.issue.title, '[release] Prepare release ')
103+
)
104+
||
105+
(
106+
startsWith(github.event.issue.title, '[release request] ') &&
107+
github.event.issue.pull_request == null
108+
)
109+
87110
secrets:
88111
OTELBOT_DOTNET_CONTRIB_PRIVATE_KEY: ${{ secrets.OTELBOT_DOTNET_CONTRIB_PRIVATE_KEY }}
89112

@@ -95,10 +118,10 @@ jobs:
95118
if: github.event_name == 'workflow_dispatch' && needs.automation.outputs.enabled
96119

97120
steps:
98-
- uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 # v3.0.0
121+
- uses: actions/create-github-app-token@1b10c78c7865c340bc4f6099eb2f838309f1e8c3 # v3.1.1
99122
id: otelbot-token
100123
with:
101-
app-id: ${{ vars.OTELBOT_DOTNET_CONTRIB_APP_ID }}
124+
client-id: ${{ vars.OTELBOT_DOTNET_CONTRIB_APP_ID }}
102125
private-key: ${{ secrets.OTELBOT_DOTNET_CONTRIB_PRIVATE_KEY }}
103126
permission-contents: write
104127
permission-pull-requests: write
@@ -145,10 +168,10 @@ jobs:
145168
needs.automation.outputs.enabled
146169
147170
steps:
148-
- uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 # v3.0.0
171+
- uses: actions/create-github-app-token@1b10c78c7865c340bc4f6099eb2f838309f1e8c3 # v3.1.1
149172
id: otelbot-token
150173
with:
151-
app-id: ${{ vars.OTELBOT_DOTNET_CONTRIB_APP_ID }}
174+
client-id: ${{ vars.OTELBOT_DOTNET_CONTRIB_APP_ID }}
152175
private-key: ${{ secrets.OTELBOT_DOTNET_CONTRIB_PRIVATE_KEY }}
153176
permission-contents: read
154177
permission-pull-requests: write
@@ -188,10 +211,10 @@ jobs:
188211
needs.automation.outputs.enabled
189212
190213
steps:
191-
- uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 # v3.0.0
214+
- uses: actions/create-github-app-token@1b10c78c7865c340bc4f6099eb2f838309f1e8c3 # v3.1.1
192215
id: otelbot-token
193216
with:
194-
app-id: ${{ vars.OTELBOT_DOTNET_CONTRIB_APP_ID }}
217+
client-id: ${{ vars.OTELBOT_DOTNET_CONTRIB_APP_ID }}
195218
private-key: ${{ secrets.OTELBOT_DOTNET_CONTRIB_PRIVATE_KEY }}
196219
permission-contents: write
197220
permission-pull-requests: write
@@ -238,10 +261,10 @@ jobs:
238261
needs.automation.outputs.enabled
239262
240263
steps:
241-
- uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 # v3.0.0
264+
- uses: actions/create-github-app-token@1b10c78c7865c340bc4f6099eb2f838309f1e8c3 # v3.1.1
242265
id: otelbot-token
243266
with:
244-
app-id: ${{ vars.OTELBOT_DOTNET_CONTRIB_APP_ID }}
267+
client-id: ${{ vars.OTELBOT_DOTNET_CONTRIB_APP_ID }}
245268
private-key: ${{ secrets.OTELBOT_DOTNET_CONTRIB_PRIVATE_KEY }}
246269
permission-contents: write
247270
permission-pull-requests: write
@@ -293,10 +316,10 @@ jobs:
293316
)
294317
295318
steps:
296-
- uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 # v3.0.0
319+
- uses: actions/create-github-app-token@1b10c78c7865c340bc4f6099eb2f838309f1e8c3 # v3.1.1
297320
id: otelbot-token
298321
with:
299-
app-id: ${{ vars.OTELBOT_DOTNET_CONTRIB_APP_ID }}
322+
client-id: ${{ vars.OTELBOT_DOTNET_CONTRIB_APP_ID }}
300323
private-key: ${{ secrets.OTELBOT_DOTNET_CONTRIB_PRIVATE_KEY }}
301324
permission-contents: write
302325
permission-issues: write

‎.github/workflows/publish-packages.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ jobs:
124124
125125
- name: Publish Artifacts
126126
id: upload-artifacts
127-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
127+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
128128
with:
129129
name: ${{ github.ref_name }}-packages
130130
path: ./artifacts/package/release
@@ -207,10 +207,10 @@ jobs:
207207
if: needs.automation.outputs.enabled && github.event_name == 'push'
208208

209209
steps:
210-
- uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 # v3.0.0
210+
- uses: actions/create-github-app-token@1b10c78c7865c340bc4f6099eb2f838309f1e8c3 # v3.1.1
211211
id: otelbot-token
212212
with:
213-
app-id: ${{ vars.OTELBOT_DOTNET_CONTRIB_APP_ID }}
213+
client-id: ${{ vars.OTELBOT_DOTNET_CONTRIB_APP_ID }}
214214
private-key: ${{ secrets.OTELBOT_DOTNET_CONTRIB_PRIVATE_KEY }}
215215
permission-contents: write
216216
permission-pull-requests: write

0 commit comments

Comments
 (0)