diff --git a/docs/instrumentation-list.yaml b/docs/instrumentation-list.yaml index 0daa958b20d8..097c1a72245f 100644 --- a/docs/instrumentation-list.yaml +++ b/docs/instrumentation-list.yaml @@ -6573,12 +6573,33 @@ libraries: type: STRING jfinal: - name: jfinal-3.2 + display_name: JFinal + description: | + This instrumentation enriches HTTP server spans with route information, and enables controller spans for JFinal controller methods (controller spans are disabled by default). + library_link: https://github.com/jfinal/jfinal + features: + - HTTP_ROUTE + - CONTROLLER_SPANS source_path: instrumentation/jfinal-3.2 scope: name: io.opentelemetry.jfinal-3.2 target_versions: javaagent: - com.jfinal:jfinal:[3.2,) + configurations: + - name: otel.instrumentation.common.experimental.controller-telemetry.enabled + description: Enables the creation of experimental controller spans. + type: boolean + default: false + telemetry: + - when: default + spans: + - span_kind: INTERNAL + attributes: + - name: code.function + type: STRING + - name: code.namespace + type: STRING jms: - name: jms-1.1 display_name: JMS (Java Message Service) diff --git a/instrumentation-docs/instrumentations.sh b/instrumentation-docs/instrumentations.sh index 292bec1a8058..ab2417ffd361 100755 --- a/instrumentation-docs/instrumentations.sh +++ b/instrumentation-docs/instrumentations.sh @@ -148,6 +148,7 @@ readonly INSTRUMENTATIONS=( "jsf:jsf-myfaces-3.0:javaagent:test" "jsp-2.3:javaagent:test" "jsp-2.3:javaagent:testExperimental" + "jfinal-3.2:javaagent:test" "kafka:kafka-clients:kafka-clients-2.6:library:test" "kafka:kafka-connect-2.6:testing:test" "ktor:ktor-1.0:library:test" diff --git a/instrumentation/jfinal-3.2/javaagent/build.gradle.kts b/instrumentation/jfinal-3.2/javaagent/build.gradle.kts index 5336ad06466d..75d23631f163 100644 --- a/instrumentation/jfinal-3.2/javaagent/build.gradle.kts +++ b/instrumentation/jfinal-3.2/javaagent/build.gradle.kts @@ -28,4 +28,5 @@ dependencies { tasks.withType().configureEach { jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true") + systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false") } diff --git a/instrumentation/jfinal-3.2/metadata.yaml b/instrumentation/jfinal-3.2/metadata.yaml new file mode 100644 index 000000000000..0e3e508780b7 --- /dev/null +++ b/instrumentation/jfinal-3.2/metadata.yaml @@ -0,0 +1,13 @@ +display_name: JFinal +description: > + This instrumentation enriches HTTP server spans with route information, and enables + controller spans for JFinal controller methods (controller spans are disabled by default). +features: + - HTTP_ROUTE + - CONTROLLER_SPANS +library_link: https://github.com/jfinal/jfinal +configurations: + - name: otel.instrumentation.common.experimental.controller-telemetry.enabled + description: Enables the creation of experimental controller spans. + type: boolean + default: false \ No newline at end of file