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

Jump to bottom

fix: Remove core processor from the mn opentelemetry http library #559

Merged
merged 2 commits into from
May 3, 2024
Merged

fix: Remove core processor from the mn opentelemetry http library #559

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
078d316
fix: Remove core processor from the mn opentelemetry http library
timyates May 2, 2024
cc962fc
Fix the obvious mistake
timyates May 2, 2024
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
7 changes: 0 additions & 7 deletions buildSrc/src/main/groovy/io.micronaut.build.internal.tracing-module.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,3 @@ dependencies {
testImplementation mn.micronaut.inject.java
testImplementation mn.micronaut.http.server.netty
}

tasks.withType(Test) {
testLogging {
showStandardStreams = true
exceptionFormat = 'full'
}
}
2 changes: 1 addition & 1 deletion test-suite-java/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ micronaut {
enableNativeImage false
processing {
incremental(true)
annotations("helloworld.*")
annotations("opentelemetry.*")
}
}

Expand Down
2 changes: 1 addition & 1 deletion tracing-annotation/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ plugins {
}

dependencies {
api mn.micronaut.core.processor
implementation(mn.micronaut.core.processor)
}
14 changes: 4 additions & 10 deletions tracing-opentelemetry-annotation/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,12 @@ plugins {
}

dependencies {
api platform (libs.boms.opentelemetry)
api platform (libs.boms.opentelemetry.alpha)
api platform (libs.boms.opentelemetry.instrumentation)
api platform (libs.boms.opentelemetry.instrumentation.alpha)
api mn.micronaut.core.processor
api projects.micronautTracingAnnotation
api libs.opentelemetry.instrumentation.annotations
implementation(platform(libs.boms.opentelemetry.instrumentation))
implementation(libs.opentelemetry.instrumentation.annotations)
timyates marked this conversation as resolved.
Show resolved Hide resolved
implementation(mn.micronaut.core.processor)
implementation(projects.micronautTracingAnnotation)
timyates marked this conversation as resolved.
Show resolved Hide resolved

testImplementation mn.micronaut.inject.java.test
testImplementation mn.micronaut.inject.groovy.test
if (!JavaVersion.current().isJava9Compatible()) {
testImplementation files(Jvm.current().toolsJar)
}
}

3 changes: 1 addition & 2 deletions tracing-opentelemetry-grpc/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ dependencies {
api platform (libs.boms.opentelemetry.instrumentation.alpha)
api mn.micronaut.core.processor
compileOnly(mnGrpc.micronaut.grpc.client.runtime)
testImplementation(mnGrpc.micronaut.grpc.client.runtime)
testImplementation(mnGrpc.micronaut.grpc.client.runtime)
compileOnly(mnGrpc.micronaut.grpc.server.runtime)
testImplementation(mnGrpc.micronaut.grpc.server.runtime)
api projects.micronautTracingAnnotation
Expand All @@ -30,7 +30,6 @@ dependencies {
testImplementation libs.grpc.protobuf
testImplementation libs.grpc.stub
testImplementation mnSerde.micronaut.serde.jackson

}

sourceSets {
Expand Down
2 changes: 1 addition & 1 deletion tracing-opentelemetry-http/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ dependencies {
api platform (libs.boms.opentelemetry.alpha)
api platform (libs.boms.opentelemetry.instrumentation)
api platform (libs.boms.opentelemetry.instrumentation.alpha)
api mn.micronaut.core.processor
api mn.micronaut.router
api projects.micronautTracingAnnotation
api projects.micronautTracingOpentelemetry
Expand All @@ -20,6 +19,7 @@ dependencies {
compileOnly mn.kotlinx.coroutines.core
compileOnly mn.kotlinx.coroutines.reactor

testImplementation(projects.micronautTracingOpentelemetryAnnotation) // For the mapper and transformer for the Groovy/Spock tests
testImplementation mnReactor.micronaut.reactor
testImplementation mnSerde.micronaut.serde.jackson
testImplementation mnReactor.micronaut.reactor.http.client
Expand Down
8 changes: 0 additions & 8 deletions tracing-opentelemetry-zipkin-exporter/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,3 @@ dependencies {
testImplementation(projects.micronautTracingOpentelemetryHttp)
}

micronautBuild {
binaryCompatibility {
def dash = version.indexOf('-')
def v = dash > 0 ? version.substring(0, dash) : version
def (major, minor, patch) = v.split('[.]').collect { it.toInteger() }
enabled = major > 5 || (major == 5 && minor > 0) || (major == 5 && minor == 0 && patch > 2)
}
}
4 changes: 1 addition & 3 deletions tracing-opentelemetry/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ dependencies {
api mn.micronaut.core.processor
api mn.micronaut.core.reactive
api projects.micronautTracingAnnotation
api projects.micronautTracingOpentelemetryAnnotation
api libs.opentelemetry.api
api libs.opentelemetry.api.events
api libs.opentelemetry.instrumentation.annotations
Expand All @@ -30,8 +29,7 @@ dependencies {
compileOnly mn.kotlinx.coroutines.reactor
compileOnly libs.managed.opentelemetry.contrib.aws.xray

testAnnotationProcessor projects.micronautTracingOpentelemetryAnnotation

testImplementation(projects.micronautTracingOpentelemetryAnnotation) // For the mapper and transformer for the Groovy/Spock tests
testImplementation(libs.managed.opentelemetry.contrib.aws.resources)

testImplementation mnReactor.micronaut.reactor
Expand Down
Loading