Skip to content

SOLR-18343: Require explicit HTTP methods for admin requests #4861

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dsmiley merged 5 commits into from
Sep 4, 2026
+253 −79
Merged

SOLR-18343: Require explicit HTTP methods for admin requests #4861

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cb757d3
SOLR-18343: Require explicit methods for admin requests
zhangxinyao88 Sep 1, 2026
216003f
SOLR-18343: Add changelog and update tracing test
zhangxinyao88 Sep 2, 2026
df6ed4d
SOLR-18343: Default legacy admin requests to POST
zhangxinyao88 Sep 2, 2026
09030e5
SOLR-18343: Preserve admin action tracing names
zhangxinyao88 Sep 2, 2026
b3f6780
Revert "SOLR-18343: Preserve admin action tracing names"
zhangxinyao88 Sep 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions changelog/unreleased/solr-18343-explicit-admin-methods.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
title: >
SolrJ v1 admin requests now use appropriate HTTP verbs -- mostly POST, some GET
type: changed
authors:
- name: Xinyao Zhang
links:
- name: SOLR-18343
url: https://issues.apache.org/jira/browse/SOLR-18343
8 changes: 4 additions & 4 deletions .../modules/opentelemetry/src/test/org/apache/solr/opentelemetry/TestDistributedTracing.java
View file
Open in desktop

@dsmiley dsmiley Sep 2, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

this is strange... why would these have changed?

@zhangxinyao88 zhangxinyao88 Sep 2, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Good catch. After switching to POST, the action is no longer in the query string, so tracing was falling back to the HTTP method. I’ve updated it to use the parsed request params instead, which keeps the action names in these spans.

Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ private void verifyCollectionCreation(String collection) throws Exception {
assertEquals(0, r1.getStatus());

// Expecting 8 spans:
// 1. api call "name=create:/admin/collections". db.instance=testInternalCollectionApiCommands
// 1. api call "name=post:/admin/collections". db.instance=testInternalCollectionApiCommands
// - unique traceId unrelated to the internal trace id generated for the operation
// 2. internal CollectionApiCommand "name=CreateCollectionCmd"
// db.instance=testInternalCollectionApiCommands
Expand All @@ -222,7 +222,7 @@ private void verifyCollectionCreation(String collection) throws Exception {
var finishedSpans = getAndClearSpans(1);
var s0 = finishedSpans.remove(0);
assertCollectionName(s0, collection);
assertEquals("create:/admin/collections", s0.getName());
assertEquals("post:/admin/collections", s0.getName());

Map<String, Integer> ops = new HashMap<>();
assertEquals(11, finishedSpans.size());
Expand All @@ -248,7 +248,7 @@ private void verifyCollectionDeletion(String collection) throws Exception {
assertEquals(0, r1.getStatus());

// Expecting 6 spans:
// 1. api call "name=delete:/admin/collections". db.instance=testInternalCollectionApiCommands
// 1. api call "name=post:/admin/collections". db.instance=testInternalCollectionApiCommands
// - unique traceId unrelated to the internal trace id generated for the operation
// 2. internal CollectionApiCommand "name=DeleteCollectionCmd"
// db.instance=testInternalCollectionApiCommands
Expand All @@ -263,7 +263,7 @@ private void verifyCollectionDeletion(String collection) throws Exception {
var finishedSpans = getAndClearSpans(1);
var s0 = finishedSpans.remove(0);
assertCollectionName(s0, collection);
assertEquals("delete:/admin/collections", s0.getName());
assertEquals("post:/admin/collections", s0.getName());

Map<String, Integer> ops = new HashMap<>();
assertEquals(5, finishedSpans.size());
Expand Down
Loading
Loading