From 9c9f44b4c9b21d78afd90bbc6eb6ee2e556661a1 Mon Sep 17 00:00:00 2001 From: serenajht <95256247+serenajht@users.noreply.github.com> Date: Tue, 12 Nov 2024 19:34:18 -0800 Subject: [PATCH 1/4] update GHA artifact version --- .github/workflows/build.yml | 2 +- .github/workflows/ci.yml | 8 ++++---- .github/workflows/publish.yml | 2 +- .github/workflows/update-gradle-wrapper.yml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 16dec8c731..8008e8fede 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,7 +27,7 @@ jobs: - get-environment-name environment: ${{ needs.get-environment-name.outputs.environment }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 submodules: true diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f974f195cb..fac7b1f80b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,7 +6,7 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: ref: ${{ github.event.pull_request.head.sha }} fetch-depth: 0 @@ -49,12 +49,12 @@ jobs: NETFLIX_OSS_REPO_USERNAME: ${{ secrets.ORG_NETFLIXOSS_USERNAME }} NETFLIX_OSS_REPO_PASSWORD: ${{ secrets.ORG_NETFLIXOSS_PASSWORD }} - name: Upload build artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: build-artifacts path: '**/build/reports' - name: Store Buildscan URL - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: build-scan path: 'buildscan.log' @@ -64,7 +64,7 @@ jobs: run: working-directory: ui steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Use Node.js uses: actions/setup-node@v3 with: diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index e8d5a5ca0c..aaa1e1e448 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest name: Gradle Build and Publish steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Zulu JDK 11 uses: actions/setup-java@v3 with: diff --git a/.github/workflows/update-gradle-wrapper.yml b/.github/workflows/update-gradle-wrapper.yml index db3a8b1e24..d64b64d4b8 100644 --- a/.github/workflows/update-gradle-wrapper.yml +++ b/.github/workflows/update-gradle-wrapper.yml @@ -9,7 +9,7 @@ jobs: update-gradle-wrapper: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Zulu JDK 11 uses: actions/setup-java@v3 with: From b23319ba1566cf4d2464e5eb96a463cf2616aea2 Mon Sep 17 00:00:00 2001 From: pmchung Date: Wed, 20 Nov 2024 01:53:47 -0800 Subject: [PATCH 2/4] update nebula 11.1.0 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index c3e7a58974..9144d74150 100644 --- a/build.gradle +++ b/build.gradle @@ -19,7 +19,7 @@ plugins { id 'java' id 'application' id 'jacoco' - id 'nebula.netflixoss' version '10.6.0' + id 'nebula.netflixoss' version '11.1.0' id 'org.sonarqube' version '3.3' } From f2e1c82f30194eaf1786627c924574e8137e4550 Mon Sep 17 00:00:00 2001 From: pmchung Date: Wed, 20 Nov 2024 02:21:45 -0800 Subject: [PATCH 3/4] resolve merge conflict --- .github/workflows/ci.yml | 1 - .gitmodules | 3 - annotations-processor/dependencies.lock | 10 +- awss3-storage/dependencies.lock | 258 +++++- awssqs-event-queue/dependencies.lock | 258 +++++- build.gradle | 2 +- cassandra-persistence/dependencies.lock | 258 +++++- .../conductor/client/http/EventClient.java | 1 + common/dependencies.lock | 21 +- .../conductor/common/utils/SummaryUtil.java | 2 +- contribs | 1 - core/dependencies.lock | 32 +- .../core/events/ActionProcessor.java | 7 + .../core/events/DefaultEventProcessor.java | 9 +- .../core/events/SimpleActionProcessor.java | 24 +- .../conductor/core/events/queue/Message.java | 9 + .../core/execution/WorkflowExecutor.java | 1 + .../core/execution/tasks/SubWorkflow.java | 4 + .../core/listener/WorkflowStatusListener.java | 8 + .../conductor/core/tracing/Tracing.java | 6 + .../core/tracing/TracingProvider.java | 2 +- .../conductor/model/WorkflowModel.java | 10 + grpc-client/dependencies.lock | 112 +-- grpc-server/dependencies.lock | 424 ++++++++-- grpc/build.gradle | 6 + grpc/dependencies.lock | 138 ++- http-task/dependencies.lock | 258 +++++- .../sdk/testing/LocalServerRunner.java | 1 + json-jq-task/dependencies.lock | 258 +++++- redis-concurrency-limit/dependencies.lock | 258 +++++- redis-lock/dependencies.lock | 258 +++++- redis-persistence/dependencies.lock | 258 +++++- rest/dependencies.lock | 326 ++++++- server/build.gradle | 1 + server/dependencies.lock | 797 +++++++++++++----- settings.gradle | 1 + test-harness/dependencies.lock | 267 ++++-- 37 files changed, 3752 insertions(+), 538 deletions(-) delete mode 160000 contribs diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fac7b1f80b..1afe133f17 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -72,4 +72,3 @@ jobs: - name: Install dependencies run: yarn install - run: yarn run build - diff --git a/.gitmodules b/.gitmodules index 7568143442..e69de29bb2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +0,0 @@ -[submodule "contribs"] - path = contribs - url = git@github.com:routific/conductor-community.git diff --git a/annotations-processor/dependencies.lock b/annotations-processor/dependencies.lock index 8e55d1c249..b761efeaff 100644 --- a/annotations-processor/dependencies.lock +++ b/annotations-processor/dependencies.lock @@ -6,7 +6,7 @@ }, "compileClasspath": { "com.github.jknack:handlebars": { - "locked": "4.3.0" + "locked": "4.3.1" }, "com.google.code.findbugs:jsr305": { "locked": "3.0.2", @@ -145,7 +145,7 @@ }, "runtimeClasspath": { "com.github.jknack:handlebars": { - "locked": "4.3.0" + "locked": "4.3.1" }, "com.google.code.findbugs:jsr305": { "locked": "3.0.2", @@ -244,7 +244,7 @@ }, "testCompileClasspath": { "com.github.jknack:handlebars": { - "locked": "4.3.0" + "locked": "4.3.1" }, "com.google.code.findbugs:jsr305": { "locked": "3.0.2", @@ -605,7 +605,7 @@ }, "testRuntimeClasspath": { "com.github.jknack:handlebars": { - "locked": "4.3.0" + "locked": "4.3.1" }, "com.google.code.findbugs:jsr305": { "locked": "3.0.2", @@ -988,4 +988,4 @@ ] } } -} \ No newline at end of file +} diff --git a/awss3-storage/dependencies.lock b/awss3-storage/dependencies.lock index 3ee448fe67..7682aa757f 100644 --- a/awss3-storage/dependencies.lock +++ b/awss3-storage/dependencies.lock @@ -341,6 +341,18 @@ "com.netflix.conductor:conductor-core" ] }, + "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-codec:commons-codec": { "locked": "1.15", "transitive": [ @@ -360,12 +372,128 @@ "org.apache.httpcomponents:httpclient" ] }, + "io.opentelemetry:opentelemetry-api": { + "locked": "1.23.1", + "transitive": [ + "com.netflix.conductor:conductor-core", + "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", + "transitive": [ + "com.netflix.conductor:conductor-core" + ] + }, + "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": [ + "com.netflix.conductor:conductor-core", + "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi", + "io.sentry:sentry-opentelemetry-core" + ] + }, + "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": [ + "com.netflix.conductor:conductor-core", + "io.opentelemetry:opentelemetry-sdk-common", + "io.opentelemetry:opentelemetry-sdk-trace" + ] + }, "io.reactivex:rxjava": { "locked": "1.3.8", "transitive": [ "com.netflix.conductor:conductor-core" ] }, + "io.sentry:sentry": { + "locked": "6.14.0", + "transitive": [ + "com.netflix.conductor:conductor-core" + ] + }, + "io.sentry:sentry-opentelemetry-core": { + "locked": "6.14.0", + "transitive": [ + "com.netflix.conductor:conductor-core" + ] + }, "jakarta.activation:jakarta.activation-api": { "locked": "1.2.2", "transitive": [ @@ -1025,6 +1153,18 @@ "com.netflix.conductor:conductor-core" ] }, + "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.vaadin.external.google:android-json": { "locked": "0.0.20131108.vaadin1", "transitive": [ @@ -1050,12 +1190,128 @@ "org.apache.httpcomponents:httpclient" ] }, + "io.opentelemetry:opentelemetry-api": { + "locked": "1.23.1", + "transitive": [ + "com.netflix.conductor:conductor-core", + "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", + "transitive": [ + "com.netflix.conductor:conductor-core" + ] + }, + "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": [ + "com.netflix.conductor:conductor-core", + "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi", + "io.sentry:sentry-opentelemetry-core" + ] + }, + "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": [ + "com.netflix.conductor:conductor-core", + "io.opentelemetry:opentelemetry-sdk-common", + "io.opentelemetry:opentelemetry-sdk-trace" + ] + }, "io.reactivex:rxjava": { "locked": "1.3.8", "transitive": [ "com.netflix.conductor:conductor-core" ] }, + "io.sentry:sentry": { + "locked": "6.14.0", + "transitive": [ + "com.netflix.conductor:conductor-core" + ] + }, + "io.sentry:sentry-opentelemetry-core": { + "locked": "6.14.0", + "transitive": [ + "com.netflix.conductor:conductor-core" + ] + }, "jakarta.activation:jakarta.activation-api": { "locked": "1.2.2", "transitive": [ @@ -1430,4 +1686,4 @@ ] } } -} \ No newline at end of file +} diff --git a/awssqs-event-queue/dependencies.lock b/awssqs-event-queue/dependencies.lock index 0b79402299..87127ea55f 100644 --- a/awssqs-event-queue/dependencies.lock +++ b/awssqs-event-queue/dependencies.lock @@ -395,6 +395,18 @@ "com.netflix.conductor:conductor-core" ] }, + "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-codec:commons-codec": { "locked": "1.15", "transitive": [ @@ -414,12 +426,128 @@ "org.apache.httpcomponents:httpclient" ] }, + "io.opentelemetry:opentelemetry-api": { + "locked": "1.23.1", + "transitive": [ + "com.netflix.conductor:conductor-core", + "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", + "transitive": [ + "com.netflix.conductor:conductor-core" + ] + }, + "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": [ + "com.netflix.conductor:conductor-core", + "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi", + "io.sentry:sentry-opentelemetry-core" + ] + }, + "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": [ + "com.netflix.conductor:conductor-core", + "io.opentelemetry:opentelemetry-sdk-common", + "io.opentelemetry:opentelemetry-sdk-trace" + ] + }, "io.reactivex:rxjava": { "locked": "1.2.2", "transitive": [ "com.netflix.conductor:conductor-core" ] }, + "io.sentry:sentry": { + "locked": "6.14.0", + "transitive": [ + "com.netflix.conductor:conductor-core" + ] + }, + "io.sentry:sentry-opentelemetry-core": { + "locked": "6.14.0", + "transitive": [ + "com.netflix.conductor:conductor-core" + ] + }, "jakarta.activation:jakarta.activation-api": { "locked": "1.2.2", "transitive": [ @@ -1134,6 +1262,18 @@ "com.netflix.conductor:conductor-core" ] }, + "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.vaadin.external.google:android-json": { "locked": "0.0.20131108.vaadin1", "transitive": [ @@ -1159,12 +1299,128 @@ "org.apache.httpcomponents:httpclient" ] }, + "io.opentelemetry:opentelemetry-api": { + "locked": "1.23.1", + "transitive": [ + "com.netflix.conductor:conductor-core", + "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", + "transitive": [ + "com.netflix.conductor:conductor-core" + ] + }, + "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": [ + "com.netflix.conductor:conductor-core", + "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi", + "io.sentry:sentry-opentelemetry-core" + ] + }, + "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": [ + "com.netflix.conductor:conductor-core", + "io.opentelemetry:opentelemetry-sdk-common", + "io.opentelemetry:opentelemetry-sdk-trace" + ] + }, "io.reactivex:rxjava": { "locked": "1.2.2", "transitive": [ "com.netflix.conductor:conductor-core" ] }, + "io.sentry:sentry": { + "locked": "6.14.0", + "transitive": [ + "com.netflix.conductor:conductor-core" + ] + }, + "io.sentry:sentry-opentelemetry-core": { + "locked": "6.14.0", + "transitive": [ + "com.netflix.conductor:conductor-core" + ] + }, "jakarta.activation:jakarta.activation-api": { "locked": "1.2.2", "transitive": [ @@ -1540,4 +1796,4 @@ ] } } -} \ No newline at end of file +} diff --git a/build.gradle b/build.gradle index c3e7a58974..9144d74150 100644 --- a/build.gradle +++ b/build.gradle @@ -19,7 +19,7 @@ plugins { id 'java' id 'application' id 'jacoco' - id 'nebula.netflixoss' version '10.6.0' + id 'nebula.netflixoss' version '11.1.0' id 'org.sonarqube' version '3.3' } diff --git a/cassandra-persistence/dependencies.lock b/cassandra-persistence/dependencies.lock index de9d7c5db2..e78c055ef6 100644 --- a/cassandra-persistence/dependencies.lock +++ b/cassandra-persistence/dependencies.lock @@ -404,6 +404,18 @@ "com.netflix.conductor:conductor-core" ] }, + "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", "transitive": [ @@ -460,12 +472,128 @@ "io.netty:netty-handler" ] }, + "io.opentelemetry:opentelemetry-api": { + "locked": "1.23.1", + "transitive": [ + "com.netflix.conductor:conductor-core", + "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", + "transitive": [ + "com.netflix.conductor:conductor-core" + ] + }, + "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": [ + "com.netflix.conductor:conductor-core", + "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi", + "io.sentry:sentry-opentelemetry-core" + ] + }, + "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": [ + "com.netflix.conductor:conductor-core", + "io.opentelemetry:opentelemetry-sdk-common", + "io.opentelemetry:opentelemetry-sdk-trace" + ] + }, "io.reactivex:rxjava": { "locked": "1.3.8", "transitive": [ "com.netflix.conductor:conductor-core" ] }, + "io.sentry:sentry": { + "locked": "6.14.0", + "transitive": [ + "com.netflix.conductor:conductor-core" + ] + }, + "io.sentry:sentry-opentelemetry-core": { + "locked": "6.14.0", + "transitive": [ + "com.netflix.conductor:conductor-core" + ] + }, "jakarta.activation:jakarta.activation-api": { "locked": "1.2.2", "transitive": [ @@ -1543,6 +1671,18 @@ "com.netflix.conductor:conductor-core" ] }, + "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.thoughtworks.qdox:qdox": { "locked": "1.12.1", "transitive": [ @@ -1623,12 +1763,128 @@ "io.netty:netty-handler" ] }, + "io.opentelemetry:opentelemetry-api": { + "locked": "1.23.1", + "transitive": [ + "com.netflix.conductor:conductor-core", + "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", + "transitive": [ + "com.netflix.conductor:conductor-core" + ] + }, + "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": [ + "com.netflix.conductor:conductor-core", + "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi", + "io.sentry:sentry-opentelemetry-core" + ] + }, + "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": [ + "com.netflix.conductor:conductor-core", + "io.opentelemetry:opentelemetry-sdk-common", + "io.opentelemetry:opentelemetry-sdk-trace" + ] + }, "io.reactivex:rxjava": { "locked": "1.3.8", "transitive": [ "com.netflix.conductor:conductor-core" ] }, + "io.sentry:sentry": { + "locked": "6.14.0", + "transitive": [ + "com.netflix.conductor:conductor-core" + ] + }, + "io.sentry:sentry-opentelemetry-core": { + "locked": "6.14.0", + "transitive": [ + "com.netflix.conductor:conductor-core" + ] + }, "jakarta.activation:jakarta.activation-api": { "locked": "1.2.2", "transitive": [ @@ -2305,4 +2561,4 @@ ] } } -} \ No newline at end of file +} diff --git a/client/src/main/java/com/netflix/conductor/client/http/EventClient.java b/client/src/main/java/com/netflix/conductor/client/http/EventClient.java index 46bf00d558..de7b824d46 100644 --- a/client/src/main/java/com/netflix/conductor/client/http/EventClient.java +++ b/client/src/main/java/com/netflix/conductor/client/http/EventClient.java @@ -31,6 +31,7 @@ public class EventClient extends ClientBase { private static final GenericType> eventHandlerList = new GenericType>() {}; + /** Creates a default metadata client */ public EventClient() { this(new DefaultClientConfig(), new DefaultConductorClientConfiguration(), null); diff --git a/common/dependencies.lock b/common/dependencies.lock index 1c5a38107a..b2404083f4 100644 --- a/common/dependencies.lock +++ b/common/dependencies.lock @@ -6,7 +6,7 @@ }, "annotationsProcessorCodegen": { "com.github.jknack:handlebars": { - "locked": "4.3.0", + "locked": "4.3.1", "transitive": [ "com.netflix.conductor:conductor-annotations-processor" ] @@ -191,25 +191,25 @@ "project": true }, "io.github.classgraph:classgraph": { - "locked": "4.8.147", + "locked": "4.8.149", "transitive": [ "org.springdoc:springdoc-openapi-ui" ] }, "io.swagger.core.v3:swagger-annotations": { - "locked": "2.2.0", + "locked": "2.2.8", "transitive": [ "io.swagger.core.v3:swagger-core" ] }, "io.swagger.core.v3:swagger-core": { - "locked": "2.2.0", + "locked": "2.2.8", "transitive": [ "org.springdoc:springdoc-openapi-common" ] }, "io.swagger.core.v3:swagger-models": { - "locked": "2.2.0", + "locked": "2.2.8", "transitive": [ "io.swagger.core.v3:swagger-core" ] @@ -306,16 +306,16 @@ ] }, "org.springdoc:springdoc-openapi-common": { - "locked": "1.6.9", + "locked": "1.6.15", "transitive": [ "org.springdoc:springdoc-openapi-webmvc-core" ] }, "org.springdoc:springdoc-openapi-ui": { - "locked": "1.6.9" + "locked": "1.6.15" }, "org.springdoc:springdoc-openapi-webmvc-core": { - "locked": "1.6.9", + "locked": "1.6.15", "transitive": [ "org.springdoc:springdoc-openapi-ui" ] @@ -412,7 +412,7 @@ ] }, "org.webjars:swagger-ui": { - "locked": "4.11.1", + "locked": "4.17.1", "transitive": [ "org.springdoc:springdoc-openapi-ui" ] @@ -427,6 +427,7 @@ "locked": "1.29", "transitive": [ "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml", + "io.swagger.core.v3:swagger-core", "org.springframework.boot:spring-boot-starter" ] } @@ -1284,4 +1285,4 @@ ] } } -} \ No newline at end of file +} diff --git a/common/src/main/java/com/netflix/conductor/common/utils/SummaryUtil.java b/common/src/main/java/com/netflix/conductor/common/utils/SummaryUtil.java index 76127124e6..e68f1771fe 100644 --- a/common/src/main/java/com/netflix/conductor/common/utils/SummaryUtil.java +++ b/common/src/main/java/com/netflix/conductor/common/utils/SummaryUtil.java @@ -34,7 +34,7 @@ public class SummaryUtil { private static boolean isSummaryInputOutputJsonSerializationEnabled; - @Value("${conductor.app.summary-input-output-json-serialization.enabled:false}") + @Value("${conductor.app.summary-input-output-json-serialization.enabled:true}") private boolean isJsonSerializationEnabled; @PostConstruct diff --git a/contribs b/contribs deleted file mode 160000 index 28e5300d82..0000000000 --- a/contribs +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 28e5300d824814ab9934f9f70b6a8a598a500c93 diff --git a/core/dependencies.lock b/core/dependencies.lock index c1165401ba..71b4f6caa4 100644 --- a/core/dependencies.lock +++ b/core/dependencies.lock @@ -111,6 +111,12 @@ "io.reactivex:rxjava": { "locked": "1.2.2" }, + "io.sentry:sentry": { + "locked": "6.14.0" + }, + "io.sentry:sentry-opentelemetry-core": { + "locked": "6.14.0" + }, "jakarta.activation:jakarta.activation-api": { "locked": "2.0.0", "transitive": [ @@ -423,7 +429,8 @@ "io.opentelemetry:opentelemetry-sdk": { "locked": "1.23.1", "transitive": [ - "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi" + "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi", + "io.sentry:sentry-opentelemetry-core" ] }, "io.opentelemetry:opentelemetry-sdk-common": { @@ -474,6 +481,12 @@ "io.reactivex:rxjava": { "locked": "1.2.2" }, + "io.sentry:sentry": { + "locked": "6.14.0" + }, + "io.sentry:sentry-opentelemetry-core": { + "locked": "6.14.0" + }, "jakarta.activation:jakarta.activation-api": { "locked": "2.0.0", "transitive": [ @@ -709,6 +722,12 @@ "io.reactivex:rxjava": { "locked": "1.2.2" }, + "io.sentry:sentry": { + "locked": "6.14.0" + }, + "io.sentry:sentry-opentelemetry-core": { + "locked": "6.14.0" + }, "jakarta.activation:jakarta.activation-api": { "locked": "2.0.0", "transitive": [ @@ -1464,7 +1483,8 @@ "io.opentelemetry:opentelemetry-sdk": { "locked": "1.23.1", "transitive": [ - "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi" + "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi", + "io.sentry:sentry-opentelemetry-core" ] }, "io.opentelemetry:opentelemetry-sdk-common": { @@ -1515,6 +1535,12 @@ "io.reactivex:rxjava": { "locked": "1.2.2" }, + "io.sentry:sentry": { + "locked": "6.14.0" + }, + "io.sentry:sentry-opentelemetry-core": { + "locked": "6.14.0" + }, "jakarta.activation:jakarta.activation-api": { "locked": "2.0.0", "transitive": [ @@ -2143,4 +2169,4 @@ ] } } -} \ No newline at end of file +} diff --git a/core/src/main/java/com/netflix/conductor/core/events/ActionProcessor.java b/core/src/main/java/com/netflix/conductor/core/events/ActionProcessor.java index 6b81396529..9eb8136b9e 100644 --- a/core/src/main/java/com/netflix/conductor/core/events/ActionProcessor.java +++ b/core/src/main/java/com/netflix/conductor/core/events/ActionProcessor.java @@ -20,4 +20,11 @@ public interface ActionProcessor { Map execute( EventHandler.Action action, Object payloadObject, String event, String messageId); + + Map execute( + EventHandler.Action action, + Object payloadObject, + String event, + String messageId, + String userIdentifier); } diff --git a/core/src/main/java/com/netflix/conductor/core/events/DefaultEventProcessor.java b/core/src/main/java/com/netflix/conductor/core/events/DefaultEventProcessor.java index 19767c4780..473fe24b6c 100644 --- a/core/src/main/java/com/netflix/conductor/core/events/DefaultEventProcessor.java +++ b/core/src/main/java/com/netflix/conductor/core/events/DefaultEventProcessor.java @@ -241,7 +241,8 @@ protected CompletableFuture> executeActionsForEventHandler( execute( eventExecution, action, - getPayloadObject(msg.getPayload())), + getPayloadObject(msg.getPayload()), + msg.getUserIdentifier()), eventActionExecutorService)); } else { LOGGER.warn("Duplicate delivery/execution of message: {}", msg.getId()); @@ -258,7 +259,8 @@ protected CompletableFuture> executeActionsForEventHandler( * completed/failed with non-transient error the input event execution, if the execution * failed due to transient error */ - protected EventExecution execute(EventExecution eventExecution, Action action, Object payload) { + protected EventExecution execute( + EventExecution eventExecution, Action action, Object payload, String userIdentifier) { try { LOGGER.debug( "Executing action: {} for event: {} with messageId: {} with payload: {}", @@ -274,7 +276,8 @@ protected EventExecution execute(EventExecution eventExecution, Action action, O action, payload, eventExecution.getEvent(), - eventExecution.getMessageId())); + eventExecution.getMessageId(), + userIdentifier)); if (output != null) { eventExecution.getOutput().putAll(output); } diff --git a/core/src/main/java/com/netflix/conductor/core/events/SimpleActionProcessor.java b/core/src/main/java/com/netflix/conductor/core/events/SimpleActionProcessor.java index 48b0f56a0b..0e192c1e1c 100644 --- a/core/src/main/java/com/netflix/conductor/core/events/SimpleActionProcessor.java +++ b/core/src/main/java/com/netflix/conductor/core/events/SimpleActionProcessor.java @@ -58,8 +58,18 @@ public SimpleActionProcessor( this.jsonUtils = jsonUtils; } + @Override public Map execute( Action action, Object payloadObject, String event, String messageId) { + return execute(action, payloadObject, event, messageId, null); + } + + public Map execute( + Action action, + Object payloadObject, + String event, + String messageId, + String userIdentifier) { LOGGER.debug( "Executing action: {} for event: {} with messageId:{}", @@ -74,7 +84,7 @@ public Map execute( switch (action.getAction()) { case start_workflow: - return startWorkflow(action, jsonObject, event, messageId); + return startWorkflow(action, jsonObject, event, messageId, userIdentifier); case complete_task: return completeTask( action, @@ -118,6 +128,7 @@ private Map completeTask( String taskId = (String) replaced.get("taskId"); String taskRefName = (String) replaced.get("taskRefName"); Boolean retry = Boolean.TRUE.equals(replaced.get("retry")); + String failReason = (String) replaced.get("failReason"); TaskModel taskModel = null; if (StringUtils.isNotEmpty(taskId)) { @@ -164,6 +175,9 @@ private Map completeTask( if (retry) { status = TaskModel.Status.FAILED; + } else if (status.equals(TaskModel.Status.FAILED_WITH_TERMINAL_ERROR) + && failReason != null) { + taskModel.setReasonForIncompletion(failReason); } taskModel.setStatus(status); @@ -199,7 +213,7 @@ private Map completeTask( } private Map startWorkflow( - Action action, Object payload, String event, String messageId) { + Action action, Object payload, String event, String messageId, String userIdentifier) { StartWorkflow params = action.getStart_workflow(); Map output = new HashMap<>(); try { @@ -218,14 +232,16 @@ private Map startWorkflow( String workflowName = (String) workflowInput.get("workflowName"); Integer version = (Integer) workflowInput.get("version"); - LOGGER.info("start workflow correlationId: {}", replaced.get("correlationId")); - workflowInput.put("conductor.event.messageId", messageId); workflowInput.put("conductor.event.name", event); params.setName(workflowName); params.setVersion(version); + if (userIdentifier != null) { + workflowInput.put("userIdentifier", userIdentifier); + } + String workflowId = workflowExecutor.startWorkflow( workflowName, diff --git a/core/src/main/java/com/netflix/conductor/core/events/queue/Message.java b/core/src/main/java/com/netflix/conductor/core/events/queue/Message.java index b7d33961fc..999b7a22d3 100644 --- a/core/src/main/java/com/netflix/conductor/core/events/queue/Message.java +++ b/core/src/main/java/com/netflix/conductor/core/events/queue/Message.java @@ -19,6 +19,7 @@ public class Message { private String payload; private String id; private String receipt; + private String userIdentifier; private int priority; public Message() {} @@ -78,6 +79,14 @@ public void setReceipt(String receipt) { this.receipt = receipt; } + public String getUserIdentifier() { + return this.userIdentifier; + } + + public void setUserIdentifier(String userIdentifier) { + this.userIdentifier = userIdentifier; + } + /** * Gets the message priority * diff --git a/core/src/main/java/com/netflix/conductor/core/execution/WorkflowExecutor.java b/core/src/main/java/com/netflix/conductor/core/execution/WorkflowExecutor.java index c1fafc2117..445482529a 100644 --- a/core/src/main/java/com/netflix/conductor/core/execution/WorkflowExecutor.java +++ b/core/src/main/java/com/netflix/conductor/core/execution/WorkflowExecutor.java @@ -421,6 +421,7 @@ public String startWorkflow( workflow.getWorkflowName(), String.valueOf(workflow.getWorkflowVersion()), workflow.getOwnerApp()); + workflowStatusListener.onWorkflowStartedIfEnabled(workflow); return workflowId; } catch (Exception e) { Monitors.recordWorkflowStartError( diff --git a/core/src/main/java/com/netflix/conductor/core/execution/tasks/SubWorkflow.java b/core/src/main/java/com/netflix/conductor/core/execution/tasks/SubWorkflow.java index 75995832d6..c1961a58c5 100644 --- a/core/src/main/java/com/netflix/conductor/core/execution/tasks/SubWorkflow.java +++ b/core/src/main/java/com/netflix/conductor/core/execution/tasks/SubWorkflow.java @@ -69,6 +69,10 @@ public void start(WorkflowModel workflow, TaskModel task, WorkflowExecutor workf } String correlationId = workflow.getCorrelationId(); + if (workflow.getUserIdentifier() != null) { + wfInput.put("userIdentifier", workflow.getUserIdentifier()); + } + try { String subWorkflowId; if (workflowDefinition != null) { diff --git a/core/src/main/java/com/netflix/conductor/core/listener/WorkflowStatusListener.java b/core/src/main/java/com/netflix/conductor/core/listener/WorkflowStatusListener.java index 1c0c4395a2..a2992846d5 100644 --- a/core/src/main/java/com/netflix/conductor/core/listener/WorkflowStatusListener.java +++ b/core/src/main/java/com/netflix/conductor/core/listener/WorkflowStatusListener.java @@ -35,9 +35,17 @@ default void onWorkflowFinalizedIfEnabled(WorkflowModel workflow) { } } + default void onWorkflowStartedIfEnabled(WorkflowModel workflow) { + if (workflow.getWorkflowDefinition().isWorkflowStatusListenerEnabled()) { + onWorkflowStarted(workflow); + } + } + void onWorkflowCompleted(WorkflowModel workflow); void onWorkflowTerminated(WorkflowModel workflow); default void onWorkflowFinalized(WorkflowModel workflow) {} + + default void onWorkflowStarted(WorkflowModel workflow) {} } diff --git a/core/src/main/java/com/netflix/conductor/core/tracing/Tracing.java b/core/src/main/java/com/netflix/conductor/core/tracing/Tracing.java index 885be1abb5..5e86b3bc72 100644 --- a/core/src/main/java/com/netflix/conductor/core/tracing/Tracing.java +++ b/core/src/main/java/com/netflix/conductor/core/tracing/Tracing.java @@ -39,6 +39,12 @@ public Optional getTraceId() { return Optional.empty(); } + public void setUserIdentifier(String userIdentifier) { + if (this.span.isPresent()) { + this.span.get().setAttribute("id", userIdentifier); + } + } + public void finish() { if (this.span.isPresent()) { Span span = this.span.get(); diff --git a/core/src/main/java/com/netflix/conductor/core/tracing/TracingProvider.java b/core/src/main/java/com/netflix/conductor/core/tracing/TracingProvider.java index f504e260b4..a13d6acb7a 100644 --- a/core/src/main/java/com/netflix/conductor/core/tracing/TracingProvider.java +++ b/core/src/main/java/com/netflix/conductor/core/tracing/TracingProvider.java @@ -63,7 +63,7 @@ public TracingProvider(ConductorProperties properties, TracingProperties tracing options.setTracesSampleRate(tracingProperties.getTracesSamplingRate()); options.setInstrumenter(Instrumenter.OTEL); options.addEventProcessor(new OpenTelemetryLinkErrorEventProcessor()); - options.setDebug(true); + options.setDebug(false); }); Resource resource = diff --git a/core/src/main/java/com/netflix/conductor/model/WorkflowModel.java b/core/src/main/java/com/netflix/conductor/model/WorkflowModel.java index 315563365b..c52849542c 100644 --- a/core/src/main/java/com/netflix/conductor/model/WorkflowModel.java +++ b/core/src/main/java/com/netflix/conductor/model/WorkflowModel.java @@ -66,6 +66,8 @@ public boolean isSuccessful() { private String correlationId; + private String userIdentifier; + private String reRunFromWorkflowId; private String reasonForIncompletion; @@ -241,6 +243,14 @@ public void setCorrelationId(String correlationId) { this.correlationId = correlationId; } + public String getUserIdentifier() { + if (this.getInput() != null && this.getInput().containsKey("userIdentifier")) { + return this.getInput().get("userIdentifier").toString(); + } + + return null; + } + public String getReRunFromWorkflowId() { return reRunFromWorkflowId; } diff --git a/grpc-client/dependencies.lock b/grpc-client/dependencies.lock index 96f2a65a77..b24680ef47 100644 --- a/grpc-client/dependencies.lock +++ b/grpc-client/dependencies.lock @@ -6,7 +6,7 @@ }, "compileClasspath": { "com.google.api.grpc:proto-google-common-protos": { - "locked": "2.0.1", + "locked": "2.17.0", "transitive": [ "io.grpc:grpc-protobuf" ] @@ -20,7 +20,7 @@ ] }, "com.google.errorprone:error_prone_annotations": { - "locked": "2.10.0", + "locked": "2.18.0", "transitive": [ "com.google.guava:guava", "io.grpc:grpc-api" @@ -64,7 +64,7 @@ "project": true }, "io.grpc:grpc-api": { - "locked": "1.46.0", + "locked": "1.56.1", "transitive": [ "io.grpc:grpc-core", "io.grpc:grpc-protobuf", @@ -73,31 +73,31 @@ ] }, "io.grpc:grpc-context": { - "locked": "1.46.0", + "locked": "1.56.1", "transitive": [ "io.grpc:grpc-api" ] }, "io.grpc:grpc-core": { - "locked": "1.46.0", + "locked": "1.56.1", "transitive": [ "io.grpc:grpc-netty" ] }, "io.grpc:grpc-netty": { - "locked": "1.46.0" + "locked": "1.56.1" }, "io.grpc:grpc-protobuf": { - "locked": "1.46.0" + "locked": "1.56.1" }, "io.grpc:grpc-protobuf-lite": { - "locked": "1.46.0", + "locked": "1.56.1", "transitive": [ "io.grpc:grpc-protobuf" ] }, "io.grpc:grpc-stub": { - "locked": "1.46.0" + "locked": "1.56.1" }, "io.netty:netty-buffer": { "locked": "4.1.76.Final", @@ -239,7 +239,7 @@ ] }, "com.google.api.grpc:proto-google-common-protos": { - "locked": "2.0.1", + "locked": "2.17.0", "transitive": [ "io.grpc:grpc-protobuf" ] @@ -260,7 +260,7 @@ ] }, "com.google.errorprone:error_prone_annotations": { - "locked": "2.10.0", + "locked": "2.18.0", "transitive": [ "com.google.guava:guava", "io.grpc:grpc-api", @@ -323,7 +323,7 @@ "project": true }, "io.grpc:grpc-api": { - "locked": "1.46.0", + "locked": "1.56.1", "transitive": [ "io.grpc:grpc-core", "io.grpc:grpc-protobuf", @@ -332,34 +332,34 @@ ] }, "io.grpc:grpc-context": { - "locked": "1.46.0", + "locked": "1.56.1", "transitive": [ "io.grpc:grpc-api" ] }, "io.grpc:grpc-core": { - "locked": "1.46.0", + "locked": "1.56.1", "transitive": [ "io.grpc:grpc-netty" ] }, "io.grpc:grpc-netty": { - "locked": "1.46.0" + "locked": "1.56.1" }, "io.grpc:grpc-protobuf": { - "locked": "1.46.0", + "locked": "1.56.1", "transitive": [ "com.netflix.conductor:conductor-grpc" ] }, "io.grpc:grpc-protobuf-lite": { - "locked": "1.46.0", + "locked": "1.56.1", "transitive": [ "io.grpc:grpc-protobuf" ] }, "io.grpc:grpc-stub": { - "locked": "1.46.0", + "locked": "1.56.1", "transitive": [ "com.netflix.conductor:conductor-grpc" ] @@ -373,7 +373,8 @@ "io.netty:netty-codec-socks", "io.netty:netty-handler", "io.netty:netty-handler-proxy", - "io.netty:netty-transport" + "io.netty:netty-transport", + "io.netty:netty-transport-native-unix-common" ] }, "io.netty:netty-codec": { @@ -416,7 +417,8 @@ "io.netty:netty-handler", "io.netty:netty-handler-proxy", "io.netty:netty-resolver", - "io.netty:netty-transport" + "io.netty:netty-transport", + "io.netty:netty-transport-native-unix-common" ] }, "io.netty:netty-handler": { @@ -447,11 +449,18 @@ "io.netty:netty-codec-http2", "io.netty:netty-codec-socks", "io.netty:netty-handler", - "io.netty:netty-handler-proxy" + "io.netty:netty-handler-proxy", + "io.netty:netty-transport-native-unix-common" + ] + }, + "io.netty:netty-transport-native-unix-common": { + "locked": "4.1.76.Final", + "transitive": [ + "io.grpc:grpc-netty" ] }, "io.perfmark:perfmark-api": { - "locked": "0.25.0", + "locked": "0.26.0", "transitive": [ "io.grpc:grpc-core", "io.grpc:grpc-netty" @@ -528,7 +537,7 @@ ] }, "org.codehaus.mojo:animal-sniffer-annotations": { - "locked": "1.19", + "locked": "1.23", "transitive": [ "io.grpc:grpc-core" ] @@ -542,7 +551,7 @@ }, "testCompileClasspath": { "com.google.api.grpc:proto-google-common-protos": { - "locked": "2.0.1", + "locked": "2.17.0", "transitive": [ "io.grpc:grpc-protobuf" ] @@ -556,7 +565,7 @@ ] }, "com.google.errorprone:error_prone_annotations": { - "locked": "2.10.0", + "locked": "2.18.0", "transitive": [ "com.google.guava:guava", "io.grpc:grpc-api" @@ -612,7 +621,7 @@ ] }, "io.grpc:grpc-api": { - "locked": "1.46.0", + "locked": "1.56.1", "transitive": [ "io.grpc:grpc-core", "io.grpc:grpc-protobuf", @@ -621,31 +630,31 @@ ] }, "io.grpc:grpc-context": { - "locked": "1.46.0", + "locked": "1.56.1", "transitive": [ "io.grpc:grpc-api" ] }, "io.grpc:grpc-core": { - "locked": "1.46.0", + "locked": "1.56.1", "transitive": [ "io.grpc:grpc-netty" ] }, "io.grpc:grpc-netty": { - "locked": "1.46.0" + "locked": "1.56.1" }, "io.grpc:grpc-protobuf": { - "locked": "1.46.0" + "locked": "1.56.1" }, "io.grpc:grpc-protobuf-lite": { - "locked": "1.46.0", + "locked": "1.56.1", "transitive": [ "io.grpc:grpc-protobuf" ] }, "io.grpc:grpc-stub": { - "locked": "1.46.0" + "locked": "1.56.1" }, "io.netty:netty-buffer": { "locked": "4.1.76.Final", @@ -1049,7 +1058,7 @@ ] }, "com.google.api.grpc:proto-google-common-protos": { - "locked": "2.0.1", + "locked": "2.17.0", "transitive": [ "io.grpc:grpc-protobuf" ] @@ -1070,7 +1079,7 @@ ] }, "com.google.errorprone:error_prone_annotations": { - "locked": "2.10.0", + "locked": "2.18.0", "transitive": [ "com.google.guava:guava", "io.grpc:grpc-api", @@ -1145,7 +1154,7 @@ ] }, "io.grpc:grpc-api": { - "locked": "1.46.0", + "locked": "1.56.1", "transitive": [ "io.grpc:grpc-core", "io.grpc:grpc-protobuf", @@ -1154,34 +1163,34 @@ ] }, "io.grpc:grpc-context": { - "locked": "1.46.0", + "locked": "1.56.1", "transitive": [ "io.grpc:grpc-api" ] }, "io.grpc:grpc-core": { - "locked": "1.46.0", + "locked": "1.56.1", "transitive": [ "io.grpc:grpc-netty" ] }, "io.grpc:grpc-netty": { - "locked": "1.46.0" + "locked": "1.56.1" }, "io.grpc:grpc-protobuf": { - "locked": "1.46.0", + "locked": "1.56.1", "transitive": [ "com.netflix.conductor:conductor-grpc" ] }, "io.grpc:grpc-protobuf-lite": { - "locked": "1.46.0", + "locked": "1.56.1", "transitive": [ "io.grpc:grpc-protobuf" ] }, "io.grpc:grpc-stub": { - "locked": "1.46.0", + "locked": "1.56.1", "transitive": [ "com.netflix.conductor:conductor-grpc" ] @@ -1195,7 +1204,8 @@ "io.netty:netty-codec-socks", "io.netty:netty-handler", "io.netty:netty-handler-proxy", - "io.netty:netty-transport" + "io.netty:netty-transport", + "io.netty:netty-transport-native-unix-common" ] }, "io.netty:netty-codec": { @@ -1238,7 +1248,8 @@ "io.netty:netty-handler", "io.netty:netty-handler-proxy", "io.netty:netty-resolver", - "io.netty:netty-transport" + "io.netty:netty-transport", + "io.netty:netty-transport-native-unix-common" ] }, "io.netty:netty-handler": { @@ -1269,11 +1280,18 @@ "io.netty:netty-codec-http2", "io.netty:netty-codec-socks", "io.netty:netty-handler", - "io.netty:netty-handler-proxy" + "io.netty:netty-handler-proxy", + "io.netty:netty-transport-native-unix-common" + ] + }, + "io.netty:netty-transport-native-unix-common": { + "locked": "4.1.76.Final", + "transitive": [ + "io.grpc:grpc-netty" ] }, "io.perfmark:perfmark-api": { - "locked": "0.25.0", + "locked": "0.26.0", "transitive": [ "io.grpc:grpc-core", "io.grpc:grpc-netty" @@ -1404,7 +1422,7 @@ ] }, "org.codehaus.mojo:animal-sniffer-annotations": { - "locked": "1.19", + "locked": "1.23", "transitive": [ "io.grpc:grpc-core" ] @@ -1636,4 +1654,4 @@ ] } } -} \ No newline at end of file +} diff --git a/grpc-server/dependencies.lock b/grpc-server/dependencies.lock index ef8618b9e6..7339c9fb7a 100644 --- a/grpc-server/dependencies.lock +++ b/grpc-server/dependencies.lock @@ -6,7 +6,7 @@ }, "compileClasspath": { "com.google.api.grpc:proto-google-common-protos": { - "locked": "2.0.1", + "locked": "2.17.0", "transitive": [ "io.grpc:grpc-protobuf" ] @@ -20,7 +20,7 @@ ] }, "com.google.errorprone:error_prone_annotations": { - "locked": "2.10.0", + "locked": "2.18.0", "transitive": [ "com.google.guava:guava", "io.grpc:grpc-api" @@ -33,7 +33,7 @@ ] }, "com.google.guava:guava": { - "locked": "31.0.1-android", + "locked": "31.1-android", "transitive": [ "io.grpc:grpc-stub" ] @@ -51,7 +51,7 @@ ] }, "com.google.protobuf:protobuf-java": { - "locked": "3.19.2", + "locked": "3.22.3", "transitive": [ "com.google.api.grpc:proto-google-common-protos", "io.grpc:grpc-protobuf" @@ -67,7 +67,7 @@ "project": true }, "io.grpc:grpc-api": { - "locked": "1.46.0", + "locked": "1.56.1", "transitive": [ "io.grpc:grpc-core", "io.grpc:grpc-protobuf", @@ -76,38 +76,38 @@ ] }, "io.grpc:grpc-context": { - "locked": "1.46.0", + "locked": "1.56.1", "transitive": [ "io.grpc:grpc-api" ] }, "io.grpc:grpc-core": { - "locked": "1.46.0", + "locked": "1.56.1", "transitive": [ "io.grpc:grpc-netty", "io.grpc:grpc-services" ] }, "io.grpc:grpc-netty": { - "locked": "1.46.0" + "locked": "1.56.1" }, "io.grpc:grpc-protobuf": { - "locked": "1.46.0", + "locked": "1.56.1", "transitive": [ "io.grpc:grpc-services" ] }, "io.grpc:grpc-protobuf-lite": { - "locked": "1.46.0", + "locked": "1.56.1", "transitive": [ "io.grpc:grpc-protobuf" ] }, "io.grpc:grpc-services": { - "locked": "1.46.0" + "locked": "1.56.1" }, "io.grpc:grpc-stub": { - "locked": "1.46.0", + "locked": "1.56.1", "transitive": [ "io.grpc:grpc-services" ] @@ -210,12 +210,6 @@ "org.apache.logging.log4j:log4j-web": { "locked": "2.17.1" }, - "org.checkerframework:checker-compat-qual": { - "locked": "2.5.5", - "transitive": [ - "com.google.guava:guava" - ] - }, "org.checkerframework:checker-qual": { "locked": "3.12.0", "transitive": [ @@ -350,7 +344,7 @@ ] }, "com.google.api.grpc:proto-google-common-protos": { - "locked": "2.0.1", + "locked": "2.17.0", "transitive": [ "io.grpc:grpc-protobuf" ] @@ -373,7 +367,7 @@ ] }, "com.google.errorprone:error_prone_annotations": { - "locked": "2.10.0", + "locked": "2.18.0", "transitive": [ "com.github.ben-manes.caffeine:caffeine", "com.google.guava:guava", @@ -392,7 +386,7 @@ ] }, "com.google.guava:guava": { - "locked": "31.0.1-android", + "locked": "31.1-jre", "transitive": [ "com.google.protobuf:protobuf-java-util", "io.grpc:grpc-api", @@ -418,7 +412,7 @@ ] }, "com.google.protobuf:protobuf-java": { - "locked": "3.19.2", + "locked": "3.22.3", "transitive": [ "com.google.api.grpc:proto-google-common-protos", "com.google.protobuf:protobuf-java-util", @@ -429,7 +423,7 @@ ] }, "com.google.protobuf:protobuf-java-util": { - "locked": "3.19.2", + "locked": "3.22.3", "transitive": [ "io.grpc:grpc-services" ] @@ -471,6 +465,18 @@ "com.netflix.conductor:conductor-core" ] }, + "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", "transitive": [ @@ -478,7 +484,7 @@ ] }, "io.grpc:grpc-api": { - "locked": "1.46.0", + "locked": "1.56.1", "transitive": [ "io.grpc:grpc-core", "io.grpc:grpc-protobuf", @@ -487,39 +493,39 @@ ] }, "io.grpc:grpc-context": { - "locked": "1.46.0", + "locked": "1.56.1", "transitive": [ "io.grpc:grpc-api" ] }, "io.grpc:grpc-core": { - "locked": "1.46.0", + "locked": "1.56.1", "transitive": [ "io.grpc:grpc-netty", "io.grpc:grpc-services" ] }, "io.grpc:grpc-netty": { - "locked": "1.46.0" + "locked": "1.56.1" }, "io.grpc:grpc-protobuf": { - "locked": "1.46.0", + "locked": "1.56.1", "transitive": [ "com.netflix.conductor:conductor-grpc", "io.grpc:grpc-services" ] }, "io.grpc:grpc-protobuf-lite": { - "locked": "1.46.0", + "locked": "1.56.1", "transitive": [ "io.grpc:grpc-protobuf" ] }, "io.grpc:grpc-services": { - "locked": "1.46.0" + "locked": "1.56.1" }, "io.grpc:grpc-stub": { - "locked": "1.46.0", + "locked": "1.56.1", "transitive": [ "com.netflix.conductor:conductor-grpc", "io.grpc:grpc-services" @@ -534,7 +540,8 @@ "io.netty:netty-codec-socks", "io.netty:netty-handler", "io.netty:netty-handler-proxy", - "io.netty:netty-transport" + "io.netty:netty-transport", + "io.netty:netty-transport-native-unix-common" ] }, "io.netty:netty-codec": { @@ -577,7 +584,8 @@ "io.netty:netty-handler", "io.netty:netty-handler-proxy", "io.netty:netty-resolver", - "io.netty:netty-transport" + "io.netty:netty-transport", + "io.netty:netty-transport-native-unix-common" ] }, "io.netty:netty-handler": { @@ -608,11 +616,122 @@ "io.netty:netty-codec-http2", "io.netty:netty-codec-socks", "io.netty:netty-handler", - "io.netty:netty-handler-proxy" + "io.netty:netty-handler-proxy", + "io.netty:netty-transport-native-unix-common" + ] + }, + "io.netty:netty-transport-native-unix-common": { + "locked": "4.1.76.Final", + "transitive": [ + "io.grpc:grpc-netty" + ] + }, + "io.opentelemetry:opentelemetry-api": { + "locked": "1.23.1", + "transitive": [ + "com.netflix.conductor:conductor-core", + "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", + "transitive": [ + "com.netflix.conductor:conductor-core" + ] + }, + "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": [ + "com.netflix.conductor:conductor-core", + "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi", + "io.sentry:sentry-opentelemetry-core" + ] + }, + "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": [ + "com.netflix.conductor:conductor-core", + "io.opentelemetry:opentelemetry-sdk-common", + "io.opentelemetry:opentelemetry-sdk-trace" ] }, "io.perfmark:perfmark-api": { - "locked": "0.25.0", + "locked": "0.26.0", "transitive": [ "io.grpc:grpc-core", "io.grpc:grpc-netty" @@ -624,6 +743,18 @@ "com.netflix.conductor:conductor-core" ] }, + "io.sentry:sentry": { + "locked": "6.14.0", + "transitive": [ + "com.netflix.conductor:conductor-core" + ] + }, + "io.sentry:sentry-opentelemetry-core": { + "locked": "6.14.0", + "transitive": [ + "com.netflix.conductor:conductor-core" + ] + }, "jakarta.activation:jakarta.activation-api": { "locked": "1.2.2", "transitive": [ @@ -720,12 +851,6 @@ "com.netflix.conductor:conductor-grpc" ] }, - "org.checkerframework:checker-compat-qual": { - "locked": "2.5.5", - "transitive": [ - "com.google.guava:guava" - ] - }, "org.checkerframework:checker-qual": { "locked": "3.19.0", "transitive": [ @@ -734,7 +859,7 @@ ] }, "org.codehaus.mojo:animal-sniffer-annotations": { - "locked": "1.19", + "locked": "1.23", "transitive": [ "io.grpc:grpc-core" ] @@ -756,7 +881,7 @@ }, "testCompileClasspath": { "com.google.api.grpc:proto-google-common-protos": { - "locked": "2.0.1", + "locked": "2.17.0", "transitive": [ "io.grpc:grpc-protobuf" ] @@ -776,7 +901,7 @@ ] }, "com.google.errorprone:error_prone_annotations": { - "locked": "2.10.0", + "locked": "2.18.0", "transitive": [ "com.google.guava:guava", "io.grpc:grpc-api" @@ -789,7 +914,7 @@ ] }, "com.google.guava:guava": { - "locked": "31.0.1-android", + "locked": "31.1-android", "transitive": [ "io.grpc:grpc-stub" ] @@ -807,7 +932,7 @@ ] }, "com.google.protobuf:protobuf-java": { - "locked": "3.19.2", + "locked": "3.22.3", "transitive": [ "com.google.api.grpc:proto-google-common-protos", "io.grpc:grpc-protobuf" @@ -835,7 +960,7 @@ ] }, "io.grpc:grpc-api": { - "locked": "1.46.0", + "locked": "1.56.1", "transitive": [ "io.grpc:grpc-core", "io.grpc:grpc-protobuf", @@ -844,13 +969,13 @@ ] }, "io.grpc:grpc-context": { - "locked": "1.46.0", + "locked": "1.56.1", "transitive": [ "io.grpc:grpc-api" ] }, "io.grpc:grpc-core": { - "locked": "1.46.0", + "locked": "1.56.1", "transitive": [ "io.grpc:grpc-netty", "io.grpc:grpc-services", @@ -858,32 +983,32 @@ ] }, "io.grpc:grpc-netty": { - "locked": "1.46.0" + "locked": "1.56.1" }, "io.grpc:grpc-protobuf": { - "locked": "1.46.0", + "locked": "1.56.1", "transitive": [ "io.grpc:grpc-services" ] }, "io.grpc:grpc-protobuf-lite": { - "locked": "1.46.0", + "locked": "1.56.1", "transitive": [ "io.grpc:grpc-protobuf" ] }, "io.grpc:grpc-services": { - "locked": "1.46.0" + "locked": "1.56.1" }, "io.grpc:grpc-stub": { - "locked": "1.46.0", + "locked": "1.56.1", "transitive": [ "io.grpc:grpc-services", "io.grpc:grpc-testing" ] }, "io.grpc:grpc-testing": { - "locked": "1.46.0" + "locked": "1.56.1" }, "io.netty:netty-buffer": { "locked": "4.1.76.Final", @@ -1058,12 +1183,6 @@ "org.springframework.boot:spring-boot-starter-test" ] }, - "org.checkerframework:checker-compat-qual": { - "locked": "2.5.5", - "transitive": [ - "com.google.guava:guava" - ] - }, "org.checkerframework:checker-qual": { "locked": "3.12.0", "transitive": [ @@ -1374,7 +1493,7 @@ ] }, "com.google.api.grpc:proto-google-common-protos": { - "locked": "2.0.1", + "locked": "2.17.0", "transitive": [ "io.grpc:grpc-protobuf" ] @@ -1403,7 +1522,7 @@ ] }, "com.google.errorprone:error_prone_annotations": { - "locked": "2.10.0", + "locked": "2.18.0", "transitive": [ "com.github.ben-manes.caffeine:caffeine", "com.google.guava:guava", @@ -1422,7 +1541,7 @@ ] }, "com.google.guava:guava": { - "locked": "31.0.1-android", + "locked": "31.1-jre", "transitive": [ "com.google.protobuf:protobuf-java-util", "io.grpc:grpc-api", @@ -1448,7 +1567,7 @@ ] }, "com.google.protobuf:protobuf-java": { - "locked": "3.19.2", + "locked": "3.22.3", "transitive": [ "com.google.api.grpc:proto-google-common-protos", "com.google.protobuf:protobuf-java-util", @@ -1459,7 +1578,7 @@ ] }, "com.google.protobuf:protobuf-java-util": { - "locked": "3.19.2", + "locked": "3.22.3", "transitive": [ "io.grpc:grpc-services" ] @@ -1502,6 +1621,18 @@ "com.netflix.conductor:conductor-core" ] }, + "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.vaadin.external.google:android-json": { "locked": "0.0.20131108.vaadin1", "transitive": [ @@ -1515,7 +1646,7 @@ ] }, "io.grpc:grpc-api": { - "locked": "1.46.0", + "locked": "1.56.1", "transitive": [ "io.grpc:grpc-core", "io.grpc:grpc-protobuf", @@ -1524,14 +1655,14 @@ ] }, "io.grpc:grpc-context": { - "locked": "1.46.0", + "locked": "1.56.1", "transitive": [ "io.grpc:grpc-api", "io.grpc:grpc-testing" ] }, "io.grpc:grpc-core": { - "locked": "1.46.0", + "locked": "1.56.1", "transitive": [ "io.grpc:grpc-netty", "io.grpc:grpc-services", @@ -1539,26 +1670,26 @@ ] }, "io.grpc:grpc-netty": { - "locked": "1.46.0" + "locked": "1.56.1" }, "io.grpc:grpc-protobuf": { - "locked": "1.46.0", + "locked": "1.56.1", "transitive": [ "com.netflix.conductor:conductor-grpc", "io.grpc:grpc-services" ] }, "io.grpc:grpc-protobuf-lite": { - "locked": "1.46.0", + "locked": "1.56.1", "transitive": [ "io.grpc:grpc-protobuf" ] }, "io.grpc:grpc-services": { - "locked": "1.46.0" + "locked": "1.56.1" }, "io.grpc:grpc-stub": { - "locked": "1.46.0", + "locked": "1.56.1", "transitive": [ "com.netflix.conductor:conductor-grpc", "io.grpc:grpc-services", @@ -1566,7 +1697,7 @@ ] }, "io.grpc:grpc-testing": { - "locked": "1.46.0" + "locked": "1.56.1" }, "io.netty:netty-buffer": { "locked": "4.1.76.Final", @@ -1577,7 +1708,8 @@ "io.netty:netty-codec-socks", "io.netty:netty-handler", "io.netty:netty-handler-proxy", - "io.netty:netty-transport" + "io.netty:netty-transport", + "io.netty:netty-transport-native-unix-common" ] }, "io.netty:netty-codec": { @@ -1620,7 +1752,8 @@ "io.netty:netty-handler", "io.netty:netty-handler-proxy", "io.netty:netty-resolver", - "io.netty:netty-transport" + "io.netty:netty-transport", + "io.netty:netty-transport-native-unix-common" ] }, "io.netty:netty-handler": { @@ -1651,11 +1784,122 @@ "io.netty:netty-codec-http2", "io.netty:netty-codec-socks", "io.netty:netty-handler", - "io.netty:netty-handler-proxy" + "io.netty:netty-handler-proxy", + "io.netty:netty-transport-native-unix-common" + ] + }, + "io.netty:netty-transport-native-unix-common": { + "locked": "4.1.76.Final", + "transitive": [ + "io.grpc:grpc-netty" + ] + }, + "io.opentelemetry:opentelemetry-api": { + "locked": "1.23.1", + "transitive": [ + "com.netflix.conductor:conductor-core", + "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", + "transitive": [ + "com.netflix.conductor:conductor-core" + ] + }, + "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": [ + "com.netflix.conductor:conductor-core", + "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi", + "io.sentry:sentry-opentelemetry-core" + ] + }, + "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": [ + "com.netflix.conductor:conductor-core", + "io.opentelemetry:opentelemetry-sdk-common", + "io.opentelemetry:opentelemetry-sdk-trace" ] }, "io.perfmark:perfmark-api": { - "locked": "0.25.0", + "locked": "0.26.0", "transitive": [ "io.grpc:grpc-core", "io.grpc:grpc-netty" @@ -1667,6 +1911,18 @@ "com.netflix.conductor:conductor-core" ] }, + "io.sentry:sentry": { + "locked": "6.14.0", + "transitive": [ + "com.netflix.conductor:conductor-core" + ] + }, + "io.sentry:sentry-opentelemetry-core": { + "locked": "6.14.0", + "transitive": [ + "com.netflix.conductor:conductor-core" + ] + }, "jakarta.activation:jakarta.activation-api": { "locked": "1.2.2", "transitive": [ @@ -1809,12 +2065,6 @@ "org.springframework.boot:spring-boot-starter-test" ] }, - "org.checkerframework:checker-compat-qual": { - "locked": "2.5.5", - "transitive": [ - "com.google.guava:guava" - ] - }, "org.checkerframework:checker-qual": { "locked": "3.19.0", "transitive": [ @@ -1823,7 +2073,7 @@ ] }, "org.codehaus.mojo:animal-sniffer-annotations": { - "locked": "1.19", + "locked": "1.23", "transitive": [ "io.grpc:grpc-core" ] @@ -2113,4 +2363,4 @@ ] } } -} \ No newline at end of file +} diff --git a/grpc/build.gradle b/grpc/build.gradle index 6d90ffaac4..87d5aead5e 100644 --- a/grpc/build.gradle +++ b/grpc/build.gradle @@ -39,6 +39,12 @@ dependencies { protobuf { protoc { artifact = "com.google.protobuf:protoc:${revProtoBuf}" + // for apple m1, add protoc_platform=osx-x86_64 in $HOME/.gradle/gradle.properties + if (project.hasProperty('protoc_platform')) { + artifact = "com.google.protobuf:protoc:3.9.2:${protoc_platform}" + } else { + artifact = "com.google.protobuf:protoc:3.9.2" + } } plugins { grpc { diff --git a/grpc/dependencies.lock b/grpc/dependencies.lock index a4e294f1a2..86ae079925 100644 --- a/grpc/dependencies.lock +++ b/grpc/dependencies.lock @@ -6,7 +6,7 @@ }, "compileClasspath": { "com.google.api.grpc:proto-google-common-protos": { - "locked": "2.0.1", + "locked": "2.17.0", "transitive": [ "io.grpc:grpc-protobuf" ] @@ -20,7 +20,7 @@ ] }, "com.google.errorprone:error_prone_annotations": { - "locked": "2.10.0", + "locked": "2.18.0", "transitive": [ "com.google.guava:guava", "io.grpc:grpc-api" @@ -33,7 +33,7 @@ ] }, "com.google.guava:guava": { - "locked": "31.0.1-android", + "locked": "31.1-android", "transitive": [ "io.grpc:grpc-stub" ] @@ -61,7 +61,7 @@ "project": true }, "io.grpc:grpc-api": { - "locked": "1.46.0", + "locked": "1.56.1", "transitive": [ "io.grpc:grpc-protobuf", "io.grpc:grpc-protobuf-lite", @@ -69,22 +69,22 @@ ] }, "io.grpc:grpc-context": { - "locked": "1.46.0", + "locked": "1.56.1", "transitive": [ "io.grpc:grpc-api" ] }, "io.grpc:grpc-protobuf": { - "locked": "1.46.0" + "locked": "1.56.1" }, "io.grpc:grpc-protobuf-lite": { - "locked": "1.46.0", + "locked": "1.56.1", "transitive": [ "io.grpc:grpc-protobuf" ] }, "io.grpc:grpc-stub": { - "locked": "1.46.0" + "locked": "1.56.1" }, "javax.annotation:javax.annotation-api": { "locked": "1.3.2" @@ -113,12 +113,6 @@ "org.apache.logging.log4j:log4j-web": { "locked": "2.17.1" }, - "org.checkerframework:checker-compat-qual": { - "locked": "2.5.5", - "transitive": [ - "com.google.guava:guava" - ] - }, "org.checkerframework:checker-qual": { "locked": "3.12.0", "transitive": [ @@ -161,7 +155,7 @@ ] }, "com.google.api.grpc:proto-google-common-protos": { - "locked": "2.0.1", + "locked": "2.17.0", "transitive": [ "io.grpc:grpc-protobuf" ] @@ -176,7 +170,7 @@ ] }, "com.google.errorprone:error_prone_annotations": { - "locked": "2.10.0", + "locked": "2.18.0", "transitive": [ "com.google.guava:guava", "io.grpc:grpc-api", @@ -190,7 +184,7 @@ ] }, "com.google.guava:guava": { - "locked": "31.0.1-android", + "locked": "31.1-android", "transitive": [ "io.grpc:grpc-api", "io.grpc:grpc-protobuf", @@ -228,7 +222,7 @@ "project": true }, "io.grpc:grpc-api": { - "locked": "1.46.0", + "locked": "1.56.1", "transitive": [ "io.grpc:grpc-protobuf", "io.grpc:grpc-protobuf-lite", @@ -236,22 +230,22 @@ ] }, "io.grpc:grpc-context": { - "locked": "1.46.0", + "locked": "1.56.1", "transitive": [ "io.grpc:grpc-api" ] }, "io.grpc:grpc-protobuf": { - "locked": "1.46.0" + "locked": "1.56.1" }, "io.grpc:grpc-protobuf-lite": { - "locked": "1.46.0", + "locked": "1.56.1", "transitive": [ "io.grpc:grpc-protobuf" ] }, "io.grpc:grpc-stub": { - "locked": "1.46.0" + "locked": "1.56.1" }, "javax.annotation:javax.annotation-api": { "locked": "1.3.2" @@ -309,12 +303,6 @@ "com.netflix.conductor:conductor-common" ] }, - "org.checkerframework:checker-compat-qual": { - "locked": "2.5.5", - "transitive": [ - "com.google.guava:guava" - ] - }, "org.checkerframework:checker-qual": { "locked": "3.12.0", "transitive": [ @@ -330,12 +318,12 @@ }, "protobufToolsLocator_grpc": { "io.grpc:protoc-gen-grpc-java": { - "locked": "1.46.0" + "locked": "1.56.1" } }, "protobufToolsLocator_protoc": { "com.google.protobuf:protoc": { - "locked": "3.13.0" + "locked": "3.9.2" } }, "runtimeClasspath": { @@ -367,7 +355,7 @@ ] }, "com.google.api.grpc:proto-google-common-protos": { - "locked": "2.0.1", + "locked": "2.17.0", "transitive": [ "io.grpc:grpc-protobuf" ] @@ -382,7 +370,7 @@ ] }, "com.google.errorprone:error_prone_annotations": { - "locked": "2.10.0", + "locked": "2.18.0", "transitive": [ "com.google.guava:guava", "io.grpc:grpc-api", @@ -396,7 +384,7 @@ ] }, "com.google.guava:guava": { - "locked": "31.0.1-android", + "locked": "31.1-android", "transitive": [ "io.grpc:grpc-api", "io.grpc:grpc-protobuf", @@ -434,7 +422,7 @@ "project": true }, "io.grpc:grpc-api": { - "locked": "1.46.0", + "locked": "1.56.1", "transitive": [ "io.grpc:grpc-protobuf", "io.grpc:grpc-protobuf-lite", @@ -442,22 +430,22 @@ ] }, "io.grpc:grpc-context": { - "locked": "1.46.0", + "locked": "1.56.1", "transitive": [ "io.grpc:grpc-api" ] }, "io.grpc:grpc-protobuf": { - "locked": "1.46.0" + "locked": "1.56.1" }, "io.grpc:grpc-protobuf-lite": { - "locked": "1.46.0", + "locked": "1.56.1", "transitive": [ "io.grpc:grpc-protobuf" ] }, "io.grpc:grpc-stub": { - "locked": "1.46.0" + "locked": "1.56.1" }, "javax.annotation:javax.annotation-api": { "locked": "1.3.2" @@ -515,12 +503,6 @@ "com.netflix.conductor:conductor-common" ] }, - "org.checkerframework:checker-compat-qual": { - "locked": "2.5.5", - "transitive": [ - "com.google.guava:guava" - ] - }, "org.checkerframework:checker-qual": { "locked": "3.12.0", "transitive": [ @@ -536,7 +518,7 @@ }, "testCompileClasspath": { "com.google.api.grpc:proto-google-common-protos": { - "locked": "2.0.1", + "locked": "2.17.0", "transitive": [ "io.grpc:grpc-protobuf" ] @@ -550,7 +532,7 @@ ] }, "com.google.errorprone:error_prone_annotations": { - "locked": "2.10.0", + "locked": "2.18.0", "transitive": [ "com.google.guava:guava", "io.grpc:grpc-api" @@ -563,7 +545,7 @@ ] }, "com.google.guava:guava": { - "locked": "31.0.1-android", + "locked": "31.1-android", "transitive": [ "io.grpc:grpc-stub" ] @@ -603,7 +585,7 @@ ] }, "io.grpc:grpc-api": { - "locked": "1.46.0", + "locked": "1.56.1", "transitive": [ "io.grpc:grpc-protobuf", "io.grpc:grpc-protobuf-lite", @@ -611,22 +593,22 @@ ] }, "io.grpc:grpc-context": { - "locked": "1.46.0", + "locked": "1.56.1", "transitive": [ "io.grpc:grpc-api" ] }, "io.grpc:grpc-protobuf": { - "locked": "1.46.0" + "locked": "1.56.1" }, "io.grpc:grpc-protobuf-lite": { - "locked": "1.46.0", + "locked": "1.56.1", "transitive": [ "io.grpc:grpc-protobuf" ] }, "io.grpc:grpc-stub": { - "locked": "1.46.0" + "locked": "1.56.1" }, "jakarta.activation:jakarta.activation-api": { "locked": "1.2.2", @@ -721,12 +703,6 @@ "org.springframework.boot:spring-boot-starter-test" ] }, - "org.checkerframework:checker-compat-qual": { - "locked": "2.5.5", - "transitive": [ - "com.google.guava:guava" - ] - }, "org.checkerframework:checker-qual": { "locked": "3.12.0", "transitive": [ @@ -965,7 +941,7 @@ ] }, "com.google.api.grpc:proto-google-common-protos": { - "locked": "2.0.1", + "locked": "2.17.0", "transitive": [ "io.grpc:grpc-protobuf" ] @@ -980,7 +956,7 @@ ] }, "com.google.errorprone:error_prone_annotations": { - "locked": "2.10.0", + "locked": "2.18.0", "transitive": [ "com.google.guava:guava", "io.grpc:grpc-api", @@ -994,7 +970,7 @@ ] }, "com.google.guava:guava": { - "locked": "31.0.1-android", + "locked": "31.1-android", "transitive": [ "io.grpc:grpc-api", "io.grpc:grpc-protobuf", @@ -1044,7 +1020,7 @@ ] }, "io.grpc:grpc-api": { - "locked": "1.46.0", + "locked": "1.56.1", "transitive": [ "io.grpc:grpc-protobuf", "io.grpc:grpc-protobuf-lite", @@ -1052,22 +1028,22 @@ ] }, "io.grpc:grpc-context": { - "locked": "1.46.0", + "locked": "1.56.1", "transitive": [ "io.grpc:grpc-api" ] }, "io.grpc:grpc-protobuf": { - "locked": "1.46.0" + "locked": "1.56.1" }, "io.grpc:grpc-protobuf-lite": { - "locked": "1.46.0", + "locked": "1.56.1", "transitive": [ "io.grpc:grpc-protobuf" ] }, "io.grpc:grpc-stub": { - "locked": "1.46.0" + "locked": "1.56.1" }, "jakarta.activation:jakarta.activation-api": { "locked": "1.2.2", @@ -1179,12 +1155,6 @@ "org.springframework.boot:spring-boot-starter-test" ] }, - "org.checkerframework:checker-compat-qual": { - "locked": "2.5.5", - "transitive": [ - "com.google.guava:guava" - ] - }, "org.checkerframework:checker-qual": { "locked": "3.12.0", "transitive": [ @@ -1447,7 +1417,7 @@ ] }, "com.google.api.grpc:proto-google-common-protos": { - "locked": "2.0.1", + "locked": "2.17.0", "transitive": [ "io.grpc:grpc-protobuf" ] @@ -1462,7 +1432,7 @@ ] }, "com.google.errorprone:error_prone_annotations": { - "locked": "2.10.0", + "locked": "2.18.0", "transitive": [ "com.google.guava:guava", "io.grpc:grpc-api", @@ -1476,7 +1446,7 @@ ] }, "com.google.guava:guava": { - "locked": "31.0.1-android", + "locked": "31.1-android", "transitive": [ "io.grpc:grpc-api", "io.grpc:grpc-protobuf", @@ -1526,7 +1496,7 @@ ] }, "io.grpc:grpc-api": { - "locked": "1.46.0", + "locked": "1.56.1", "transitive": [ "io.grpc:grpc-protobuf", "io.grpc:grpc-protobuf-lite", @@ -1534,22 +1504,22 @@ ] }, "io.grpc:grpc-context": { - "locked": "1.46.0", + "locked": "1.56.1", "transitive": [ "io.grpc:grpc-api" ] }, "io.grpc:grpc-protobuf": { - "locked": "1.46.0" + "locked": "1.56.1" }, "io.grpc:grpc-protobuf-lite": { - "locked": "1.46.0", + "locked": "1.56.1", "transitive": [ "io.grpc:grpc-protobuf" ] }, "io.grpc:grpc-stub": { - "locked": "1.46.0" + "locked": "1.56.1" }, "jakarta.activation:jakarta.activation-api": { "locked": "1.2.2", @@ -1661,12 +1631,6 @@ "org.springframework.boot:spring-boot-starter-test" ] }, - "org.checkerframework:checker-compat-qual": { - "locked": "2.5.5", - "transitive": [ - "com.google.guava:guava" - ] - }, "org.checkerframework:checker-qual": { "locked": "3.12.0", "transitive": [ @@ -1900,4 +1864,4 @@ ] } } -} \ No newline at end of file +} diff --git a/http-task/dependencies.lock b/http-task/dependencies.lock index 9cc0ba6a6a..b895bf1339 100644 --- a/http-task/dependencies.lock +++ b/http-task/dependencies.lock @@ -325,18 +325,146 @@ "com.netflix.conductor:conductor-core" ] }, + "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", "transitive": [ "com.netflix.conductor:conductor-core" ] }, + "io.opentelemetry:opentelemetry-api": { + "locked": "1.23.1", + "transitive": [ + "com.netflix.conductor:conductor-core", + "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", + "transitive": [ + "com.netflix.conductor:conductor-core" + ] + }, + "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": [ + "com.netflix.conductor:conductor-core", + "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi", + "io.sentry:sentry-opentelemetry-core" + ] + }, + "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": [ + "com.netflix.conductor:conductor-core", + "io.opentelemetry:opentelemetry-sdk-common", + "io.opentelemetry:opentelemetry-sdk-trace" + ] + }, "io.reactivex:rxjava": { "locked": "1.3.8", "transitive": [ "com.netflix.conductor:conductor-core" ] }, + "io.sentry:sentry": { + "locked": "6.14.0", + "transitive": [ + "com.netflix.conductor:conductor-core" + ] + }, + "io.sentry:sentry-opentelemetry-core": { + "locked": "6.14.0", + "transitive": [ + "com.netflix.conductor:conductor-core" + ] + }, "jakarta.activation:jakarta.activation-api": { "locked": "1.2.2", "transitive": [ @@ -1680,6 +1808,18 @@ "com.netflix.conductor:conductor-core" ] }, + "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": [ @@ -1813,12 +1953,128 @@ "org.mock-server:mockserver-core" ] }, + "io.opentelemetry:opentelemetry-api": { + "locked": "1.23.1", + "transitive": [ + "com.netflix.conductor:conductor-core", + "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", + "transitive": [ + "com.netflix.conductor:conductor-core" + ] + }, + "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": [ + "com.netflix.conductor:conductor-core", + "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi", + "io.sentry:sentry-opentelemetry-core" + ] + }, + "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": [ + "com.netflix.conductor:conductor-core", + "io.opentelemetry:opentelemetry-sdk-common", + "io.opentelemetry:opentelemetry-sdk-trace" + ] + }, "io.reactivex:rxjava": { "locked": "1.3.8", "transitive": [ "com.netflix.conductor:conductor-core" ] }, + "io.sentry:sentry": { + "locked": "6.14.0", + "transitive": [ + "com.netflix.conductor:conductor-core" + ] + }, + "io.sentry:sentry-opentelemetry-core": { + "locked": "6.14.0", + "transitive": [ + "com.netflix.conductor:conductor-core" + ] + }, "io.swagger.core.v3:swagger-annotations": { "locked": "2.1.13", "transitive": [ @@ -2460,4 +2716,4 @@ ] } } -} \ No newline at end of file +} diff --git a/java-sdk/src/main/java/com/netflix/conductor/sdk/testing/LocalServerRunner.java b/java-sdk/src/main/java/com/netflix/conductor/sdk/testing/LocalServerRunner.java index f406fa0516..452336431d 100644 --- a/java-sdk/src/main/java/com/netflix/conductor/sdk/testing/LocalServerRunner.java +++ b/java-sdk/src/main/java/com/netflix/conductor/sdk/testing/LocalServerRunner.java @@ -65,6 +65,7 @@ public LocalServerRunner(int port, String conductorVersion) { public String getServerAPIUrl() { return this.serverURL + "api/"; } + /** * Starts the local server. Downloads the latest conductor build from the maven repo If you want * to start the server from a specific download location, set `repositoryURL` system property diff --git a/json-jq-task/dependencies.lock b/json-jq-task/dependencies.lock index a675bba7b3..deae434e5b 100644 --- a/json-jq-task/dependencies.lock +++ b/json-jq-task/dependencies.lock @@ -265,18 +265,146 @@ "com.netflix.conductor:conductor-core" ] }, + "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", "transitive": [ "com.netflix.conductor:conductor-core" ] }, + "io.opentelemetry:opentelemetry-api": { + "locked": "1.23.1", + "transitive": [ + "com.netflix.conductor:conductor-core", + "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", + "transitive": [ + "com.netflix.conductor:conductor-core" + ] + }, + "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": [ + "com.netflix.conductor:conductor-core", + "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi", + "io.sentry:sentry-opentelemetry-core" + ] + }, + "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": [ + "com.netflix.conductor:conductor-core", + "io.opentelemetry:opentelemetry-sdk-common", + "io.opentelemetry:opentelemetry-sdk-trace" + ] + }, "io.reactivex:rxjava": { "locked": "1.3.8", "transitive": [ "com.netflix.conductor:conductor-core" ] }, + "io.sentry:sentry": { + "locked": "6.14.0", + "transitive": [ + "com.netflix.conductor:conductor-core" + ] + }, + "io.sentry:sentry-opentelemetry-core": { + "locked": "6.14.0", + "transitive": [ + "com.netflix.conductor:conductor-core" + ] + }, "jakarta.activation:jakarta.activation-api": { "locked": "1.2.2", "transitive": [ @@ -851,6 +979,18 @@ "com.netflix.conductor:conductor-core" ] }, + "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.vaadin.external.google:android-json": { "locked": "0.0.20131108.vaadin1", "transitive": [ @@ -863,12 +1003,128 @@ "com.netflix.conductor:conductor-core" ] }, + "io.opentelemetry:opentelemetry-api": { + "locked": "1.23.1", + "transitive": [ + "com.netflix.conductor:conductor-core", + "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", + "transitive": [ + "com.netflix.conductor:conductor-core" + ] + }, + "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": [ + "com.netflix.conductor:conductor-core", + "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi", + "io.sentry:sentry-opentelemetry-core" + ] + }, + "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": [ + "com.netflix.conductor:conductor-core", + "io.opentelemetry:opentelemetry-sdk-common", + "io.opentelemetry:opentelemetry-sdk-trace" + ] + }, "io.reactivex:rxjava": { "locked": "1.3.8", "transitive": [ "com.netflix.conductor:conductor-core" ] }, + "io.sentry:sentry": { + "locked": "6.14.0", + "transitive": [ + "com.netflix.conductor:conductor-core" + ] + }, + "io.sentry:sentry-opentelemetry-core": { + "locked": "6.14.0", + "transitive": [ + "com.netflix.conductor:conductor-core" + ] + }, "jakarta.activation:jakarta.activation-api": { "locked": "1.2.2", "transitive": [ @@ -1234,4 +1490,4 @@ ] } } -} \ No newline at end of file +} diff --git a/redis-concurrency-limit/dependencies.lock b/redis-concurrency-limit/dependencies.lock index 7402bb15ae..7a640a84d8 100644 --- a/redis-concurrency-limit/dependencies.lock +++ b/redis-concurrency-limit/dependencies.lock @@ -269,18 +269,146 @@ "com.netflix.conductor:conductor-core" ] }, + "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", "transitive": [ "com.netflix.conductor:conductor-core" ] }, + "io.opentelemetry:opentelemetry-api": { + "locked": "1.23.1", + "transitive": [ + "com.netflix.conductor:conductor-core", + "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", + "transitive": [ + "com.netflix.conductor:conductor-core" + ] + }, + "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": [ + "com.netflix.conductor:conductor-core", + "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi", + "io.sentry:sentry-opentelemetry-core" + ] + }, + "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": [ + "com.netflix.conductor:conductor-core", + "io.opentelemetry:opentelemetry-sdk-common", + "io.opentelemetry:opentelemetry-sdk-trace" + ] + }, "io.reactivex:rxjava": { "locked": "1.3.8", "transitive": [ "com.netflix.conductor:conductor-core" ] }, + "io.sentry:sentry": { + "locked": "6.14.0", + "transitive": [ + "com.netflix.conductor:conductor-core" + ] + }, + "io.sentry:sentry-opentelemetry-core": { + "locked": "6.14.0", + "transitive": [ + "com.netflix.conductor:conductor-core" + ] + }, "jakarta.activation:jakarta.activation-api": { "locked": "1.2.2", "transitive": [ @@ -1202,6 +1330,18 @@ "com.netflix.conductor:conductor-core" ] }, + "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.thoughtworks.qdox:qdox": { "locked": "1.12.1", "transitive": [ @@ -1232,12 +1372,128 @@ "org.codehaus.groovy:groovy-cli-picocli" ] }, + "io.opentelemetry:opentelemetry-api": { + "locked": "1.23.1", + "transitive": [ + "com.netflix.conductor:conductor-core", + "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", + "transitive": [ + "com.netflix.conductor:conductor-core" + ] + }, + "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": [ + "com.netflix.conductor:conductor-core", + "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi", + "io.sentry:sentry-opentelemetry-core" + ] + }, + "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": [ + "com.netflix.conductor:conductor-core", + "io.opentelemetry:opentelemetry-sdk-common", + "io.opentelemetry:opentelemetry-sdk-trace" + ] + }, "io.reactivex:rxjava": { "locked": "1.3.8", "transitive": [ "com.netflix.conductor:conductor-core" ] }, + "io.sentry:sentry": { + "locked": "6.14.0", + "transitive": [ + "com.netflix.conductor:conductor-core" + ] + }, + "io.sentry:sentry-opentelemetry-core": { + "locked": "6.14.0", + "transitive": [ + "com.netflix.conductor:conductor-core" + ] + }, "jakarta.activation:jakarta.activation-api": { "locked": "1.2.2", "transitive": [ @@ -1931,4 +2187,4 @@ "locked": "3.3.0" } } -} \ No newline at end of file +} diff --git a/redis-lock/dependencies.lock b/redis-lock/dependencies.lock index f17bf9e8dd..b27613a534 100644 --- a/redis-lock/dependencies.lock +++ b/redis-lock/dependencies.lock @@ -386,6 +386,18 @@ "com.netflix.conductor:conductor-core" ] }, + "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", "transitive": [ @@ -462,6 +474,110 @@ "org.redisson:redisson" ] }, + "io.opentelemetry:opentelemetry-api": { + "locked": "1.23.1", + "transitive": [ + "com.netflix.conductor:conductor-core", + "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", + "transitive": [ + "com.netflix.conductor:conductor-core" + ] + }, + "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": [ + "com.netflix.conductor:conductor-core", + "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi", + "io.sentry:sentry-opentelemetry-core" + ] + }, + "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": [ + "com.netflix.conductor:conductor-core", + "io.opentelemetry:opentelemetry-sdk-common", + "io.opentelemetry:opentelemetry-sdk-trace" + ] + }, "io.projectreactor:reactor-core": { "locked": "3.4.17", "transitive": [ @@ -480,6 +596,18 @@ "com.netflix.conductor:conductor-core" ] }, + "io.sentry:sentry": { + "locked": "6.14.0", + "transitive": [ + "com.netflix.conductor:conductor-core" + ] + }, + "io.sentry:sentry-opentelemetry-core": { + "locked": "6.14.0", + "transitive": [ + "com.netflix.conductor:conductor-core" + ] + }, "jakarta.activation:jakarta.activation-api": { "locked": "1.2.2", "transitive": [ @@ -1233,6 +1361,18 @@ "com.netflix.conductor:conductor-core" ] }, + "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.vaadin.external.google:android-json": { "locked": "0.0.20131108.vaadin1", "transitive": [ @@ -1316,6 +1456,110 @@ "org.redisson:redisson" ] }, + "io.opentelemetry:opentelemetry-api": { + "locked": "1.23.1", + "transitive": [ + "com.netflix.conductor:conductor-core", + "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", + "transitive": [ + "com.netflix.conductor:conductor-core" + ] + }, + "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": [ + "com.netflix.conductor:conductor-core", + "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi", + "io.sentry:sentry-opentelemetry-core" + ] + }, + "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": [ + "com.netflix.conductor:conductor-core", + "io.opentelemetry:opentelemetry-sdk-common", + "io.opentelemetry:opentelemetry-sdk-trace" + ] + }, "io.projectreactor:reactor-core": { "locked": "3.4.17", "transitive": [ @@ -1334,6 +1578,18 @@ "com.netflix.conductor:conductor-core" ] }, + "io.sentry:sentry": { + "locked": "6.14.0", + "transitive": [ + "com.netflix.conductor:conductor-core" + ] + }, + "io.sentry:sentry-opentelemetry-core": { + "locked": "6.14.0", + "transitive": [ + "com.netflix.conductor:conductor-core" + ] + }, "jakarta.activation:jakarta.activation-api": { "locked": "1.2.2", "transitive": [ @@ -1728,4 +1984,4 @@ ] } } -} \ No newline at end of file +} diff --git a/redis-persistence/dependencies.lock b/redis-persistence/dependencies.lock index a3b7f2bb15..f86bfdfe24 100644 --- a/redis-persistence/dependencies.lock +++ b/redis-persistence/dependencies.lock @@ -664,6 +664,18 @@ "com.netflix.conductor:conductor-core" ] }, + "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.jersey.contribs:jersey-apache-client4": { "locked": "1.19.1", "transitive": [ @@ -746,12 +758,128 @@ "com.thoughtworks.xstream:xstream" ] }, + "io.opentelemetry:opentelemetry-api": { + "locked": "1.23.1", + "transitive": [ + "com.netflix.conductor:conductor-core", + "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", + "transitive": [ + "com.netflix.conductor:conductor-core" + ] + }, + "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": [ + "com.netflix.conductor:conductor-core", + "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi", + "io.sentry:sentry-opentelemetry-core" + ] + }, + "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": [ + "com.netflix.conductor:conductor-core", + "io.opentelemetry:opentelemetry-sdk-common", + "io.opentelemetry:opentelemetry-sdk-trace" + ] + }, "io.reactivex:rxjava": { "locked": "1.3.8", "transitive": [ "com.netflix.conductor:conductor-core" ] }, + "io.sentry:sentry": { + "locked": "6.14.0", + "transitive": [ + "com.netflix.conductor:conductor-core" + ] + }, + "io.sentry:sentry-opentelemetry-core": { + "locked": "6.14.0", + "transitive": [ + "com.netflix.conductor:conductor-core" + ] + }, "jakarta.activation:jakarta.activation-api": { "locked": "1.2.2", "transitive": [ @@ -1838,6 +1966,18 @@ "com.netflix.conductor:conductor-core" ] }, + "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.jersey.contribs:jersey-apache-client4": { "locked": "1.19.1", "transitive": [ @@ -1926,12 +2066,128 @@ "com.thoughtworks.xstream:xstream" ] }, + "io.opentelemetry:opentelemetry-api": { + "locked": "1.23.1", + "transitive": [ + "com.netflix.conductor:conductor-core", + "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", + "transitive": [ + "com.netflix.conductor:conductor-core" + ] + }, + "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": [ + "com.netflix.conductor:conductor-core", + "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi", + "io.sentry:sentry-opentelemetry-core" + ] + }, + "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": [ + "com.netflix.conductor:conductor-core", + "io.opentelemetry:opentelemetry-sdk-common", + "io.opentelemetry:opentelemetry-sdk-trace" + ] + }, "io.reactivex:rxjava": { "locked": "1.3.8", "transitive": [ "com.netflix.conductor:conductor-core" ] }, + "io.sentry:sentry": { + "locked": "6.14.0", + "transitive": [ + "com.netflix.conductor:conductor-core" + ] + }, + "io.sentry:sentry-opentelemetry-core": { + "locked": "6.14.0", + "transitive": [ + "com.netflix.conductor:conductor-core" + ] + }, "jakarta.activation:jakarta.activation-api": { "locked": "1.2.2", "transitive": [ @@ -2410,4 +2666,4 @@ ] } } -} \ No newline at end of file +} diff --git a/rest/dependencies.lock b/rest/dependencies.lock index db041bf55c..486a686b14 100644 --- a/rest/dependencies.lock +++ b/rest/dependencies.lock @@ -83,25 +83,25 @@ "locked": "1.1.4" }, "io.github.classgraph:classgraph": { - "locked": "4.8.147", + "locked": "4.8.149", "transitive": [ "org.springdoc:springdoc-openapi-ui" ] }, "io.swagger.core.v3:swagger-annotations": { - "locked": "2.2.0", + "locked": "2.2.8", "transitive": [ "io.swagger.core.v3:swagger-core" ] }, "io.swagger.core.v3:swagger-core": { - "locked": "2.2.0", + "locked": "2.2.8", "transitive": [ "org.springdoc:springdoc-openapi-common" ] }, "io.swagger.core.v3:swagger-models": { - "locked": "2.2.0", + "locked": "2.2.8", "transitive": [ "io.swagger.core.v3:swagger-core" ] @@ -196,16 +196,16 @@ ] }, "org.springdoc:springdoc-openapi-common": { - "locked": "1.6.9", + "locked": "1.6.15", "transitive": [ "org.springdoc:springdoc-openapi-webmvc-core" ] }, "org.springdoc:springdoc-openapi-ui": { - "locked": "1.6.9" + "locked": "1.6.15" }, "org.springdoc:springdoc-openapi-webmvc-core": { - "locked": "1.6.9", + "locked": "1.6.15", "transitive": [ "org.springdoc:springdoc-openapi-ui" ] @@ -318,7 +318,7 @@ ] }, "org.webjars:swagger-ui": { - "locked": "4.11.1", + "locked": "4.17.1", "transitive": [ "org.springdoc:springdoc-openapi-ui" ] @@ -333,6 +333,7 @@ "locked": "1.29", "transitive": [ "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml", + "io.swagger.core.v3:swagger-core", "org.springframework.boot:spring-boot-starter" ] } @@ -466,6 +467,18 @@ "com.netflix.conductor:conductor-core" ] }, + "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", "transitive": [ @@ -473,31 +486,147 @@ ] }, "io.github.classgraph:classgraph": { - "locked": "4.8.147", + "locked": "4.8.149", "transitive": [ "org.springdoc:springdoc-openapi-ui" ] }, + "io.opentelemetry:opentelemetry-api": { + "locked": "1.23.1", + "transitive": [ + "com.netflix.conductor:conductor-core", + "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", + "transitive": [ + "com.netflix.conductor:conductor-core" + ] + }, + "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": [ + "com.netflix.conductor:conductor-core", + "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi", + "io.sentry:sentry-opentelemetry-core" + ] + }, + "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": [ + "com.netflix.conductor:conductor-core", + "io.opentelemetry:opentelemetry-sdk-common", + "io.opentelemetry:opentelemetry-sdk-trace" + ] + }, "io.reactivex:rxjava": { "locked": "1.3.8", "transitive": [ "com.netflix.conductor:conductor-core" ] }, + "io.sentry:sentry": { + "locked": "6.14.0", + "transitive": [ + "com.netflix.conductor:conductor-core" + ] + }, + "io.sentry:sentry-opentelemetry-core": { + "locked": "6.14.0", + "transitive": [ + "com.netflix.conductor:conductor-core" + ] + }, "io.swagger.core.v3:swagger-annotations": { - "locked": "2.2.0", + "locked": "2.2.8", "transitive": [ "io.swagger.core.v3:swagger-core" ] }, "io.swagger.core.v3:swagger-core": { - "locked": "2.2.0", + "locked": "2.2.8", "transitive": [ "org.springdoc:springdoc-openapi-common" ] }, "io.swagger.core.v3:swagger-models": { - "locked": "2.2.0", + "locked": "2.2.8", "transitive": [ "io.swagger.core.v3:swagger-core" ] @@ -651,16 +780,16 @@ ] }, "org.springdoc:springdoc-openapi-common": { - "locked": "1.6.9", + "locked": "1.6.15", "transitive": [ "org.springdoc:springdoc-openapi-webmvc-core" ] }, "org.springdoc:springdoc-openapi-ui": { - "locked": "1.6.9" + "locked": "1.6.15" }, "org.springdoc:springdoc-openapi-webmvc-core": { - "locked": "1.6.9", + "locked": "1.6.15", "transitive": [ "org.springdoc:springdoc-openapi-ui" ] @@ -773,7 +902,7 @@ ] }, "org.webjars:swagger-ui": { - "locked": "4.11.1", + "locked": "4.17.1", "transitive": [ "org.springdoc:springdoc-openapi-ui" ] @@ -788,6 +917,7 @@ "locked": "1.29", "transitive": [ "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml", + "io.swagger.core.v3:swagger-core", "org.springframework.boot:spring-boot-starter" ] } @@ -883,25 +1013,25 @@ ] }, "io.github.classgraph:classgraph": { - "locked": "4.8.147", + "locked": "4.8.149", "transitive": [ "org.springdoc:springdoc-openapi-ui" ] }, "io.swagger.core.v3:swagger-annotations": { - "locked": "2.2.0", + "locked": "2.2.8", "transitive": [ "io.swagger.core.v3:swagger-core" ] }, "io.swagger.core.v3:swagger-core": { - "locked": "2.2.0", + "locked": "2.2.8", "transitive": [ "org.springdoc:springdoc-openapi-common" ] }, "io.swagger.core.v3:swagger-models": { - "locked": "2.2.0", + "locked": "2.2.8", "transitive": [ "io.swagger.core.v3:swagger-core" ] @@ -1125,16 +1255,16 @@ ] }, "org.springdoc:springdoc-openapi-common": { - "locked": "1.6.9", + "locked": "1.6.15", "transitive": [ "org.springdoc:springdoc-openapi-webmvc-core" ] }, "org.springdoc:springdoc-openapi-ui": { - "locked": "1.6.9" + "locked": "1.6.15" }, "org.springdoc:springdoc-openapi-webmvc-core": { - "locked": "1.6.9", + "locked": "1.6.15", "transitive": [ "org.springdoc:springdoc-openapi-ui" ] @@ -1278,7 +1408,7 @@ ] }, "org.webjars:swagger-ui": { - "locked": "4.11.1", + "locked": "4.17.1", "transitive": [ "org.springdoc:springdoc-openapi-ui" ] @@ -1299,6 +1429,7 @@ "locked": "1.29", "transitive": [ "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml", + "io.swagger.core.v3:swagger-core", "org.springframework.boot:spring-boot-starter" ] } @@ -1433,6 +1564,18 @@ "com.netflix.conductor:conductor-core" ] }, + "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.vaadin.external.google:android-json": { "locked": "0.0.20131108.vaadin1", "transitive": [ @@ -1446,31 +1589,147 @@ ] }, "io.github.classgraph:classgraph": { - "locked": "4.8.147", + "locked": "4.8.149", "transitive": [ "org.springdoc:springdoc-openapi-ui" ] }, + "io.opentelemetry:opentelemetry-api": { + "locked": "1.23.1", + "transitive": [ + "com.netflix.conductor:conductor-core", + "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", + "transitive": [ + "com.netflix.conductor:conductor-core" + ] + }, + "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": [ + "com.netflix.conductor:conductor-core", + "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi", + "io.sentry:sentry-opentelemetry-core" + ] + }, + "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": [ + "com.netflix.conductor:conductor-core", + "io.opentelemetry:opentelemetry-sdk-common", + "io.opentelemetry:opentelemetry-sdk-trace" + ] + }, "io.reactivex:rxjava": { "locked": "1.3.8", "transitive": [ "com.netflix.conductor:conductor-core" ] }, + "io.sentry:sentry": { + "locked": "6.14.0", + "transitive": [ + "com.netflix.conductor:conductor-core" + ] + }, + "io.sentry:sentry-opentelemetry-core": { + "locked": "6.14.0", + "transitive": [ + "com.netflix.conductor:conductor-core" + ] + }, "io.swagger.core.v3:swagger-annotations": { - "locked": "2.2.0", + "locked": "2.2.8", "transitive": [ "io.swagger.core.v3:swagger-core" ] }, "io.swagger.core.v3:swagger-core": { - "locked": "2.2.0", + "locked": "2.2.8", "transitive": [ "org.springdoc:springdoc-openapi-common" ] }, "io.swagger.core.v3:swagger-models": { - "locked": "2.2.0", + "locked": "2.2.8", "transitive": [ "io.swagger.core.v3:swagger-core" ] @@ -1746,16 +2005,16 @@ ] }, "org.springdoc:springdoc-openapi-common": { - "locked": "1.6.9", + "locked": "1.6.15", "transitive": [ "org.springdoc:springdoc-openapi-webmvc-core" ] }, "org.springdoc:springdoc-openapi-ui": { - "locked": "1.6.9" + "locked": "1.6.15" }, "org.springdoc:springdoc-openapi-webmvc-core": { - "locked": "1.6.9", + "locked": "1.6.15", "transitive": [ "org.springdoc:springdoc-openapi-ui" ] @@ -1899,7 +2158,7 @@ ] }, "org.webjars:swagger-ui": { - "locked": "4.11.1", + "locked": "4.17.1", "transitive": [ "org.springdoc:springdoc-openapi-ui" ] @@ -1920,8 +2179,9 @@ "locked": "1.29", "transitive": [ "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml", + "io.swagger.core.v3:swagger-core", "org.springframework.boot:spring-boot-starter" ] } } -} \ No newline at end of file +} diff --git a/server/build.gradle b/server/build.gradle index 9aa5cb3919..9be3931a5b 100644 --- a/server/build.gradle +++ b/server/build.gradle @@ -35,6 +35,7 @@ dependencies { implementation project(':contribs:persistence:postgres-persistence') implementation project(':contribs:index:es7-persistence') implementation project(':contribs:metrics') + implementation project(':contribs:workflow-event-listener') implementation 'org.springframework.boot:spring-boot-starter' implementation 'org.springframework.boot:spring-boot-starter-validation' diff --git a/server/dependencies.lock b/server/dependencies.lock index 2e9dfda6a8..bf92b0ca29 100644 --- a/server/dependencies.lock +++ b/server/dependencies.lock @@ -100,9 +100,6 @@ "com.netflix.conductor:conductor-json-jq-task": { "project": true }, - "com.netflix.conductor:conductor-metrics": { - "locked": "3.8.0" - }, "com.netflix.conductor:conductor-redis-concurrency-limit": { "project": true }, @@ -124,11 +121,17 @@ "com.netflix.conductor:kafka-publish": { "project": true }, + "com.netflix.conductor:metrics": { + "project": true + }, "com.netflix.conductor:postgres-persistence": { "project": true }, + "com.netflix.conductor:workflow-event-listener": { + "project": true + }, "io.github.classgraph:classgraph": { - "locked": "4.8.147", + "locked": "4.8.149", "transitive": [ "org.springdoc:springdoc-openapi-ui" ] @@ -140,19 +143,19 @@ ] }, "io.swagger.core.v3:swagger-annotations": { - "locked": "2.2.0", + "locked": "2.2.8", "transitive": [ "io.swagger.core.v3:swagger-core" ] }, "io.swagger.core.v3:swagger-core": { - "locked": "2.2.0", + "locked": "2.2.8", "transitive": [ "org.springdoc:springdoc-openapi-common" ] }, "io.swagger.core.v3:swagger-models": { - "locked": "2.2.0", + "locked": "2.2.8", "transitive": [ "io.swagger.core.v3:swagger-core" ] @@ -275,16 +278,16 @@ ] }, "org.springdoc:springdoc-openapi-common": { - "locked": "1.6.9", + "locked": "1.6.15", "transitive": [ "org.springdoc:springdoc-openapi-webmvc-core" ] }, "org.springdoc:springdoc-openapi-ui": { - "locked": "1.6.9" + "locked": "1.6.15" }, "org.springdoc:springdoc-openapi-webmvc-core": { - "locked": "1.6.9", + "locked": "1.6.15", "transitive": [ "org.springdoc:springdoc-openapi-ui" ] @@ -426,7 +429,7 @@ ] }, "org.webjars:swagger-ui": { - "locked": "4.11.1", + "locked": "4.17.1", "transitive": [ "org.springdoc:springdoc-openapi-ui" ] @@ -441,6 +444,7 @@ "locked": "1.29", "transitive": [ "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml", + "io.swagger.core.v3:swagger-core", "org.springframework.boot:spring-boot-starter" ] } @@ -699,7 +703,7 @@ ] }, "com.google.api.grpc:proto-google-common-protos": { - "locked": "2.0.1", + "locked": "2.17.0", "transitive": [ "io.grpc:grpc-protobuf" ] @@ -727,7 +731,7 @@ ] }, "com.google.errorprone:error_prone_annotations": { - "locked": "2.10.0", + "locked": "2.18.0", "transitive": [ "com.github.ben-manes.caffeine:caffeine", "com.google.guava:guava", @@ -746,18 +750,19 @@ ] }, "com.google.guava:guava": { - "locked": "31.0.1-android", + "locked": "31.1-jre", "transitive": [ "com.datastax.cassandra:cassandra-driver-core", "com.google.inject:guice", "com.google.protobuf:protobuf-java-util", "com.netflix.archaius:archaius-core", "com.netflix.conductor:conductor-awssqs-event-queue", - "com.netflix.conductor:conductor-metrics", "com.netflix.conductor:es7-persistence", "com.netflix.conductor:kafka", "com.netflix.conductor:kafka-publish", + "com.netflix.conductor:metrics", "com.netflix.conductor:postgres-persistence", + "com.netflix.conductor:workflow-event-listener", "com.netflix.netflix-commons:netflix-infix", "com.netflix.servo:servo-core", "io.grpc:grpc-api", @@ -791,7 +796,7 @@ ] }, "com.google.protobuf:protobuf-java": { - "locked": "3.19.2", + "locked": "3.22.3", "transitive": [ "com.google.api.grpc:proto-google-common-protos", "com.google.protobuf:protobuf-java-util", @@ -802,7 +807,7 @@ ] }, "com.google.protobuf:protobuf-java-util": { - "locked": "3.19.2", + "locked": "3.22.3", "transitive": [ "io.grpc:grpc-services" ] @@ -867,14 +872,15 @@ "com.netflix.conductor:conductor-grpc-server", "com.netflix.conductor:conductor-http-task", "com.netflix.conductor:conductor-json-jq-task", - "com.netflix.conductor:conductor-metrics", "com.netflix.conductor:conductor-redis-concurrency-limit", "com.netflix.conductor:conductor-redis-persistence", "com.netflix.conductor:conductor-rest", "com.netflix.conductor:es7-persistence", "com.netflix.conductor:kafka", "com.netflix.conductor:kafka-publish", - "com.netflix.conductor:postgres-persistence" + "com.netflix.conductor:metrics", + "com.netflix.conductor:postgres-persistence", + "com.netflix.conductor:workflow-event-listener" ] }, "com.netflix.conductor:conductor-core": { @@ -887,7 +893,6 @@ "com.netflix.conductor:conductor-grpc-server", "com.netflix.conductor:conductor-http-task", "com.netflix.conductor:conductor-json-jq-task", - "com.netflix.conductor:conductor-metrics", "com.netflix.conductor:conductor-redis-concurrency-limit", "com.netflix.conductor:conductor-redis-lock", "com.netflix.conductor:conductor-redis-persistence", @@ -895,7 +900,9 @@ "com.netflix.conductor:es7-persistence", "com.netflix.conductor:kafka", "com.netflix.conductor:kafka-publish", - "com.netflix.conductor:postgres-persistence" + "com.netflix.conductor:metrics", + "com.netflix.conductor:postgres-persistence", + "com.netflix.conductor:workflow-event-listener" ] }, "com.netflix.conductor:conductor-grpc": { @@ -913,9 +920,6 @@ "com.netflix.conductor:conductor-json-jq-task": { "project": true }, - "com.netflix.conductor:conductor-metrics": { - "locked": "3.8.0" - }, "com.netflix.conductor:conductor-redis-concurrency-limit": { "project": true }, @@ -937,9 +941,15 @@ "com.netflix.conductor:kafka-publish": { "project": true }, + "com.netflix.conductor:metrics": { + "project": true + }, "com.netflix.conductor:postgres-persistence": { "project": true }, + "com.netflix.conductor:workflow-event-listener": { + "project": true + }, "com.netflix.dyno-queues:dyno-queues-core": { "locked": "2.0.20", "transitive": [ @@ -1043,13 +1053,13 @@ "com.netflix.spectator:spectator-reg-metrics3": { "locked": "0.122.0", "transitive": [ - "com.netflix.conductor:conductor-metrics" + "com.netflix.conductor:metrics" ] }, "com.netflix.spectator:spectator-reg-micrometer": { "locked": "0.122.0", "transitive": [ - "com.netflix.conductor:conductor-metrics" + "com.netflix.conductor:metrics" ] }, "com.spotify:completable-futures": { @@ -1059,6 +1069,18 @@ "com.netflix.conductor:kafka" ] }, + "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": [ @@ -1172,7 +1194,7 @@ ] }, "io.github.classgraph:classgraph": { - "locked": "4.8.147", + "locked": "4.8.149", "transitive": [ "org.springdoc:springdoc-openapi-ui" ] @@ -1184,7 +1206,7 @@ ] }, "io.grpc:grpc-api": { - "locked": "1.47.0", + "locked": "1.56.1", "transitive": [ "io.grpc:grpc-core", "io.grpc:grpc-protobuf", @@ -1193,45 +1215,45 @@ ] }, "io.grpc:grpc-context": { - "locked": "1.47.0", + "locked": "1.56.1", "transitive": [ "io.grpc:grpc-api" ] }, "io.grpc:grpc-core": { - "locked": "1.47.0", + "locked": "1.56.1", "transitive": [ "io.grpc:grpc-netty", "io.grpc:grpc-services" ] }, "io.grpc:grpc-netty": { - "locked": "1.47.0", + "locked": "1.56.1", "transitive": [ "com.netflix.conductor:conductor-grpc-server" ] }, "io.grpc:grpc-protobuf": { - "locked": "1.47.0", + "locked": "1.56.1", "transitive": [ "com.netflix.conductor:conductor-grpc", "io.grpc:grpc-services" ] }, "io.grpc:grpc-protobuf-lite": { - "locked": "1.47.0", + "locked": "1.56.1", "transitive": [ "io.grpc:grpc-protobuf" ] }, "io.grpc:grpc-services": { - "locked": "1.47.0", + "locked": "1.56.1", "transitive": [ "com.netflix.conductor:conductor-grpc-server" ] }, "io.grpc:grpc-stub": { - "locked": "1.47.0", + "locked": "1.56.1", "transitive": [ "com.netflix.conductor:conductor-grpc", "io.grpc:grpc-services" @@ -1248,7 +1270,7 @@ "io.micrometer:micrometer-registry-prometheus": { "locked": "1.8.5", "transitive": [ - "com.netflix.conductor:conductor-metrics" + "com.netflix.conductor:metrics" ] }, "io.netty:netty-buffer": { @@ -1374,8 +1396,112 @@ "io.grpc:grpc-netty" ] }, + "io.opentelemetry:opentelemetry-api": { + "locked": "1.23.1", + "transitive": [ + "com.netflix.conductor:conductor-core", + "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", + "transitive": [ + "com.netflix.conductor:conductor-core" + ] + }, + "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": [ + "com.netflix.conductor:conductor-core", + "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi", + "io.sentry:sentry-opentelemetry-core" + ] + }, + "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": [ + "com.netflix.conductor:conductor-core", + "io.opentelemetry:opentelemetry-sdk-common", + "io.opentelemetry:opentelemetry-sdk-trace" + ] + }, "io.perfmark:perfmark-api": { - "locked": "0.25.0", + "locked": "0.26.0", "transitive": [ "io.grpc:grpc-core", "io.grpc:grpc-netty" @@ -1390,7 +1516,7 @@ "io.prometheus:simpleclient": { "locked": "0.12.0", "transitive": [ - "com.netflix.conductor:conductor-metrics", + "com.netflix.conductor:metrics", "io.prometheus:simpleclient_common" ] }, @@ -1430,25 +1556,37 @@ "transitive": [ "com.netflix.conductor:conductor-awssqs-event-queue", "com.netflix.conductor:conductor-core", - "com.netflix.conductor:conductor-metrics", "com.netflix.conductor:kafka", - "com.netflix.conductor:kafka-publish" + "com.netflix.conductor:kafka-publish", + "com.netflix.conductor:metrics" + ] + }, + "io.sentry:sentry": { + "locked": "6.14.0", + "transitive": [ + "com.netflix.conductor:conductor-core" + ] + }, + "io.sentry:sentry-opentelemetry-core": { + "locked": "6.14.0", + "transitive": [ + "com.netflix.conductor:conductor-core" ] }, "io.swagger.core.v3:swagger-annotations": { - "locked": "2.2.0", + "locked": "2.2.8", "transitive": [ "io.swagger.core.v3:swagger-core" ] }, "io.swagger.core.v3:swagger-core": { - "locked": "2.2.0", + "locked": "2.2.8", "transitive": [ "org.springdoc:springdoc-openapi-common" ] }, "io.swagger.core.v3:swagger-models": { - "locked": "2.2.0", + "locked": "2.2.8", "transitive": [ "io.swagger.core.v3:swagger-core" ] @@ -1510,8 +1648,8 @@ "locked": "1.1.1", "transitive": [ "com.netflix.conductor:conductor-http-task", - "com.netflix.conductor:conductor-metrics", "com.netflix.conductor:kafka-publish", + "com.netflix.conductor:metrics", "com.netflix.eureka:eureka-client", "com.sun.jersey:jersey-core" ] @@ -1589,11 +1727,11 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core", "com.netflix.conductor:conductor-grpc-server", - "com.netflix.conductor:conductor-metrics", "com.netflix.conductor:conductor-redis-concurrency-limit", "com.netflix.conductor:conductor-redis-lock", "com.netflix.conductor:es7-persistence", "com.netflix.conductor:kafka-publish", + "com.netflix.conductor:metrics", "com.netflix.conductor:postgres-persistence", "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", @@ -1651,7 +1789,8 @@ "locked": "3.1.0", "transitive": [ "com.netflix.conductor:kafka", - "com.netflix.conductor:kafka-publish" + "com.netflix.conductor:kafka-publish", + "com.netflix.conductor:workflow-event-listener" ] }, "org.apache.logging.log4j:log4j-api": { @@ -1668,7 +1807,6 @@ "com.netflix.conductor:conductor-grpc-server", "com.netflix.conductor:conductor-http-task", "com.netflix.conductor:conductor-json-jq-task", - "com.netflix.conductor:conductor-metrics", "com.netflix.conductor:conductor-redis-concurrency-limit", "com.netflix.conductor:conductor-redis-lock", "com.netflix.conductor:conductor-redis-persistence", @@ -1676,7 +1814,9 @@ "com.netflix.conductor:es7-persistence", "com.netflix.conductor:kafka", "com.netflix.conductor:kafka-publish", + "com.netflix.conductor:metrics", "com.netflix.conductor:postgres-persistence", + "com.netflix.conductor:workflow-event-listener", "org.apache.logging.log4j:log4j-core", "org.apache.logging.log4j:log4j-jul", "org.apache.logging.log4j:log4j-slf4j-impl", @@ -1698,7 +1838,6 @@ "com.netflix.conductor:conductor-grpc-server", "com.netflix.conductor:conductor-http-task", "com.netflix.conductor:conductor-json-jq-task", - "com.netflix.conductor:conductor-metrics", "com.netflix.conductor:conductor-redis-concurrency-limit", "com.netflix.conductor:conductor-redis-lock", "com.netflix.conductor:conductor-redis-persistence", @@ -1706,7 +1845,9 @@ "com.netflix.conductor:es7-persistence", "com.netflix.conductor:kafka", "com.netflix.conductor:kafka-publish", + "com.netflix.conductor:metrics", "com.netflix.conductor:postgres-persistence", + "com.netflix.conductor:workflow-event-listener", "org.apache.logging.log4j:log4j-slf4j-impl", "org.apache.logging.log4j:log4j-web", "org.springframework.boot:spring-boot-starter-log4j2" @@ -1726,7 +1867,6 @@ "com.netflix.conductor:conductor-grpc-server", "com.netflix.conductor:conductor-http-task", "com.netflix.conductor:conductor-json-jq-task", - "com.netflix.conductor:conductor-metrics", "com.netflix.conductor:conductor-redis-concurrency-limit", "com.netflix.conductor:conductor-redis-lock", "com.netflix.conductor:conductor-redis-persistence", @@ -1734,7 +1874,9 @@ "com.netflix.conductor:es7-persistence", "com.netflix.conductor:kafka", "com.netflix.conductor:kafka-publish", + "com.netflix.conductor:metrics", "com.netflix.conductor:postgres-persistence", + "com.netflix.conductor:workflow-event-listener", "org.springframework.boot:spring-boot-starter-log4j2" ] }, @@ -1752,7 +1894,6 @@ "com.netflix.conductor:conductor-grpc-server", "com.netflix.conductor:conductor-http-task", "com.netflix.conductor:conductor-json-jq-task", - "com.netflix.conductor:conductor-metrics", "com.netflix.conductor:conductor-redis-concurrency-limit", "com.netflix.conductor:conductor-redis-lock", "com.netflix.conductor:conductor-redis-persistence", @@ -1760,7 +1901,9 @@ "com.netflix.conductor:es7-persistence", "com.netflix.conductor:kafka", "com.netflix.conductor:kafka-publish", + "com.netflix.conductor:metrics", "com.netflix.conductor:postgres-persistence", + "com.netflix.conductor:workflow-event-listener", "org.springframework.boot:spring-boot-starter-log4j2" ] }, @@ -1778,7 +1921,6 @@ "com.netflix.conductor:conductor-grpc-server", "com.netflix.conductor:conductor-http-task", "com.netflix.conductor:conductor-json-jq-task", - "com.netflix.conductor:conductor-metrics", "com.netflix.conductor:conductor-redis-concurrency-limit", "com.netflix.conductor:conductor-redis-lock", "com.netflix.conductor:conductor-redis-persistence", @@ -1786,7 +1928,9 @@ "com.netflix.conductor:es7-persistence", "com.netflix.conductor:kafka", "com.netflix.conductor:kafka-publish", - "com.netflix.conductor:postgres-persistence" + "com.netflix.conductor:metrics", + "com.netflix.conductor:postgres-persistence", + "com.netflix.conductor:workflow-event-listener" ] }, "org.apache.lucene:lucene-analyzers-common": { @@ -1899,12 +2043,6 @@ "org.springframework.boot:spring-boot-starter-tomcat" ] }, - "org.checkerframework:checker-compat-qual": { - "locked": "2.5.5", - "transitive": [ - "com.google.guava:guava" - ] - }, "org.checkerframework:checker-qual": { "locked": "3.19.0", "transitive": [ @@ -1920,7 +2058,7 @@ ] }, "org.codehaus.mojo:animal-sniffer-annotations": { - "locked": "1.19", + "locked": "1.23", "transitive": [ "io.grpc:grpc-core" ] @@ -2203,19 +2341,19 @@ ] }, "org.springdoc:springdoc-openapi-common": { - "locked": "1.6.9", + "locked": "1.6.15", "transitive": [ "org.springdoc:springdoc-openapi-webmvc-core" ] }, "org.springdoc:springdoc-openapi-ui": { - "locked": "1.6.9", + "locked": "1.6.15", "transitive": [ "com.netflix.conductor:conductor-rest" ] }, "org.springdoc:springdoc-openapi-webmvc-core": { - "locked": "1.6.9", + "locked": "1.6.15", "transitive": [ "org.springdoc:springdoc-openapi-ui" ] @@ -2383,7 +2521,7 @@ ] }, "org.webjars:swagger-ui": { - "locked": "4.11.1", + "locked": "4.17.1", "transitive": [ "org.springdoc:springdoc-openapi-ui" ] @@ -2404,6 +2542,7 @@ "locked": "1.29", "transitive": [ "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml", + "io.swagger.core.v3:swagger-core", "org.elasticsearch:elasticsearch-x-content", "org.redisson:redisson", "org.springframework.boot:spring-boot-starter" @@ -2691,7 +2830,7 @@ ] }, "com.google.api.grpc:proto-google-common-protos": { - "locked": "2.0.1", + "locked": "2.17.0", "transitive": [ "io.grpc:grpc-protobuf" ] @@ -2719,7 +2858,7 @@ ] }, "com.google.errorprone:error_prone_annotations": { - "locked": "2.10.0", + "locked": "2.18.0", "transitive": [ "com.github.ben-manes.caffeine:caffeine", "com.google.guava:guava", @@ -2738,18 +2877,19 @@ ] }, "com.google.guava:guava": { - "locked": "31.0.1-android", + "locked": "31.1-jre", "transitive": [ "com.datastax.cassandra:cassandra-driver-core", "com.google.inject:guice", "com.google.protobuf:protobuf-java-util", "com.netflix.archaius:archaius-core", "com.netflix.conductor:conductor-awssqs-event-queue", - "com.netflix.conductor:conductor-metrics", "com.netflix.conductor:es7-persistence", "com.netflix.conductor:kafka", "com.netflix.conductor:kafka-publish", + "com.netflix.conductor:metrics", "com.netflix.conductor:postgres-persistence", + "com.netflix.conductor:workflow-event-listener", "com.netflix.netflix-commons:netflix-infix", "com.netflix.servo:servo-core", "io.grpc:grpc-api", @@ -2783,7 +2923,7 @@ ] }, "com.google.protobuf:protobuf-java": { - "locked": "3.19.2", + "locked": "3.22.3", "transitive": [ "com.google.api.grpc:proto-google-common-protos", "com.google.protobuf:protobuf-java-util", @@ -2794,7 +2934,7 @@ ] }, "com.google.protobuf:protobuf-java-util": { - "locked": "3.19.2", + "locked": "3.22.3", "transitive": [ "io.grpc:grpc-services" ] @@ -2859,14 +2999,15 @@ "com.netflix.conductor:conductor-grpc-server", "com.netflix.conductor:conductor-http-task", "com.netflix.conductor:conductor-json-jq-task", - "com.netflix.conductor:conductor-metrics", "com.netflix.conductor:conductor-redis-concurrency-limit", "com.netflix.conductor:conductor-redis-persistence", "com.netflix.conductor:conductor-rest", "com.netflix.conductor:es7-persistence", "com.netflix.conductor:kafka", "com.netflix.conductor:kafka-publish", - "com.netflix.conductor:postgres-persistence" + "com.netflix.conductor:metrics", + "com.netflix.conductor:postgres-persistence", + "com.netflix.conductor:workflow-event-listener" ] }, "com.netflix.conductor:conductor-core": { @@ -2879,7 +3020,6 @@ "com.netflix.conductor:conductor-grpc-server", "com.netflix.conductor:conductor-http-task", "com.netflix.conductor:conductor-json-jq-task", - "com.netflix.conductor:conductor-metrics", "com.netflix.conductor:conductor-redis-concurrency-limit", "com.netflix.conductor:conductor-redis-lock", "com.netflix.conductor:conductor-redis-persistence", @@ -2887,7 +3027,9 @@ "com.netflix.conductor:es7-persistence", "com.netflix.conductor:kafka", "com.netflix.conductor:kafka-publish", - "com.netflix.conductor:postgres-persistence" + "com.netflix.conductor:metrics", + "com.netflix.conductor:postgres-persistence", + "com.netflix.conductor:workflow-event-listener" ] }, "com.netflix.conductor:conductor-grpc": { @@ -2905,9 +3047,6 @@ "com.netflix.conductor:conductor-json-jq-task": { "project": true }, - "com.netflix.conductor:conductor-metrics": { - "locked": "3.8.0" - }, "com.netflix.conductor:conductor-redis-concurrency-limit": { "project": true }, @@ -2929,9 +3068,15 @@ "com.netflix.conductor:kafka-publish": { "project": true }, + "com.netflix.conductor:metrics": { + "project": true + }, "com.netflix.conductor:postgres-persistence": { "project": true }, + "com.netflix.conductor:workflow-event-listener": { + "project": true + }, "com.netflix.dyno-queues:dyno-queues-core": { "locked": "2.0.20", "transitive": [ @@ -3035,13 +3180,13 @@ "com.netflix.spectator:spectator-reg-metrics3": { "locked": "0.122.0", "transitive": [ - "com.netflix.conductor:conductor-metrics" + "com.netflix.conductor:metrics" ] }, "com.netflix.spectator:spectator-reg-micrometer": { "locked": "0.122.0", "transitive": [ - "com.netflix.conductor:conductor-metrics" + "com.netflix.conductor:metrics" ] }, "com.spotify:completable-futures": { @@ -3051,6 +3196,18 @@ "com.netflix.conductor:kafka" ] }, + "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": [ @@ -3164,7 +3321,7 @@ ] }, "io.github.classgraph:classgraph": { - "locked": "4.8.147", + "locked": "4.8.149", "transitive": [ "org.springdoc:springdoc-openapi-ui" ] @@ -3176,7 +3333,7 @@ ] }, "io.grpc:grpc-api": { - "locked": "1.47.0", + "locked": "1.56.1", "transitive": [ "io.grpc:grpc-core", "io.grpc:grpc-protobuf", @@ -3185,45 +3342,45 @@ ] }, "io.grpc:grpc-context": { - "locked": "1.47.0", + "locked": "1.56.1", "transitive": [ "io.grpc:grpc-api" ] }, "io.grpc:grpc-core": { - "locked": "1.47.0", + "locked": "1.56.1", "transitive": [ "io.grpc:grpc-netty", "io.grpc:grpc-services" ] }, "io.grpc:grpc-netty": { - "locked": "1.47.0", + "locked": "1.56.1", "transitive": [ "com.netflix.conductor:conductor-grpc-server" ] }, "io.grpc:grpc-protobuf": { - "locked": "1.47.0", + "locked": "1.56.1", "transitive": [ "com.netflix.conductor:conductor-grpc", "io.grpc:grpc-services" ] }, "io.grpc:grpc-protobuf-lite": { - "locked": "1.47.0", + "locked": "1.56.1", "transitive": [ "io.grpc:grpc-protobuf" ] }, "io.grpc:grpc-services": { - "locked": "1.47.0", + "locked": "1.56.1", "transitive": [ "com.netflix.conductor:conductor-grpc-server" ] }, "io.grpc:grpc-stub": { - "locked": "1.47.0", + "locked": "1.56.1", "transitive": [ "com.netflix.conductor:conductor-grpc", "io.grpc:grpc-services" @@ -3240,7 +3397,7 @@ "io.micrometer:micrometer-registry-prometheus": { "locked": "1.8.5", "transitive": [ - "com.netflix.conductor:conductor-metrics" + "com.netflix.conductor:metrics" ] }, "io.netty:netty-buffer": { @@ -3366,8 +3523,112 @@ "io.grpc:grpc-netty" ] }, + "io.opentelemetry:opentelemetry-api": { + "locked": "1.23.1", + "transitive": [ + "com.netflix.conductor:conductor-core", + "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", + "transitive": [ + "com.netflix.conductor:conductor-core" + ] + }, + "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": [ + "com.netflix.conductor:conductor-core", + "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi", + "io.sentry:sentry-opentelemetry-core" + ] + }, + "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": [ + "com.netflix.conductor:conductor-core", + "io.opentelemetry:opentelemetry-sdk-common", + "io.opentelemetry:opentelemetry-sdk-trace" + ] + }, "io.perfmark:perfmark-api": { - "locked": "0.25.0", + "locked": "0.26.0", "transitive": [ "io.grpc:grpc-core", "io.grpc:grpc-netty" @@ -3382,7 +3643,7 @@ "io.prometheus:simpleclient": { "locked": "0.12.0", "transitive": [ - "com.netflix.conductor:conductor-metrics", + "com.netflix.conductor:metrics", "io.prometheus:simpleclient_common" ] }, @@ -3422,25 +3683,37 @@ "transitive": [ "com.netflix.conductor:conductor-awssqs-event-queue", "com.netflix.conductor:conductor-core", - "com.netflix.conductor:conductor-metrics", "com.netflix.conductor:kafka", - "com.netflix.conductor:kafka-publish" + "com.netflix.conductor:kafka-publish", + "com.netflix.conductor:metrics" + ] + }, + "io.sentry:sentry": { + "locked": "6.14.0", + "transitive": [ + "com.netflix.conductor:conductor-core" + ] + }, + "io.sentry:sentry-opentelemetry-core": { + "locked": "6.14.0", + "transitive": [ + "com.netflix.conductor:conductor-core" ] }, "io.swagger.core.v3:swagger-annotations": { - "locked": "2.2.0", + "locked": "2.2.8", "transitive": [ "io.swagger.core.v3:swagger-core" ] }, "io.swagger.core.v3:swagger-core": { - "locked": "2.2.0", + "locked": "2.2.8", "transitive": [ "org.springdoc:springdoc-openapi-common" ] }, "io.swagger.core.v3:swagger-models": { - "locked": "2.2.0", + "locked": "2.2.8", "transitive": [ "io.swagger.core.v3:swagger-core" ] @@ -3502,8 +3775,8 @@ "locked": "1.1.1", "transitive": [ "com.netflix.conductor:conductor-http-task", - "com.netflix.conductor:conductor-metrics", "com.netflix.conductor:kafka-publish", + "com.netflix.conductor:metrics", "com.netflix.eureka:eureka-client", "com.sun.jersey:jersey-core" ] @@ -3581,11 +3854,11 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core", "com.netflix.conductor:conductor-grpc-server", - "com.netflix.conductor:conductor-metrics", "com.netflix.conductor:conductor-redis-concurrency-limit", "com.netflix.conductor:conductor-redis-lock", "com.netflix.conductor:es7-persistence", "com.netflix.conductor:kafka-publish", + "com.netflix.conductor:metrics", "com.netflix.conductor:postgres-persistence", "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", @@ -3643,7 +3916,8 @@ "locked": "3.1.0", "transitive": [ "com.netflix.conductor:kafka", - "com.netflix.conductor:kafka-publish" + "com.netflix.conductor:kafka-publish", + "com.netflix.conductor:workflow-event-listener" ] }, "org.apache.logging.log4j:log4j-api": { @@ -3660,7 +3934,6 @@ "com.netflix.conductor:conductor-grpc-server", "com.netflix.conductor:conductor-http-task", "com.netflix.conductor:conductor-json-jq-task", - "com.netflix.conductor:conductor-metrics", "com.netflix.conductor:conductor-redis-concurrency-limit", "com.netflix.conductor:conductor-redis-lock", "com.netflix.conductor:conductor-redis-persistence", @@ -3668,7 +3941,9 @@ "com.netflix.conductor:es7-persistence", "com.netflix.conductor:kafka", "com.netflix.conductor:kafka-publish", + "com.netflix.conductor:metrics", "com.netflix.conductor:postgres-persistence", + "com.netflix.conductor:workflow-event-listener", "org.apache.logging.log4j:log4j-core", "org.apache.logging.log4j:log4j-jul", "org.apache.logging.log4j:log4j-slf4j-impl", @@ -3690,7 +3965,6 @@ "com.netflix.conductor:conductor-grpc-server", "com.netflix.conductor:conductor-http-task", "com.netflix.conductor:conductor-json-jq-task", - "com.netflix.conductor:conductor-metrics", "com.netflix.conductor:conductor-redis-concurrency-limit", "com.netflix.conductor:conductor-redis-lock", "com.netflix.conductor:conductor-redis-persistence", @@ -3698,7 +3972,9 @@ "com.netflix.conductor:es7-persistence", "com.netflix.conductor:kafka", "com.netflix.conductor:kafka-publish", + "com.netflix.conductor:metrics", "com.netflix.conductor:postgres-persistence", + "com.netflix.conductor:workflow-event-listener", "org.apache.logging.log4j:log4j-slf4j-impl", "org.apache.logging.log4j:log4j-web", "org.springframework.boot:spring-boot-starter-log4j2" @@ -3718,7 +3994,6 @@ "com.netflix.conductor:conductor-grpc-server", "com.netflix.conductor:conductor-http-task", "com.netflix.conductor:conductor-json-jq-task", - "com.netflix.conductor:conductor-metrics", "com.netflix.conductor:conductor-redis-concurrency-limit", "com.netflix.conductor:conductor-redis-lock", "com.netflix.conductor:conductor-redis-persistence", @@ -3726,7 +4001,9 @@ "com.netflix.conductor:es7-persistence", "com.netflix.conductor:kafka", "com.netflix.conductor:kafka-publish", + "com.netflix.conductor:metrics", "com.netflix.conductor:postgres-persistence", + "com.netflix.conductor:workflow-event-listener", "org.springframework.boot:spring-boot-starter-log4j2" ] }, @@ -3744,7 +4021,6 @@ "com.netflix.conductor:conductor-grpc-server", "com.netflix.conductor:conductor-http-task", "com.netflix.conductor:conductor-json-jq-task", - "com.netflix.conductor:conductor-metrics", "com.netflix.conductor:conductor-redis-concurrency-limit", "com.netflix.conductor:conductor-redis-lock", "com.netflix.conductor:conductor-redis-persistence", @@ -3752,7 +4028,9 @@ "com.netflix.conductor:es7-persistence", "com.netflix.conductor:kafka", "com.netflix.conductor:kafka-publish", + "com.netflix.conductor:metrics", "com.netflix.conductor:postgres-persistence", + "com.netflix.conductor:workflow-event-listener", "org.springframework.boot:spring-boot-starter-log4j2" ] }, @@ -3770,7 +4048,6 @@ "com.netflix.conductor:conductor-grpc-server", "com.netflix.conductor:conductor-http-task", "com.netflix.conductor:conductor-json-jq-task", - "com.netflix.conductor:conductor-metrics", "com.netflix.conductor:conductor-redis-concurrency-limit", "com.netflix.conductor:conductor-redis-lock", "com.netflix.conductor:conductor-redis-persistence", @@ -3778,7 +4055,9 @@ "com.netflix.conductor:es7-persistence", "com.netflix.conductor:kafka", "com.netflix.conductor:kafka-publish", - "com.netflix.conductor:postgres-persistence" + "com.netflix.conductor:metrics", + "com.netflix.conductor:postgres-persistence", + "com.netflix.conductor:workflow-event-listener" ] }, "org.apache.lucene:lucene-analyzers-common": { @@ -3891,12 +4170,6 @@ "org.springframework.boot:spring-boot-starter-tomcat" ] }, - "org.checkerframework:checker-compat-qual": { - "locked": "2.5.5", - "transitive": [ - "com.google.guava:guava" - ] - }, "org.checkerframework:checker-qual": { "locked": "3.19.0", "transitive": [ @@ -3912,7 +4185,7 @@ ] }, "org.codehaus.mojo:animal-sniffer-annotations": { - "locked": "1.19", + "locked": "1.23", "transitive": [ "io.grpc:grpc-core" ] @@ -4195,19 +4468,19 @@ ] }, "org.springdoc:springdoc-openapi-common": { - "locked": "1.6.9", + "locked": "1.6.15", "transitive": [ "org.springdoc:springdoc-openapi-webmvc-core" ] }, "org.springdoc:springdoc-openapi-ui": { - "locked": "1.6.9", + "locked": "1.6.15", "transitive": [ "com.netflix.conductor:conductor-rest" ] }, "org.springdoc:springdoc-openapi-webmvc-core": { - "locked": "1.6.9", + "locked": "1.6.15", "transitive": [ "org.springdoc:springdoc-openapi-ui" ] @@ -4375,7 +4648,7 @@ ] }, "org.webjars:swagger-ui": { - "locked": "4.11.1", + "locked": "4.17.1", "transitive": [ "org.springdoc:springdoc-openapi-ui" ] @@ -4396,6 +4669,7 @@ "locked": "1.29", "transitive": [ "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml", + "io.swagger.core.v3:swagger-core", "org.elasticsearch:elasticsearch-x-content", "org.redisson:redisson", "org.springframework.boot:spring-boot-starter" @@ -4505,7 +4779,7 @@ ] }, "com.google.api.grpc:proto-google-common-protos": { - "locked": "2.0.1", + "locked": "2.17.0", "transitive": [ "io.grpc:grpc-protobuf" ] @@ -4519,7 +4793,7 @@ ] }, "com.google.errorprone:error_prone_annotations": { - "locked": "2.10.0", + "locked": "2.18.0", "transitive": [ "com.google.guava:guava", "io.grpc:grpc-api" @@ -4532,7 +4806,7 @@ ] }, "com.google.guava:guava": { - "locked": "31.0.1-android", + "locked": "31.1-android", "transitive": [ "io.grpc:grpc-stub" ] @@ -4586,9 +4860,6 @@ "com.netflix.conductor:conductor-json-jq-task": { "project": true }, - "com.netflix.conductor:conductor-metrics": { - "locked": "3.8.0" - }, "com.netflix.conductor:conductor-redis-concurrency-limit": { "project": true }, @@ -4610,9 +4881,15 @@ "com.netflix.conductor:kafka-publish": { "project": true }, + "com.netflix.conductor:metrics": { + "project": true + }, "com.netflix.conductor:postgres-persistence": { "project": true }, + "com.netflix.conductor:workflow-event-listener": { + "project": true + }, "com.vaadin.external.google:android-json": { "locked": "0.0.20131108.vaadin1", "transitive": [ @@ -4620,13 +4897,13 @@ ] }, "io.github.classgraph:classgraph": { - "locked": "4.8.147", + "locked": "4.8.149", "transitive": [ "org.springdoc:springdoc-openapi-ui" ] }, "io.grpc:grpc-api": { - "locked": "1.47.0", + "locked": "1.56.1", "transitive": [ "io.grpc:grpc-core", "io.grpc:grpc-protobuf", @@ -4635,34 +4912,34 @@ ] }, "io.grpc:grpc-context": { - "locked": "1.47.0", + "locked": "1.56.1", "transitive": [ "io.grpc:grpc-api" ] }, "io.grpc:grpc-core": { - "locked": "1.47.0", + "locked": "1.56.1", "transitive": [ "io.grpc:grpc-testing" ] }, "io.grpc:grpc-protobuf": { - "locked": "1.47.0" + "locked": "1.56.1" }, "io.grpc:grpc-protobuf-lite": { - "locked": "1.47.0", + "locked": "1.56.1", "transitive": [ "io.grpc:grpc-protobuf" ] }, "io.grpc:grpc-stub": { - "locked": "1.47.0", + "locked": "1.56.1", "transitive": [ "io.grpc:grpc-testing" ] }, "io.grpc:grpc-testing": { - "locked": "1.47.0" + "locked": "1.56.1" }, "io.micrometer:micrometer-core": { "locked": "1.8.5", @@ -4671,19 +4948,19 @@ ] }, "io.swagger.core.v3:swagger-annotations": { - "locked": "2.2.0", + "locked": "2.2.8", "transitive": [ "io.swagger.core.v3:swagger-core" ] }, "io.swagger.core.v3:swagger-core": { - "locked": "2.2.0", + "locked": "2.2.8", "transitive": [ "org.springdoc:springdoc-openapi-common" ] }, "io.swagger.core.v3:swagger-models": { - "locked": "2.2.0", + "locked": "2.2.8", "transitive": [ "io.swagger.core.v3:swagger-core" ] @@ -4816,12 +5093,6 @@ "org.springframework.boot:spring-boot-starter-test" ] }, - "org.checkerframework:checker-compat-qual": { - "locked": "2.5.5", - "transitive": [ - "com.google.guava:guava" - ] - }, "org.checkerframework:checker-qual": { "locked": "3.12.0", "transitive": [ @@ -4942,16 +5213,16 @@ ] }, "org.springdoc:springdoc-openapi-common": { - "locked": "1.6.9", + "locked": "1.6.15", "transitive": [ "org.springdoc:springdoc-openapi-webmvc-core" ] }, "org.springdoc:springdoc-openapi-ui": { - "locked": "1.6.9" + "locked": "1.6.15" }, "org.springdoc:springdoc-openapi-webmvc-core": { - "locked": "1.6.9", + "locked": "1.6.15", "transitive": [ "org.springdoc:springdoc-openapi-ui" ] @@ -5121,7 +5392,7 @@ ] }, "org.webjars:swagger-ui": { - "locked": "4.11.1", + "locked": "4.17.1", "transitive": [ "org.springdoc:springdoc-openapi-ui" ] @@ -5142,6 +5413,7 @@ "locked": "1.29", "transitive": [ "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml", + "io.swagger.core.v3:swagger-core", "org.springframework.boot:spring-boot-starter" ] } @@ -5400,7 +5672,7 @@ ] }, "com.google.api.grpc:proto-google-common-protos": { - "locked": "2.0.1", + "locked": "2.17.0", "transitive": [ "io.grpc:grpc-protobuf" ] @@ -5428,7 +5700,7 @@ ] }, "com.google.errorprone:error_prone_annotations": { - "locked": "2.10.0", + "locked": "2.18.0", "transitive": [ "com.github.ben-manes.caffeine:caffeine", "com.google.guava:guava", @@ -5447,18 +5719,19 @@ ] }, "com.google.guava:guava": { - "locked": "31.0.1-android", + "locked": "31.1-jre", "transitive": [ "com.datastax.cassandra:cassandra-driver-core", "com.google.inject:guice", "com.google.protobuf:protobuf-java-util", "com.netflix.archaius:archaius-core", "com.netflix.conductor:conductor-awssqs-event-queue", - "com.netflix.conductor:conductor-metrics", "com.netflix.conductor:es7-persistence", "com.netflix.conductor:kafka", "com.netflix.conductor:kafka-publish", + "com.netflix.conductor:metrics", "com.netflix.conductor:postgres-persistence", + "com.netflix.conductor:workflow-event-listener", "com.netflix.netflix-commons:netflix-infix", "com.netflix.servo:servo-core", "io.grpc:grpc-api", @@ -5503,7 +5776,7 @@ ] }, "com.google.protobuf:protobuf-java-util": { - "locked": "3.19.2", + "locked": "3.22.3", "transitive": [ "io.grpc:grpc-services" ] @@ -5569,14 +5842,15 @@ "com.netflix.conductor:conductor-grpc-server", "com.netflix.conductor:conductor-http-task", "com.netflix.conductor:conductor-json-jq-task", - "com.netflix.conductor:conductor-metrics", "com.netflix.conductor:conductor-redis-concurrency-limit", "com.netflix.conductor:conductor-redis-persistence", "com.netflix.conductor:conductor-rest", "com.netflix.conductor:es7-persistence", "com.netflix.conductor:kafka", "com.netflix.conductor:kafka-publish", - "com.netflix.conductor:postgres-persistence" + "com.netflix.conductor:metrics", + "com.netflix.conductor:postgres-persistence", + "com.netflix.conductor:workflow-event-listener" ] }, "com.netflix.conductor:conductor-core": { @@ -5589,7 +5863,6 @@ "com.netflix.conductor:conductor-grpc-server", "com.netflix.conductor:conductor-http-task", "com.netflix.conductor:conductor-json-jq-task", - "com.netflix.conductor:conductor-metrics", "com.netflix.conductor:conductor-redis-concurrency-limit", "com.netflix.conductor:conductor-redis-lock", "com.netflix.conductor:conductor-redis-persistence", @@ -5597,7 +5870,9 @@ "com.netflix.conductor:es7-persistence", "com.netflix.conductor:kafka", "com.netflix.conductor:kafka-publish", - "com.netflix.conductor:postgres-persistence" + "com.netflix.conductor:metrics", + "com.netflix.conductor:postgres-persistence", + "com.netflix.conductor:workflow-event-listener" ] }, "com.netflix.conductor:conductor-grpc": { @@ -5615,9 +5890,6 @@ "com.netflix.conductor:conductor-json-jq-task": { "project": true }, - "com.netflix.conductor:conductor-metrics": { - "locked": "3.8.0" - }, "com.netflix.conductor:conductor-redis-concurrency-limit": { "project": true }, @@ -5639,9 +5911,15 @@ "com.netflix.conductor:kafka-publish": { "project": true }, + "com.netflix.conductor:metrics": { + "project": true + }, "com.netflix.conductor:postgres-persistence": { "project": true }, + "com.netflix.conductor:workflow-event-listener": { + "project": true + }, "com.netflix.dyno-queues:dyno-queues-core": { "locked": "2.0.20", "transitive": [ @@ -5745,13 +6023,13 @@ "com.netflix.spectator:spectator-reg-metrics3": { "locked": "0.122.0", "transitive": [ - "com.netflix.conductor:conductor-metrics" + "com.netflix.conductor:metrics" ] }, "com.netflix.spectator:spectator-reg-micrometer": { "locked": "0.122.0", "transitive": [ - "com.netflix.conductor:conductor-metrics" + "com.netflix.conductor:metrics" ] }, "com.spotify:completable-futures": { @@ -5761,6 +6039,18 @@ "com.netflix.conductor:kafka" ] }, + "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": [ @@ -5880,7 +6170,7 @@ ] }, "io.github.classgraph:classgraph": { - "locked": "4.8.147", + "locked": "4.8.149", "transitive": [ "org.springdoc:springdoc-openapi-ui" ] @@ -5892,7 +6182,7 @@ ] }, "io.grpc:grpc-api": { - "locked": "1.47.0", + "locked": "1.56.1", "transitive": [ "io.grpc:grpc-core", "io.grpc:grpc-protobuf", @@ -5901,14 +6191,14 @@ ] }, "io.grpc:grpc-context": { - "locked": "1.47.0", + "locked": "1.56.1", "transitive": [ "io.grpc:grpc-api", "io.grpc:grpc-testing" ] }, "io.grpc:grpc-core": { - "locked": "1.47.0", + "locked": "1.56.1", "transitive": [ "io.grpc:grpc-netty", "io.grpc:grpc-services", @@ -5916,32 +6206,32 @@ ] }, "io.grpc:grpc-netty": { - "locked": "1.47.0", + "locked": "1.56.1", "transitive": [ "com.netflix.conductor:conductor-grpc-server" ] }, "io.grpc:grpc-protobuf": { - "locked": "1.47.0", + "locked": "1.56.1", "transitive": [ "com.netflix.conductor:conductor-grpc", "io.grpc:grpc-services" ] }, "io.grpc:grpc-protobuf-lite": { - "locked": "1.47.0", + "locked": "1.56.1", "transitive": [ "io.grpc:grpc-protobuf" ] }, "io.grpc:grpc-services": { - "locked": "1.47.0", + "locked": "1.56.1", "transitive": [ "com.netflix.conductor:conductor-grpc-server" ] }, "io.grpc:grpc-stub": { - "locked": "1.47.0", + "locked": "1.56.1", "transitive": [ "com.netflix.conductor:conductor-grpc", "io.grpc:grpc-services", @@ -5949,7 +6239,7 @@ ] }, "io.grpc:grpc-testing": { - "locked": "1.47.0" + "locked": "1.56.1" }, "io.micrometer:micrometer-core": { "locked": "1.8.5", @@ -5962,7 +6252,7 @@ "io.micrometer:micrometer-registry-prometheus": { "locked": "1.8.5", "transitive": [ - "com.netflix.conductor:conductor-metrics" + "com.netflix.conductor:metrics" ] }, "io.netty:netty-buffer": { @@ -6088,8 +6378,112 @@ "io.grpc:grpc-netty" ] }, + "io.opentelemetry:opentelemetry-api": { + "locked": "1.23.1", + "transitive": [ + "com.netflix.conductor:conductor-core", + "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", + "transitive": [ + "com.netflix.conductor:conductor-core" + ] + }, + "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": [ + "com.netflix.conductor:conductor-core", + "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi", + "io.sentry:sentry-opentelemetry-core" + ] + }, + "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": [ + "com.netflix.conductor:conductor-core", + "io.opentelemetry:opentelemetry-sdk-common", + "io.opentelemetry:opentelemetry-sdk-trace" + ] + }, "io.perfmark:perfmark-api": { - "locked": "0.25.0", + "locked": "0.26.0", "transitive": [ "io.grpc:grpc-core", "io.grpc:grpc-netty" @@ -6104,7 +6498,7 @@ "io.prometheus:simpleclient": { "locked": "0.12.0", "transitive": [ - "com.netflix.conductor:conductor-metrics", + "com.netflix.conductor:metrics", "io.prometheus:simpleclient_common" ] }, @@ -6144,25 +6538,37 @@ "transitive": [ "com.netflix.conductor:conductor-awssqs-event-queue", "com.netflix.conductor:conductor-core", - "com.netflix.conductor:conductor-metrics", "com.netflix.conductor:kafka", - "com.netflix.conductor:kafka-publish" + "com.netflix.conductor:kafka-publish", + "com.netflix.conductor:metrics" + ] + }, + "io.sentry:sentry": { + "locked": "6.14.0", + "transitive": [ + "com.netflix.conductor:conductor-core" + ] + }, + "io.sentry:sentry-opentelemetry-core": { + "locked": "6.14.0", + "transitive": [ + "com.netflix.conductor:conductor-core" ] }, "io.swagger.core.v3:swagger-annotations": { - "locked": "2.2.0", + "locked": "2.2.8", "transitive": [ "io.swagger.core.v3:swagger-core" ] }, "io.swagger.core.v3:swagger-core": { - "locked": "2.2.0", + "locked": "2.2.8", "transitive": [ "org.springdoc:springdoc-openapi-common" ] }, "io.swagger.core.v3:swagger-models": { - "locked": "2.2.0", + "locked": "2.2.8", "transitive": [ "io.swagger.core.v3:swagger-core" ] @@ -6225,8 +6631,8 @@ "locked": "1.1.1", "transitive": [ "com.netflix.conductor:conductor-http-task", - "com.netflix.conductor:conductor-metrics", "com.netflix.conductor:kafka-publish", + "com.netflix.conductor:metrics", "com.netflix.eureka:eureka-client", "com.sun.jersey:jersey-core" ] @@ -6317,11 +6723,11 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core", "com.netflix.conductor:conductor-grpc-server", - "com.netflix.conductor:conductor-metrics", "com.netflix.conductor:conductor-redis-concurrency-limit", "com.netflix.conductor:conductor-redis-lock", "com.netflix.conductor:es7-persistence", "com.netflix.conductor:kafka-publish", + "com.netflix.conductor:metrics", "com.netflix.conductor:postgres-persistence", "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", @@ -6379,7 +6785,8 @@ "locked": "3.1.0", "transitive": [ "com.netflix.conductor:kafka", - "com.netflix.conductor:kafka-publish" + "com.netflix.conductor:kafka-publish", + "com.netflix.conductor:workflow-event-listener" ] }, "org.apache.logging.log4j:log4j-api": { @@ -6396,7 +6803,6 @@ "com.netflix.conductor:conductor-grpc-server", "com.netflix.conductor:conductor-http-task", "com.netflix.conductor:conductor-json-jq-task", - "com.netflix.conductor:conductor-metrics", "com.netflix.conductor:conductor-redis-concurrency-limit", "com.netflix.conductor:conductor-redis-lock", "com.netflix.conductor:conductor-redis-persistence", @@ -6404,7 +6810,9 @@ "com.netflix.conductor:es7-persistence", "com.netflix.conductor:kafka", "com.netflix.conductor:kafka-publish", + "com.netflix.conductor:metrics", "com.netflix.conductor:postgres-persistence", + "com.netflix.conductor:workflow-event-listener", "org.apache.logging.log4j:log4j-core", "org.apache.logging.log4j:log4j-jul", "org.apache.logging.log4j:log4j-slf4j-impl", @@ -6426,7 +6834,6 @@ "com.netflix.conductor:conductor-grpc-server", "com.netflix.conductor:conductor-http-task", "com.netflix.conductor:conductor-json-jq-task", - "com.netflix.conductor:conductor-metrics", "com.netflix.conductor:conductor-redis-concurrency-limit", "com.netflix.conductor:conductor-redis-lock", "com.netflix.conductor:conductor-redis-persistence", @@ -6434,7 +6841,9 @@ "com.netflix.conductor:es7-persistence", "com.netflix.conductor:kafka", "com.netflix.conductor:kafka-publish", + "com.netflix.conductor:metrics", "com.netflix.conductor:postgres-persistence", + "com.netflix.conductor:workflow-event-listener", "org.apache.logging.log4j:log4j-slf4j-impl", "org.apache.logging.log4j:log4j-web", "org.springframework.boot:spring-boot-starter-log4j2" @@ -6454,7 +6863,6 @@ "com.netflix.conductor:conductor-grpc-server", "com.netflix.conductor:conductor-http-task", "com.netflix.conductor:conductor-json-jq-task", - "com.netflix.conductor:conductor-metrics", "com.netflix.conductor:conductor-redis-concurrency-limit", "com.netflix.conductor:conductor-redis-lock", "com.netflix.conductor:conductor-redis-persistence", @@ -6462,7 +6870,9 @@ "com.netflix.conductor:es7-persistence", "com.netflix.conductor:kafka", "com.netflix.conductor:kafka-publish", + "com.netflix.conductor:metrics", "com.netflix.conductor:postgres-persistence", + "com.netflix.conductor:workflow-event-listener", "org.springframework.boot:spring-boot-starter-log4j2" ] }, @@ -6480,7 +6890,6 @@ "com.netflix.conductor:conductor-grpc-server", "com.netflix.conductor:conductor-http-task", "com.netflix.conductor:conductor-json-jq-task", - "com.netflix.conductor:conductor-metrics", "com.netflix.conductor:conductor-redis-concurrency-limit", "com.netflix.conductor:conductor-redis-lock", "com.netflix.conductor:conductor-redis-persistence", @@ -6488,7 +6897,9 @@ "com.netflix.conductor:es7-persistence", "com.netflix.conductor:kafka", "com.netflix.conductor:kafka-publish", + "com.netflix.conductor:metrics", "com.netflix.conductor:postgres-persistence", + "com.netflix.conductor:workflow-event-listener", "org.springframework.boot:spring-boot-starter-log4j2" ] }, @@ -6506,7 +6917,6 @@ "com.netflix.conductor:conductor-grpc-server", "com.netflix.conductor:conductor-http-task", "com.netflix.conductor:conductor-json-jq-task", - "com.netflix.conductor:conductor-metrics", "com.netflix.conductor:conductor-redis-concurrency-limit", "com.netflix.conductor:conductor-redis-lock", "com.netflix.conductor:conductor-redis-persistence", @@ -6514,7 +6924,9 @@ "com.netflix.conductor:es7-persistence", "com.netflix.conductor:kafka", "com.netflix.conductor:kafka-publish", - "com.netflix.conductor:postgres-persistence" + "com.netflix.conductor:metrics", + "com.netflix.conductor:postgres-persistence", + "com.netflix.conductor:workflow-event-listener" ] }, "org.apache.lucene:lucene-analyzers-common": { @@ -6633,12 +7045,6 @@ "org.springframework.boot:spring-boot-starter-test" ] }, - "org.checkerframework:checker-compat-qual": { - "locked": "2.5.5", - "transitive": [ - "com.google.guava:guava" - ] - }, "org.checkerframework:checker-qual": { "locked": "3.19.0", "transitive": [ @@ -6654,7 +7060,7 @@ ] }, "org.codehaus.mojo:animal-sniffer-annotations": { - "locked": "1.19", + "locked": "1.23", "transitive": [ "io.grpc:grpc-core" ] @@ -7033,19 +7439,19 @@ ] }, "org.springdoc:springdoc-openapi-common": { - "locked": "1.6.9", + "locked": "1.6.15", "transitive": [ "org.springdoc:springdoc-openapi-webmvc-core" ] }, "org.springdoc:springdoc-openapi-ui": { - "locked": "1.6.9", + "locked": "1.6.15", "transitive": [ "com.netflix.conductor:conductor-rest" ] }, "org.springdoc:springdoc-openapi-webmvc-core": { - "locked": "1.6.9", + "locked": "1.6.15", "transitive": [ "org.springdoc:springdoc-openapi-ui" ] @@ -7241,7 +7647,7 @@ ] }, "org.webjars:swagger-ui": { - "locked": "4.11.1", + "locked": "4.17.1", "transitive": [ "org.springdoc:springdoc-openapi-ui" ] @@ -7268,6 +7674,7 @@ "locked": "1.29", "transitive": [ "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml", + "io.swagger.core.v3:swagger-core", "org.elasticsearch:elasticsearch-x-content", "org.redisson:redisson", "org.springframework.boot:spring-boot-starter" @@ -7301,4 +7708,4 @@ ] } } -} \ No newline at end of file +} diff --git a/settings.gradle b/settings.gradle index 7e65eccf83..468ee8a7e3 100644 --- a/settings.gradle +++ b/settings.gradle @@ -67,5 +67,6 @@ include 'contribs:index:es7-persistence' include 'contribs:task:kafka-publish' include 'contribs:test-util' include 'contribs:metrics' +include 'contribs:workflow-event-listener' rootProject.children.each {it.name="conductor-${it.name}"} diff --git a/test-harness/dependencies.lock b/test-harness/dependencies.lock index 00f0d1c54d..8cb1e5974a 100644 --- a/test-harness/dependencies.lock +++ b/test-harness/dependencies.lock @@ -1567,7 +1567,7 @@ ] }, "com.google.api.grpc:proto-google-common-protos": { - "locked": "2.0.1", + "locked": "2.17.0", "transitive": [ "io.grpc:grpc-protobuf" ] @@ -1596,7 +1596,7 @@ ] }, "com.google.errorprone:error_prone_annotations": { - "locked": "2.10.0", + "locked": "2.18.0", "transitive": [ "com.github.ben-manes.caffeine:caffeine", "com.google.guava:guava", @@ -1623,10 +1623,12 @@ "com.netflix.archaius:archaius-core", "com.netflix.conductor:conductor-awssqs-event-queue", "com.netflix.conductor:conductor-grpc-client", - "com.netflix.conductor:conductor-metrics", "com.netflix.conductor:es7-persistence", "com.netflix.conductor:kafka", + "com.netflix.conductor:kafka-publish", + "com.netflix.conductor:metrics", "com.netflix.conductor:postgres-persistence", + "com.netflix.conductor:workflow-event-listener", "com.netflix.netflix-commons:netflix-infix", "com.netflix.servo:servo-core", "io.grpc:grpc-api", @@ -1672,7 +1674,7 @@ ] }, "com.google.protobuf:protobuf-java-util": { - "locked": "3.19.2", + "locked": "3.22.3", "transitive": [ "io.grpc:grpc-services" ] @@ -1752,13 +1754,15 @@ "com.netflix.conductor:conductor-grpc-server", "com.netflix.conductor:conductor-http-task", "com.netflix.conductor:conductor-json-jq-task", - "com.netflix.conductor:conductor-metrics", "com.netflix.conductor:conductor-redis-concurrency-limit", "com.netflix.conductor:conductor-redis-persistence", "com.netflix.conductor:conductor-rest", "com.netflix.conductor:es7-persistence", "com.netflix.conductor:kafka", - "com.netflix.conductor:postgres-persistence" + "com.netflix.conductor:kafka-publish", + "com.netflix.conductor:metrics", + "com.netflix.conductor:postgres-persistence", + "com.netflix.conductor:workflow-event-listener" ] }, "com.netflix.conductor:conductor-core": { @@ -1771,7 +1775,6 @@ "com.netflix.conductor:conductor-grpc-server", "com.netflix.conductor:conductor-http-task", "com.netflix.conductor:conductor-json-jq-task", - "com.netflix.conductor:conductor-metrics", "com.netflix.conductor:conductor-redis-concurrency-limit", "com.netflix.conductor:conductor-redis-lock", "com.netflix.conductor:conductor-redis-persistence", @@ -1779,7 +1782,10 @@ "com.netflix.conductor:conductor-server", "com.netflix.conductor:es7-persistence", "com.netflix.conductor:kafka", - "com.netflix.conductor:postgres-persistence" + "com.netflix.conductor:kafka-publish", + "com.netflix.conductor:metrics", + "com.netflix.conductor:postgres-persistence", + "com.netflix.conductor:workflow-event-listener" ] }, "com.netflix.conductor:conductor-grpc": { @@ -1810,12 +1816,6 @@ "com.netflix.conductor:conductor-server" ] }, - "com.netflix.conductor:conductor-metrics": { - "locked": "3.8.0", - "transitive": [ - "com.netflix.conductor:conductor-server" - ] - }, "com.netflix.conductor:conductor-redis-concurrency-limit": { "project": true, "transitive": [ @@ -1855,12 +1855,30 @@ "com.netflix.conductor:conductor-server" ] }, + "com.netflix.conductor:kafka-publish": { + "project": true, + "transitive": [ + "com.netflix.conductor:conductor-server" + ] + }, + "com.netflix.conductor:metrics": { + "project": true, + "transitive": [ + "com.netflix.conductor:conductor-server" + ] + }, "com.netflix.conductor:postgres-persistence": { "project": true, "transitive": [ "com.netflix.conductor:conductor-server" ] }, + "com.netflix.conductor:workflow-event-listener": { + "project": true, + "transitive": [ + "com.netflix.conductor:conductor-server" + ] + }, "com.netflix.dyno-queues:dyno-queues-core": { "locked": "2.0.20", "transitive": [ @@ -1966,13 +1984,13 @@ "com.netflix.spectator:spectator-reg-metrics3": { "locked": "0.122.0", "transitive": [ - "com.netflix.conductor:conductor-metrics" + "com.netflix.conductor:metrics" ] }, "com.netflix.spectator:spectator-reg-micrometer": { "locked": "0.122.0", "transitive": [ - "com.netflix.conductor:conductor-metrics" + "com.netflix.conductor:metrics" ] }, "com.spotify:completable-futures": { @@ -1982,6 +2000,18 @@ "com.netflix.conductor:kafka" ] }, + "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": [ @@ -2117,7 +2147,7 @@ ] }, "io.github.classgraph:classgraph": { - "locked": "4.8.147", + "locked": "4.8.149", "transitive": [ "org.springdoc:springdoc-openapi-ui" ] @@ -2129,7 +2159,7 @@ ] }, "io.grpc:grpc-api": { - "locked": "1.46.0", + "locked": "1.56.1", "transitive": [ "io.grpc:grpc-core", "io.grpc:grpc-protobuf", @@ -2138,27 +2168,27 @@ ] }, "io.grpc:grpc-context": { - "locked": "1.46.0", + "locked": "1.56.1", "transitive": [ "io.grpc:grpc-api" ] }, "io.grpc:grpc-core": { - "locked": "1.46.0", + "locked": "1.56.1", "transitive": [ "io.grpc:grpc-netty", "io.grpc:grpc-services" ] }, "io.grpc:grpc-netty": { - "locked": "1.46.0", + "locked": "1.56.1", "transitive": [ "com.netflix.conductor:conductor-grpc-client", "com.netflix.conductor:conductor-grpc-server" ] }, "io.grpc:grpc-protobuf": { - "locked": "1.46.0", + "locked": "1.56.1", "transitive": [ "com.netflix.conductor:conductor-grpc", "com.netflix.conductor:conductor-grpc-client", @@ -2166,19 +2196,19 @@ ] }, "io.grpc:grpc-protobuf-lite": { - "locked": "1.46.0", + "locked": "1.56.1", "transitive": [ "io.grpc:grpc-protobuf" ] }, "io.grpc:grpc-services": { - "locked": "1.46.0", + "locked": "1.56.1", "transitive": [ "com.netflix.conductor:conductor-grpc-server" ] }, "io.grpc:grpc-stub": { - "locked": "1.46.0", + "locked": "1.56.1", "transitive": [ "com.netflix.conductor:conductor-grpc", "com.netflix.conductor:conductor-grpc-client", @@ -2196,7 +2226,7 @@ "io.micrometer:micrometer-registry-prometheus": { "locked": "1.8.5", "transitive": [ - "com.netflix.conductor:conductor-metrics" + "com.netflix.conductor:metrics" ] }, "io.netty:netty-buffer": { @@ -2211,6 +2241,7 @@ "io.netty:netty-handler-proxy", "io.netty:netty-resolver-dns", "io.netty:netty-transport", + "io.netty:netty-transport-native-unix-common", "org.redisson:redisson" ] }, @@ -2266,6 +2297,7 @@ "io.netty:netty-resolver", "io.netty:netty-resolver-dns", "io.netty:netty-transport", + "io.netty:netty-transport-native-unix-common", "org.redisson:redisson" ] }, @@ -2310,11 +2342,122 @@ "io.netty:netty-handler", "io.netty:netty-handler-proxy", "io.netty:netty-resolver-dns", + "io.netty:netty-transport-native-unix-common", "org.redisson:redisson" ] }, + "io.netty:netty-transport-native-unix-common": { + "locked": "4.1.76.Final", + "transitive": [ + "io.grpc:grpc-netty" + ] + }, + "io.opentelemetry:opentelemetry-api": { + "locked": "1.23.1", + "transitive": [ + "com.netflix.conductor:conductor-core", + "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", + "transitive": [ + "com.netflix.conductor:conductor-core" + ] + }, + "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": [ + "com.netflix.conductor:conductor-core", + "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi", + "io.sentry:sentry-opentelemetry-core" + ] + }, + "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": [ + "com.netflix.conductor:conductor-core", + "io.opentelemetry:opentelemetry-sdk-common", + "io.opentelemetry:opentelemetry-sdk-trace" + ] + }, "io.perfmark:perfmark-api": { - "locked": "0.25.0", + "locked": "0.26.0", "transitive": [ "io.grpc:grpc-core", "io.grpc:grpc-netty" @@ -2329,7 +2472,7 @@ "io.prometheus:simpleclient": { "locked": "0.12.0", "transitive": [ - "com.netflix.conductor:conductor-metrics", + "com.netflix.conductor:metrics", "io.prometheus:simpleclient_common" ] }, @@ -2369,24 +2512,37 @@ "transitive": [ "com.netflix.conductor:conductor-awssqs-event-queue", "com.netflix.conductor:conductor-core", - "com.netflix.conductor:conductor-metrics", - "com.netflix.conductor:kafka" + "com.netflix.conductor:kafka", + "com.netflix.conductor:kafka-publish", + "com.netflix.conductor:metrics" + ] + }, + "io.sentry:sentry": { + "locked": "6.14.0", + "transitive": [ + "com.netflix.conductor:conductor-core" + ] + }, + "io.sentry:sentry-opentelemetry-core": { + "locked": "6.14.0", + "transitive": [ + "com.netflix.conductor:conductor-core" ] }, "io.swagger.core.v3:swagger-annotations": { - "locked": "2.2.0", + "locked": "2.2.8", "transitive": [ "io.swagger.core.v3:swagger-core" ] }, "io.swagger.core.v3:swagger-core": { - "locked": "2.2.0", + "locked": "2.2.8", "transitive": [ "org.springdoc:springdoc-openapi-common" ] }, "io.swagger.core.v3:swagger-models": { - "locked": "2.2.0", + "locked": "2.2.8", "transitive": [ "io.swagger.core.v3:swagger-core" ] @@ -2451,7 +2607,8 @@ "locked": "1.1.1", "transitive": [ "com.netflix.conductor:conductor-http-task", - "com.netflix.conductor:conductor-metrics", + "com.netflix.conductor:kafka-publish", + "com.netflix.conductor:metrics", "com.netflix.eureka:eureka-client", "com.sun.jersey:jersey-core" ] @@ -2591,10 +2748,11 @@ "com.netflix.conductor:conductor-core", "com.netflix.conductor:conductor-grpc-client", "com.netflix.conductor:conductor-grpc-server", - "com.netflix.conductor:conductor-metrics", "com.netflix.conductor:conductor-redis-concurrency-limit", "com.netflix.conductor:conductor-redis-lock", "com.netflix.conductor:es7-persistence", + "com.netflix.conductor:kafka-publish", + "com.netflix.conductor:metrics", "com.netflix.conductor:postgres-persistence", "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", @@ -2651,7 +2809,9 @@ "org.apache.kafka:kafka-clients": { "locked": "3.1.0", "transitive": [ - "com.netflix.conductor:kafka" + "com.netflix.conductor:kafka", + "com.netflix.conductor:kafka-publish", + "com.netflix.conductor:workflow-event-listener" ] }, "org.apache.logging.log4j:log4j-api": { @@ -2670,7 +2830,6 @@ "com.netflix.conductor:conductor-grpc-server", "com.netflix.conductor:conductor-http-task", "com.netflix.conductor:conductor-json-jq-task", - "com.netflix.conductor:conductor-metrics", "com.netflix.conductor:conductor-redis-concurrency-limit", "com.netflix.conductor:conductor-redis-lock", "com.netflix.conductor:conductor-redis-persistence", @@ -2678,7 +2837,10 @@ "com.netflix.conductor:conductor-server", "com.netflix.conductor:es7-persistence", "com.netflix.conductor:kafka", + "com.netflix.conductor:kafka-publish", + "com.netflix.conductor:metrics", "com.netflix.conductor:postgres-persistence", + "com.netflix.conductor:workflow-event-listener", "org.apache.logging.log4j:log4j-core", "org.apache.logging.log4j:log4j-jul", "org.apache.logging.log4j:log4j-slf4j-impl", @@ -2702,7 +2864,6 @@ "com.netflix.conductor:conductor-grpc-server", "com.netflix.conductor:conductor-http-task", "com.netflix.conductor:conductor-json-jq-task", - "com.netflix.conductor:conductor-metrics", "com.netflix.conductor:conductor-redis-concurrency-limit", "com.netflix.conductor:conductor-redis-lock", "com.netflix.conductor:conductor-redis-persistence", @@ -2710,7 +2871,10 @@ "com.netflix.conductor:conductor-server", "com.netflix.conductor:es7-persistence", "com.netflix.conductor:kafka", + "com.netflix.conductor:kafka-publish", + "com.netflix.conductor:metrics", "com.netflix.conductor:postgres-persistence", + "com.netflix.conductor:workflow-event-listener", "org.apache.logging.log4j:log4j-slf4j-impl", "org.apache.logging.log4j:log4j-web", "org.springframework.boot:spring-boot-starter-log4j2" @@ -2732,7 +2896,6 @@ "com.netflix.conductor:conductor-grpc-server", "com.netflix.conductor:conductor-http-task", "com.netflix.conductor:conductor-json-jq-task", - "com.netflix.conductor:conductor-metrics", "com.netflix.conductor:conductor-redis-concurrency-limit", "com.netflix.conductor:conductor-redis-lock", "com.netflix.conductor:conductor-redis-persistence", @@ -2740,7 +2903,10 @@ "com.netflix.conductor:conductor-server", "com.netflix.conductor:es7-persistence", "com.netflix.conductor:kafka", + "com.netflix.conductor:kafka-publish", + "com.netflix.conductor:metrics", "com.netflix.conductor:postgres-persistence", + "com.netflix.conductor:workflow-event-listener", "org.springframework.boot:spring-boot-starter-log4j2" ] }, @@ -2760,7 +2926,6 @@ "com.netflix.conductor:conductor-grpc-server", "com.netflix.conductor:conductor-http-task", "com.netflix.conductor:conductor-json-jq-task", - "com.netflix.conductor:conductor-metrics", "com.netflix.conductor:conductor-redis-concurrency-limit", "com.netflix.conductor:conductor-redis-lock", "com.netflix.conductor:conductor-redis-persistence", @@ -2768,7 +2933,10 @@ "com.netflix.conductor:conductor-server", "com.netflix.conductor:es7-persistence", "com.netflix.conductor:kafka", + "com.netflix.conductor:kafka-publish", + "com.netflix.conductor:metrics", "com.netflix.conductor:postgres-persistence", + "com.netflix.conductor:workflow-event-listener", "org.springframework.boot:spring-boot-starter-log4j2" ] }, @@ -2788,7 +2956,6 @@ "com.netflix.conductor:conductor-grpc-server", "com.netflix.conductor:conductor-http-task", "com.netflix.conductor:conductor-json-jq-task", - "com.netflix.conductor:conductor-metrics", "com.netflix.conductor:conductor-redis-concurrency-limit", "com.netflix.conductor:conductor-redis-lock", "com.netflix.conductor:conductor-redis-persistence", @@ -2796,7 +2963,10 @@ "com.netflix.conductor:conductor-server", "com.netflix.conductor:es7-persistence", "com.netflix.conductor:kafka", - "com.netflix.conductor:postgres-persistence" + "com.netflix.conductor:kafka-publish", + "com.netflix.conductor:metrics", + "com.netflix.conductor:postgres-persistence", + "com.netflix.conductor:workflow-event-listener" ] }, "org.apache.lucene:lucene-analyzers-common": { @@ -3116,7 +3286,7 @@ ] }, "org.codehaus.mojo:animal-sniffer-annotations": { - "locked": "1.19", + "locked": "1.23", "transitive": [ "io.grpc:grpc-core" ] @@ -3533,20 +3703,20 @@ "locked": "1.3-groovy-2.5" }, "org.springdoc:springdoc-openapi-common": { - "locked": "1.6.9", + "locked": "1.6.15", "transitive": [ "org.springdoc:springdoc-openapi-webmvc-core" ] }, "org.springdoc:springdoc-openapi-ui": { - "locked": "1.6.9", + "locked": "1.6.15", "transitive": [ "com.netflix.conductor:conductor-rest", "com.netflix.conductor:conductor-server" ] }, "org.springdoc:springdoc-openapi-webmvc-core": { - "locked": "1.6.9", + "locked": "1.6.15", "transitive": [ "org.springdoc:springdoc-openapi-ui" ] @@ -3771,7 +3941,7 @@ ] }, "org.webjars:swagger-ui": { - "locked": "4.11.1", + "locked": "4.17.1", "transitive": [ "org.springdoc:springdoc-openapi-ui" ] @@ -3798,6 +3968,7 @@ "locked": "1.29", "transitive": [ "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml", + "io.swagger.core.v3:swagger-core", "org.elasticsearch:elasticsearch-x-content", "org.redisson:redisson", "org.springframework.boot:spring-boot-starter" @@ -3825,4 +3996,4 @@ ] } } -} \ No newline at end of file +} From ce5d4baa03e6e546cd9a07c967859866291ad11a Mon Sep 17 00:00:00 2001 From: pmchung Date: Wed, 20 Nov 2024 02:31:17 -0800 Subject: [PATCH 4/4] add back submodule --- .gitmodules | 3 +++ contribs | 1 + 2 files changed, 4 insertions(+) create mode 160000 contribs diff --git a/.gitmodules b/.gitmodules index e69de29bb2..7568143442 100644 --- a/.gitmodules +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "contribs"] + path = contribs + url = git@github.com:routific/conductor-community.git diff --git a/contribs b/contribs new file mode 160000 index 0000000000..7b46f1aef3 --- /dev/null +++ b/contribs @@ -0,0 +1 @@ +Subproject commit 7b46f1aef3a610d473d6e9acbe10821bad2c3837