Skip to content

Commit 505009b

Browse files
committed
Polishing.
Inline micrometer documentation fragments. See #2453
1 parent b721ce4 commit 505009b

File tree

2 files changed

+3
-40
lines changed

2 files changed

+3
-40
lines changed

pom.xml

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,6 @@
2828
<multithreadedtc>1.01</multithreadedtc>
2929
<netty>4.1.79.Final</netty>
3030
<java-module-name>spring.data.redis</java-module-name>
31-
32-
<!-- Observability -->
33-
<micrometer-docs-generator.inputPath>${project.basedir}</micrometer-docs-generator.inputPath>
34-
<micrometer-docs-generator.inclusionPattern>.*</micrometer-docs-generator.inclusionPattern>
35-
<micrometer-docs-generator.outputPath>${project.basedir}/target/</micrometer-docs-generator.outputPath>
3631
</properties>
3732

3833
<scm>
@@ -328,38 +323,6 @@
328323
</configuration>
329324
</plugin>
330325

331-
<plugin>
332-
<groupId>org.codehaus.mojo</groupId>
333-
<artifactId>exec-maven-plugin</artifactId>
334-
<version>3.1.0</version>
335-
<executions>
336-
<execution>
337-
<id>generate-docs</id>
338-
<phase>generate-resources</phase>
339-
<goals>
340-
<goal>java</goal>
341-
</goals>
342-
<configuration>
343-
<mainClass>io.micrometer.docs.DocsGeneratorCommand</mainClass>
344-
<includePluginDependencies>true</includePluginDependencies>
345-
<arguments>
346-
<argument>${micrometer-docs-generator.inputPath}</argument>
347-
<argument>${micrometer-docs-generator.inclusionPattern}</argument>
348-
<argument>${micrometer-docs-generator.outputPath}</argument>
349-
</arguments>
350-
</configuration>
351-
</execution>
352-
</executions>
353-
<dependencies>
354-
<dependency>
355-
<groupId>io.micrometer</groupId>
356-
<artifactId>micrometer-docs-generator</artifactId>
357-
<version>${micrometer-docs-generator}</version>
358-
<type>jar</type>
359-
</dependency>
360-
</dependencies>
361-
</plugin>
362-
363326
<plugin>
364327
<groupId>org.apache.maven.plugins</groupId>
365328
<artifactId>maven-assembly-plugin</artifactId>

src/main/asciidoc/reference/observability.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ class ObservabilityConfiguration {
3131
}
3232
----
3333

34-
include::../../../../target/_conventions.adoc[]
34+
include::../observability/_conventions.adoc[]
3535

36-
include::../../../../target/_metrics.adoc[]
36+
include::../observability/_metrics.adoc[]
3737

38-
include::../../../../target/_spans.adoc[]
38+
include::../observability/_spans.adoc[]
3939

4040
See also https://opentelemetry.io/docs/reference/specification/trace/semantic_conventions/database/#redis[OpenTelemetry Semantic Conventions] for further reference.

0 commit comments

Comments
 (0)