Skip to content

Reconcile dev after merge to main for v1.52.0#5745

Merged
bnjjj merged 33 commits intodevfrom
main
Jul 30, 2024
Merged

Reconcile dev after merge to main for v1.52.0#5745
bnjjj merged 33 commits intodevfrom
main

Conversation

@bnjjj
Copy link
Contributor

@bnjjj bnjjj commented Jul 30, 2024

Follow-up to the v1.52.0 being officially released, bringing version bumps and changelog updates into the dev branch.

lleadbet and others added 30 commits July 16, 2024 10:40
@lleadbet
updating dynatrace docs
f68b3e0
@abernix
Merge branch 'main' into docs/dynatrace-otlp-port
fe1a251
@abernix
docs: Dynatrace otlp port (#5671)
e586627
@abernix
Introduce make_fake_batch() to avoid racy caches and redact more otel…
99dedb0 
… trace details (#5638)
@shorgi
docs: fix propagation typo (#5678)
c5822cf
@shorgi
docs: remove unused imported component (#5663)
dff748f
@abernix
prep release: v1.52.0-rc.0
748c143
@abernix
chore(ci): Add more known-flaky tests to the list from this week's data.
c5f6ed0
@shorgi @Meschreiber
@abernix @chandrikas
docs: router naming conventions (#5400)
b9936cc 
Co-authored-by: Maria Elisabeth Schreiber <maria.schreiber@apollographql.com>
Co-authored-by: Jesse Rosenberger <git@jro.cc>
Co-authored-by: Chandrika Srinivasan <chandrikas@users.noreply.github.com>
@abernix
Merge branch 'main' into 1.52.0
e37da5d
@Meschreiber
docs: fix telemetry link (#5723)
e2211b4
@bnjjj @shorgi
Update .changesets/fix_bnjjj_filter_metric_events.md
8e69c42 
Co-authored-by: Edward Huang <edward.huang@apollographql.com>
@bnjjj @shorgi
Update .changesets/maint_bnjjj_entity_cache_versioning.md
13f7282 
Co-authored-by: Edward Huang <edward.huang@apollographql.com>
@bnjjj @shorgi
Update .changesets/feat_geal_entity_cache_metrics.md
a91089d 
Co-authored-by: Edward Huang <edward.huang@apollographql.com>
@bnjjj @shorgi
Update .changesets/feat_geal_entity_cache_metrics.md
db56aed 
Co-authored-by: Edward Huang <edward.huang@apollographql.com>
@bnjjj @shorgi
Update .changesets/feat_geal_entity_cache_metrics.md
92e557c 
Co-authored-by: Edward Huang <edward.huang@apollographql.com>
@bnjjj @shorgi
Update .changesets/feat_geal_entity_cache_metrics.md
116f422 
Co-authored-by: Edward Huang <edward.huang@apollographql.com>
@bnjjj @abernix
Update .changesets/feat_geal_entity_cache_metrics.md
6e78407 
Co-authored-by: Jesse Rosenberger <git@jro.cc>
@lizhennessy
Update distributed-caching.mdx (#5716)
c1525fb
@goto-bus-stop @shorgi
Update .changesets/exp_remove_js_api_schema.md
d0df47d 
Co-authored-by: Edward Huang <edward.huang@apollographql.com>
@BrynCooke @shorgi
Update .changesets/fix_bryn_datadog_exporter_span_kind.md
40a1e01 
Co-authored-by: Edward Huang <edward.huang@apollographql.com>
@BrynCooke @shorgi
Update .changesets/fix_bryn_service_version.md
182b1c8 
Co-authored-by: Edward Huang <edward.huang@apollographql.com>
@BrynCooke @shorgi
Update .changesets/fix_bryn_service_version.md
25aaee5 
Co-authored-by: Edward Huang <edward.huang@apollographql.com>
@BrynCooke @shorgi
Update .changesets/fix_bryn_service_version.md
d67ee13 
Co-authored-by: Edward Huang <edward.huang@apollographql.com>
@bnjjj @shorgi
Update .changesets/fix_spawn_blocking_parser.md
455b587 
Co-authored-by: Edward Huang <edward.huang@apollographql.com>
@bnjjj @shorgi
Update .changesets/feat_helm_existingsecretkeyrefkey.md
eaf4267 
Co-authored-by: Edward Huang <edward.huang@apollographql.com>
@BrynCooke @shorgi
Update .changesets/fix_bryn_datadog_exporter_span_metrics.md
f052c0a 
Co-authored-by: Edward Huang <edward.huang@apollographql.com>
@BrynCooke @shorgi
Update .changesets/fix_bryn_datadog_timeout.md
10bbdb5 
Co-authored-by: Edward Huang <edward.huang@apollographql.com>
@BrynCooke @shorgi
Update .changesets/fix_bryn_service_version.md
e2414b2 
Co-authored-by: Edward Huang <edward.huang@apollographql.com>
@BrynCooke @shorgi
Update .changesets/fix_bryn_datadog_timeout.md
10f8b73 
Co-authored-by: Edward Huang <edward.huang@apollographql.com>
BrynCooke and others added 3 commits July 30, 2024 11:17
@bnjjj bnjjj requested a review from a team July 30, 2024 13:09
@bnjjj bnjjj enabled auto-merge July 30, 2024 13:09
@router-perf
Copy link

router-perf bot commented Jul 30, 2024

CI performance tests

  • const - Basic stress test that runs with a constant number of users
  • demand-control-instrumented - A copy of the step test, but with demand control monitoring and metrics enabled
  • demand-control-uninstrumented - A copy of the step test, but with demand control monitoring enabled
  • enhanced-signature - Enhanced signature enabled
  • events - Stress test for events with a lot of users and deduplication ENABLED
  • events_big_cap_high_rate - Stress test for events with a lot of users, deduplication enabled and high rate event with a big queue capacity
  • events_big_cap_high_rate_callback - Stress test for events with a lot of users, deduplication enabled and high rate event with a big queue capacity using callback mode
  • events_callback - Stress test for events with a lot of users and deduplication ENABLED in callback mode
  • events_without_dedup - Stress test for events with a lot of users and deduplication DISABLED
  • events_without_dedup_callback - Stress test for events with a lot of users and deduplication DISABLED using callback mode
  • extended-reference-mode - Extended reference mode enabled
  • large-request - Stress test with a 1 MB request payload
  • no-tracing - Basic stress test, no tracing
  • reload - Reload test over a long period of time at a constant rate of users
  • step-jemalloc-tuning - Clone of the basic stress test for jemalloc tuning
  • step-local-metrics - Field stats that are generated from the router rather than FTV1
  • step-with-prometheus - A copy of the step test with the Prometheus metrics exporter enabled
  • step - Basic stress test that steps up the number of users over time
  • xlarge-request - Stress test with 10 MB request payload
  • xxlarge-request - Stress test with 100 MB request payload

abernix
abernix approved these changes Jul 30, 2024
View reviewed changes
Copy link
Member

@abernix abernix left a comment

Choose a reason for hiding this comment

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

LGTM. Reminder to TRUE merge.

@bnjjj bnjjj merged commit 4554a7b into dev Jul 30, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@abernix abernix abernix approved these changes

@dariuszkuc dariuszkuc Awaiting requested review from dariuszkuc

@sachindshinde sachindshinde Awaiting requested review from sachindshinde

@goto-bus-stop goto-bus-stop Awaiting requested review from goto-bus-stop

@SimonSapin SimonSapin Awaiting requested review from SimonSapin

@lrlna lrlna Awaiting requested review from lrlna

@TylerBloom TylerBloom Awaiting requested review from TylerBloom

@duckki duckki Awaiting requested review from duckki

+2 more reviewers

@garypen garypen garypen approved these changes

@Geal Geal Geal approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@bnjjj bnjjj

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

10 participants

@bnjjj @garypen @Geal @abernix @lleadbet @shorgi @Meschreiber @lizhennessy @goto-bus-stop @BrynCooke