Skip to content

Commit

Permalink
refactor: rebase master
Browse files Browse the repository at this point in the history 
refactor: rebase master

refactor: update Tracing to OpenTracing

Remove references to CustomTracer and move to standard OpenTracing libraries

BREAKING CHANGE: Remove TracingProviderComponent.java

refactor: update Tracing to OpenTracing
  • Loading branch information
@RyanJonesMX @RyanJones08
RyanJonesMX authored and RyanJones08 committed Aug 21, 2024
1 parent 4ebcef4 commit 24bd7fd
Show file tree
Hide file tree
Showing 8 changed files with 55 additions and 62 deletions.
2 changes: 1 addition & 1 deletion build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ allprojects {
}

ext {
pathSDKVersion = "[3.14.0,4.0.0)"
pathSDKVersion = "[4.0.0,5.0.0)"
springVersion = "[2.7.0,2.8.0)!!2.7.5"
}
}
Expand Down
17 changes: 10 additions & 7 deletions mdx-gateway-generator/gradle.lockfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
# Manual edits can break the build and are not advised.
# This file is expected to be part of source control.
com.auth0:java-jwt:4.4.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.datadoghq:dd-trace-api:1.38.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.fasterxml.jackson.core:jackson-annotations:2.14.0-rc1=compileClasspath,testCompileClasspath
com.fasterxml.jackson.core:jackson-annotations:2.14.2=runtimeClasspath,testRuntimeClasspath
com.fasterxml.jackson.core:jackson-core:2.14.0-rc1=compileClasspath,testCompileClasspath
Expand Down Expand Up @@ -32,13 +33,13 @@ com.google.guava:guava:31.0.1-jre=runtimeClasspath,testRuntimeClasspath
com.google.guava:guava:31.1-jre=compileClasspath,testCompileClasspath
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.google.j2objc:j2objc-annotations:1.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:common:3.14.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:context:3.14.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:gateway-generator:3.14.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:gateway:3.14.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:messaging:3.14.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:platform:3.14.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:utilities:3.14.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:common:4.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:context:4.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:gateway-generator:4.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:gateway:4.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:messaging:4.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:platform:4.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:utilities:4.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.squareup:javapoet:1.13.0=runtimeClasspath,testRuntimeClasspath
com.sun.activation:jakarta.activation:1.2.2=runtimeClasspath,testRuntimeClasspath
com.sun.istack:istack-commons-runtime:3.0.12=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
Expand All @@ -51,6 +52,8 @@ commons-lang:commons-lang:2.6=runtimeClasspath,testRuntimeClasspath
commons-logging:commons-logging:1.2=runtimeClasspath,testRuntimeClasspath
io.github.cdimascio:dotenv-java:2.3.2=runtimeClasspath,testRuntimeClasspath
io.opentracing:opentracing-api:0.33.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
io.opentracing:opentracing-noop:0.33.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
io.opentracing:opentracing-util:0.33.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
jakarta.activation:jakarta.activation-api:1.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
jakarta.xml.bind:jakarta.xml.bind-api:2.3.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
jakarta.xml.soap:jakarta.xml.soap-api:1.4.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
Expand Down
19 changes: 10 additions & 9 deletions mdx-gateways/gradle.lockfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
antlr:antlr:2.7.7=checkstyle
com.auth0:java-jwt:4.4.0=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.beust:jcommander:1.48=pmd
com.datadoghq:dd-trace-api:1.38.0=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.fasterxml.jackson.core:jackson-annotations:2.14.0-rc1=compileClasspath,testCompileClasspath
com.fasterxml.jackson.core:jackson-annotations:2.14.2=annotationProcessor,runtimeClasspath,testRuntimeClasspath
com.fasterxml.jackson.core:jackson-core:2.14.0-rc1=compileClasspath,testCompileClasspath
Expand Down Expand Up @@ -37,13 +38,13 @@ com.google.guava:guava:31.0.1-jre=annotationProcessor
com.google.guava:guava:31.1-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,checkstyle,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.google.j2objc:j2objc-annotations:1.3=annotationProcessor,checkstyle,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:common:3.14.0=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:context:3.14.0=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:gateway-generator:3.14.0=annotationProcessor
com.mx.path-core:gateway:3.14.0=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:messaging:3.14.0=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:platform:3.14.0=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:utilities:3.14.0=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:common:4.0.0=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:context:4.0.0=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:gateway-generator:4.0.0=annotationProcessor
com.mx.path-core:gateway:4.0.0=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:messaging:4.0.0=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:platform:4.0.0=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:utilities:4.0.0=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.puppycrawl.tools:checkstyle:8.29=checkstyle
com.squareup:javapoet:1.13.0=annotationProcessor
com.sun.activation:jakarta.activation:1.2.2=annotationProcessor,runtimeClasspath,testRuntimeClasspath
Expand All @@ -60,8 +61,8 @@ info.picocli:picocli:4.1.4=checkstyle
io.github.cdimascio:dotenv-java:2.3.2=annotationProcessor,runtimeClasspath,testRuntimeClasspath
io.opentracing:opentracing-api:0.33.0=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
io.opentracing:opentracing-mock:0.33.0=testCompileClasspath,testRuntimeClasspath
io.opentracing:opentracing-noop:0.33.0=testCompileClasspath,testRuntimeClasspath
io.opentracing:opentracing-util:0.33.0=testCompileClasspath,testRuntimeClasspath
io.opentracing:opentracing-noop:0.33.0=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
io.opentracing:opentracing-util:0.33.0=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
jakarta.activation:jakarta.activation-api:1.2.2=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
jakarta.xml.bind:jakarta.xml.bind-api:2.3.3=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
jakarta.xml.soap:jakarta.xml.soap-api:1.4.2=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
Expand Down
17 changes: 10 additions & 7 deletions mdx-models/gradle.lockfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
antlr:antlr:2.7.7=checkstyle
com.auth0:java-jwt:4.4.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.beust:jcommander:1.48=pmd
com.datadoghq:dd-trace-api:1.38.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.fasterxml.jackson.core:jackson-annotations:2.14.0-rc1=compileClasspath,testCompileClasspath
com.fasterxml.jackson.core:jackson-annotations:2.14.2=runtimeClasspath,testRuntimeClasspath
com.fasterxml.jackson.core:jackson-core:2.14.0-rc1=compileClasspath,testCompileClasspath
Expand Down Expand Up @@ -32,13 +33,13 @@ com.google.guava:guava:28.2-jre=checkstyle
com.google.guava:guava:31.1-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=checkstyle,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.google.j2objc:j2objc-annotations:1.3=checkstyle,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:common:3.14.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:context:3.14.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:gateway:3.14.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:messaging:3.14.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:platform:3.14.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:testing:3.14.0=testCompileClasspath,testRuntimeClasspath
com.mx.path-core:utilities:3.14.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:common:4.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:context:4.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:gateway:4.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:messaging:4.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:platform:4.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:testing:4.0.0=testCompileClasspath,testRuntimeClasspath
com.mx.path-core:utilities:4.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.puppycrawl.tools:checkstyle:8.29=checkstyle
com.sun.activation:jakarta.activation:1.2.2=runtimeClasspath,testRuntimeClasspath
com.sun.istack:istack-commons-runtime:3.0.12=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
Expand All @@ -53,6 +54,8 @@ commons-logging:commons-logging:1.2=compileClasspath,runtimeClasspath,testCompil
info.picocli:picocli:4.1.4=checkstyle
io.github.cdimascio:dotenv-java:2.3.2=runtimeClasspath,testRuntimeClasspath
io.opentracing:opentracing-api:0.33.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
io.opentracing:opentracing-noop:0.33.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
io.opentracing:opentracing-util:0.33.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
jakarta.activation:jakarta.activation-api:1.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
jakarta.xml.bind:jakarta.xml.bind-api:2.3.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
jakarta.xml.soap:jakarta.xml.soap-api:1.4.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
Expand Down
19 changes: 10 additions & 9 deletions mdx-web/gradle.lockfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ ch.qos.logback:logback-classic:1.2.11=compileClasspath,runtimeClasspath,testComp
ch.qos.logback:logback-core:1.2.11=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.auth0:java-jwt:4.4.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.beust:jcommander:1.48=pmd
com.datadoghq:dd-trace-api:1.38.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.fasterxml.jackson.core:jackson-annotations:2.14.0-rc1=compileClasspath,testCompileClasspath
com.fasterxml.jackson.core:jackson-annotations:2.14.2=runtimeClasspath,testRuntimeClasspath
com.fasterxml.jackson.core:jackson-core:2.14.0-rc1=compileClasspath,testCompileClasspath
Expand Down Expand Up @@ -39,13 +40,13 @@ com.google.guava:guava:31.1-jre=compileClasspath,runtimeClasspath,testCompileCla
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=checkstyle,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.google.j2objc:j2objc-annotations:1.3=checkstyle,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.jayway.jsonpath:json-path:2.7.0=testCompileClasspath,testRuntimeClasspath
com.mx.path-core:common:3.14.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:context:3.14.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:gateway:3.14.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:messaging:3.14.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:platform:3.14.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:testing:3.14.0=testCompileClasspath,testRuntimeClasspath
com.mx.path-core:utilities:3.14.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:common:4.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:context:4.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:gateway:4.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:messaging:4.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:platform:4.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.mx.path-core:testing:4.0.0=testCompileClasspath,testRuntimeClasspath
com.mx.path-core:utilities:4.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.puppycrawl.tools:checkstyle:8.29=checkstyle
com.sun.activation:jakarta.activation:1.2.2=runtimeClasspath,testRuntimeClasspath
com.sun.istack:istack-commons-runtime:3.0.12=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
Expand All @@ -62,8 +63,8 @@ info.picocli:picocli:4.1.4=checkstyle
io.github.cdimascio:dotenv-java:2.3.2=runtimeClasspath,testRuntimeClasspath
io.opentracing:opentracing-api:0.33.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
io.opentracing:opentracing-mock:0.33.0=testCompileClasspath,testRuntimeClasspath
io.opentracing:opentracing-noop:0.33.0=testCompileClasspath,testRuntimeClasspath
io.opentracing:opentracing-util:0.33.0=testCompileClasspath,testRuntimeClasspath
io.opentracing:opentracing-noop:0.33.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
io.opentracing:opentracing-util:0.33.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
jakarta.activation:jakarta.activation-api:1.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
jakarta.annotation:jakarta.annotation-api:1.3.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
jakarta.xml.bind:jakarta.xml.bind-api:2.3.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
Expand Down
19 changes: 0 additions & 19 deletions mdx-web/src/main/java/com/mx/path/model/mdx/web/TracingProviderComponent.java
View file

This file was deleted.

5 changes: 3 additions & 2 deletions mdx-web/src/main/java/com/mx/path/model/mdx/web/filter/WebExceptionContext.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,12 @@
import com.mx.path.core.common.exception.ExceptionContext;
import com.mx.path.core.context.RequestContext;
import com.mx.path.core.context.Session;
import com.mx.path.core.context.tracing.CustomTracer;

import org.springframework.core.env.Environment;
import org.springframework.lang.NonNull;

import io.opentracing.util.GlobalTracer;

class WebExceptionContext implements ExceptionContext {

private final Map<String, String> context = new LinkedHashMap<>();
Expand Down Expand Up @@ -166,7 +167,7 @@ public final String getSessionTraceId() {

@Override
public final String getTraceId() {
return CustomTracer.getTraceId();
return GlobalTracer.get().activeSpan().context().toTraceId();
}

@Override
Expand Down
Loading

0 comments on commit 24bd7fd

Please sign in to comment.