Skip to content

Commit

Permalink
Merge pull request #17 from routific/otel-integration
Browse files Browse the repository at this point in the history 
Otel integration
  • Loading branch information
@pmchung
pmchung authored Mar 20, 2023
2 parents 09f858b + 444c66a commit 0de17c7
Show file tree
Hide file tree
Showing 8 changed files with 646 additions and 1 deletion.
2 changes: 1 addition & 1 deletion contribs
Submodule contribs updated 9 files
+392 −0 event-queue/kafka/dependencies.lock
+32 −6 event-queue/kafka/src/main/java/com/netflix/conductor/contribs/queue/kafka/KafkaObservableQueue.java
+12 −18 event-queue/kafka/src/main/java/com/netflix/conductor/contribs/queue/kafka/KafkaPartitionTask.java
+65 −0 event-queue/kafka/src/main/java/com/netflix/conductor/contribs/queue/kafka/KafkaTransactionRecord.java
+4 −2 ...eue/kafka/src/main/java/com/netflix/conductor/contribs/queue/kafka/config/KafkaEventQueueConfiguration.java
+10 −0 ...-queue/kafka/src/main/java/com/netflix/conductor/contribs/queue/kafka/config/KafkaEventQueueProperties.java
+5 −2 event-queue/kafka/src/main/java/com/netflix/conductor/contribs/queue/kafka/config/KafkaEventQueueProvider.java
+262 −22 task/kafka-publish/dependencies.lock
+24 −4 task/kafka-publish/src/main/java/com/netflix/conductor/contribs/tasks/kafka/KafkaPublishTask.java
14 changes: 14 additions & 0 deletions core/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,14 @@
* an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/

repositories {
mavenCentral()
}

apply plugin: 'groovy'


