Skip to content

Commit

Permalink
Add API for configuring custom ObservationRegistry (#2747)
Browse files Browse the repository at this point in the history
Fixes #2719
  • Loading branch information
violetagg authored Mar 29, 2023
1 parent 4effedc commit bfb341d
Showing 1 changed file with 14 additions and 2 deletions.
16 changes: 14 additions & 2 deletions reactor-netty-core/src/main/java/reactor/netty/Metrics.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2019-2022 VMware, Inc. or its affiliates, All Rights Reserved.
* Copyright (c) 2019-2023 VMware, Inc. or its affiliates, All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -39,7 +39,7 @@
public class Metrics {
public static final MeterRegistry REGISTRY = io.micrometer.core.instrument.Metrics.globalRegistry;
public static final String OBSERVATION_KEY = "micrometer.observation";
public static final ObservationRegistry OBSERVATION_REGISTRY = ObservationRegistry.create();
public static ObservationRegistry OBSERVATION_REGISTRY = ObservationRegistry.create();
static {
OBSERVATION_REGISTRY.observationConfig().observationHandler(
new ObservationHandler.FirstMatchingCompositeObservationHandler(
Expand Down Expand Up @@ -313,6 +313,18 @@ public static String formatSocketAddress(@Nullable SocketAddress socketAddress)
return null;
}

/**
* Set the {@link ObservationRegistry} to use in Reactor Netty for tracing related purposes.
*
* @return the previously configured registry.
* @since 1.1.6
*/
public static ObservationRegistry observationRegistry(ObservationRegistry observationRegistry) {
ObservationRegistry previous = OBSERVATION_REGISTRY;
OBSERVATION_REGISTRY = observationRegistry;
return previous;
}

public static Context updateContext(Context context, Object observation) {
return context.hasKey(OBSERVATION_KEY) ? context : context.put(OBSERVATION_KEY, observation);
}
Expand Down

0 comments on commit bfb341d

Please sign in to comment.