Skip to content

Revert "Adapt to ObservationConvention location change" #25

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 1 commit into from
Sep 9, 2022
Merged

Revert "Adapt to ObservationConvention location change" #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,6 +299,7 @@ subprojects {
description = 'Facade over tracing concepts'

repositories {
mavenLocal()
mavenCentral()
maven { url 'https://repo.spring.io/milestone' }
maven { url 'https://repo.spring.io/snapshot' }
Expand Down
4 changes: 2 additions & 2 deletions micrometer-docs-generator-commons/src/main/java/io/micrometer/docs/commons/ParsingUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
import io.micrometer.common.lang.Nullable;
import io.micrometer.common.util.internal.logging.InternalLogger;
import io.micrometer.common.util.internal.logging.InternalLoggerFactory;
import io.micrometer.observation.ObservationConvention;
import io.micrometer.observation.Observation;
import org.jboss.forge.roaster.Internal;
import org.jboss.forge.roaster.Roaster;
import org.jboss.forge.roaster._shade.org.eclipse.jdt.core.dom.AbstractTypeDeclaration;
Expand Down Expand Up @@ -127,7 +127,7 @@ private static String tryToReadNameFromConventionClass(Path file, String classNa
}
if (actualConventionImplementation instanceof JavaClassImpl) {
List<String> interfaces = ((JavaClassImpl) actualConventionImplementation).getInterfaces();
if (interfaces.stream().noneMatch(s -> s.contains(ObservationConvention.class.getSimpleName()))) {
if (interfaces.stream().noneMatch(s -> s.contains(Observation.ObservationConvention.class.getSimpleName()))) {
return null;
}
MethodSource<JavaClassSource> name = ((JavaClassImpl) actualConventionImplementation).getMethod("getName");
Expand Down
6 changes: 2 additions & 4 deletions ...enerator-metrics/src/main/java/io/micrometer/docs/metrics/MetricSearchingFileVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,7 @@
import io.micrometer.docs.commons.KeyValueEntry;
import io.micrometer.docs.commons.ObservationConventionEntry;
import io.micrometer.docs.commons.ParsingUtils;
import io.micrometer.observation.GlobalObservationConvention;
import io.micrometer.observation.Observation;
import io.micrometer.observation.ObservationConvention;
import io.micrometer.observation.docs.DocumentedObservation;
import org.jboss.forge.roaster.Roaster;
import org.jboss.forge.roaster._shade.org.eclipse.jdt.core.dom.MethodDeclaration;
Expand Down Expand Up @@ -142,12 +140,12 @@ private String contextClassName(Pattern classPattern, String anInterface) {

// TODO: Duplication
private boolean isLocalObservationConvention(String interf) {
return interf.contains(ObservationConvention.class.getSimpleName()) || interf.contains(ObservationConvention.class.getCanonicalName());
return interf.contains(Observation.ObservationConvention.class.getSimpleName()) || interf.contains(Observation.ObservationConvention.class.getCanonicalName());
}

// TODO: Duplication
private boolean isGlobalObservationConvention(String interf) {
return interf.contains(GlobalObservationConvention.class.getSimpleName()) || interf.contains(GlobalObservationConvention.class.getCanonicalName());
return interf.contains(Observation.GlobalObservationConvention.class.getSimpleName()) || interf.contains(Observation.GlobalObservationConvention.class.getCanonicalName());
}

// if entry has overridesDefaultSpanFrom - read tags from that thing
Expand Down
11 changes: 5 additions & 6 deletions ...ter-docs-generator-metrics/src/test/java/io/micrometer/docs/metrics/AsyncObservation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@

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

enum AsyncObservation implements DocumentedObservation {
Expand Down Expand Up @@ -61,7 +60,7 @@ public KeyName[] getLowCardinalityKeyNames() {
*/
TEST_WITH_CONVENTION {
@Override
public Class<? extends ObservationConvention<? extends Observation.Context>> getDefaultConvention() {
public Class<? extends Observation.ObservationConvention<? extends Observation.Context>> getDefaultConvention() {
return MyConvention.class;
}

Expand All @@ -77,7 +76,7 @@ public KeyName[] getLowCardinalityKeyNames() {
*/
TEST_WITH_CONVENTION_2 {
@Override
public Class<? extends ObservationConvention<? extends Observation.Context>> getDefaultConvention() {
public Class<? extends Observation.ObservationConvention<? extends Observation.Context>> getDefaultConvention() {
return PublicObservationConvention.class;
}

Expand All @@ -93,7 +92,7 @@ public KeyName[] getLowCardinalityKeyNames() {
*/
TEST_WITH_CONVENTION_3 {
@Override
public Class<? extends ObservationConvention<? extends Observation.Context>> getDefaultConvention() {
public Class<? extends Observation.ObservationConvention<? extends Observation.Context>> getDefaultConvention() {
return MyDynamicConvention.class;
}

Expand All @@ -104,7 +103,7 @@ public KeyName[] getLowCardinalityKeyNames() {

};

static class MyConvention implements ObservationConvention<Observation.Context> {
static class MyConvention implements Observation.ObservationConvention<Observation.Context> {

@Override
public String getName() {
Expand All @@ -117,7 +116,7 @@ public boolean supportsContext(Observation.Context context) {
}
}

static class MyDynamicConvention implements ObservationConvention<Observation.Context> {
static class MyDynamicConvention implements Observation.ObservationConvention<Observation.Context> {

@Override
public String getName() {
Expand Down
3 changes: 1 addition & 2 deletions ...nerator-metrics/src/test/java/io/micrometer/docs/metrics/PublicObservationConvention.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,8 @@
package io.micrometer.docs.metrics;

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

public class PublicObservationConvention implements ObservationConvention<Observation.Context> {
public class PublicObservationConvention implements Observation.ObservationConvention<Observation.Context> {

@Override
public String getName() {
Expand Down
6 changes: 2 additions & 4 deletions ...docs-generator-spans/src/main/java/io/micrometer/docs/spans/SpanSearchingFileVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,7 @@
import io.micrometer.docs.commons.KeyValueEntry;
import io.micrometer.docs.commons.ObservationConventionEntry;
import io.micrometer.docs.commons.ParsingUtils;
import io.micrometer.observation.GlobalObservationConvention;
import io.micrometer.observation.Observation;
import io.micrometer.observation.ObservationConvention;
import io.micrometer.observation.docs.DocumentedObservation;
import io.micrometer.tracing.docs.DocumentedSpan;
import io.micrometer.tracing.docs.EventValue;
Expand Down Expand Up @@ -137,10 +135,10 @@ private String contextClassName(Pattern classPattern, String anInterface) {
}

private boolean isLocalObservationConvention(String interf) {
return interf.contains(ObservationConvention.class.getSimpleName()) || interf.contains(ObservationConvention.class.getCanonicalName());
return interf.contains(Observation.ObservationConvention.class.getSimpleName()) || interf.contains(Observation.ObservationConvention.class.getCanonicalName());
}
private boolean isGlobalObservationConvention(String interf) {
return interf.contains(GlobalObservationConvention.class.getSimpleName()) || interf.contains(GlobalObservationConvention.class.getCanonicalName());
return interf.contains(Observation.GlobalObservationConvention.class.getSimpleName()) || interf.contains(Observation.GlobalObservationConvention.class.getCanonicalName());
}

@Override
Expand Down
9 changes: 4 additions & 5 deletions ...cs-generator-spans/src/test/java/io/micrometer/docs/spans/conventions/AnnotationSpan.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

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

enum AnnotationSpan implements DocumentedObservation {
Expand All @@ -28,7 +27,7 @@ enum AnnotationSpan implements DocumentedObservation {
*/
PUBLIC_CONVENTION {
@Override
public Class<? extends ObservationConvention<? extends Observation.Context>> getDefaultConvention() {
public Class<? extends Observation.ObservationConvention<? extends Observation.Context>> getDefaultConvention() {
return PublicObservationConvention.class;
}

Expand All @@ -49,7 +48,7 @@ public KeyName[] getHighCardinalityKeyNames() {
*/
NESTED_CONVENTION {
@Override
public Class<? extends ObservationConvention<? extends Observation.Context>> getDefaultConvention() {
public Class<? extends Observation.ObservationConvention<? extends Observation.Context>> getDefaultConvention() {
return NestedConvention.class;
}

Expand All @@ -70,7 +69,7 @@ public KeyName[] getHighCardinalityKeyNames() {
*/
DYNAMIC_CONVENTION {
@Override
public Class<? extends ObservationConvention<? extends Observation.Context>> getDefaultConvention() {
public Class<? extends Observation.ObservationConvention<? extends Observation.Context>> getDefaultConvention() {
return DynamicObservationConvention.class;
}

Expand All @@ -86,7 +85,7 @@ public KeyName[] getHighCardinalityKeyNames() {

};

static class NestedConvention implements ObservationConvention<Observation.Context> {
static class NestedConvention implements Observation.ObservationConvention<Observation.Context> {

@Override
public String getName() {
Expand Down
3 changes: 1 addition & 2 deletions ...pans/src/test/java/io/micrometer/docs/spans/conventions/DynamicObservationConvention.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,8 @@
package io.micrometer.docs.spans.conventions;

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

public class DynamicObservationConvention implements ObservationConvention<Observation.Context> {
public class DynamicObservationConvention implements Observation.ObservationConvention<Observation.Context> {

@Override
public String getName() {
Expand Down
3 changes: 1 addition & 2 deletions ...src/test/java/io/micrometer/docs/spans/conventions/PublicGlobalObservationConvention.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,9 @@

package io.micrometer.docs.spans.conventions;

import io.micrometer.observation.GlobalObservationConvention;
import io.micrometer.observation.Observation;

public class PublicGlobalObservationConvention implements GlobalObservationConvention<Observation.Context> {
public class PublicGlobalObservationConvention implements Observation.GlobalObservationConvention<Observation.Context> {

@Override
public String getName() {
Expand Down
3 changes: 1 addition & 2 deletions ...spans/src/test/java/io/micrometer/docs/spans/conventions/PublicObservationConvention.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,8 @@
package io.micrometer.docs.spans.conventions;

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

public class PublicObservationConvention implements ObservationConvention<Observation.Context> {
public class PublicObservationConvention implements Observation.ObservationConvention<Observation.Context> {

@Override
public String getName() {
Expand Down