Skip to content
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

Jump to bottom

Merge micrometer-binder changes and revert micrometer-api changes #3046

Merged
merged 22 commits into from Mar 3, 2022
Merged

Merge micrometer-binder changes and revert micrometer-api changes #3046

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
c25fefa
Use elastic create operation instead of index (#2997)
jeremyross Feb 16, 2022
6dc8222
Generate lock files for 1.9.0-M3
jonatan-ivanov Feb 16, 2022
8d2a781
Pin springframework to 5.x
jonatan-ivanov Feb 16, 2022
479ba9a
Revert "Generate lock files for 1.9.0-M3"
jonatan-ivanov Feb 16, 2022
31488cc
Exemplars support for Prometheus Counter (#2813)
jonatan-ivanov Feb 21, 2022
259923c
Add integration tests for Elasticsearch 8 (#3037)
izeye Feb 22, 2022
598a6b4
Deprecating core.instrument.binder and move classes to binder package…
jonatan-ivanov Feb 28, 2022
ded1549
Merge micrometer-binder changes with micrometer-api changes
shakuzen Mar 1, 2022
ecf8395
Add Apple silicon native test dep for StatsdMeterRegistryPublishTest
shakuzen Mar 3, 2022
37e1178
Upgrade Nebula plugins to latest versions
shakuzen Mar 3, 2022
87843c4
Merge branch '1.7.x' into 1.8.x
shakuzen Mar 3, 2022
390e333
Merge branch '1.8.x'
shakuzen Mar 3, 2022
4cc4c20
Remove things added back in merge by mistake.
shakuzen Mar 3, 2022
96ba184
Move cache and http core classes back to core (#3050)
shakuzen Mar 3, 2022
95c2394
Generate lock files for 1.9.0-M3
jonatan-ivanov Feb 16, 2022
00656eb
Pin springframework to 5.x
jonatan-ivanov Feb 16, 2022
d8bee8e
Revert "Generate lock files for 1.9.0-M3"
jonatan-ivanov Feb 16, 2022
531cb87
Deprecating core.instrument.binder and move classes to binder package…
jonatan-ivanov Feb 28, 2022
23ede41
Add Apple silicon native test dep for StatsdMeterRegistryPublishTest
shakuzen Mar 3, 2022
87f3f63
Upgrade Nebula plugins to latest versions
shakuzen Mar 3, 2022
dadb6bb
Move cache and http core classes back to core (#3050)
shakuzen Mar 3, 2022
962bf2f
Merge remote-tracking branch 'upstream/main' into api-back-to-core
shakuzen Mar 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
8 changes: 4 additions & 4 deletions ...-core/src/jmh/java/io/micrometer/benchmark/compare/CompareCountersWithOtherLibraries.java
View file
Open in desktop
Expand Up @@ -15,10 +15,10 @@
*/
package io.micrometer.benchmark.compare;

import io.micrometer.api.instrument.Counter;
import io.micrometer.api.instrument.Meter;
import io.micrometer.api.instrument.MeterRegistry;
import io.micrometer.api.instrument.simple.SimpleMeterRegistry;
import io.micrometer.core.instrument.Counter;
import io.micrometer.core.instrument.Meter;
import io.micrometer.core.instrument.MeterRegistry;
import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
import org.openjdk.jmh.annotations.*;
import org.openjdk.jmh.infra.Blackhole;
import org.openjdk.jmh.profile.GCProfiler;
Expand Down
12 changes: 6 additions & 6 deletions ...ore/src/jmh/java/io/micrometer/benchmark/compare/CompareHistogramsWithOtherLibraries.java
View file
Open in desktop
Expand Up @@ -23,12 +23,12 @@
import com.google.common.collect.Iterators;
import com.google.common.primitives.Doubles;
////CHECKSTYLE:ON
import io.micrometer.api.instrument.DistributionSummary;
import io.micrometer.api.instrument.MeterRegistry;
import io.micrometer.api.instrument.Clock;
import io.micrometer.api.instrument.distribution.DistributionStatisticConfig;
import io.micrometer.api.instrument.distribution.PercentileHistogramBuckets;
import io.micrometer.api.instrument.simple.SimpleMeterRegistry;
import io.micrometer.core.instrument.DistributionSummary;
import io.micrometer.core.instrument.MeterRegistry;
import io.micrometer.core.instrument.Clock;
import io.micrometer.core.instrument.distribution.DistributionStatisticConfig;
import io.micrometer.core.instrument.distribution.PercentileHistogramBuckets;
import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
import io.micrometer.prometheus.PrometheusConfig;
import io.micrometer.prometheus.PrometheusMeterRegistry;
import io.prometheus.client.CollectorRegistry;
Expand Down
4 changes: 2 additions & 2 deletions benchmarks/benchmarks-core/src/jmh/java/io/micrometer/benchmark/core/CounterBenchmark.java
View file
Open in desktop
Expand Up @@ -15,8 +15,8 @@
*/
package io.micrometer.benchmark.core;

import io.micrometer.api.instrument.Counter;
import io.micrometer.api.instrument.MeterRegistry;
import io.micrometer.core.instrument.Counter;
import io.micrometer.core.instrument.MeterRegistry;
import io.micrometer.prometheus.PrometheusConfig;
import io.micrometer.prometheus.PrometheusMeterRegistry;
import org.openjdk.jmh.annotations.*;
Expand Down
4 changes: 2 additions & 2 deletions ...benchmarks-core/src/jmh/java/io/micrometer/benchmark/core/MeterRegistrationBenchmark.java
View file
Open in desktop
Expand Up @@ -15,8 +15,8 @@
*/
package io.micrometer.benchmark.core;

import io.micrometer.api.instrument.MeterRegistry;
import io.micrometer.api.instrument.simple.SimpleMeterRegistry;
import io.micrometer.core.instrument.MeterRegistry;
import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
import org.openjdk.jmh.annotations.*;
import org.openjdk.jmh.runner.Runner;
import org.openjdk.jmh.runner.RunnerException;
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/benchmarks-core/src/jmh/java/io/micrometer/benchmark/core/TagsBenchmark.java
View file
Open in desktop
Expand Up @@ -15,7 +15,7 @@
*/
package io.micrometer.benchmark.core;

import io.micrometer.api.instrument.Tags;
import io.micrometer.core.instrument.Tags;
import org.openjdk.jmh.annotations.*;
import org.openjdk.jmh.runner.Runner;
import org.openjdk.jmh.runner.RunnerException;
Expand Down
4 changes: 2 additions & 2 deletions benchmarks/benchmarks-core/src/jmh/java/io/micrometer/benchmark/core/TimerBenchmark.java
View file
Open in desktop
Expand Up @@ -15,8 +15,8 @@
*/
package io.micrometer.benchmark.core;

import io.micrometer.api.instrument.MeterRegistry;
import io.micrometer.api.instrument.Timer;
import io.micrometer.core.instrument.MeterRegistry;
import io.micrometer.core.instrument.Timer;
import io.micrometer.prometheus.PrometheusConfig;
import io.micrometer.prometheus.PrometheusMeterRegistry;
import org.openjdk.jmh.annotations.*;
Expand Down
4 changes: 3 additions & 1 deletion config/checkstyle/checkstyle-suppressions.xml
View file
Open in desktop
Expand Up @@ -4,9 +4,11 @@
"https://checkstyle.org/dtds/suppressions_1_2.dtd">
<suppressions>
<suppress files="io[\\/]micrometer[\\/]core[\\/]instrument[\\/]binder[\\/]logging[\\/].+" checks="IllegalImport" />
<suppress files="io[\\/]micrometer[\\/]api[\\/]internal[\\/]logging[\\/].+" checks="IllegalImport" />
<suppress files="io[\\/]micrometer[\\/]core[\\/]util[\\/]internal[\\/]logging[\\/].+" checks="IllegalImport" />
<suppress files="io[\\/]micrometer[\\/]binder[\\/]logging[\\/].+" checks="IllegalImport" />
<suppress files="implementations[\\/].+" id="SLF4JIllegalImportCheck" />
<suppress files="samples[\\/].+" checks="IllegalImport" />
<suppress files="test[\\/]java[\\/]io[\\/]micrometer[\\/]core[\\/]instrument[\\/]binder[\\/]jersey[\\/]server.+" checks="(IllegalImport)" />
<suppress files="test[\\/]java[\\/]io[\\/]micrometer[\\/]binder[\\/]jersey[\\/]server.+" checks="(IllegalImport)" />
<suppress files="LogbackMetricsAutoConfiguration" checks="IllegalImport" />
</suppressions>
12 changes: 6 additions & 6 deletions .../micrometer-registry-appoptics/src/main/java/io/micrometer/appoptics/AppOpticsConfig.java
View file
Open in desktop
Expand Up @@ -15,15 +15,15 @@
*/
package io.micrometer.appoptics;

import io.micrometer.api.instrument.config.validate.InvalidReason;
import io.micrometer.api.instrument.config.validate.Validated;
import io.micrometer.api.instrument.step.StepRegistryConfig;
import io.micrometer.api.lang.Nullable;
import io.micrometer.core.instrument.config.validate.InvalidReason;
import io.micrometer.core.instrument.config.validate.Validated;
import io.micrometer.core.instrument.step.StepRegistryConfig;
import io.micrometer.core.lang.Nullable;

import java.time.Duration;

import static io.micrometer.api.instrument.config.MeterRegistryConfigValidator.*;
import static io.micrometer.api.instrument.config.validate.PropertyValidator.*;
import static io.micrometer.core.instrument.config.MeterRegistryConfigValidator.*;
import static io.micrometer.core.instrument.config.validate.PropertyValidator.*;

/**
* Configuration for {@link AppOpticsMeterRegistry}.
Expand Down
22 changes: 11 additions & 11 deletions ...eter-registry-appoptics/src/main/java/io/micrometer/appoptics/AppOpticsMeterRegistry.java
View file
Open in desktop
Expand Up @@ -15,15 +15,15 @@
*/
package io.micrometer.appoptics;

import io.micrometer.api.instrument.*;
import io.micrometer.api.instrument.config.MeterFilter;
import io.micrometer.api.instrument.distribution.HistogramSnapshot;
import io.micrometer.api.instrument.step.StepMeterRegistry;
import io.micrometer.api.instrument.util.MeterPartition;
import io.micrometer.api.instrument.util.NamedThreadFactory;
import io.micrometer.api.ipc.http.HttpSender;
import io.micrometer.api.ipc.http.HttpUrlConnectionSender;
import io.micrometer.api.lang.Nullable;
import io.micrometer.core.instrument.*;
import io.micrometer.core.instrument.config.MeterFilter;
import io.micrometer.core.instrument.distribution.HistogramSnapshot;
import io.micrometer.core.instrument.step.StepMeterRegistry;
import io.micrometer.core.instrument.util.MeterPartition;
import io.micrometer.core.instrument.util.NamedThreadFactory;
import io.micrometer.core.ipc.http.HttpSender;
import io.micrometer.core.ipc.http.HttpUrlConnectionSender;
import io.micrometer.core.lang.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand All @@ -35,8 +35,8 @@
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;

import static io.micrometer.api.instrument.util.DoubleFormat.decimal;
import static io.micrometer.api.instrument.util.StringEscapeUtils.escapeJson;
import static io.micrometer.core.instrument.util.DoubleFormat.decimal;
import static io.micrometer.core.instrument.util.StringEscapeUtils.escapeJson;
import static java.util.stream.Collectors.joining;

/**
Expand Down
8 changes: 4 additions & 4 deletions ...r-registry-appoptics/src/main/java/io/micrometer/appoptics/AppOpticsNamingConvention.java
View file
Open in desktop
Expand Up @@ -15,10 +15,10 @@
*/
package io.micrometer.appoptics;

import io.micrometer.api.instrument.Meter;
import io.micrometer.api.instrument.config.NamingConvention;
import io.micrometer.api.instrument.util.StringUtils;
import io.micrometer.api.lang.Nullable;
import io.micrometer.core.instrument.Meter;
import io.micrometer.core.instrument.config.NamingConvention;
import io.micrometer.core.instrument.util.StringUtils;
import io.micrometer.core.lang.Nullable;

import java.util.regex.Pattern;

Expand Down
4 changes: 2 additions & 2 deletions ...ons/micrometer-registry-appoptics/src/main/java/io/micrometer/appoptics/package-info.java
View file
Open in desktop
Expand Up @@ -17,5 +17,5 @@
@NonNullFields
package io.micrometer.appoptics;

import io.micrometer.api.lang.NonNullApi;
import io.micrometer.api.lang.NonNullFields;
import io.micrometer.core.lang.NonNullApi;
import io.micrometer.core.lang.NonNullFields;
2 changes: 1 addition & 1 deletion ...rometer-registry-appoptics/src/test/java/io/micrometer/appoptics/AppOpticsConfigTest.java
View file
Open in desktop
Expand Up @@ -15,7 +15,7 @@
*/
package io.micrometer.appoptics;

import io.micrometer.api.instrument.config.validate.Validated;
import io.micrometer.core.instrument.config.validate.Validated;
import org.junit.jupiter.api.Test;

import java.util.HashMap;
Expand Down
4 changes: 2 additions & 2 deletions ...optics/src/test/java/io/micrometer/appoptics/AppOpticsMeterRegistryCompatibilityTest.java
View file
Open in desktop
Expand Up @@ -15,8 +15,8 @@
*/
package io.micrometer.appoptics;

import io.micrometer.api.instrument.MeterRegistry;
import io.micrometer.api.instrument.MockClock;
import io.micrometer.core.instrument.MeterRegistry;
import io.micrometer.core.instrument.MockClock;
import io.micrometer.core.tck.MeterRegistryCompatibilityKit;

import java.time.Duration;
Expand Down
18 changes: 9 additions & 9 deletions ...-registry-appoptics/src/test/java/io/micrometer/appoptics/AppOpticsMeterRegistryTest.java
View file
Open in desktop
Expand Up @@ -22,15 +22,15 @@
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;

import io.micrometer.api.instrument.FunctionCounter;
import io.micrometer.api.instrument.Gauge;
import io.micrometer.api.instrument.Measurement;
import io.micrometer.api.instrument.Meter;
import io.micrometer.api.instrument.MockClock;
import io.micrometer.api.instrument.Statistic;
import io.micrometer.api.instrument.Tags;
import io.micrometer.api.instrument.TimeGauge;
import io.micrometer.api.ipc.http.HttpSender;
import io.micrometer.core.instrument.FunctionCounter;
import io.micrometer.core.instrument.Gauge;
import io.micrometer.core.instrument.Measurement;
import io.micrometer.core.instrument.Meter;
import io.micrometer.core.instrument.MockClock;
import io.micrometer.core.instrument.Statistic;
import io.micrometer.core.instrument.Tags;
import io.micrometer.core.instrument.TimeGauge;
import io.micrometer.core.ipc.http.HttpSender;
import org.junit.jupiter.api.Test;

import static org.assertj.core.api.Assertions.assertThat;
Expand Down
22 changes: 11 additions & 11 deletions ...tions/micrometer-registry-atlas/src/main/java/io/micrometer/atlas/AtlasMeterRegistry.java
View file
Open in desktop
Expand Up @@ -23,17 +23,17 @@
import com.netflix.spectator.api.patterns.PolledMeter;
import com.netflix.spectator.atlas.AtlasConfig;
import com.netflix.spectator.atlas.AtlasRegistry;
import io.micrometer.api.instrument.*;
import io.micrometer.api.instrument.distribution.DistributionStatisticConfig;
import io.micrometer.api.instrument.distribution.HistogramGauges;
import io.micrometer.api.instrument.distribution.HistogramSupport;
import io.micrometer.api.instrument.distribution.ValueAtPercentile;
import io.micrometer.api.instrument.distribution.pause.PauseDetector;
import io.micrometer.api.instrument.internal.DefaultMeter;
import io.micrometer.api.instrument.step.StepFunctionCounter;
import io.micrometer.api.instrument.step.StepFunctionTimer;
import io.micrometer.api.instrument.util.DoubleFormat;
import io.micrometer.api.lang.Nullable;
import io.micrometer.core.instrument.*;
import io.micrometer.core.instrument.distribution.DistributionStatisticConfig;
import io.micrometer.core.instrument.distribution.HistogramGauges;
import io.micrometer.core.instrument.distribution.HistogramSupport;
import io.micrometer.core.instrument.distribution.ValueAtPercentile;
import io.micrometer.core.instrument.distribution.pause.PauseDetector;
import io.micrometer.core.instrument.internal.DefaultMeter;
import io.micrometer.core.instrument.step.StepFunctionCounter;
import io.micrometer.core.instrument.step.StepFunctionTimer;
import io.micrometer.core.instrument.util.DoubleFormat;
import io.micrometer.core.lang.Nullable;

import java.util.List;
import java.util.concurrent.TimeUnit;
Expand Down
6 changes: 3 additions & 3 deletions ...ns/micrometer-registry-atlas/src/main/java/io/micrometer/atlas/AtlasNamingConvention.java
View file
Open in desktop
Expand Up @@ -15,9 +15,9 @@
*/
package io.micrometer.atlas;

import io.micrometer.api.instrument.Meter;
import io.micrometer.api.instrument.config.NamingConvention;
import io.micrometer.api.lang.Nullable;
import io.micrometer.core.instrument.Meter;
import io.micrometer.core.instrument.config.NamingConvention;
import io.micrometer.core.lang.Nullable;

/**
* The naming convention most commonly employed at Netflix, and so most likely to
Expand Down
4 changes: 2 additions & 2 deletions implementations/micrometer-registry-atlas/src/main/java/io/micrometer/atlas/AtlasUtils.java
View file
Open in desktop
Expand Up @@ -15,8 +15,8 @@
*/
package io.micrometer.atlas;

import io.micrometer.api.instrument.Statistic;
import io.micrometer.api.lang.Nullable;
import io.micrometer.core.instrument.Statistic;
import io.micrometer.core.lang.Nullable;

import static com.netflix.spectator.api.Statistic.*;

Expand Down
8 changes: 4 additions & 4 deletions ...tations/micrometer-registry-atlas/src/main/java/io/micrometer/atlas/SpectatorCounter.java
View file
Open in desktop
Expand Up @@ -15,10 +15,10 @@
*/
package io.micrometer.atlas;

import io.micrometer.api.instrument.AbstractMeter;
import io.micrometer.api.instrument.Counter;
import io.micrometer.api.instrument.Meter;
import io.micrometer.api.instrument.util.MeterEquivalence;
import io.micrometer.core.instrument.AbstractMeter;
import io.micrometer.core.instrument.Counter;
import io.micrometer.core.instrument.Meter;
import io.micrometer.core.instrument.util.MeterEquivalence;

public class SpectatorCounter extends AbstractMeter implements Counter {
private com.netflix.spectator.api.Counter counter;
Expand Down
10 changes: 5 additions & 5 deletions ...ometer-registry-atlas/src/main/java/io/micrometer/atlas/SpectatorDistributionSummary.java
View file
Open in desktop
Expand Up @@ -17,11 +17,11 @@

import com.netflix.spectator.api.Measurement;
import com.netflix.spectator.api.Statistic;
import io.micrometer.api.instrument.AbstractDistributionSummary;
import io.micrometer.api.instrument.Clock;
import io.micrometer.api.instrument.distribution.DistributionStatisticConfig;
import io.micrometer.api.instrument.util.MeterEquivalence;
import io.micrometer.api.lang.Nullable;
import io.micrometer.core.instrument.AbstractDistributionSummary;
import io.micrometer.core.instrument.Clock;
import io.micrometer.core.instrument.distribution.DistributionStatisticConfig;
import io.micrometer.core.instrument.util.MeterEquivalence;
import io.micrometer.core.lang.Nullable;

import static java.util.stream.StreamSupport.stream;

Expand Down
6 changes: 3 additions & 3 deletions ...entations/micrometer-registry-atlas/src/main/java/io/micrometer/atlas/SpectatorGauge.java
View file
Open in desktop
Expand Up @@ -15,9 +15,9 @@
*/
package io.micrometer.atlas;

import io.micrometer.api.instrument.AbstractMeter;
import io.micrometer.api.instrument.Gauge;
import io.micrometer.api.instrument.util.MeterEquivalence;
import io.micrometer.core.instrument.AbstractMeter;
import io.micrometer.core.instrument.Gauge;
import io.micrometer.core.instrument.util.MeterEquivalence;

public class SpectatorGauge extends AbstractMeter implements Gauge {
private com.netflix.spectator.api.Gauge gauge;
Expand Down
14 changes: 7 additions & 7 deletions ...s/micrometer-registry-atlas/src/main/java/io/micrometer/atlas/SpectatorLongTaskTimer.java
View file
Open in desktop
Expand Up @@ -15,13 +15,13 @@
*/
package io.micrometer.atlas;

import io.micrometer.api.instrument.Clock;
import io.micrometer.api.instrument.LongTaskTimer;
import io.micrometer.api.instrument.Meter;
import io.micrometer.api.instrument.distribution.DistributionStatisticConfig;
import io.micrometer.api.instrument.internal.DefaultLongTaskTimer;
import io.micrometer.api.instrument.util.MeterEquivalence;
import io.micrometer.api.instrument.util.TimeUtils;
import io.micrometer.core.instrument.Clock;
import io.micrometer.core.instrument.LongTaskTimer;
import io.micrometer.core.instrument.Meter;
import io.micrometer.core.instrument.distribution.DistributionStatisticConfig;
import io.micrometer.core.instrument.internal.DefaultLongTaskTimer;
import io.micrometer.core.instrument.util.MeterEquivalence;
import io.micrometer.core.instrument.util.TimeUtils;

import java.util.concurrent.TimeUnit;

Expand Down
10 changes: 5 additions & 5 deletions ...entations/micrometer-registry-atlas/src/main/java/io/micrometer/atlas/SpectatorTimer.java
View file
Open in desktop
Expand Up @@ -18,11 +18,11 @@
import com.netflix.spectator.api.Measurement;
import com.netflix.spectator.api.Statistic;
import com.netflix.spectator.api.Timer;
import io.micrometer.api.instrument.AbstractTimer;
import io.micrometer.api.instrument.Clock;
import io.micrometer.api.instrument.distribution.DistributionStatisticConfig;
import io.micrometer.api.instrument.distribution.pause.PauseDetector;
import io.micrometer.api.instrument.util.TimeUtils;
import io.micrometer.core.instrument.AbstractTimer;
import io.micrometer.core.instrument.Clock;
import io.micrometer.core.instrument.distribution.DistributionStatisticConfig;
import io.micrometer.core.instrument.distribution.pause.PauseDetector;
import io.micrometer.core.instrument.util.TimeUtils;

import java.util.concurrent.TimeUnit;

Expand Down
2 changes: 1 addition & 1 deletion ...s/micrometer-registry-atlas/src/main/java/io/micrometer/atlas/SpectatorToDoubleGauge.java
View file
Open in desktop
Expand Up @@ -16,7 +16,7 @@
package io.micrometer.atlas;

import com.netflix.spectator.api.*;
import io.micrometer.api.lang.Nullable;
import io.micrometer.core.lang.Nullable;

import java.util.Collections;
import java.util.function.ToDoubleFunction;
Expand Down
4 changes: 2 additions & 2 deletions ...ementations/micrometer-registry-atlas/src/main/java/io/micrometer/atlas/package-info.java
View file
Open in desktop
Expand Up @@ -17,5 +17,5 @@
@NonNullFields
package io.micrometer.atlas;

import io.micrometer.api.lang.NonNullApi;
import io.micrometer.api.lang.NonNullFields;
import io.micrometer.core.lang.NonNullApi;
import io.micrometer.core.lang.NonNullFields;
4 changes: 2 additions & 2 deletions ...registry-atlas/src/test/java/io/micrometer/atlas/AtlasMeterRegistryCompatibilityTest.java
View file
Open in desktop
Expand Up @@ -16,8 +16,8 @@
package io.micrometer.atlas;

import com.netflix.spectator.atlas.AtlasConfig;
import io.micrometer.api.instrument.MeterRegistry;
import io.micrometer.api.instrument.MockClock;
import io.micrometer.core.instrument.MeterRegistry;
import io.micrometer.core.instrument.MockClock;
import io.micrometer.core.tck.MeterRegistryCompatibilityKit;

import java.time.Duration;
Expand Down
8 changes: 4 additions & 4 deletions ...s/micrometer-registry-atlas/src/test/java/io/micrometer/atlas/AtlasMeterRegistryTest.java
View file
Open in desktop
Expand Up @@ -21,10 +21,10 @@
import com.netflix.spectator.atlas.AtlasConfig;
import com.netflix.spectator.atlas.AtlasRegistry;
import io.micrometer.core.Issue;
import io.micrometer.api.instrument.Clock;
import io.micrometer.api.instrument.FunctionCounter;
import io.micrometer.api.instrument.MockClock;
import io.micrometer.api.lang.Nullable;
import io.micrometer.core.instrument.Clock;
import io.micrometer.core.instrument.FunctionCounter;
import io.micrometer.core.instrument.MockClock;
import io.micrometer.core.lang.Nullable;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import ru.lanwen.wiremock.ext.WiremockResolver;
Expand Down