Skip to content

chore: merge main#3432

Merged
tlowrimore-heroku merged 30 commits intov11.0.0from
tl/merge-main
Dec 15, 2025
Merged

chore: merge main#3432
tlowrimore-heroku merged 30 commits intov11.0.0from
tl/merge-main

Conversation

@tlowrimore-heroku
Copy link
Copy Markdown
Contributor

@tlowrimore-heroku tlowrimore-heroku commented Dec 10, 2025 •
edited
Loading

Background

  • merges main into the v11.0.0 branch
  • updates opentelemetry libraries to resolve version mismatch. This change is the result of Sentry being moved in from main.

SOC 2 Compliance

W-20493733

heroku-johnny and others added 24 commits October 23, 2025 14:44
@heroku-johnny
release v10.14.0 (#3397)
c0d7800 
v10.14.0
@heroku-johnny
chore: remove default team from docs (#3398)
03b9480 
Remove default team from docs
@joeybrown-sf
feat(cli): Introduce splunkhec drain type (#3395)
31e7341
@tlowrimore-heroku
release v10.15.0 (#3405)
4bb523c 
v10.15.0
@michaelmalave
chore: removing rollbar configuration and references (#3411)
64c2ffd 
* removing rollbar configuration and references

* updating yarn lock file from yarn install
@dependabot
chore(deps): bump glob from 10.3.10 to 10.5.0 (#3415)
95824b9 
Bumps [glob](https://github.com/isaacs/node-glob) from 10.3.10 to 10.5.0.
- [Changelog](https://github.com/isaacs/node-glob/blob/main/changelog.md)
- [Commits](isaacs/node-glob@v10.3.10...v10.5.0)

---
updated-dependencies:
- dependency-name: glob
  dependency-version: 10.5.0
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@k80bowman
release v10.15.1 (#3416)
48340fa 
v10.15.1
@michaelmalave
fix: ensure IP restriction error handling for run:inside and logs com…
42b3a2a 
…mands (#3389)

* chore: add IP restriction error handling for run:inside and logs commands. Prevents silent failures when commands are executed outside trusted IP ranges

* updating logging test to capture updated error for 401

* updating cases to account for 403 error returned by fir

* update of test to match updates to error

* adding error message validation logic

* adding http helper to get the error message and updating testing to match

* updating to use fetch for log url

* updating to use fetch for log url

* updating the logging method to use immdiate vs delayed method to distinguish between 403 error types

* removing clean all to match other test patterns

* restoring tests to prior to fir addition

* adding unit tests for fir app log streaming errors
@michaelmalave
fix: using setImmediate for error handle in log displayer unit test (#…
8f8b1d6 
…3417)

chore: using setImmediate for testing for error handle unit test
@sbosio
chore: Resolve 3PP vulnerabilities (W-20328182) (#3419)
8479f5a 
* Resolve 3PP vulnerabilities

* Fix ansi-regex resolutions
@dependabot
chore(deps): bump actions/upload-artifact from 4 to 5 (#3407)
23580fe 
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4 to 5.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](actions/upload-artifact@v4...v5)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-version: '5'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
chore(deps): bump actions/download-artifact from 4 to 6 (#3401)
afdd944 
Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 4 to 6.
- [Release notes](https://github.com/actions/download-artifact/releases)
- [Commits](actions/download-artifact@v4...v6)

---
updated-dependencies:
- dependency-name: actions/download-artifact
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
chore(deps): bump actions/setup-node from 4 to 6 (#3390)
4268abd 
Bumps [actions/setup-node](https://github.com/actions/setup-node) from 4 to 6.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](actions/setup-node@v4...v6)

---
updated-dependencies:
- dependency-name: actions/setup-node
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
chore(deps): bump actions/checkout from 4 to 6 (#3421)
10d29ef 
Bumps [actions/checkout](https://github.com/actions/checkout) from 4 to 6.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@v4...v6)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
chore(deps): bump express from 5.1.0 to 5.2.1 (#3422)
89a95ab 
Bumps [express](https://github.com/expressjs/express) from 5.1.0 to 5.2.1.
- [Release notes](https://github.com/expressjs/express/releases)
- [Changelog](https://github.com/expressjs/express/blob/master/History.md)
- [Commits](expressjs/express@v5.1.0...v5.2.1)

---
updated-dependencies:
- dependency-name: express
  dependency-version: 5.2.1
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@k80bowman
feat(W-19894449): add Sentry error reporting (#3413)
15fe316 
* feat: add sentry for error monitoring

* promisify sendToSentry function

* fix: remove scrubbing of API key pattern as too aggressive

* remove overly-aggressive scrubber presets and patterns

* test: add unit test for sending data to sentry

* fix: incorporate otel into sentry reporting

* add notes and remove unnecessary code

* remove promise rejection from sendToSentry function as unnecessary
@eablack
fix: update ps-exec to 2.6.4 (#3425)
85c70ef
@dependabot
chore(deps): bump @modelcontextprotocol/sdk from 1.12.1 to 1.24.0 (#3423
389b2d2 
)

Bumps [@modelcontextprotocol/sdk](https://github.com/modelcontextprotocol/typescript-sdk) from 1.12.1 to 1.24.0.
- [Release notes](https://github.com/modelcontextprotocol/typescript-sdk/releases)
- [Commits](modelcontextprotocol/typescript-sdk@1.12.1...1.24.0)

---
updated-dependencies:
- dependency-name: "@modelcontextprotocol/sdk"
  dependency-version: 1.24.0
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@k80bowman
fix(W-20270674): bump heroku-cli-util and fix resulting errors (#3426)
19ed38c 
fix: bump heroku-cli-util and fix resulting errors
@eablack
release v10.16.0 (#3427)
3f0b8a2 
v10.16.0
@michaelmalave
feat: adding conditional logic for receiving applied state of trusted…
217271b 
… ips (#3424)

* adding conditional logic for receiving applied state of trusted ips and respective messaging

* updating the error messaging to ensure alignment on testing patterns

* updating the output to simply be output since its meant to be informative

* removing trailing spaces

* adding comment for usage and todo for future removal of condition
@tlowrimore-heroku
fix: ensures authentications:revoke documentation is generated (#3428)
fdfec26 
removes revoke from its own aliases list
@tlowrimore-heroku
merge main
9271210
@tlowrimore-heroku
minimally updates otel dependencies to address peer dependency conflict
44de88f
@git2gus
Copy link
Copy Markdown

git2gus bot commented Dec 10, 2025

Git2Gus App is installed but the .git2gus/config.json doesn't exist.

@tlowrimore-heroku tlowrimore-heroku changed the base branch from main to v11.0.0 December 12, 2025 22:48
@tlowrimore-heroku
Merge branch 'v11.0.0' into tl/merge-main
2a45b8f 
Signed-off-by: Timothy Lowrimore <154477569+tlowrimore-heroku@users.noreply.github.com>
@tlowrimore-heroku tlowrimore-heroku marked this pull request as ready for review December 15, 2025 16:54
@tlowrimore-heroku tlowrimore-heroku requested a review from a team as a code owner December 15, 2025 16:54
k80bowman
k80bowman requested changes Dec 15, 2025
View reviewed changes
Copy link
Copy Markdown
Contributor

@k80bowman k80bowman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Overall this looks great, fantastic job on what was a tough rebase! I do have a few small change requests, though.

k80bowman
k80bowman approved these changes Dec 15, 2025
View reviewed changes
Copy link
Copy Markdown
Contributor

@k80bowman k80bowman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for the updates!

@tlowrimore-heroku tlowrimore-heroku merged commit 59e9686 into v11.0.0 Dec 15, 2025
13 checks passed
@tlowrimore-heroku tlowrimore-heroku deleted the tl/merge-main branch December 15, 2025 21:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@k80bowman k80bowman k80bowman approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@tlowrimore-heroku @k80bowman @heroku-johnny @joeybrown-sf @michaelmalave @sbosio @eablack