You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by re...@apache.org on 2023/10/17 01:09:22 UTC
[cxf] branch 3.5.x-fixes updated (b8d0aca942 -> 76c8263ab4)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a change to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
from b8d0aca942 Recording .gitmergeinfo Changes
new 11f2b28167 Replace deprecated OpenTelemetry semantic convention attributes
new eb72d4ac2f Update Apache Tomcat to 9.0.81
new 76c8263ab4 Recording .gitmergeinfo Changes
The 3 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:
.gitmergeinfo | 2 ++
distribution/src/main/release/samples/pom.xml | 2 +-
.../opentelemetry/AbstractOpenTelemetryClientProvider.java | 6 +++---
.../cxf/tracing/opentelemetry/AbstractOpenTelemetryProvider.java | 6 +++---
parent/pom.xml | 2 +-
.../jaxrs/tracing/opentelemetry/OpenTelemetryTracingTest.java | 8 ++++----
.../jaxws/tracing/opentelemetry/OpenTelemetryTracingTest.java | 4 ++--
7 files changed, 16 insertions(+), 14 deletions(-)
[cxf] 01/03: Replace deprecated OpenTelemetry semantic convention attributes
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 11f2b2816742f194fc9e96c1cdbaa7fadca1ed8f
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Mon Oct 16 20:57:48 2023 -0400
Replace deprecated OpenTelemetry semantic convention attributes
(cherry picked from commit d17fe348a8153db12508c5efe274d262a7b4d83f)
(cherry picked from commit 59bbb479dd3997fb715a057d4ff7f57df89fa57a)
---
.../opentelemetry/AbstractOpenTelemetryClientProvider.java | 6 +++---
.../cxf/tracing/opentelemetry/AbstractOpenTelemetryProvider.java | 6 +++---
.../jaxrs/tracing/opentelemetry/OpenTelemetryTracingTest.java | 8 ++++----
.../jaxws/tracing/opentelemetry/OpenTelemetryTracingTest.java | 4 ++--
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/AbstractOpenTelemetryClientProvider.java b/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/AbstractOpenTelemetryClientProvider.java
index d2e5717eb6..52cfd7e893 100644
--- a/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/AbstractOpenTelemetryClientProvider.java
+++ b/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/AbstractOpenTelemetryClientProvider.java
@@ -59,8 +59,8 @@ public abstract class AbstractOpenTelemetryClientProvider extends AbstractTracin
Context parentContext = Context.current();
Span activeSpan = tracer.spanBuilder(buildSpanDescription(uri.toString(), method))
.setParent(parentContext).setSpanKind(SpanKind.CLIENT)
- .setAttribute(SemanticAttributes.HTTP_METHOD, method)
- .setAttribute(SemanticAttributes.HTTP_URL, uri.toString())
+ .setAttribute(SemanticAttributes.HTTP_REQUEST_METHOD, method)
+ .setAttribute(SemanticAttributes.URL_FULL, uri.toString())
// TODO: Enhance with semantics from request
.startSpan();
Scope scope = activeSpan.makeCurrent();
@@ -100,7 +100,7 @@ public abstract class AbstractOpenTelemetryClientProvider extends AbstractTracin
scope = span.makeCurrent();
}
- span.setAttribute(SemanticAttributes.HTTP_STATUS_CODE.getKey(), responseStatus);
+ span.setAttribute(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE.getKey(), responseStatus);
span.end();
diff --git a/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/AbstractOpenTelemetryProvider.java b/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/AbstractOpenTelemetryProvider.java
index d8ddda3e8d..b23d47537a 100644
--- a/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/AbstractOpenTelemetryProvider.java
+++ b/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/AbstractOpenTelemetryProvider.java
@@ -63,8 +63,8 @@ public abstract class AbstractOpenTelemetryProvider extends AbstractTracingProvi
SpanBuilder spanBuilder = tracer.spanBuilder(buildSpanDescription(uri.getPath(), method))
.setSpanKind(SpanKind.SERVER)
- .setAttribute(SemanticAttributes.HTTP_METHOD, method)
- .setAttribute(SemanticAttributes.HTTP_URL, uri.toString());
+ .setAttribute(SemanticAttributes.HTTP_REQUEST_METHOD, method)
+ .setAttribute(SemanticAttributes.URL_FULL, uri.toString());
Span activeSpan = spanBuilder.startSpan();
Scope scope = activeSpan.makeCurrent();
@@ -104,7 +104,7 @@ public abstract class AbstractOpenTelemetryProvider extends AbstractTracingProvi
scope = span.makeCurrent();
}
- span.setAttribute(SemanticAttributes.HTTP_STATUS_CODE, responseStatus);
+ span.setAttribute(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, responseStatus);
span.end();
scope.close();
diff --git a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/opentelemetry/OpenTelemetryTracingTest.java b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/opentelemetry/OpenTelemetryTracingTest.java
index 1a5df89044..d49604f3bf 100644
--- a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/opentelemetry/OpenTelemetryTracingTest.java
+++ b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/opentelemetry/OpenTelemetryTracingTest.java
@@ -126,7 +126,7 @@ public class OpenTelemetryTracingTest extends AbstractClientServerTestBase {
assertThat(otelRule.getSpans().get(0).getName(), equalTo("Get Books"));
assertThat(otelRule.getSpans().get(1).getName(), equalTo("GET /bookstore/books"));
assertThat(otelRule.getSpans().get(1).getAttributes(),
- hasAttribute(SemanticAttributes.HTTP_STATUS_CODE, 200L));
+ hasAttribute(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200L));
assertThat(otelRule.getSpans().get(1).getInstrumentationScopeInfo().getName(),
equalTo("jaxrs-server-test"));
}
@@ -397,7 +397,7 @@ public class OpenTelemetryTracingTest extends AbstractClientServerTestBase {
assertThat(otelRule.getSpans().toString(), otelRule.getSpans().size(), equalTo(1));
assertThat(otelRule.getSpans().get(0).getName(), equalTo("GET /bookstore/books/exception"));
assertThat(otelRule.getSpans().get(0).getAttributes(),
- hasAttribute(SemanticAttributes.HTTP_STATUS_CODE, 500L));
+ hasAttribute(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 500L));
}
@Test
@@ -408,7 +408,7 @@ public class OpenTelemetryTracingTest extends AbstractClientServerTestBase {
assertThat(otelRule.getSpans().toString(), otelRule.getSpans().size(), equalTo(1));
assertThat(otelRule.getSpans().get(0).getName(), equalTo("GET /bookstore/books/error"));
assertThat(otelRule.getSpans().get(0).getAttributes(),
- hasAttribute(SemanticAttributes.HTTP_STATUS_CODE, 503L));
+ hasAttribute(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 503L));
}
@Test
@@ -419,7 +419,7 @@ public class OpenTelemetryTracingTest extends AbstractClientServerTestBase {
assertThat(otelRule.getSpans().toString(), otelRule.getSpans().size(), equalTo(1));
assertThat(otelRule.getSpans().get(0).getName(), equalTo("GET /bookstore/books/mapper"));
assertThat(otelRule.getSpans().get(0).getAttributes(),
- hasAttribute(SemanticAttributes.HTTP_STATUS_CODE, 404L));
+ hasAttribute(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 404L));
}
private WebClient withTrace(final WebClient client) {
diff --git a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/opentelemetry/OpenTelemetryTracingTest.java b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/opentelemetry/OpenTelemetryTracingTest.java
index bab22a1ee1..f24d254bca 100644
--- a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/opentelemetry/OpenTelemetryTracingTest.java
+++ b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/opentelemetry/OpenTelemetryTracingTest.java
@@ -238,7 +238,7 @@ public class OpenTelemetryTracingTest extends AbstractClientServerTestBase {
assertThat(otelRule.getSpans().size(), equalTo(2));
assertThat(otelRule.getSpans().get(0).getName(), equalTo("POST /BookStore"));
assertThat(otelRule.getSpans().get(0).getAttributes(),
- hasAttribute(SemanticAttributes.HTTP_STATUS_CODE, 500L));
+ hasAttribute(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 500L));
assertThat(otelRule.getSpans().get(1).getName(),
equalTo("POST http://localhost:" + PORT + "/BookStore"));
}
@@ -253,7 +253,7 @@ public class OpenTelemetryTracingTest extends AbstractClientServerTestBase {
assertThat(otelRule.getSpans().size(), equalTo(1));
assertThat(otelRule.getSpans().get(0).getName(), equalTo("POST /BookStore"));
assertThat(otelRule.getSpans().get(0).getAttributes(),
- hasAttribute(SemanticAttributes.HTTP_STATUS_CODE, 202L));
+ hasAttribute(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 202L));
}
@Test
[cxf] 02/03: Update Apache Tomcat to 9.0.81
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit eb72d4ac2f7874633759c185591ff6bdb0d4d7d2
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Mon Oct 16 21:01:04 2023 -0400
Update Apache Tomcat to 9.0.81
(cherry picked from commit 3b5ea3c9e256a7373912f00f52344a1cded19bd5)
# Conflicts:
# distribution/src/main/release/samples/pom.xml
---
distribution/src/main/release/samples/pom.xml | 2 +-
parent/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml
index 9a01287d39..760b4480d8 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -37,7 +37,7 @@
<cxf.httpcomponents.client.version>4.5.14</cxf.httpcomponents.client.version>
<cxf.swagger.ui.version>5.9.0</cxf.swagger.ui.version>
<cxf.tika.version>2.7.0</cxf.tika.version>
- <cxf.tomcat.version>9.0.80</cxf.tomcat.version>
+ <cxf.tomcat.version>9.0.81</cxf.tomcat.version>
<graalvm.version>21.1.0</graalvm.version>
<cxf.aspectj.version>1.9.20.1</cxf.aspectj.version>
<cxf.brave.version>5.16.0</cxf.brave.version>
diff --git a/parent/pom.xml b/parent/pom.xml
index e74ff417d9..e10420d004 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -218,7 +218,7 @@
<cxf.swagger2.guava.version>31.1-jre</cxf.swagger2.guava.version>
<cxf.swagger2.guava.failureaccess.version>1.0.1</cxf.swagger2.guava.failureaccess.version>
<cxf.tika.version>2.7.0</cxf.tika.version>
- <cxf.tomcat.version>9.0.80</cxf.tomcat.version>
+ <cxf.tomcat.version>9.0.81</cxf.tomcat.version>
<cxf.tomitribe.http.signature.version>1.8</cxf.tomitribe.http.signature.version>
<cxf.undertow.osgi.version>[1.4,3.0)</cxf.undertow.osgi.version>
<cxf.undertow.xnio.osgi.version>[3.3,4.0)</cxf.undertow.xnio.osgi.version>
[cxf] 03/03: Recording .gitmergeinfo Changes
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 76c8263ab49f60ca5c6e51bb7194e88dc98b70fa
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Mon Oct 16 21:02:03 2023 -0400
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 8349697320..8552cd502f 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -131,6 +131,7 @@ B 55534e4d391793e88df3515867224f80a12b312c
B 5684388c26f4d81e280505810f4f450915abe684
B 56b9c7017c30cda588bd446aa9a22b60c6aae416
B 56ee7acf496ff8c45ab0b4a5b909c4380fe01da8
+B 575e24e5f632f5541736b0f7f06459b4d673a3d4
B 5794ddf9809aa6f8a67c43bd5edeff71be275fd3
B 592cf5b16d5988ab68187af5369541ead7b4292a
B 59b33d4a326016f2b4a861e408c7de06cd895362
@@ -457,6 +458,7 @@ M 395cba5b5a6b6725e6a54d41ee9b3b1675ffbb43
M 396f0406fd857ac0c947cf5f57d483e362380b79
M 3af07983a1d4e569761a8e39e76cea74ae384d9b
M 3b1c2cc3e8b139cb805f8073b2cf49fc1a6faca9
+M 3b5ea3c9e256a7373912f00f52344a1cded19bd5
M 3ba3ce8f7bd1a86d2063761bd7a8df323f98c448
M 3c95abf3be5c52a4b800f8139f8633088f0c9be7
M 3d40d621a8212c92e4a38355f8bfe19fec2b8e85