Skip to content

Adapts to ObservationConvention location change #1071

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
merged 2 commits into from
Sep 13, 2022
Merged

Adapts to ObservationConvention location change #1071

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
931fcbf
Adapt to ObservationConvention location change
violetagg Sep 13, 2022
967e542
Adapt to SampleTestRunner change in micrometer tracing
violetagg Sep 13, 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
12 changes: 11 additions & 1 deletion ...examples/src/test/java/io/rsocket/integration/observation/ObservationIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ public class ObservationIntegrationTest extends SampleTestRunner {
private final RSocketInterceptor responderInterceptor;

ObservationIntegrationTest() {
super(SampleRunnerConfig.builder().build(), observationRegistry, registry);
super(SampleRunnerConfig.builder().build());
requesterInterceptor =
reactiveSocket -> new ObservationRequesterRSocketProxy(reactiveSocket, observationRegistry);

Expand Down Expand Up @@ -233,4 +233,14 @@ public Mono<Void> fireAndForget(Payload payload) {
// @formatter:on
};
}

@Override
protected MeterRegistry getMeterRegistry() {
return registry;
}

@Override
protected ObservationRegistry getObservationRegistry() {
return observationRegistry;
}
}
19 changes: 10 additions & 9 deletions ...rometer/src/main/java/io/rsocket/micrometer/observation/RSocketDocumentedObservation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,15 @@

import io.micrometer.common.docs.KeyName;
import io.micrometer.observation.Observation;
import io.micrometer.observation.ObservationConvention;
import io.micrometer.observation.docs.DocumentedObservation;

enum RSocketDocumentedObservation implements DocumentedObservation {

/** Observation created on the RSocket responder side. */
RSOCKET_RESPONDER {
@Override
public Class<? extends Observation.ObservationConvention<? extends Observation.Context>>
public Class<? extends ObservationConvention<? extends Observation.Context>>
getDefaultConvention() {
return DefaultRSocketResponderObservationConvention.class;
}
Expand All @@ -34,7 +35,7 @@ enum RSocketDocumentedObservation implements DocumentedObservation {
/** Observation created on the RSocket requester side for Fire and Forget frame type. */
RSOCKET_REQUESTER_FNF {
@Override
public Class<? extends Observation.ObservationConvention<? extends Observation.Context>>
public Class<? extends ObservationConvention<? extends Observation.Context>>
getDefaultConvention() {
return DefaultRSocketRequesterObservationConvention.class;
}
Expand All @@ -53,7 +54,7 @@ public String getPrefix() {
/** Observation created on the RSocket responder side for Fire and Forget frame type. */
RSOCKET_RESPONDER_FNF {
@Override
public Class<? extends Observation.ObservationConvention<? extends Observation.Context>>
public Class<? extends ObservationConvention<? extends Observation.Context>>
getDefaultConvention() {
return DefaultRSocketResponderObservationConvention.class;
}
Expand All @@ -72,7 +73,7 @@ public String getPrefix() {
/** Observation created on the RSocket requester side for Request Response frame type. */
RSOCKET_REQUESTER_REQUEST_RESPONSE {
@Override
public Class<? extends Observation.ObservationConvention<? extends Observation.Context>>
public Class<? extends ObservationConvention<? extends Observation.Context>>
getDefaultConvention() {
return DefaultRSocketRequesterObservationConvention.class;
}
Expand All @@ -91,7 +92,7 @@ public String getPrefix() {
/** Observation created on the RSocket responder side for Request Response frame type. */
RSOCKET_RESPONDER_REQUEST_RESPONSE {
@Override
public Class<? extends Observation.ObservationConvention<? extends Observation.Context>>
public Class<? extends ObservationConvention<? extends Observation.Context>>
getDefaultConvention() {
return DefaultRSocketResponderObservationConvention.class;
}
Expand All @@ -110,7 +111,7 @@ public String getPrefix() {
/** Observation created on the RSocket requester side for Request Stream frame type. */
RSOCKET_REQUESTER_REQUEST_STREAM {
@Override
public Class<? extends Observation.ObservationConvention<? extends Observation.Context>>
public Class<? extends ObservationConvention<? extends Observation.Context>>
getDefaultConvention() {
return DefaultRSocketRequesterObservationConvention.class;
}
Expand All @@ -129,7 +130,7 @@ public String getPrefix() {
/** Observation created on the RSocket responder side for Request Stream frame type. */
RSOCKET_RESPONDER_REQUEST_STREAM {
@Override
public Class<? extends Observation.ObservationConvention<? extends Observation.Context>>
public Class<? extends ObservationConvention<? extends Observation.Context>>
getDefaultConvention() {
return DefaultRSocketResponderObservationConvention.class;
}
Expand All @@ -148,7 +149,7 @@ public String getPrefix() {
/** Observation created on the RSocket requester side for Request Channel frame type. */
RSOCKET_REQUESTER_REQUEST_CHANNEL {
@Override
public Class<? extends Observation.ObservationConvention<? extends Observation.Context>>
public Class<? extends ObservationConvention<? extends Observation.Context>>
getDefaultConvention() {
return DefaultRSocketRequesterObservationConvention.class;
}
Expand All @@ -167,7 +168,7 @@ public String getPrefix() {
/** Observation created on the RSocket responder side for Request Channel frame type. */
RSOCKET_RESPONDER_REQUEST_CHANNEL {
@Override
public Class<? extends Observation.ObservationConvention<? extends Observation.Context>>
public Class<? extends ObservationConvention<? extends Observation.Context>>
getDefaultConvention() {
return DefaultRSocketResponderObservationConvention.class;
}
Expand Down
5 changes: 3 additions & 2 deletions ...rc/main/java/io/rsocket/micrometer/observation/RSocketRequesterObservationConvention.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,16 @@
package io.rsocket.micrometer.observation;

import io.micrometer.observation.Observation;
import io.micrometer.observation.ObservationConvention;

/**
* {@link Observation.ObservationConvention} for RSocket requester {@link RSocketContext}.
* {@link ObservationConvention} for RSocket requester {@link RSocketContext}.
*
* @author Marcin Grzejszczak
* @since 2.0.0
*/
public interface RSocketRequesterObservationConvention
extends Observation.ObservationConvention<RSocketContext> {
extends ObservationConvention<RSocketContext> {

@Override
default boolean supportsContext(Observation.Context context) {
Expand Down
5 changes: 3 additions & 2 deletions ...rc/main/java/io/rsocket/micrometer/observation/RSocketResponderObservationConvention.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,16 @@
package io.rsocket.micrometer.observation;

import io.micrometer.observation.Observation;
import io.micrometer.observation.ObservationConvention;

/**
* {@link Observation.ObservationConvention} for RSocket responder {@link RSocketContext}.
* {@link ObservationConvention} for RSocket responder {@link RSocketContext}.
*
* @author Marcin Grzejszczak
* @since 2.0.0
*/
public interface RSocketResponderObservationConvention
extends Observation.ObservationConvention<RSocketContext> {
extends ObservationConvention<RSocketContext> {

@Override
default boolean supportsContext(Observation.Context context) {
Expand Down