Skip to content

Aligns the context entries with the rest of the portfolio #4218

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

Closed
wants to merge 3 commits into from
Closed

Aligns the context entries with the rest of the portfolio #4218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c48adbc
Aligns the context entries with the rest of the portfolio
marcingrzejszczak Oct 21, 2022
af78464
Moved micrometer.observation to a constant
marcingrzejszczak Oct 24, 2022
34bff70
Polish
marcingrzejszczak Oct 24, 2022
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
3 changes: 2 additions & 1 deletion .../src/main/java/org/springframework/data/mongodb/observability/ContextProviderFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,8 @@ public RequestContext getContext() {

Observation currentObservation = observationRegistry.getCurrentObservation();
if (currentObservation != null) {
requestContext.put(Observation.class, currentObservation);
// Aligned with ObservationThreadLocalAccessor.KEY
requestContext.put("micrometer.observation", currentObservation);
}

return requestContext;
Expand Down
20 changes: 12 additions & 8 deletions .../java/org/springframework/data/mongodb/observability/MongoObservationCommandListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,11 @@ public class MongoObservationCommandListener implements CommandListener {

private static final Log log = LogFactory.getLog(MongoObservationCommandListener.class);

/**
* Aligns with ObservationThreadLocalAccessor.KEY.
*/
private static final String MICROMETER_OBSERVATION_KEY = "micrometer.observation";

private final ObservationRegistry observationRegistry;
private final @Nullable ConnectionString connectionString;

Expand Down Expand Up @@ -114,8 +119,7 @@ public void commandStarted(CommandStartedEvent event) {

observation.start();

requestContext.put(Observation.class, observation);
requestContext.put(MongoHandlerContext.class, observationContext);
requestContext.put(MICROMETER_OBSERVATION_KEY, observation);

if (log.isDebugEnabled()) {
log.debug(
Expand All @@ -132,12 +136,12 @@ public void commandSucceeded(CommandSucceededEvent event) {
return;
}

Observation observation = requestContext.getOrDefault(Observation.class, null);
Observation observation = requestContext.getOrDefault(MICROMETER_OBSERVATION_KEY, null);
if (observation == null) {
return;
}

MongoHandlerContext context = requestContext.get(MongoHandlerContext.class);
MongoHandlerContext context = (MongoHandlerContext) observation.getContext();
context.setCommandSucceededEvent(event);

if (log.isDebugEnabled()) {
Expand All @@ -156,12 +160,12 @@ public void commandFailed(CommandFailedEvent event) {
return;
}

Observation observation = requestContext.getOrDefault(Observation.class, null);
Observation observation = requestContext.getOrDefault(MICROMETER_OBSERVATION_KEY, null);
if (observation == null) {
return;
}

MongoHandlerContext context = requestContext.get(MongoHandlerContext.class);
MongoHandlerContext context = (MongoHandlerContext) observation.getContext();
context.setCommandFailedEvent(event);

if (log.isDebugEnabled()) {
Expand All @@ -181,7 +185,7 @@ public void commandFailed(CommandFailedEvent event) {
@Nullable
private static Observation observationFromContext(RequestContext context) {

Observation observation = context.getOrDefault(Observation.class, null);
Observation observation = context.getOrDefault(MICROMETER_OBSERVATION_KEY, null);

if (observation != null) {

Expand All @@ -192,7 +196,7 @@ private static Observation observationFromContext(RequestContext context) {
}

if (log.isDebugEnabled()) {
log.debug("No observation was found - will not create any child spans");
log.debug("No observation was found - will not create any child observations");
}

return null;
Expand Down
2 changes: 1 addition & 1 deletion ...rc/test/java/org/springframework/data/mongodb/observability/ReactiveIntegrationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ public SampleTestRunnerConsumer yourCode() {
.verifyComplete();

repository.findByLastname("Matthews") //
.contextWrite(Context.of(Observation.class, intermediate)) //
.contextWrite(Context.of("micrometer.observation", intermediate)) //
.as(StepVerifier::create).assertNext(actual -> {

assertThat(actual).extracting("firstname", "lastname").containsExactly("Dave", "Matthews");
Expand Down