dependencies {
implementation project(':conductor-common')
compileOnly 'org.springframework.boot:spring-boot-starter'
Expand Down Expand Up @@ -46,6 +52,14 @@ dependencies {
implementation "jakarta.xml.bind:jakarta.xml.bind-api:${revJAXB}"
implementation "jakarta.activation:jakarta.activation-api:${revActivation}"

implementation 'io.opentelemetry:opentelemetry-api:1.23.1'
implementation 'io.opentelemetry:opentelemetry-sdk:1.23.1'
implementation 'io.opentelemetry:opentelemetry-exporter-otlp:1.23.1'
implementation 'io.opentelemetry:opentelemetry-semconv:1.23.1-alpha'

implementation 'io.sentry:sentry-opentelemetry-core:6.14.0'
implementation 'io.sentry:sentry:6.14.0'

// Only add it as a test dependency. The actual jaxb runtime provider is provided when building the server.
testImplementation "org.glassfish.jaxb:jaxb-runtime:${revJAXB}"

Expand Down
312 changes: 312 additions & 0 deletions core/dependencies.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,53 @@
"commons-io:commons-io": {
"locked": "2.7"
},
"io.opentelemetry:opentelemetry-api": {
"locked": "1.23.1",
"transitive": [
"io.opentelemetry:opentelemetry-sdk",
"io.opentelemetry:opentelemetry-sdk-common",
"io.opentelemetry:opentelemetry-sdk-metrics",
"io.opentelemetry:opentelemetry-sdk-trace",
"io.opentelemetry:opentelemetry-semconv"
]
},
"io.opentelemetry:opentelemetry-context": {
"locked": "1.23.1",
"transitive": [
"io.opentelemetry:opentelemetry-api"
]
},
"io.opentelemetry:opentelemetry-exporter-otlp": {
"locked": "1.23.1"
},
"io.opentelemetry:opentelemetry-sdk": {
"locked": "1.23.1"
},
"io.opentelemetry:opentelemetry-sdk-common": {
"locked": "1.23.1",
"transitive": [
"io.opentelemetry:opentelemetry-sdk",
"io.opentelemetry:opentelemetry-sdk-metrics",
"io.opentelemetry:opentelemetry-sdk-trace"
]
},
"io.opentelemetry:opentelemetry-sdk-metrics": {
"locked": "1.23.1",
"transitive": [
"io.opentelemetry:opentelemetry-exporter-otlp",
"io.opentelemetry:opentelemetry-sdk"
]
},
"io.opentelemetry:opentelemetry-sdk-trace": {
"locked": "1.23.1",
"transitive": [
"io.opentelemetry:opentelemetry-exporter-otlp",
"io.opentelemetry:opentelemetry-sdk"
]
},
"io.opentelemetry:opentelemetry-semconv": {
"locked": "1.23.1-alpha"
},
"io.reactivex:rxjava": {
"locked": "1.2.2"
},
Expand Down Expand Up @@ -312,9 +359,118 @@
"com.spotify:completable-futures": {
"locked": "0.3.3"
},
"com.squareup.okhttp3:okhttp": {
"locked": "3.14.9",
"transitive": [
"io.opentelemetry:opentelemetry-exporter-otlp-common"
]
},
"com.squareup.okio:okio": {
"locked": "1.17.2",
"transitive": [
"com.squareup.okhttp3:okhttp"
]
},
"commons-io:commons-io": {
"locked": "2.7"
},
"io.opentelemetry:opentelemetry-api": {
"locked": "1.23.1",
"transitive": [
"io.opentelemetry:opentelemetry-api-events",
"io.opentelemetry:opentelemetry-api-logs",
"io.opentelemetry:opentelemetry-exporter-common",
"io.opentelemetry:opentelemetry-sdk",
"io.opentelemetry:opentelemetry-sdk-common",
"io.opentelemetry:opentelemetry-sdk-metrics",
"io.opentelemetry:opentelemetry-sdk-trace",
"io.opentelemetry:opentelemetry-semconv"
]
},
"io.opentelemetry:opentelemetry-api-events": {
"locked": "1.23.1-alpha",
"transitive": [
"io.opentelemetry:opentelemetry-sdk-logs"
]
},
"io.opentelemetry:opentelemetry-api-logs": {
"locked": "1.23.1-alpha",
"transitive": [
"io.opentelemetry:opentelemetry-sdk-logs"
]
},
"io.opentelemetry:opentelemetry-context": {
"locked": "1.23.1",
"transitive": [
"io.opentelemetry:opentelemetry-api"
]
},
"io.opentelemetry:opentelemetry-exporter-common": {
"locked": "1.23.1",
"transitive": [
"io.opentelemetry:opentelemetry-exporter-otlp-common"
]
},
"io.opentelemetry:opentelemetry-exporter-otlp": {
"locked": "1.23.1"
},
"io.opentelemetry:opentelemetry-exporter-otlp-common": {
"locked": "1.23.1",
"transitive": [
"io.opentelemetry:opentelemetry-exporter-otlp"
]
},
"io.opentelemetry:opentelemetry-sdk": {
"locked": "1.23.1",
"transitive": [
"io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi"
]
},
"io.opentelemetry:opentelemetry-sdk-common": {
"locked": "1.23.1",
"transitive": [
"io.opentelemetry:opentelemetry-sdk",
"io.opentelemetry:opentelemetry-sdk-logs",
"io.opentelemetry:opentelemetry-sdk-metrics",
"io.opentelemetry:opentelemetry-sdk-trace"
]
},
"io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi": {
"locked": "1.23.1",
"transitive": [
"io.opentelemetry:opentelemetry-exporter-otlp",
"io.opentelemetry:opentelemetry-exporter-otlp-common"
]
},
"io.opentelemetry:opentelemetry-sdk-logs": {
"locked": "1.23.1-alpha",
"transitive": [
"io.opentelemetry:opentelemetry-sdk",
"io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi"
]
},
"io.opentelemetry:opentelemetry-sdk-metrics": {
"locked": "1.23.1",
"transitive": [
"io.opentelemetry:opentelemetry-exporter-otlp",
"io.opentelemetry:opentelemetry-sdk",
"io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi"
]
},
"io.opentelemetry:opentelemetry-sdk-trace": {
"locked": "1.23.1",
"transitive": [
"io.opentelemetry:opentelemetry-exporter-otlp",
"io.opentelemetry:opentelemetry-sdk"
]
},
"io.opentelemetry:opentelemetry-semconv": {
"locked": "1.23.1-alpha",
"transitive": [
"io.opentelemetry:opentelemetry-sdk-common",
"io.opentelemetry:opentelemetry-sdk-trace"
]
},
"io.reactivex:rxjava": {
"locked": "1.2.2"
},
Expand Down Expand Up @@ -503,6 +659,53 @@
"org.codehaus.groovy:groovy-cli-picocli"
]
},
"io.opentelemetry:opentelemetry-api": {
"locked": "1.23.1",
"transitive": [
"io.opentelemetry:opentelemetry-sdk",
"io.opentelemetry:opentelemetry-sdk-common",
"io.opentelemetry:opentelemetry-sdk-metrics",
"io.opentelemetry:opentelemetry-sdk-trace",
"io.opentelemetry:opentelemetry-semconv"
]
},
"io.opentelemetry:opentelemetry-context": {
"locked": "1.23.1",
"transitive": [
"io.opentelemetry:opentelemetry-api"
]
},
"io.opentelemetry:opentelemetry-exporter-otlp": {
"locked": "1.23.1"
},
"io.opentelemetry:opentelemetry-sdk": {
"locked": "1.23.1"
},
"io.opentelemetry:opentelemetry-sdk-common": {
"locked": "1.23.1",
"transitive": [
"io.opentelemetry:opentelemetry-sdk",
"io.opentelemetry:opentelemetry-sdk-metrics",
"io.opentelemetry:opentelemetry-sdk-trace"
]
},
"io.opentelemetry:opentelemetry-sdk-metrics": {
"locked": "1.23.1",
"transitive": [
"io.opentelemetry:opentelemetry-exporter-otlp",
"io.opentelemetry:opentelemetry-sdk"
]
},
"io.opentelemetry:opentelemetry-sdk-trace": {
"locked": "1.23.1",
"transitive": [
"io.opentelemetry:opentelemetry-exporter-otlp",
"io.opentelemetry:opentelemetry-sdk"
]
},
"io.opentelemetry:opentelemetry-semconv": {
"locked": "1.23.1-alpha"
},
"io.reactivex:rxjava": {
"locked": "1.2.2"
},
Expand Down Expand Up @@ -1161,6 +1364,18 @@
"com.spotify:completable-futures": {
"locked": "0.3.3"
},
"com.squareup.okhttp3:okhttp": {
"locked": "3.14.9",
"transitive": [
"io.opentelemetry:opentelemetry-exporter-otlp-common"
]
},
"com.squareup.okio:okio": {
"locked": "1.17.2",
"transitive": [
"com.squareup.okhttp3:okhttp"
]
},
"com.sun.activation:jakarta.activation": {
"locked": "1.2.2",
"transitive": [
Expand Down Expand Up @@ -1200,6 +1415,103 @@
"org.codehaus.groovy:groovy-cli-picocli"
]
},
"io.opentelemetry:opentelemetry-api": {
"locked": "1.23.1",
"transitive": [
"io.opentelemetry:opentelemetry-api-events",
"io.opentelemetry:opentelemetry-api-logs",
"io.opentelemetry:opentelemetry-exporter-common",
"io.opentelemetry:opentelemetry-sdk",
"io.opentelemetry:opentelemetry-sdk-common",
"io.opentelemetry:opentelemetry-sdk-metrics",
"io.opentelemetry:opentelemetry-sdk-trace",
"io.opentelemetry:opentelemetry-semconv"
]
},
"io.opentelemetry:opentelemetry-api-events": {
"locked": "1.23.1-alpha",
"transitive": [
"io.opentelemetry:opentelemetry-sdk-logs"
]
},
"io.opentelemetry:opentelemetry-api-logs": {
"locked": "1.23.1-alpha",
"transitive": [
"io.opentelemetry:opentelemetry-sdk-logs"
]
},
"io.opentelemetry:opentelemetry-context": {
"locked": "1.23.1",
"transitive": [
"io.opentelemetry:opentelemetry-api"
]
},
"io.opentelemetry:opentelemetry-exporter-common": {
"locked": "1.23.1",
"transitive": [
"io.opentelemetry:opentelemetry-exporter-otlp-common"
]
},
"io.opentelemetry:opentelemetry-exporter-otlp": {
"locked": "1.23.1"
},
"io.opentelemetry:opentelemetry-exporter-otlp-common": {
"locked": "1.23.1",
"transitive": [
"io.opentelemetry:opentelemetry-exporter-otlp"
]
},
"io.opentelemetry:opentelemetry-sdk": {
"locked": "1.23.1",
"transitive": [
"io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi"
]
},
"io.opentelemetry:opentelemetry-sdk-common": {
"locked": "1.23.1",
"transitive": [
"io.opentelemetry:opentelemetry-sdk",
"io.opentelemetry:opentelemetry-sdk-logs",
"io.opentelemetry:opentelemetry-sdk-metrics",
"io.opentelemetry:opentelemetry-sdk-trace"
]
},
"io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi": {
"locked": "1.23.1",
"transitive": [
"io.opentelemetry:opentelemetry-exporter-otlp",
"io.opentelemetry:opentelemetry-exporter-otlp-common"
]
},
"io.opentelemetry:opentelemetry-sdk-logs": {
"locked": "1.23.1-alpha",
"transitive": [
"io.opentelemetry:opentelemetry-sdk",
"io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi"
]
},
"io.opentelemetry:opentelemetry-sdk-metrics": {
"locked": "1.23.1",
"transitive": [
"io.opentelemetry:opentelemetry-exporter-otlp",
"io.opentelemetry:opentelemetry-sdk",
"io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi"
]
},
"io.opentelemetry:opentelemetry-sdk-trace": {
"locked": "1.23.1",
"transitive": [
"io.opentelemetry:opentelemetry-exporter-otlp",
"io.opentelemetry:opentelemetry-sdk"
]
},
"io.opentelemetry:opentelemetry-semconv": {
"locked": "1.23.1-alpha",
"transitive": [
"io.opentelemetry:opentelemetry-sdk-common",
"io.opentelemetry:opentelemetry-sdk-trace"
]
},
"io.reactivex:rxjava": {
"locked": "1.2.2"
},
Expand Down
Loading

0 comments on commit 0de17c7

Please sign in to comment.