Skip to content

Conversation

@apollo-bot2
Copy link
Contributor

Opened from a copy of so conflicts can be resolved without pushing to a protected branch.

Samuel Collard and others added 30 commits September 10, 2025 16:17
Redirect `/docs/apollo-mcp-server/guides` to fix 404
Added instructions for configuring load balancers with Apollo MCP Server to ensure session affinity.
Co-authored-by: Michelle Mabuyo <[email protected]>
Add load balancer configuration details for Apollo MCP
* fix(ci): pin to specific stable rust version (#287)

This commit pins the rust-toolchain to a specific rust version (1.89.0)
for compatibility guarantees. Renovate will handle warning on outdated
versions of stable rust.

A minimal supported rust version was also added to the underlying crates
to ensure compatibility guarantees as the stable verison increments in
future updates.

* feat: Implement Test Coverage Measurement and Reporting

* chore: add changeset

* feat: remove unnecessary codecov setting

* feat: add codecov badge

* feat: add codecov config file

* feat: add code coverage docs to CONTRIBUTING.md

* test: add tests for uplink schema event

* ci: prevent draft PRs from verifying changeset

* chore: add changeset

* ci: trigger verify changeset workflow when PR becomes ready for review

* ci: update github checkout actions

* feat: Configuration for disabling authorization token passthrough (#336)

* Allow config for not forwarding Auth tokens to GraphQL API

* use serde default to make new config optional

* Changeset

* Fix default case in main.rs

* Add new config option to documentation

* Redirect /docs/apollo-mcp-server/guides to fix 404 (#349)

Co-authored-by: Samuel Collard <[email protected]>
Co-authored-by: Michelle Mabuyo <[email protected]>

* chore: update RMCP version to latest (#328)

This commit updates the RMCP dependency to the latest version 0.6.4.
Sadly, schemars was also updated with this, so a lot of unrelated
changes were needed to conform with the new stable schemars version.

* chore(release): bumping to version 0.8.0

* chore(release): changelog for 0.8.0

---------

Co-authored-by: Apollo Bot <[email protected]>
Co-authored-by: Armando Locay <[email protected]>
Co-authored-by: Nicholas Cioli <[email protected]>
Co-authored-by: Dale Seo <[email protected]>
Co-authored-by: Dale Seo <[email protected]>
Co-authored-by: Samuel Collard <[email protected]>
Co-authored-by: apollo-bot2 <[email protected]>
Co-authored-by: Samuel Collard <[email protected]>
Co-authored-by: Michelle Mabuyo <[email protected]>
Using Claude's support documentation and the methods we've been demonstrating on live streams and webinars, this change gives instructions for adding an MCP server to Claude through their Custom Connectors feature.
Hotfix docs: Add instructions for Goose as an LLM client on Auth guide#275
…cker

docs: Add always pull latest docker image to sample docker run commands
Docs: Clarify examples for defining tools
DaleSeo and others added 21 commits September 29, 2025 14:35
* Create a prototype of otel emitting traces to local jaegar instance

* Add tracing annotations

* Combine logging and tracing

* copilot feedback

* Add changeset

* Instrument other tools

* Clippy fixes

* PR feedback

* Change default env name to development

Co-authored-by: Dale Seo <[email protected]>

* Remove some extraneous extensions

---------

Co-authored-by: Dale Seo <[email protected]>
* Implement metrics for mcp tool and operation counts and durations

* Changeset

* Unit test attribute setting in graphql.rs

* Add axum_otel_metrics for emitting basic http metrics about requests

* Lazy load singleton Meter for metrics

* Alphabetize

* Simplify result.is_error checking
…l headers downstream (#307)

* Fix sending OTLP trace headers downstream to GQL API

* Changeset
* Add basic config file options to otel telemetry

* Happy path unit test for telemetry config

* Changeset

* Taplo format

* Refactor to add a couple more tests

* Update unit test for clippy after rust upgrade

* Rename unit tests
* feat: adding ability to omit attributes for traces and metrics

* chore: adding changeset

* chore: updating changeset text

* chore: removing unused file

* chore: renaming exporter file

* chore: renaming module

* re-running checks

* chore: auto-gen the as_str function using enums instead of constants

* chore: updating changeset entry and fixing fields in instruemnt attribute

* chore: adding description as a doc string

* chore: updating changeset  entry

* chore: updating operation attribute descriptions

* chore: updating operation_type attribute to operation_source

* chore: skipping request from instrumentation

* chore: fixing clippy issues

* re-running nix build

* updating unit test snapshot

* chore: fixing toml formatting issues

* test: removing asserts on constants

* chore: format issues

* test: adjusting unit test to not use local envar

* revert: undoing accidental commit

* test: removing unnecessary assert
* feat: adding config option for trace sampling

* chore: adding changeset entry
Add status code to the http trace
Changeset

Unit tests for auth.rs

Add raw_operation as a telemetry attribute

Unit test starting a streamable http server

Rename self to operation_source
Add telemetry docs to sidebar

Cleaning up

Fix title on grafana guide

Update the overview

Update configuration section to be more complete

Add a quick start guide and info about prod

Update production section with more useful ino

Apply suggestions from code review

Style edits

Co-authored-by: Joseph Caudle <[email protected]>

Remove custom from 'custom metrics'

Remove Grafana how-to guide

Move configuration reference to the config page

Add a note about cardinality control using sampling and attribute filtering

Fix typo: traaces -> traces
Fix links to external vendors OTLP docs

pr feedback: LazyLock meter, debug and todo removal, comments
@apollo-bot2 apollo-bot2 requested review from a team as code owners September 29, 2025 19:45
@apollo-bot2 apollo-bot2 added skip-changeset Used when the changeset verification can be skipped back-merge A PR opened by Apollo bot to sync main and develop automation A PR opened by github workflow automation conflicts A sync PR with conflicts that need to be resolved labels Sep 29, 2025
@github-actions github-actions bot mentioned this pull request Sep 29, 2025
@esilverm esilverm closed this pull request by merging all changes into develop in 086137a Sep 30, 2025
@esilverm esilverm deleted the conflict/main-into-develop-pr-378 branch September 30, 2025 15:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

automation A PR opened by github workflow automation back-merge A PR opened by Apollo bot to sync main and develop conflicts A sync PR with conflicts that need to be resolved skip-changeset Used when the changeset verification can be skipped

Projects

None yet

Development

Successfully merging this pull request may close these issues.