Skip to content

Polishing pass after 2.0 -> 1.10 refactor #3152

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 18 commits into from
May 6, 2022
Merged

Polishing pass after 2.0 -> 1.10 refactor #3152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
e6fac40
Remove checkstyle suppression for io.mivrometer.binder (removed)
jonatan-ivanov Apr 28, 2022
56b2009
Polishing new additions of build.gradle
jonatan-ivanov Apr 28, 2022
ce885db
Revert formatting/import
jonatan-ivanov Apr 28, 2022
f5c67cf
Revert using new dependencies
jonatan-ivanov Apr 28, 2022
e6b82bb
Remove observation.lang and replace it with common.lang
jonatan-ivanov Apr 28, 2022
358650d
Remove core.lang and replace it with common.lang
jonatan-ivanov Apr 28, 2022
a581843
Use common.util.StringUtils instead of core.instrument.util
jonatan-ivanov Apr 28, 2022
b9e2722
Remove core.util.internal.logging and use common.util.internal.logging
jonatan-ivanov Apr 28, 2022
c5a3822
Remove duplicated class (back-merge issue)
jonatan-ivanov May 5, 2022
a30dc41
Restore core.lang annotations but deprecate them
jonatan-ivanov May 5, 2022
df9d435
Restore core.instrument.util.StringUtils but deprecate it
jonatan-ivanov May 5, 2022
b6c85f8
Restore core.util.internal.logging but deprecate it
jonatan-ivanov May 5, 2022
3d8d33b
Fixing indentation in build.gradle
jonatan-ivanov May 5, 2022
0d170f0
fix typo
jonatan-ivanov May 5, 2022
b3f7d52
@Deprecated is invalid if I compile with Java 8 (but valid with 18)
jonatan-ivanov May 5, 2022
c0a9d66
@deprecated fix
jonatan-ivanov May 5, 2022
7b544ca
Code format/import changes
shakuzen May 6, 2022
2320f5c
Missed changes to Observation during rebase
shakuzen May 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
43 changes: 18 additions & 25 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ buildscript {
classpath 'io.spring.nohttp:nohttp-gradle:0.0.10'
classpath 'org.gradle:test-retry-gradle-plugin:1.3.1'
classpath 'io.github.gradle-nexus:publish-plugin:1.1.0'
classpath "me.champeau.gradle:japicmp-gradle-plugin:0.4.0"
classpath "de.undercouch:gradle-download-task:5.0.2"
classpath 'me.champeau.gradle:japicmp-gradle-plugin:0.4.0'
classpath 'de.undercouch:gradle-download-task:5.0.2'
classpath 'io.spring.javaformat:spring-javaformat-gradle-plugin:0.0.31'

constraints {
Expand Down Expand Up @@ -296,19 +296,17 @@ subprojects {
}
}


// new projects
if (["micrometer-commons", "micrometer-observation", "micrometer-observation-test"].every { it != project.name }) {
if (!(project.name in ['micrometer-commons', 'micrometer-observation', 'micrometer-observation-test'])) {
apply plugin: 'me.champeau.gradle.japicmp'
apply plugin: 'de.undercouch.download'

task downloadBaseline(type: Download) {
onlyIf {
if (project.gradle.startParameter.isOffline()) {
println "Offline: skipping downloading of baseline and JAPICMP"
println 'Offline: skipping downloading of baseline and JAPICMP'
return false
} else if ("$compatibleVersion" == "SKIP") {
println "SKIP: Instructed to skip the baseline comparison"
} else if (compatibleVersion == 'SKIP') {
println 'SKIP: Instructed to skip the baseline comparison'
return false
} else {
println "Will download and perform baseline comparison with ${compatibleVersion}"
Expand All @@ -318,12 +316,15 @@ subprojects {

onlyIfNewer true
compress true
String rootUrl = repositories.mavenCentral().url
if (compatibleVersion.contains("-M") || compatibleVersion.contains("-RC")) {
rootUrl = "https://repo.spring.io/milestone/"
String rootUrl
if (compatibleVersion.contains('-M') || compatibleVersion.contains('-RC')) {
rootUrl = 'https://repo.spring.io/milestone/'
} else if (compatibleVersion.contains('-SNAPSHOT') ) {
rootUrl = 'https://repo.spring.io/snapshot/'
} else {
rootUrl = "https://repo.spring.io/snapshot/"
rootUrl = repositories.mavenCentral().url
}

src "${rootUrl}io/micrometer/${project.name}/${compatibleVersion}/${project.name}-${compatibleVersion}.jar"
dest "${buildDir}/baselineLibs/${project.name}-${compatibleVersion}.jar"
}
Expand All @@ -338,13 +339,12 @@ subprojects {
txtOutputFile = file("${project.buildDir}/reports/japi.txt")
ignoreMissingClasses = true
includeSynthetic = true
onlyIf { "${compatibleVersion}" != "SKIP" }
onlyIf { compatibleVersion != 'SKIP' }
}

tasks.japicmp.dependsOn(downloadBaseline)
tasks.check.dependsOn(japicmp)
}

}

contacts {
Expand All @@ -358,21 +358,14 @@ subprojects {
description = 'Application monitoring instrumentation facade'

repositories {
mavenLocal()
mavenCentral()
maven {
url 'https://repo.spring.io/snapshot/'
content {
// we only need this repo for the context-propagation-api
includeModule 'io.micrometer', 'context-propagation-api'
}
url 'https://repo.spring.io/snapshot/' // we only need this repo for the context-propagation-api
content { includeModule 'io.micrometer', 'context-propagation-api' }
}
maven {
url 'https://repo.spring.io/milestone/'
content {
// we only need this repo for the context-propagation-api
includeModule 'io.micrometer', 'context-propagation-api'
}
url 'https://repo.spring.io/milestone/' // we only need this repo for the context-propagation-api
content { includeModule 'io.micrometer', 'context-propagation-api' }
}
}

Expand Down
1 change: 0 additions & 1 deletion config/checkstyle/checkstyle-suppressions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<suppressions>
<suppress files="io[\\/]micrometer[\\/]core[\\/]instrument[\\/]binder[\\/]logging[\\/].+" checks="IllegalImport" />
<suppress files="io[\\/]micrometer[\\/]core[\\/]util[\\/]internal[\\/]logging[\\/].+" checks="IllegalImport" />
<suppress files="io[\\/]micrometer[\\/]binder[\\/]logging[\\/].+" checks="IllegalImport" />
<suppress files="io[\\/]micrometer[\\/]common[\\/]util[\\/]internal[\\/]logging[\\/].+" checks="IllegalImport" />
<suppress files="implementations[\\/].+" id="SLF4JIllegalImportCheck" />
<suppress files="samples[\\/].+" checks="IllegalImport" />
Expand Down
3 changes: 0 additions & 3 deletions dependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,6 @@ def VERSIONS = [
'info.ganglia.gmetric4j:gmetric4j:latest.release',
'io.prometheus:simpleclient_common:latest.release',
'io.prometheus:simpleclient_pushgateway:latest.release',
// TODO support HttpTagsProvider variants based on Jakarta APIs?
// 'jakarta.servlet:jakarta.servlet-api:latest.release',
Copy link
Member

@shakuzen shakuzen May 2, 2022

Choose a reason for hiding this comment

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

I never made an issue for this, and no one has requested it (that I can remember now), but maybe we can open something to see if there's any interest. An issue is a better place than a comment here, anyway.

'javax.annotation:javax.annotation-api:latest.release',
'javax.cache:cache-api:latest.release',
'javax.inject:javax.inject:1',
'javax.servlet:javax.servlet-api:latest.release',
Expand Down
2 changes: 1 addition & 1 deletion .../micrometer-registry-appoptics/src/main/java/io/micrometer/appoptics/AppOpticsConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
*/
package io.micrometer.appoptics;

import io.micrometer.common.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;

Expand Down
2 changes: 1 addition & 1 deletion ...eter-registry-appoptics/src/main/java/io/micrometer/appoptics/AppOpticsMeterRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
*/
package io.micrometer.appoptics;

import io.micrometer.common.lang.Nullable;
import io.micrometer.core.instrument.*;
import io.micrometer.core.instrument.config.MeterFilter;
import io.micrometer.core.instrument.distribution.HistogramSnapshot;
Expand All @@ -23,7 +24,6 @@
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 Down
4 changes: 2 additions & 2 deletions ...r-registry-appoptics/src/main/java/io/micrometer/appoptics/AppOpticsNamingConvention.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
*/
package io.micrometer.appoptics;

import io.micrometer.common.lang.Nullable;
import io.micrometer.common.util.StringUtils;
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
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@
@NonNullFields
package io.micrometer.appoptics;

import io.micrometer.core.lang.NonNullApi;
import io.micrometer.core.lang.NonNullFields;
import io.micrometer.common.lang.NonNullApi;
import io.micrometer.common.lang.NonNullFields;
2 changes: 1 addition & 1 deletion ...tions/micrometer-registry-atlas/src/main/java/io/micrometer/atlas/AtlasMeterRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import com.netflix.spectator.api.patterns.PolledMeter;
import com.netflix.spectator.atlas.AtlasConfig;
import com.netflix.spectator.atlas.AtlasRegistry;
import io.micrometer.common.lang.Nullable;
import io.micrometer.core.instrument.*;
import io.micrometer.core.instrument.distribution.DistributionStatisticConfig;
import io.micrometer.core.instrument.distribution.HistogramGauges;
Expand All @@ -33,7 +34,6 @@
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
2 changes: 1 addition & 1 deletion ...ns/micrometer-registry-atlas/src/main/java/io/micrometer/atlas/AtlasNamingConvention.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
*/
package io.micrometer.atlas;

import io.micrometer.common.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 show up
Expand Down
2 changes: 1 addition & 1 deletion implementations/micrometer-registry-atlas/src/main/java/io/micrometer/atlas/AtlasUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
*/
package io.micrometer.atlas;

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

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

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
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
package io.micrometer.atlas;

import com.netflix.spectator.api.*;
import io.micrometer.core.lang.Nullable;
import io.micrometer.common.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
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@
@NonNullFields
package io.micrometer.atlas;

import io.micrometer.core.lang.NonNullApi;
import io.micrometer.core.lang.NonNullFields;
import io.micrometer.common.lang.NonNullApi;
import io.micrometer.common.lang.NonNullFields;
2 changes: 1 addition & 1 deletion ...s/micrometer-registry-atlas/src/test/java/io/micrometer/atlas/AtlasMeterRegistryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@
import com.netflix.spectator.api.patterns.PolledMeter;
import com.netflix.spectator.atlas.AtlasConfig;
import com.netflix.spectator.atlas.AtlasRegistry;
import io.micrometer.common.lang.Nullable;
import io.micrometer.core.Issue;
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
4 changes: 2 additions & 2 deletions ...try-azure-monitor/src/main/java/io/micrometer/azuremonitor/AzureMonitorMeterRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@
import com.microsoft.applicationinsights.telemetry.MetricTelemetry;
import com.microsoft.applicationinsights.telemetry.SeverityLevel;
import com.microsoft.applicationinsights.telemetry.TraceTelemetry;
import io.micrometer.common.lang.Nullable;
import io.micrometer.common.util.StringUtils;
import io.micrometer.core.instrument.*;
import io.micrometer.core.instrument.step.StepMeterRegistry;
import io.micrometer.core.instrument.util.NamedThreadFactory;
import io.micrometer.core.instrument.util.StringUtils;
import io.micrometer.core.lang.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down
2 changes: 1 addition & 1 deletion ...-azure-monitor/src/main/java/io/micrometer/azuremonitor/AzureMonitorNamingConvention.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
*/
package io.micrometer.azuremonitor;

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

import java.util.regex.Pattern;

Expand Down
4 changes: 2 additions & 2 deletions ...rometer-registry-azure-monitor/src/main/java/io/micrometer/azuremonitor/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@
@NonNullFields
package io.micrometer.azuremonitor;

import io.micrometer.core.lang.NonNullApi;
import io.micrometer.core.lang.NonNullFields;
import io.micrometer.common.lang.NonNullApi;
import io.micrometer.common.lang.NonNullFields;
43 changes: 13 additions & 30 deletions ...r-registry-cloudwatch/src/main/java/io/micrometer/cloudwatch/CloudWatchMeterRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,45 +15,27 @@
*/
package io.micrometer.cloudwatch;

import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.TimeUnit;
import java.util.stream.Stream;

import com.amazonaws.AbortedException;
import com.amazonaws.handlers.AsyncHandler;
import com.amazonaws.services.cloudwatch.AmazonCloudWatchAsync;
import com.amazonaws.services.cloudwatch.model.Dimension;
import com.amazonaws.services.cloudwatch.model.MetricDatum;
import com.amazonaws.services.cloudwatch.model.PutMetricDataRequest;
import com.amazonaws.services.cloudwatch.model.PutMetricDataResult;
import com.amazonaws.services.cloudwatch.model.StandardUnit;
import io.micrometer.core.instrument.Clock;
import io.micrometer.core.instrument.Counter;
import io.micrometer.core.instrument.DistributionSummary;
import io.micrometer.core.instrument.FunctionCounter;
import io.micrometer.core.instrument.FunctionTimer;
import io.micrometer.core.instrument.Gauge;
import io.micrometer.core.instrument.LongTaskTimer;
import io.micrometer.core.instrument.Meter;
import com.amazonaws.services.cloudwatch.model.*;
import io.micrometer.common.lang.Nullable;
import io.micrometer.common.util.StringUtils;
import io.micrometer.common.util.internal.logging.WarnThenDebugLogger;
import io.micrometer.core.instrument.Tag;
import io.micrometer.core.instrument.TimeGauge;
import io.micrometer.core.instrument.Timer;
import io.micrometer.core.instrument.config.MissingRequiredConfigurationException;
import io.micrometer.core.instrument.*;
import io.micrometer.core.instrument.step.StepMeterRegistry;
import io.micrometer.core.instrument.util.NamedThreadFactory;
import io.micrometer.core.instrument.util.StringUtils;
import io.micrometer.core.lang.Nullable;
import io.micrometer.core.util.internal.logging.WarnThenDebugLogger;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.util.*;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.TimeUnit;
import java.util.stream.Stream;

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

Expand Down Expand Up @@ -97,7 +79,8 @@ public CloudWatchMeterRegistry(CloudWatchConfig config, Clock clock, AmazonCloud
super(config, clock);

if (config.namespace() == null) {
throw new MissingRequiredConfigurationException("namespace must be set to report metrics to CloudWatch");
throw new io.micrometer.core.instrument.config.MissingRequiredConfigurationException(
"namespace must be set to report metrics to CloudWatch");
}

this.amazonCloudWatchAsync = amazonCloudWatchAsync;
Expand Down
4 changes: 2 additions & 2 deletions ...egistry-cloudwatch/src/main/java/io/micrometer/cloudwatch/CloudWatchNamingConvention.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
*/
package io.micrometer.cloudwatch;

import io.micrometer.common.lang.Nullable;
import io.micrometer.common.util.StringUtils;
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;

/**
* {@link NamingConvention} for CloudWatch.
Expand Down
4 changes: 2 additions & 2 deletions ...s/micrometer-registry-cloudwatch/src/main/java/io/micrometer/cloudwatch/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@
@NonNullFields
package io.micrometer.cloudwatch;

import io.micrometer.core.lang.NonNullApi;
import io.micrometer.core.lang.NonNullFields;
import io.micrometer.common.lang.NonNullApi;
import io.micrometer.common.lang.NonNullFields;
2 changes: 1 addition & 1 deletion ...atch/src/test/java/io/micrometer/cloudwatch/CloudWatchMeterRegistryCompatibilityTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
*/
package io.micrometer.cloudwatch;

import io.micrometer.common.lang.Nullable;
import io.micrometer.core.instrument.MeterRegistry;
import io.micrometer.core.instrument.MockClock;
import io.micrometer.core.lang.Nullable;
import io.micrometer.core.tck.MeterRegistryCompatibilityKit;

import java.time.Duration;
Expand Down
6 changes: 3 additions & 3 deletions ...registry-cloudwatch2/src/main/java/io/micrometer/cloudwatch2/CloudWatchMeterRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
*/
package io.micrometer.cloudwatch2;

import io.micrometer.common.lang.Nullable;
import io.micrometer.common.util.StringUtils;
import io.micrometer.common.util.internal.logging.WarnThenDebugLogger;
import io.micrometer.core.instrument.Timer;
import io.micrometer.core.instrument.*;
import io.micrometer.core.instrument.step.StepMeterRegistry;
import io.micrometer.core.instrument.util.NamedThreadFactory;
import io.micrometer.core.instrument.util.StringUtils;
import io.micrometer.core.lang.Nullable;
import io.micrometer.core.util.internal.logging.WarnThenDebugLogger;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import software.amazon.awssdk.core.exception.AbortedException;
Expand Down
4 changes: 2 additions & 2 deletions ...istry-cloudwatch2/src/main/java/io/micrometer/cloudwatch2/CloudWatchNamingConvention.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
*/
package io.micrometer.cloudwatch2;

import io.micrometer.common.lang.Nullable;
import io.micrometer.common.util.StringUtils;
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;

/**
* {@link NamingConvention} for CloudWatch.
Expand Down
4 changes: 2 additions & 2 deletions ...micrometer-registry-cloudwatch2/src/main/java/io/micrometer/cloudwatch2/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@
@NonNullFields
package io.micrometer.cloudwatch2;

import io.micrometer.core.lang.NonNullApi;
import io.micrometer.core.lang.NonNullFields;
import io.micrometer.common.lang.NonNullApi;
import io.micrometer.common.lang.NonNullFields;
Loading