This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
The following commit(s) were added to refs/heads/main by this push:
new 3740469c fix(trait): Telemetry trait properties change
3740469c is described below
commit 3740469c5344d06d05c7f82c36ee501f1cd6021d
Author: Gaelle Fournier <gaelle.fournier.w...@gmail.com>
AuthorDate: Thu Oct 10 14:23:11 2024 +0200
fix(trait): Telemetry trait properties change
Properties modification:
* propEndpoint: "quarkus.opentelemetry.tracer.exporter.otlp.endpoint" =>
"quarkus.otel.exporter.otlp.traces.endpoint"
* propServiceName: "quarkus.opentelemetry.tracer.resource-attributes" =>
"quarkus.otel.resource.attributes"
* propSampler: "quarkus.opentelemetry.tracer.sampler" =>
"quarkus.otel.traces.sampler"
* propSamplerRatio: "quarkus.opentelemetry.tracer.sampler.ratio" =>
"quarkus.otel.traces.sampler.ratio"
* propSamplerParentBased:
"quarkus.opentelemetry.tracer.sampler.parent-based" =>
"quarkus.otel.traces.sampler.parent-based"
---
.../camel-k-maven-plugin/src/it/generate-catalog/verify.groovy | 10 +++++-----
.../org/apache/camel/k/tooling/maven/GenerateCatalogMojo.java | 10 +++++-----
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/support/camel-k-maven-plugin/src/it/generate-catalog/verify.groovy
b/support/camel-k-maven-plugin/src/it/generate-catalog/verify.groovy
index 1de6480b..cfe328f5 100644
--- a/support/camel-k-maven-plugin/src/it/generate-catalog/verify.groovy
+++ b/support/camel-k-maven-plugin/src/it/generate-catalog/verify.groovy
@@ -63,15 +63,15 @@ new File(basedir, "catalog.yaml").withReader {
assert
catalog.spec.runtime.capabilities['master'].runtimeProperties[2].key ==
'quarkus.camel.cluster.kubernetes.resource-type'
assert
catalog.spec.runtime.capabilities['master'].runtimeProperties[2].value ==
'${camel.k.master.resourceType}'
// Telemetry properties
- assert
catalog.spec.runtime.capabilities['telemetry'].runtimeProperties[0].key ==
'quarkus.opentelemetry.tracer.exporter.otlp.endpoint'
+ assert
catalog.spec.runtime.capabilities['telemetry'].runtimeProperties[0].key ==
'quarkus.otel.exporter.otlp.traces.endpoint'
assert
catalog.spec.runtime.capabilities['telemetry'].runtimeProperties[0].value ==
'${camel.k.telemetry.endpoint}'
- assert
catalog.spec.runtime.capabilities['telemetry'].runtimeProperties[1].key ==
'quarkus.opentelemetry.tracer.resource-attributes'
+ assert
catalog.spec.runtime.capabilities['telemetry'].runtimeProperties[1].key ==
'quarkus.otel.resource.attributes'
assert
catalog.spec.runtime.capabilities['telemetry'].runtimeProperties[1].value ==
'${camel.k.telemetry.serviceName}'
- assert
catalog.spec.runtime.capabilities['telemetry'].runtimeProperties[2].key ==
'quarkus.opentelemetry.tracer.sampler'
+ assert
catalog.spec.runtime.capabilities['telemetry'].runtimeProperties[2].key ==
'quarkus.otel.traces.sampler'
assert
catalog.spec.runtime.capabilities['telemetry'].runtimeProperties[2].value ==
'${camel.k.telemetry.sampler}'
- assert
catalog.spec.runtime.capabilities['telemetry'].runtimeProperties[3].key ==
'quarkus.opentelemetry.tracer.sampler.parent-based'
+ assert
catalog.spec.runtime.capabilities['telemetry'].runtimeProperties[3].key ==
'quarkus.otel.traces.sampler.parent-based'
assert
catalog.spec.runtime.capabilities['telemetry'].runtimeProperties[3].value ==
'${camel.k.telemetry.samplerParentBased}'
- assert
catalog.spec.runtime.capabilities['telemetry'].runtimeProperties[4].key ==
'quarkus.opentelemetry.tracer.sampler.ratio'
+ assert
catalog.spec.runtime.capabilities['telemetry'].runtimeProperties[4].key ==
'quarkus.otel.traces.sampler.ratio'
assert
catalog.spec.runtime.capabilities['telemetry'].runtimeProperties[4].value ==
'${camel.k.telemetry.samplerRatio}'
// Service Binding properties
diff --git
a/support/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateCatalogMojo.java
b/support/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateCatalogMojo.java
index 1d85c8cd..a70acacb 100644
---
a/support/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateCatalogMojo.java
+++
b/support/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateCatalogMojo.java
@@ -491,11 +491,11 @@ public class GenerateCatalogMojo extends AbstractMojo {
artifacts.clear();
artifacts.add(Artifact.from("org.apache.camel.quarkus",
"camel-quarkus-opentelemetry"));
properties.clear();
-
properties.add(Property.from("quarkus.opentelemetry.tracer.exporter.otlp.endpoint",
"${camel.k.telemetry.endpoint}"));
-
properties.add(Property.from("quarkus.opentelemetry.tracer.resource-attributes",
"${camel.k.telemetry.serviceName}"));
- properties.add(Property.from("quarkus.opentelemetry.tracer.sampler",
"${camel.k.telemetry.sampler}"));
-
properties.add(Property.from("quarkus.opentelemetry.tracer.sampler.ratio",
"${camel.k.telemetry.samplerRatio}"));
-
properties.add(Property.from("quarkus.opentelemetry.tracer.sampler.parent-based",
"${camel.k.telemetry.samplerParentBased}"));
+
properties.add(Property.from("quarkus.otel.exporter.otlp.traces.endpoint",
"${camel.k.telemetry.endpoint}"));
+ properties.add(Property.from("quarkus.otel.resource.attributes",
"${camel.k.telemetry.serviceName}"));
+ properties.add(Property.from("quarkus.otel.traces.sampler",
"${camel.k.telemetry.sampler}"));
+ properties.add(Property.from("quarkus.otel.traces.sampler.ratio",
"${camel.k.telemetry.samplerRatio}"));
+
properties.add(Property.from("quarkus.otel.traces.sampler.parent-based",
"${camel.k.telemetry.samplerParentBased}"));
addCapability(runtimeSpec, catalogSpec, "telemetry", artifacts,
properties, new ArrayList<>(), new ArrayList<>(), false);
artifacts.clear();
