You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2023/06/21 12:10:51 UTC
[camel] branch camel-3.14.x updated (363b7a509bb -> bf9f1870a09)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch camel-3.14.x
in repository https://gitbox.apache.org/repos/asf/camel.git
from 363b7a509bb CAMEL-19480: Upgrade to netty 4.1.94
new 0f019a6d274 CAMEL-19477: camel-micrometer - Use sanitized endpoint uri for captured events to avoid showing sensitive data such as passwords from URIs
new bf9f1870a09 Rename package name
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/camel/component/micrometer/MicrometerEndpoint.java | 3 +--
.../MicrometerExchangeEventNotifierNamingStrategy.java | 7 ++++++-
.../apache/camel/component/micrometer/MicrometerEndpointTest.java | 8 --------
.../AbstractMicrometerEventNotifierTest.java | 3 +--
.../MicrometerExchangeEventNotifierTest.java | 7 +++----
.../MicrometerRouteEventNotifierTest.java | 4 +---
6 files changed, 12 insertions(+), 20 deletions(-)
rename components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/{eventNotifier => eventnotifier}/AbstractMicrometerEventNotifierTest.java (94%)
rename components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/{eventNotifier => eventnotifier}/MicrometerExchangeEventNotifierTest.java (92%)
rename components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/{eventNotifier => eventnotifier}/MicrometerRouteEventNotifierTest.java (91%)
[camel] 02/02: Rename package name
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.14.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit bf9f1870a0920d7aac38a6638c050a7e78cda17a
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Jun 21 14:03:55 2023 +0200
Rename package name
---
.../AbstractMicrometerEventNotifierTest.java | 3 +--
.../MicrometerExchangeEventNotifierTest.java | 4 +---
.../MicrometerRouteEventNotifierTest.java | 4 +---
3 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/eventNotifier/AbstractMicrometerEventNotifierTest.java b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/eventnotifier/AbstractMicrometerEventNotifierTest.java
similarity index 94%
rename from components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/eventNotifier/AbstractMicrometerEventNotifierTest.java
rename to components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/eventnotifier/AbstractMicrometerEventNotifierTest.java
index 1aa3f6f576a..b32e2b65751 100644
--- a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/eventNotifier/AbstractMicrometerEventNotifierTest.java
+++ b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/eventnotifier/AbstractMicrometerEventNotifierTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.micrometer.eventNotifier;
+package org.apache.camel.component.micrometer.eventnotifier;
import io.micrometer.core.instrument.Clock;
import io.micrometer.core.instrument.composite.CompositeMeterRegistry;
@@ -25,7 +25,6 @@ import org.apache.camel.BindToRegistry;
import org.apache.camel.CamelContext;
import org.apache.camel.component.micrometer.CamelJmxConfig;
import org.apache.camel.component.micrometer.MicrometerConstants;
-import org.apache.camel.component.micrometer.eventnotifier.AbstractMicrometerEventNotifier;
import org.apache.camel.test.junit5.CamelTestSupport;
abstract class AbstractMicrometerEventNotifierTest extends CamelTestSupport {
diff --git a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/eventNotifier/MicrometerExchangeEventNotifierTest.java b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/eventnotifier/MicrometerExchangeEventNotifierTest.java
similarity index 93%
rename from components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/eventNotifier/MicrometerExchangeEventNotifierTest.java
rename to components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/eventnotifier/MicrometerExchangeEventNotifierTest.java
index 57dbc32ec3f..61271520e63 100644
--- a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/eventNotifier/MicrometerExchangeEventNotifierTest.java
+++ b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/eventnotifier/MicrometerExchangeEventNotifierTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.micrometer.eventNotifier;
+package org.apache.camel.component.micrometer.eventnotifier;
import java.util.concurrent.TimeUnit;
@@ -22,8 +22,6 @@ import io.micrometer.core.instrument.Timer;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.micrometer.eventnotifier.AbstractMicrometerEventNotifier;
-import org.apache.camel.component.micrometer.eventnotifier.MicrometerExchangeEventNotifier;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.support.ExpressionAdapter;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/eventNotifier/MicrometerRouteEventNotifierTest.java b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/eventnotifier/MicrometerRouteEventNotifierTest.java
similarity index 91%
rename from components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/eventNotifier/MicrometerRouteEventNotifierTest.java
rename to components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/eventnotifier/MicrometerRouteEventNotifierTest.java
index a3225424e0a..3d34d820d64 100644
--- a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/eventNotifier/MicrometerRouteEventNotifierTest.java
+++ b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/eventnotifier/MicrometerRouteEventNotifierTest.java
@@ -14,12 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.micrometer.eventNotifier;
+package org.apache.camel.component.micrometer.eventnotifier;
import io.micrometer.core.instrument.Gauge;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.micrometer.eventnotifier.AbstractMicrometerEventNotifier;
-import org.apache.camel.component.micrometer.eventnotifier.MicrometerRouteEventNotifier;
import org.junit.jupiter.api.Test;
import static org.apache.camel.component.micrometer.MicrometerConstants.DEFAULT_CAMEL_ROUTES_ADDED;
[camel] 01/02: CAMEL-19477: camel-micrometer - Use sanitized endpoint uri for captured events to avoid showing sensitive data such as passwords from URIs
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.14.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 0f019a6d274560cd452842b8310ce496680e4767
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Jun 21 14:03:31 2023 +0200
CAMEL-19477: camel-micrometer - Use sanitized endpoint uri for captured events to avoid showing sensitive data such as passwords from URIs
---
.../org/apache/camel/component/micrometer/MicrometerEndpoint.java | 3 +--
.../MicrometerExchangeEventNotifierNamingStrategy.java | 7 ++++++-
.../apache/camel/component/micrometer/MicrometerEndpointTest.java | 8 --------
.../eventNotifier/MicrometerExchangeEventNotifierTest.java | 3 ++-
4 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/components/camel-micrometer/src/main/java/org/apache/camel/component/micrometer/MicrometerEndpoint.java b/components/camel-micrometer/src/main/java/org/apache/camel/component/micrometer/MicrometerEndpoint.java
index 5bec25ee32c..1802f38bb60 100644
--- a/components/camel-micrometer/src/main/java/org/apache/camel/component/micrometer/MicrometerEndpoint.java
+++ b/components/camel-micrometer/src/main/java/org/apache/camel/component/micrometer/MicrometerEndpoint.java
@@ -24,7 +24,6 @@ import org.apache.camel.Component;
import org.apache.camel.Consumer;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
-import org.apache.camel.RuntimeCamelException;
import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.UriEndpoint;
import org.apache.camel.spi.UriParam;
@@ -68,7 +67,7 @@ public class MicrometerEndpoint extends DefaultEndpoint {
@Override
public Consumer createConsumer(Processor processor) {
- throw new RuntimeCamelException("Cannot consume from " + getClass().getSimpleName() + ": " + getEndpointUri());
+ throw new UnsupportedOperationException("Consumer not supported");
}
@Override
diff --git a/components/camel-micrometer/src/main/java/org/apache/camel/component/micrometer/eventnotifier/MicrometerExchangeEventNotifierNamingStrategy.java b/components/camel-micrometer/src/main/java/org/apache/camel/component/micrometer/eventnotifier/MicrometerExchangeEventNotifierNamingStrategy.java
index 6e6f6640257..c7f935a9569 100644
--- a/components/camel-micrometer/src/main/java/org/apache/camel/component/micrometer/eventnotifier/MicrometerExchangeEventNotifierNamingStrategy.java
+++ b/components/camel-micrometer/src/main/java/org/apache/camel/component/micrometer/eventnotifier/MicrometerExchangeEventNotifierNamingStrategy.java
@@ -46,11 +46,16 @@ public interface MicrometerExchangeEventNotifierNamingStrategy {
}
default Tags getTags(ExchangeEvent event, Endpoint endpoint) {
+ String uri = "";
+ if (endpoint != null) {
+ // use sanitized uri to not reveal sensitive information
+ uri = endpoint.toString();
+ }
return Tags.of(
CAMEL_CONTEXT_TAG, event.getExchange().getContext().getName(),
SERVICE_NAME, MicrometerEventNotifierService.class.getSimpleName(),
EVENT_TYPE_TAG, event.getClass().getSimpleName(),
- ENDPOINT_NAME, endpoint.getEndpointUri(),
+ ENDPOINT_NAME, uri,
FAILED_TAG, Boolean.toString(event.getExchange().isFailed()));
}
diff --git a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/MicrometerEndpointTest.java b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/MicrometerEndpointTest.java
index f2782d0308d..06ef6e8ec72 100644
--- a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/MicrometerEndpointTest.java
+++ b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/MicrometerEndpointTest.java
@@ -23,7 +23,6 @@ import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
-import org.apache.camel.RuntimeCamelException;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -35,7 +34,6 @@ import org.mockito.junit.jupiter.MockitoExtension;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
-import static org.junit.jupiter.api.Assertions.assertThrows;
@ExtendWith(MockitoExtension.class)
public class MicrometerEndpointTest {
@@ -85,12 +83,6 @@ public class MicrometerEndpointTest {
assertThat(endpoint.getRegistry(), is(registry));
}
- @Test
- public void testCreateConsumer() {
- assertThrows(RuntimeCamelException.class,
- () -> endpoint.createConsumer(processor));
- }
-
@Test
public void testIsSingleton() {
assertThat(endpoint.isSingleton(), is(true));
diff --git a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/eventNotifier/MicrometerExchangeEventNotifierTest.java b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/eventNotifier/MicrometerExchangeEventNotifierTest.java
index 5b035212573..57dbc32ec3f 100644
--- a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/eventNotifier/MicrometerExchangeEventNotifierTest.java
+++ b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/eventNotifier/MicrometerExchangeEventNotifierTest.java
@@ -43,7 +43,8 @@ public class MicrometerExchangeEventNotifierTest extends AbstractMicrometerEvent
@Override
protected AbstractMicrometerEventNotifier<?> getEventNotifier() {
MicrometerExchangeEventNotifier eventNotifier = new MicrometerExchangeEventNotifier();
- eventNotifier.setNamingStrategy((exchange, endpoint) -> endpoint.getEndpointUri());
+ // use sanitized uri to not reveal sensitive information
+ eventNotifier.setNamingStrategy((exchange, endpoint) -> endpoint.toString());
return eventNotifier;
}