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/08/22 01:52:44 UTC
[cxf] branch 3.6.x-fixes updated (bdcbca177e -> dab72900c9)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a change to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
from bdcbca177e Recording .gitmergeinfo Changes
new 6a30d229f4 Bump org.owasp:dependency-check-maven from 8.3.1 to 8.4.0 (#1394)
new d786f282ee CXF-8457: Provide OpenTelemetry support (minor API usability improvements)
new dab72900c9 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 ++
.../java/demo/jaxrs/tracing/OpenTelemetrySetup.java | 4 ++--
.../main/java/demo/jaxrs/tracing/client/Client.java | 4 ++--
.../AbstractOpenTelemetryClientInterceptor.java | 9 ++++++++-
.../AbstractOpenTelemetryClientProvider.java | 8 ++++++--
.../AbstractOpenTelemetryInterceptor.java | 11 +++++++++--
.../opentelemetry/AbstractOpenTelemetryProvider.java | 6 +++++-
.../opentelemetry/OpenTelemetryClientFeature.java | 15 +++++++++++++--
.../OpenTelemetryClientStartInterceptor.java | 10 ++++++++++
.../OpenTelemetryClientStopInterceptor.java | 14 ++++++++++++--
.../tracing/opentelemetry/OpenTelemetryFeature.java | 14 ++++++++++++--
.../opentelemetry/OpenTelemetryStartInterceptor.java | 8 ++++++--
.../opentelemetry/OpenTelemetryStopInterceptor.java | 5 +++++
.../jaxrs/OpenTelemetryClientProvider.java | 5 +++++
.../opentelemetry/jaxrs/OpenTelemetryFeature.java | 18 ++++++++++++------
.../opentelemetry/jaxrs/OpenTelemetryProvider.java | 5 +++++
parent/pom.xml | 1 +
pom.xml | 2 +-
18 files changed, 116 insertions(+), 25 deletions(-)
[cxf] 01/03: Bump org.owasp:dependency-check-maven from 8.3.1 to 8.4.0 (#1394)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 6a30d229f487a9446431a4c254c46d74be26a200
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Mon Aug 21 08:02:43 2023 -0400
Bump org.owasp:dependency-check-maven from 8.3.1 to 8.4.0 (#1394)
Bumps [org.owasp:dependency-check-maven](https://github.com/jeremylong/DependencyCheck) from 8.3.1 to 8.4.0.
- [Release notes](https://github.com/jeremylong/DependencyCheck/releases)
- [Changelog](https://github.com/jeremylong/DependencyCheck/blob/main/CHANGELOG.md)
- [Commits](https://github.com/jeremylong/DependencyCheck/compare/v8.3.1...v8.4.0)
---
updated-dependencies:
- dependency-name: org.owasp:dependency-check-maven
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <su...@github.com>
Co-authored-by: dependabot[bot] <49...@users.noreply.github.com>
(cherry picked from commit 59641959edcfaa379dba7d0adaca11e88c3cff7a)
# Conflicts:
# pom.xml
---
parent/pom.xml | 1 +
pom.xml | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 8c3d8bcb50..3aafb2d92c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -6,6 +6,7 @@
regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
diff --git a/pom.xml b/pom.xml
index 552d528b10..f2a6e11332 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,7 +45,7 @@
<cxf.jdk.version>11</cxf.jdk.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<site.deploy.url>scp://people.apache.org/www/cxf.apache.org/maven-site</site.deploy.url>
- <maven-owasp-plugin-version>8.2.1</maven-owasp-plugin-version>
+ <maven-owasp-plugin-version>8.4.0</maven-owasp-plugin-version>
</properties>
<distributionManagement>
<repository>
[cxf] 02/03: CXF-8457: Provide OpenTelemetry support (minor API usability improvements)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit d786f282eeffc8e76d3e5152a9e49103d550e6f9
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Mon Aug 21 12:16:28 2023 -0400
CXF-8457: Provide OpenTelemetry support (minor API usability improvements)
(cherry picked from commit 22d97aa326eefc6c4758c24179cf564d9b4bc47f)
# Conflicts:
# integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/jaxrs/OpenTelemetryFeature.java
---
.../java/demo/jaxrs/tracing/OpenTelemetrySetup.java | 4 ++--
.../main/java/demo/jaxrs/tracing/client/Client.java | 4 ++--
.../AbstractOpenTelemetryClientInterceptor.java | 9 ++++++++-
.../AbstractOpenTelemetryClientProvider.java | 8 ++++++--
.../AbstractOpenTelemetryInterceptor.java | 11 +++++++++--
.../opentelemetry/AbstractOpenTelemetryProvider.java | 6 +++++-
.../opentelemetry/OpenTelemetryClientFeature.java | 15 +++++++++++++--
.../OpenTelemetryClientStartInterceptor.java | 10 ++++++++++
.../OpenTelemetryClientStopInterceptor.java | 14 ++++++++++++--
.../tracing/opentelemetry/OpenTelemetryFeature.java | 14 ++++++++++++--
.../opentelemetry/OpenTelemetryStartInterceptor.java | 8 ++++++--
.../opentelemetry/OpenTelemetryStopInterceptor.java | 5 +++++
.../jaxrs/OpenTelemetryClientProvider.java | 5 +++++
.../opentelemetry/jaxrs/OpenTelemetryFeature.java | 18 ++++++++++++------
.../opentelemetry/jaxrs/OpenTelemetryProvider.java | 5 +++++
15 files changed, 112 insertions(+), 24 deletions(-)
diff --git a/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/src/main/java/demo/jaxrs/tracing/OpenTelemetrySetup.java b/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/src/main/java/demo/jaxrs/tracing/OpenTelemetrySetup.java
index dd5a04c851..e60290ec7d 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/src/main/java/demo/jaxrs/tracing/OpenTelemetrySetup.java
+++ b/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/src/main/java/demo/jaxrs/tracing/OpenTelemetrySetup.java
@@ -36,11 +36,11 @@ public class OpenTelemetrySetup {
Resource resource = Resource.getDefault()
.merge(Resource.create(Attributes.of(ResourceAttributes.SERVICE_NAME, serviceName)));
- SdkTracerProvider sdkTracerProvider = SdkTracerProvider.builder()
+ final SdkTracerProvider sdkTracerProvider = SdkTracerProvider.builder()
.addSpanProcessor(BatchSpanProcessor.builder(LoggingSpanExporter.create()).build())
.setResource(resource).build();
- OpenTelemetrySdk openTelemetrySdk = OpenTelemetrySdk.builder().setTracerProvider(sdkTracerProvider)
+ final OpenTelemetrySdk openTelemetrySdk = OpenTelemetrySdk.builder().setTracerProvider(sdkTracerProvider)
.setPropagators(ContextPropagators.create(W3CTraceContextPropagator.getInstance()))
.buildAndRegisterGlobal();
diff --git a/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/src/main/java/demo/jaxrs/tracing/client/Client.java b/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/src/main/java/demo/jaxrs/tracing/client/Client.java
index eda7265da2..94974f56dc 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/src/main/java/demo/jaxrs/tracing/client/Client.java
+++ b/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/src/main/java/demo/jaxrs/tracing/client/Client.java
@@ -26,7 +26,7 @@ import javax.ws.rs.core.Response;
import demo.jaxrs.tracing.OpenTelemetrySetup;
import org.apache.cxf.jaxrs.client.WebClient;
-import org.apache.cxf.tracing.opentelemetry.OpenTelemetryFeature;
+import org.apache.cxf.tracing.opentelemetry.jaxrs.OpenTelemetryFeature;
import org.apache.cxf.tracing.opentelemetry.jaxrs.OpenTelemetryClientProvider;
import io.opentelemetry.sdk.OpenTelemetrySdk;
@@ -38,7 +38,7 @@ public final class Client {
public static void main(final String[] args) throws Exception {
try (OpenTelemetrySdk openTelemetry = OpenTelemetrySetup.setup(Client.class.getName())) {
final OpenTelemetryClientProvider provider = new OpenTelemetryClientProvider(openTelemetry,
- OpenTelemetryFeature.DEFAULT_INSTRUMENTATION_NAME);
+ openTelemetry.getTracer(OpenTelemetryFeature.DEFAULT_INSTRUMENTATION_NAME));
final Response response = WebClient
.create("http://localhost:9000/catalog", Arrays.asList(provider))
diff --git a/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/AbstractOpenTelemetryClientInterceptor.java b/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/AbstractOpenTelemetryClientInterceptor.java
index 004b9e5256..28eb3431f4 100644
--- a/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/AbstractOpenTelemetryClientInterceptor.java
+++ b/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/AbstractOpenTelemetryClientInterceptor.java
@@ -26,6 +26,7 @@ import org.apache.cxf.message.Message;
import org.apache.cxf.phase.PhaseInterceptor;
import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.api.trace.Tracer;
public abstract class AbstractOpenTelemetryClientInterceptor extends AbstractOpenTelemetryClientProvider
implements PhaseInterceptor<Message> {
@@ -33,11 +34,17 @@ public abstract class AbstractOpenTelemetryClientInterceptor extends AbstractOpe
private String phase;
protected AbstractOpenTelemetryClientInterceptor(final String phase, final OpenTelemetry openTelemetry,
- final String instrumentationName) {
+ final String instrumentationName) {
super(openTelemetry, instrumentationName);
this.phase = phase;
}
+ protected AbstractOpenTelemetryClientInterceptor(final String phase, final OpenTelemetry openTelemetry,
+ final Tracer tracer) {
+ super(openTelemetry, tracer);
+ this.phase = phase;
+ }
+
public Collection<PhaseInterceptor<? extends Message>> getAdditionalInterceptors() {
return null;
}
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 2287952f9f..35727007cd 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
@@ -45,9 +45,13 @@ public abstract class AbstractOpenTelemetryClientProvider extends AbstractTracin
private final Tracer tracer;
private final OpenTelemetry openTelemetry;
- public AbstractOpenTelemetryClientProvider(final OpenTelemetry openTelemetry, final String instrumentationName) {
+ protected AbstractOpenTelemetryClientProvider(final OpenTelemetry openTelemetry, final String instrumentationName) {
+ this(openTelemetry, openTelemetry.getTracer(instrumentationName));
+ }
+
+ protected AbstractOpenTelemetryClientProvider(final OpenTelemetry openTelemetry, Tracer tracer) {
this.openTelemetry = openTelemetry;
- this.tracer = openTelemetry.getTracer(instrumentationName);
+ this.tracer = tracer;
}
protected TraceScopeHolder<TraceScope> startTraceSpan(final Map<String, List<String>> requestHeaders,
diff --git a/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/AbstractOpenTelemetryInterceptor.java b/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/AbstractOpenTelemetryInterceptor.java
index 7ec051fabd..511a04cc41 100644
--- a/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/AbstractOpenTelemetryInterceptor.java
+++ b/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/AbstractOpenTelemetryInterceptor.java
@@ -26,18 +26,25 @@ import org.apache.cxf.message.Message;
import org.apache.cxf.phase.PhaseInterceptor;
import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.api.trace.Tracer;
public abstract class AbstractOpenTelemetryInterceptor extends AbstractOpenTelemetryProvider
implements PhaseInterceptor<Message> {
private final String phase;
- protected AbstractOpenTelemetryInterceptor(String phase, OpenTelemetry openTelemetry,
- String instrumentationName) {
+ protected AbstractOpenTelemetryInterceptor(final String phase, final OpenTelemetry openTelemetry,
+ final String instrumentationName) {
super(openTelemetry, instrumentationName);
this.phase = phase;
}
+ protected AbstractOpenTelemetryInterceptor(final String phase, final OpenTelemetry openTelemetry,
+ final Tracer tracer) {
+ super(openTelemetry, tracer);
+ this.phase = phase;
+ }
+
@Override
public Set<String> getAfter() {
return Collections.emptySet();
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 193327fc95..c1f9a4c76a 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
@@ -46,8 +46,12 @@ public abstract class AbstractOpenTelemetryProvider extends AbstractTracingProvi
protected final Tracer tracer;
protected AbstractOpenTelemetryProvider(final OpenTelemetry openTelemetry, final String instrumentationName) {
+ this(openTelemetry, openTelemetry.getTracer(instrumentationName));
+ }
+
+ protected AbstractOpenTelemetryProvider(final OpenTelemetry openTelemetry, final Tracer tracer) {
this.openTelemetry = openTelemetry;
- this.tracer = openTelemetry.getTracer(instrumentationName);
+ this.tracer = tracer;
}
protected TraceScopeHolder<TraceScope> startTraceSpan(final Map<String, List<String>> requestHeaders,
diff --git a/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/OpenTelemetryClientFeature.java b/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/OpenTelemetryClientFeature.java
index 60f3edc11f..de34d485f8 100644
--- a/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/OpenTelemetryClientFeature.java
+++ b/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/OpenTelemetryClientFeature.java
@@ -28,6 +28,7 @@ import org.apache.cxf.feature.DelegatingFeature;
import org.apache.cxf.interceptor.InterceptorProvider;
import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.api.trace.Tracer;
@NoJSR250Annotations
@Provider(value = Type.Feature, scope = Scope.Client)
@@ -40,9 +41,14 @@ public class OpenTelemetryClientFeature extends DelegatingFeature<OpenTelemetryC
super(new Portable(openTelemetry, instrumentationName));
}
+ public OpenTelemetryClientFeature(OpenTelemetry openTelemetry, Tracer tracer) {
+ super(new Portable(openTelemetry, tracer));
+ }
+
public static class Portable implements AbstractPortableFeature {
- private OpenTelemetryClientStartInterceptor out;
- private OpenTelemetryClientStopInterceptor in;
+ private final OpenTelemetryClientStartInterceptor out;
+ private final OpenTelemetryClientStopInterceptor in;
+
public Portable(OpenTelemetry openTelemetry) {
this(openTelemetry, OpenTelemetryFeature.DEFAULT_INSTRUMENTATION_NAME);
}
@@ -52,6 +58,11 @@ public class OpenTelemetryClientFeature extends DelegatingFeature<OpenTelemetryC
in = new OpenTelemetryClientStopInterceptor(openTelemetry, instrumentationName);
}
+ public Portable(OpenTelemetry openTelemetry, Tracer tracer) {
+ out = new OpenTelemetryClientStartInterceptor(openTelemetry, tracer);
+ in = new OpenTelemetryClientStopInterceptor(openTelemetry, tracer);
+ }
+
@Override
public void doInitializeProvider(InterceptorProvider provider, Bus bus) {
provider.getInInterceptors().add(in);
diff --git a/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/OpenTelemetryClientStartInterceptor.java b/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/OpenTelemetryClientStartInterceptor.java
index d2396cdf0f..e4adf2aa6e 100644
--- a/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/OpenTelemetryClientStartInterceptor.java
+++ b/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/OpenTelemetryClientStartInterceptor.java
@@ -27,17 +27,27 @@ import org.apache.cxf.message.Message;
import org.apache.cxf.phase.Phase;
import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.api.trace.Tracer;
public class OpenTelemetryClientStartInterceptor extends AbstractOpenTelemetryClientInterceptor {
public OpenTelemetryClientStartInterceptor(final OpenTelemetry openTelemetry, final String instrumentationName) {
this(Phase.PRE_STREAM, openTelemetry, instrumentationName);
}
+ public OpenTelemetryClientStartInterceptor(final OpenTelemetry openTelemetry, final Tracer tracer) {
+ this(Phase.PRE_STREAM, openTelemetry, tracer);
+ }
+
public OpenTelemetryClientStartInterceptor(final String phase, final OpenTelemetry openTelemetry,
final String instrumentationName) {
super(phase, openTelemetry, instrumentationName);
}
+ public OpenTelemetryClientStartInterceptor(final String phase, final OpenTelemetry openTelemetry,
+ final Tracer tracer) {
+ super(phase, openTelemetry, tracer);
+ }
+
@Override
public void handleMessage(Message message) throws Fault {
final Map<String, List<String>> headers = CastUtils
diff --git a/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/OpenTelemetryClientStopInterceptor.java b/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/OpenTelemetryClientStopInterceptor.java
index ce23c8944b..6bb59bff4c 100644
--- a/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/OpenTelemetryClientStopInterceptor.java
+++ b/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/OpenTelemetryClientStopInterceptor.java
@@ -23,18 +23,28 @@ import org.apache.cxf.message.Message;
import org.apache.cxf.phase.Phase;
import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.api.trace.Tracer;
public class OpenTelemetryClientStopInterceptor extends AbstractOpenTelemetryClientInterceptor {
public OpenTelemetryClientStopInterceptor(final OpenTelemetry openTelemetry,
- final String instrumentationName) {
+ final String instrumentationName) {
this(Phase.RECEIVE, openTelemetry, instrumentationName);
}
+ public OpenTelemetryClientStopInterceptor(final OpenTelemetry openTelemetry, final Tracer tracer) {
+ this(Phase.RECEIVE, openTelemetry, tracer);
+ }
+
public OpenTelemetryClientStopInterceptor(final String phase, final OpenTelemetry openTelemetry,
- final String instrumentationName) {
+ final String instrumentationName) {
super(phase, openTelemetry, instrumentationName);
}
+ public OpenTelemetryClientStopInterceptor(final String phase, final OpenTelemetry openTelemetry,
+ final Tracer tracer) {
+ super(phase, openTelemetry, tracer);
+ }
+
@Override
public void handleMessage(Message message) throws Fault {
@SuppressWarnings("unchecked")
diff --git a/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/OpenTelemetryFeature.java b/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/OpenTelemetryFeature.java
index 6b682a5cc2..2da133a8cf 100644
--- a/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/OpenTelemetryFeature.java
+++ b/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/OpenTelemetryFeature.java
@@ -29,6 +29,7 @@ import org.apache.cxf.interceptor.InterceptorProvider;
import io.opentelemetry.api.GlobalOpenTelemetry;
import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.api.trace.Tracer;
@NoJSR250Annotations
@Provider(value = Type.Feature, scope = Scope.Server)
@@ -51,9 +52,13 @@ public class OpenTelemetryFeature extends DelegatingFeature<OpenTelemetryFeature
super(new Portable(openTelemetry, instrumentationName));
}
+ public OpenTelemetryFeature(final OpenTelemetry openTelemetry, final Tracer tracer) {
+ super(new Portable(openTelemetry, tracer));
+ }
+
public static class Portable implements AbstractPortableFeature {
- private OpenTelemetryStartInterceptor in;
- private OpenTelemetryStopInterceptor out;
+ private final OpenTelemetryStartInterceptor in;
+ private final OpenTelemetryStopInterceptor out;
public Portable() {
this(GlobalOpenTelemetry.get());
@@ -72,6 +77,11 @@ public class OpenTelemetryFeature extends DelegatingFeature<OpenTelemetryFeature
out = new OpenTelemetryStopInterceptor(openTelemetry, instrumentationName);
}
+ public Portable(final OpenTelemetry openTelemetry, final Tracer tracer) {
+ in = new OpenTelemetryStartInterceptor(openTelemetry, tracer);
+ out = new OpenTelemetryStopInterceptor(openTelemetry, tracer);
+ }
+
@Override
public void doInitializeProvider(InterceptorProvider provider, Bus bus) {
provider.getInInterceptors().add(in);
diff --git a/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/OpenTelemetryStartInterceptor.java b/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/OpenTelemetryStartInterceptor.java
index 23b6309afb..24f2a63fc7 100644
--- a/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/OpenTelemetryStartInterceptor.java
+++ b/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/OpenTelemetryStartInterceptor.java
@@ -28,6 +28,7 @@ import org.apache.cxf.message.Message;
import org.apache.cxf.phase.Phase;
import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.api.trace.Tracer;
@NoJSR250Annotations
public class OpenTelemetryStartInterceptor extends AbstractOpenTelemetryInterceptor {
@@ -35,14 +36,17 @@ public class OpenTelemetryStartInterceptor extends AbstractOpenTelemetryIntercep
super(Phase.PRE_INVOKE, openTelemetry, instrumentationName);
}
+ public OpenTelemetryStartInterceptor(OpenTelemetry openTelemetry, Tracer tracer) {
+ super(Phase.PRE_INVOKE, openTelemetry, tracer);
+ }
+
@Override
public void handleMessage(Message message) throws Fault {
final Map<String, List<String>> headers = CastUtils
.cast((Map<?, ?>)message.get(Message.PROTOCOL_HEADERS));
final TraceScopeHolder<TraceScope> holder = super.startTraceSpan(headers, getUri(message),
- (String)message
- .get(Message.HTTP_REQUEST_METHOD));
+ (String)message.get(Message.HTTP_REQUEST_METHOD));
if (holder != null) {
message.getExchange().put(TRACE_SPAN, holder);
diff --git a/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/OpenTelemetryStopInterceptor.java b/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/OpenTelemetryStopInterceptor.java
index cd129ae519..c11c4d8ce8 100644
--- a/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/OpenTelemetryStopInterceptor.java
+++ b/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/OpenTelemetryStopInterceptor.java
@@ -29,12 +29,17 @@ import org.apache.cxf.message.MessageUtils;
import org.apache.cxf.phase.Phase;
import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.api.trace.Tracer;
public class OpenTelemetryStopInterceptor extends AbstractOpenTelemetryInterceptor {
public OpenTelemetryStopInterceptor(final OpenTelemetry openTelemetry, final String instrumentationName) {
super(Phase.POST_MARSHAL, openTelemetry, instrumentationName);
}
+ public OpenTelemetryStopInterceptor(final OpenTelemetry openTelemetry, final Tracer tracer) {
+ super(Phase.POST_MARSHAL, openTelemetry, tracer);
+ }
+
@Override
public void handleMessage(Message message) throws Fault {
Map<String, List<Object>> responseHeaders = CastUtils
diff --git a/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/jaxrs/OpenTelemetryClientProvider.java b/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/jaxrs/OpenTelemetryClientProvider.java
index bf69979be0..d4aed68a4d 100644
--- a/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/jaxrs/OpenTelemetryClientProvider.java
+++ b/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/jaxrs/OpenTelemetryClientProvider.java
@@ -30,6 +30,7 @@ import org.apache.cxf.tracing.opentelemetry.AbstractOpenTelemetryClientProvider;
import org.apache.cxf.tracing.opentelemetry.TraceScope;
import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.api.trace.Tracer;
@Provider
public class OpenTelemetryClientProvider extends AbstractOpenTelemetryClientProvider
@@ -39,6 +40,10 @@ public class OpenTelemetryClientProvider extends AbstractOpenTelemetryClientProv
super(openTelemetry, instrumentationName);
}
+ public OpenTelemetryClientProvider(final OpenTelemetry openTelemetry, final Tracer tracer) {
+ super(openTelemetry, tracer);
+ }
+
@Override
public void filter(final ClientRequestContext requestContext) throws IOException {
final TraceScopeHolder<TraceScope> holder = super.startTraceSpan(requestContext.getStringHeaders(),
diff --git a/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/jaxrs/OpenTelemetryFeature.java b/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/jaxrs/OpenTelemetryFeature.java
index 3e404d6e5a..55d5ca109d 100644
--- a/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/jaxrs/OpenTelemetryFeature.java
+++ b/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/jaxrs/OpenTelemetryFeature.java
@@ -24,11 +24,14 @@ import javax.ws.rs.ext.Provider;
import io.opentelemetry.api.GlobalOpenTelemetry;
import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.api.trace.Tracer;
@Provider
public class OpenTelemetryFeature implements Feature {
+ public static final String DEFAULT_INSTRUMENTATION_NAME = "org.apache.cxf";
+
private final OpenTelemetry openTelemetry;
- private final String instrumentationName;
+ private final Tracer tracer;
public OpenTelemetryFeature() {
this(GlobalOpenTelemetry.get());
@@ -39,19 +42,22 @@ public class OpenTelemetryFeature implements Feature {
}
public OpenTelemetryFeature(final OpenTelemetry openTelemetry) {
- this(openTelemetry,
- org.apache.cxf.tracing.opentelemetry.OpenTelemetryFeature.DEFAULT_INSTRUMENTATION_NAME);
+ this(openTelemetry, DEFAULT_INSTRUMENTATION_NAME);
}
public OpenTelemetryFeature(final OpenTelemetry openTelemetry, final String instrumentationName) {
+ this(openTelemetry, openTelemetry.getTracer(instrumentationName));
+ }
+
+ public OpenTelemetryFeature(final OpenTelemetry openTelemetry, final Tracer tracer) {
this.openTelemetry = openTelemetry;
- this.instrumentationName = instrumentationName;
+ this.tracer = tracer;
}
@Override
public boolean configure(FeatureContext context) {
- context.register(new OpenTelemetryProvider(openTelemetry, instrumentationName));
- context.register(new OpenTelemetryContextProvider(openTelemetry.getTracer(instrumentationName)));
+ context.register(new OpenTelemetryProvider(openTelemetry, tracer));
+ context.register(new OpenTelemetryContextProvider(tracer));
return true;
}
}
diff --git a/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/jaxrs/OpenTelemetryProvider.java b/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/jaxrs/OpenTelemetryProvider.java
index d68132881d..c2f75a854c 100644
--- a/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/jaxrs/OpenTelemetryProvider.java
+++ b/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/jaxrs/OpenTelemetryProvider.java
@@ -34,6 +34,7 @@ import org.apache.cxf.tracing.opentelemetry.AbstractOpenTelemetryProvider;
import org.apache.cxf.tracing.opentelemetry.TraceScope;
import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.api.trace.Tracer;
@Provider
public class OpenTelemetryProvider extends AbstractOpenTelemetryProvider
@@ -45,6 +46,10 @@ public class OpenTelemetryProvider extends AbstractOpenTelemetryProvider
super(openTelemetry, instrumentationName);
}
+ public OpenTelemetryProvider(final OpenTelemetry openTelemetry, final Tracer tracer) {
+ super(openTelemetry, tracer);
+ }
+
@Override
public void filter(final ContainerRequestContext requestContext) throws IOException {
final TraceScopeHolder<TraceScope> holder = super.startTraceSpan(requestContext.getHeaders(),
[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.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit dab72900c97b508025c6b6e84f6658a6c0605b04
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Mon Aug 21 21:48:03 2023 -0400
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 7c06630e55..21f4fd73b7 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -242,6 +242,7 @@ M 217d8a7cd6ab50593afbd3dfd539992f7dc3844d
M 21d3ff920418c7325b2e4b32d7b49cca9681b3ec
M 227e81b07f547106af5e76af7e526fc6c3c8ffc2
M 2293ef355cd13d6aa73785f750c33c94fa8a746e
+M 22d97aa326eefc6c4758c24179cf564d9b4bc47f
M 230fc881ed63bc56dbcb9b86f7e5a9eda4e15466
M 23fdd237d48a05ac1c3518e9bd90165067aadcf0
M 24151890ce517fcd8cfb5db08251e9088f4d7e85
@@ -346,6 +347,7 @@ M 57999b80bbdb93016dd8b336f671d83f3eaf3c8c
M 57fc08eb5ce64641b01504747eb277898bd9c47f
M 58489c178816eab367f19f0b3c0e44f32ae0f6a1
M 594a3bd6741e18d83ee02eb07c9b1cfd3e1dce52
+M 59641959edcfaa379dba7d0adaca11e88c3cff7a
M 59bd624dabd116f069ea69e039237c29e0af2c0c
M 5a848f2994f5d7fe76a325a34baa2481c02cf2a3
M 5af87bddb070ddd14c56bb3e764a831b32b5e456