Skip to content

Commit

Permalink
Merge branch 'main' of github.com:open-telemetry/opentelemetry-go int…
Browse files Browse the repository at this point in the history
…o jmacd/experimental_new_sampler_with_otep_250
  • Loading branch information
jmacd committed Jul 23, 2024
2 parents 53203f6 + 2a454a7 commit e832f22
Show file tree
Hide file tree
Showing 533 changed files with 46,041 additions and 4,225 deletions.
2 changes: 2 additions & 0 deletions .codespellignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,5 @@ collison
consequentially
ans
nam
valu
thirdparty
2 changes: 1 addition & 1 deletion .codespellrc
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ check-filenames =
check-hidden =
ignore-words = .codespellignore
interactive = 1
skip = .git,go.mod,go.sum,semconv,venv,.tools
skip = .git,go.mod,go.sum,go.work,go.work.sum,semconv,venv,.tools
uri-ignore-words-list = *
write =
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/version_release.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ assignees: ''
<!--- The current milestones can be found at https://github.com/open-telemetry/opentelemetry-go/milestones -->
- [ ] Complete [Milestone](https://github.com/open-telemetry/opentelemetry-go/milestone/<Release Milesone>)
<!-- markdownlint-enable MD034 -->
- [ ] Update contrib codebase to support changes about to be released (use a git sha version)
- [ ] [Update contrib codebase to support changes about to be released (use a git sha version)](https://github.com/open-telemetry/opentelemetry-go/blob/main/RELEASING.md#verify-changes-for-contrib-repository)
- [ ] [Pre-release](https://github.com/open-telemetry/opentelemetry-go/blob/main/RELEASING.md#pre-release)
- [ ] [Tag](https://github.com/open-telemetry/opentelemetry-go/blob/main/RELEASING.md#tag)
- [ ] [Release](https://github.com/open-telemetry/opentelemetry-go/blob/main/RELEASING.md#release)
Expand Down
282 changes: 0 additions & 282 deletions .github/dependabot.yml

This file was deleted.

15 changes: 8 additions & 7 deletions .github/workflows/benchmark.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
name: Benchmark
on:
push:
tags:
- v1.*
branches:
- main
workflow_dispatch:

env:
DEFAULT_GO_VERSION: "~1.22.0"
DEFAULT_GO_VERSION: "~1.22.5"
jobs:
benchmark:
name: Benchmarks
runs-on: ubuntu-latest
runs-on: actuated-arm64-4cpu-4gb
timeout-minutes: 15
steps:
- uses: actions/checkout@v4
Expand All @@ -27,14 +27,15 @@ jobs:
path: ./benchmarks
key: ${{ runner.os }}-benchmark
- name: Store benchmarks result
uses: benchmark-action/github-action-benchmark@v1.19.3
uses: benchmark-action/github-action-benchmark@v1.20.3
with:
name: Benchmarks
tool: 'go'
output-file-path: output.txt
external-data-json-path: ./benchmarks/data.json
github-token: ${{ secrets.GITHUB_TOKEN }}
gh-pages-branch: benchmarks
auto-push: true
fail-on-alert: false
fail-on-alert: true
alert-threshold: "400%"
# Add benchmark summary to GitHub workflow run report
summary-always: true
Loading

0 comments on commit e832f22

Please sign in to comment.