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

Polishing pass after 2.0 -> 1.10 refactor #3152

Merged

shakuzen merged 18 commits into micrometer-metrics:main from jonatan-ivanov:polishing-pass-after-2.x-refactor

May 6, 2022

Member

jonatan-ivanov commented Apr 28, 2022 •

edited by shakuzen

Loading

Removed Checkstyle supressions were left for the binder module that no longer exists
Polish new additions in root build.gradle
Reverted formatting changes (indentation, import order)
MissingRequiredConfigurationException moved mistakenly
micrometer-core contained some unnecessary dependencies
Moved internal code to commons module (StringUtils, loggers, nullability annotations)

jonatan-ivanov changed the title ~~Polishing pass after 2.x refactor~~ Polishing pass after 2.0 -> 1.10 refactor

shakuzen reviewed

View reviewed changes

dependencies.gradle

@@ @@ -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',

Member

shakuzen May 2, 2022

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.

sonatype-lift bot reviewed

View reviewed changes

micrometer-core/src/main/java/io/micrometer/core/instrument/util/MeterEquivalence.java Show resolved Hide resolved

sonatype-lift bot reviewed

View reviewed changes

micrometer-core/src/main/java/io/micrometer/core/lang/NonNullFields.java Outdated Show resolved Hide resolved

sonatype-lift bot reviewed

View reviewed changes

micrometer-core/src/main/java/io/micrometer/core/lang/Nullable.java Outdated Show resolved Hide resolved

sonatype-lift bot reviewed

View reviewed changes

micrometer-test/src/main/java/io/micrometer/common/util/internal/logging/LogEvent.java Show resolved Hide resolved

sonatype-lift bot reviewed

View reviewed changes

micrometer-core/src/main/java/io/micrometer/core/lang/NonNullApi.java Outdated Show resolved Hide resolved

sonatype-lift bot reviewed

View reviewed changes

micrometer-core/src/main/java/io/micrometer/core/instrument/util/MeterEquivalence.java Show resolved Hide resolved

sonatype-lift bot reviewed

View reviewed changes

micrometer-core/src/main/java/io/micrometer/core/util/internal/logging/package-info.java Show resolved Hide resolved

sonatype-lift bot reviewed

View reviewed changes

micrometer-test/src/main/java/io/micrometer/common/util/internal/logging/MockLogger.java Outdated Show resolved Hide resolved

sonatype-lift bot reviewed

View reviewed changes

micrometer-test/src/main/java/io/micrometer/common/util/internal/logging/LogEvent.java Show resolved Hide resolved

sonatype-lift bot reviewed

View reviewed changes

micrometer-core/src/main/java/io/micrometer/core/util/internal/logging/package-info.java Show resolved Hide resolved

sonatype-lift bot reviewed

View reviewed changes

micrometer-core/src/main/java/io/micrometer/core/lang/NonNullApi.java Outdated Show resolved Hide resolved

sonatype-lift bot reviewed

View reviewed changes

micrometer-core/src/main/java/io/micrometer/core/instrument/util/MeterEquivalence.java Show resolved Hide resolved

sonatype-lift bot reviewed

View reviewed changes

micrometer-core/src/main/java/io/micrometer/core/lang/NonNullFields.java Outdated Show resolved Hide resolved

sonatype-lift bot reviewed

View reviewed changes

micrometer-test/src/main/java/io/micrometer/common/util/internal/logging/MockLogger.java Outdated Show resolved Hide resolved

sonatype-lift bot reviewed

View reviewed changes

micrometer-core/src/main/java/io/micrometer/core/lang/Nullable.java Outdated Show resolved Hide resolved

sonatype-lift bot reviewed

View reviewed changes

micrometer-test/src/main/java/io/micrometer/common/util/internal/logging/MockLogger.java Outdated Show resolved Hide resolved

sonatype-lift bot reviewed

View reviewed changes

micrometer-core/src/main/java/io/micrometer/core/lang/NonNullFields.java Outdated Show resolved Hide resolved

sonatype-lift bot reviewed

View reviewed changes

micrometer-core/src/main/java/io/micrometer/core/instrument/util/MeterEquivalence.java Show resolved Hide resolved

sonatype-lift bot reviewed

View reviewed changes

micrometer-core/src/main/java/io/micrometer/core/lang/NonNullApi.java Outdated Show resolved Hide resolved

sonatype-lift bot reviewed

View reviewed changes

micrometer-test/src/main/java/io/micrometer/common/util/internal/logging/LogEvent.java Show resolved Hide resolved

sonatype-lift bot reviewed

View reviewed changes

micrometer-core/src/main/java/io/micrometer/core/lang/Nullable.java Outdated Show resolved Hide resolved

sonatype-lift bot reviewed

View reviewed changes

micrometer-core/src/main/java/io/micrometer/core/util/internal/logging/package-info.java Show resolved Hide resolved

sonatype-lift bot reviewed

View reviewed changes

micrometer-core/src/main/java/io/micrometer/core/lang/NonNullFields.java Outdated Show resolved Hide resolved

sonatype-lift bot reviewed

View reviewed changes

micrometer-test/src/main/java/io/micrometer/common/util/internal/logging/MockLogger.java Outdated Show resolved Hide resolved

sonatype-lift bot reviewed

