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

Update versions ready for micronaut 4.3.0 #478

Merged
merged 1 commit into from
Jan 19, 2024
Merged

Update versions ready for micronaut 4.3.0 #478

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

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[versions]
micronaut = "4.2.3"
micronaut-test = "4.0.0"
micronaut-logging = "1.1.2"
micronaut-platform = "4.1.4"
micronaut-test = "4.2.0"
micronaut-logging = "1.2.1"
micronaut-platform = "4.2.3"
micronaut-docs = '2.0.0'
groovy = "4.0.13"
groovy = "4.0.17"
spock = "2.3-groovy-4.0"

managed-brave-instrumentation = '5.16.0'
Expand All @@ -14,7 +14,7 @@ managed-opentelemetry-instrumentation = '1.31.0'
managed-opentelemetry-instrumentation-alpha = '1.31.0-alpha'
managed-opentelemetry-contrib-aws-xray = '1.32.0'
managed-opentelemetry-contrib-aws-resources = '1.31.0-alpha'
managed-opentelemetry-gcp-trace = '0.25.2-alpha'
managed-opentelemetry-gcp-trace = '0.27.0-alpha'
managed-opentelemetry-semconv = '1.21.0-alpha'
managed-protobuf = '0.9.4'
managed-zipkin = '2.24.3'
Expand Down Expand Up @@ -55,7 +55,6 @@ micronaut-rxjava2 = { module = 'io.micronaut.rxjava2:micronaut-rxjava2-bom', ver
micronaut-serde = { module = 'io.micronaut.serde:micronaut-serde-bom', version.ref = 'micronaut-serde'}
micronaut-kafka = { module = 'io.micronaut.kafka:micronaut-kafka-bom', version.ref = 'micronaut-kafka'}


brave-instrumentation-http = { module = 'io.zipkin.brave:brave-instrumentation-http' }
brave-opentracing = { module = 'io.opentracing.brave:brave-opentracing', version.ref = 'managed-brave-opentracing' }
grpc-protobuf = { module = 'io.grpc:grpc-protobuf', version.ref = 'grpc' }
Expand Down
16 changes: 16 additions & 0 deletions test-suite-java/src/test/resources/logback-test.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<configuration>

<appender name='STDOUT' class='ch.qos.logback.core.ConsoleAppender'>
<encoder>
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %5p %logger{0} [%t:%X{traceId:-}] %m%n</pattern>
</encoder>
</appender>

<root level='info'>
<appender-ref ref='STDOUT' />
</root>

<!-- <logger name="io.micronaut.tracing.instrument.util.MdcInstrumenter" level="debug"/>-->
<!-- <logger name="brave.internal.recorder.PendingSpans" level="trace" />-->

</configuration>
16 changes: 16 additions & 0 deletions tests/kotlin-tests/src/test/resources/logback-test.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<configuration>

<appender name='STDOUT' class='ch.qos.logback.core.ConsoleAppender'>
<encoder>
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %5p %logger{0} [%t:%X{traceId:-}] %m%n</pattern>
</encoder>
</appender>

<root level='info'>
<appender-ref ref='STDOUT' />
</root>

<!-- <logger name="io.micronaut.tracing.instrument.util.MdcInstrumenter" level="debug"/>-->
<!-- <logger name="brave.internal.recorder.PendingSpans" level="trace" />-->

</configuration>
7 changes: 1 addition & 6 deletions tracing-bom/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,10 @@ micronautBom {
"io.zipkin.proto3"
] as Set
)
// opentelemetry-instrumentation-bom and opentelemetry-instrumentation-bom-alpha still use 1.30.1
dependencies.add("io.opentelemetry:opentelemetry-bom:1.30.1")
dependencies.add("io.opentelemetry:opentelemetry-bom-alpha:1.30.1-alpha")

dependencies.add("io.opentelemetry:opentelemetry-bom:1.31.0")
dependencies.add("io.opentelemetry:opentelemetry-bom-alpha:1.31.0-alpha")
dependencies.add("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.31.0")
dependencies.add("io.zipkin.brave:brave-bom:5.16.0")
dependencies.add("io.zipkin.reporter2:zipkin-reporter-bom:2.16.3")
dependencies.add("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.31.0")
dependencies.add("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.30.0-alpha")
}
}
16 changes: 16 additions & 0 deletions tracing-opentelemetry-annotation/src/test/resources/logback-test.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<configuration>

<appender name='STDOUT' class='ch.qos.logback.core.ConsoleAppender'>
<encoder>
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %5p %logger{0} [%t:%X{traceId:-}] %m%n</pattern>
</encoder>
</appender>

<root level='info'>
<appender-ref ref='STDOUT' />
</root>

<!-- <logger name="io.micronaut.tracing.instrument.util.MdcInstrumenter" level="debug"/>-->
<!-- <logger name="brave.internal.recorder.PendingSpans" level="trace" />-->

</configuration>
16 changes: 16 additions & 0 deletions tracing-opentelemetry-grpc/src/test/resources/logback-test.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<configuration>

<appender name='STDOUT' class='ch.qos.logback.core.ConsoleAppender'>
<encoder>
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %5p %logger{0} [%t:%X{traceId:-}] %m%n</pattern>
</encoder>
</appender>

<root level='info'>
<appender-ref ref='STDOUT' />
</root>

<!-- <logger name="io.micronaut.tracing.instrument.util.MdcInstrumenter" level="debug"/>-->
<!-- <logger name="brave.internal.recorder.PendingSpans" level="trace" />-->

</configuration>
16 changes: 16 additions & 0 deletions tracing-opentelemetry-http/src/test/resources/logback-test.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<configuration>

<appender name='STDOUT' class='ch.qos.logback.core.ConsoleAppender'>
<encoder>
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %5p %logger{0} [%t:%X{traceId:-}] %m%n</pattern>
</encoder>
</appender>

<root level='info'>
<appender-ref ref='STDOUT' />
</root>

<!-- <logger name="io.micronaut.tracing.instrument.util.MdcInstrumenter" level="debug"/>-->
<!-- <logger name="brave.internal.recorder.PendingSpans" level="trace" />-->

</configuration>
16 changes: 16 additions & 0 deletions tracing-opentelemetry-kafka/src/test/resources/logback-test.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<configuration>

<appender name='STDOUT' class='ch.qos.logback.core.ConsoleAppender'>
<encoder>
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %5p %logger{0} [%t:%X{traceId:-}] %m%n</pattern>
</encoder>
</appender>

<root level='info'>
<appender-ref ref='STDOUT' />
</root>

<!-- <logger name="io.micronaut.tracing.instrument.util.MdcInstrumenter" level="debug"/>-->
<!-- <logger name="brave.internal.recorder.PendingSpans" level="trace" />-->

</configuration>
16 changes: 16 additions & 0 deletions tracing-opentelemetry-zipkin-exporter/src/test/resources/logback-test.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<configuration>

<appender name='STDOUT' class='ch.qos.logback.core.ConsoleAppender'>
<encoder>
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %5p %logger{0} [%t:%X{traceId:-}] %m%n</pattern>
</encoder>
</appender>

<root level='info'>
<appender-ref ref='STDOUT' />
</root>

<!-- <logger name="io.micronaut.tracing.instrument.util.MdcInstrumenter" level="debug"/>-->
<!-- <logger name="brave.internal.recorder.PendingSpans" level="trace" />-->

</configuration>