View reviewed changes

micrometer-core/src/main/java/io/micrometer/core/lang/NonNullApi.java Outdated Show resolved Hide resolved

sonatype-lift bot reviewed

View reviewed changes

micrometer-core/src/main/java/io/micrometer/core/lang/Nullable.java Outdated Show resolved Hide resolved

sonatype-lift bot reviewed

View reviewed changes

micrometer-test/src/main/java/io/micrometer/common/util/internal/logging/LogEvent.java Show resolved Hide resolved

sonatype-lift bot reviewed

View reviewed changes

micrometer-core/src/main/java/io/micrometer/core/instrument/util/MeterEquivalence.java Show resolved Hide resolved

shakuzen approved these changes

View reviewed changes

jonatan-ivanov and others added 17 commits

May 6, 2022 16:38


          Remove checkstyle suppression for io.mivrometer.binder (removed)

e6fac40


          Polishing new additions of build.gradle

56b2009


          Revert formatting/import

ce885db


          Revert using new dependencies

f5c67cf


          Remove observation.lang and replace it with common.lang

e6b82bb


          Remove core.lang and replace it with common.lang

358650d


          Use common.util.StringUtils instead of core.instrument.util

a581843


          Remove core.util.internal.logging and use common.util.internal.logging

b9e2722


          Remove duplicated class (back-merge issue)

c5a3822


          Restore core.lang annotations but deprecate them

a30dc41


          Restore core.instrument.util.StringUtils but deprecate it

df9d435


          Restore core.util.internal.logging but deprecate it

b6c85f8


          Fixing indentation in build.gradle

3d8d33b


          fix typo

0d170f0


          @deprecated is invalid if I compile with Java 8 (but valid with 18)

b3f7d52


          @deprecated fix

c0a9d66


          Code format/import changes

7b544ca

shakuzen force-pushed the polishing-pass-after-2.x-refactor branch from 520d500 to 7b544ca Compare

May 6, 2022 07:44


          Missed changes to Observation during rebase

2320f5c

Member

shakuzen commented May 6, 2022

I managed to mess up the rebase and lose some changes made on main. I've hopefully recovered things with the last commit.

shakuzen merged commit b617100 into micrometer-metrics:main

sonatype-lift bot reviewed

View reviewed changes

micrometer-core/src/main/java/io/micrometer/core/instrument/util/MeterEquivalence.java

               import io.micrometer.core.instrument.Meter;
-              import io.micrometer.core.lang.Nullable;
               /**
                * @author Jon Schneider

Contributor

sonatype-lift bot May 6, 2022

MissingSummary: A summary line is required on public/protected Javadocs.

(at-me in a reply with help or ignore)

Was this a good recommendation?
[ 🙁 Not relevant ] - [ 😕 Won't fix ] - [ 😑 Not critical, will fix ] - [ 🙂 Critical, will fix ] - [ 😊 Critical, fixing now ]

sonatype-lift bot reviewed

View reviewed changes

micrometer-test/src/main/java/io/micrometer/common/util/internal/logging/MockLogger.java

    
                  }

                  /**

                   * @return The recorded {@link LogEvent} instances, in descending order by age (the

Contributor

sonatype-lift bot May 6, 2022

MissingSummary: A summary fragment is required; consider using the value of the @return block as a summary fragment instead.

Suggested change

      
                 * @return The recorded {@link LogEvent} instances, in descending order by age (the
          
                 *Returns the recorded {@link LogEvent} instances, in descending order by age (the

(at-me in a reply with help or ignore)

Was this a good recommendation?
[ 🙁 Not relevant ] - [ 😕 Won't fix ] - [ 😑 Not critical, will fix ] - [ 🙂 Critical, will fix ] - [ 😊 Critical, fixing now ]

sonatype-lift bot reviewed

View reviewed changes

micrometer-test/src/main/java/io/micrometer/common/util/internal/logging/LogEvent.java

    
                  }

                  @Override

                  public boolean equals(Object o) {

Contributor

sonatype-lift bot May 6, 2022

EqualsGetClass: Prefer instanceof to getClass when implementing Object#equals.

Suggested change

      
                public boolean equals(Object o) {
          
                if (!(o instanceof LogEvent))

(at-me in a reply with help or ignore)

Was this a good recommendation?
[ 🙁 Not relevant ] - [ 😕 Won't fix ] - [ 😑 Not critical, will fix ] - [ 🙂 Critical, will fix ] - [ 😊 Critical, fixing now ]

jonatan-ivanov deleted the polishing-pass-after-2.x-refactor branch

May 6, 2022 19:59

izeye mentioned this pull request

Dynatrace registry: Truncate log output #3148

Merged

shakuzen pushed a commit that referenced this pull request


          Re-apply Dynatrace log truncation change

ccbde40

This got lost in a rebase gone bad with gh-3152. See original commit ea438e5 from gh-3148.

jonatan-ivanov added a commit to jonatan-ivanov/micrometer that referenced this pull request


          Re-apply 'Polishing Dynatrace V2 logging changes a little'

d628d18

This got lost in a rebase gone bad with micrometer-metricsgh-3152. See original commit cf655e9

jonatan-ivanov restored the polishing-pass-after-2.x-refactor branch

May 10, 2022 18:32

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet