Skip to content

Commit 433b508

Browse files
sureshgsureshg
committed
chore: fix otel agent build & dep updates
1 parent 1240638 commit 433b508

File tree

2 files changed

+38
-17
lines changed

2 files changed

+38
-17
lines changed

‎backend/agent/otel/build.gradle.kts

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ val otel by configurations.registering { isTransitive = false }
2121
// Task to repackage the OpenTelemetry agent with custom extensions
2222
val extendedAgent by
2323
tasks.registering(Jar::class) {
24+
description = "Creates extended OpenTelemetry agent with extensions"
25+
group = "build"
26+
2427
val otelAgentJar = zipTree(otel.map { it.singleFile })
2528
val extnJar = tasks.shadowJar.map { it.archiveFile }
2629

@@ -41,8 +44,13 @@ val extendedAgent by
4144
}
4245
}
4346

44-
// Replace the normal jar with the one built by 'shadowJar' in both api and runtime variants
47+
// Replace the 'shadowJar' jar with the 'extendedAgent`
4548
configurations {
49+
default {
50+
outgoing.artifacts.clear()
51+
outgoing.artifact(extendedAgent)
52+
}
53+
4654
apiElements {
4755
outgoing.artifacts.clear()
4856
outgoing.artifact(extendedAgent)
@@ -52,6 +60,13 @@ configurations {
5260
outgoing.artifacts.clear()
5361
outgoing.artifact(extendedAgent)
5462
}
63+
64+
this.shadow {
65+
outgoing.artifacts.clear()
66+
outgoing.artifact(extendedAgent)
67+
}
68+
69+
shadowRuntimeElements { outgoing.artifacts.clear() }
5570
}
5671

5772
tasks {

‎gradle/libs.versions.toml

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ org-name = "suresh.dev"
2020
org-url = "https://suresh.dev"
2121

2222
# Gradle Dependencies Versions
23-
bc-plugins = "1.10.0"
23+
bc-plugins = "1.11.0"
2424
kotlinx-kover = "0.9.1"
2525
kotlinx-bcv = "0.17.0"
2626
kotlin-dokka = "2.0.0"
@@ -42,7 +42,7 @@ kotlin-wrappers = "2025.2.5"
4242
kotlin-redacted = "1.12.0"
4343
kotlin-serviceloader = "0.0.15"
4444
kotlinx-multik = "0.2.3"
45-
kotlinx-dataframe = "0.16.0-dev-5705"
45+
kotlinx-dataframe = "0.16.0-dev-5786"
4646
kotlinx-kandy = "0.8.0"
4747
kotlin-statistics = "0.4.0-RC1"
4848
evas = "1.2.0"
@@ -58,8 +58,8 @@ spring-depmgmt = "1.1.7"
5858
ktor = "3.1.0"
5959
ktor-cohort = "2.6.1"
6060
otel = "1.47.0"
61-
otel-instr = "2.12.0"
62-
otel-instr-alpha = "2.12.0-alpha"
61+
otel-instr = "2.13.0"
62+
otel-instr-alpha = "2.13.0-alpha"
6363
otel-semconv = "1.30.0-rc.1"
6464
otel-samplers = "1.43.0-alpha"
6565
elastic-otel = "0.4.0"
@@ -68,7 +68,7 @@ sslcontext-kickstart = "9.0.0"
6868
ksp-auto-service = "1.2.0"
6969
gradle-kotlin-dsl = "4.3.1"
7070
zip-prefixer = "0.3.1"
71-
ajalt-mordant = "3.0.1"
71+
ajalt-mordant = "3.0.2"
7272
ajalt-clikt = "5.0.3"
7373
ajalt-colormath = "3.6.1"
7474
classgraph = "4.8.179"
@@ -86,7 +86,7 @@ koin = "4.1.0-Beta5"
8686
koin-annotations = "2.0.0-RC1"
8787
kotest = "6.0.0.M2"
8888
mockk = "1.13.16"
89-
mokkery = "2.6.1"
89+
mokkery = "2.7.0"
9090
wiremock = "3.12.0"
9191
wiremock-kotlin = "2.1.1"
9292
okhttp = "5.0.0-alpha.14"
@@ -98,7 +98,7 @@ jmh = "1.37"
9898
mrjar = "0.1.1"
9999
ktfmt = "0.54"
100100
google-javaformat = "1.25.2"
101-
palantir-javaformat = "2.51.0"
101+
palantir-javaformat = "2.52.0"
102102
google-auto-service = "1.1.1"
103103
google-tink = "1.16.0"
104104
graalvm = "24.1.2"
@@ -121,7 +121,7 @@ urlencoder = "1.5.0"
121121
bytesize = "2.0.0-beta04"
122122
cash-turbine = "1.2.0"
123123
cardiologist = "0.3.1"
124-
kmp-store5 = "5.1.0-alpha04"
124+
kmp-store5 = "5.1.0-alpha05"
125125
kmp-settings = "1.3.0"
126126
kmp-appdirs = "1.2.0"
127127
parsus = "0.6.1"
@@ -138,7 +138,7 @@ micrometer = "1.14.3"
138138
swagger-ui = "5.17.14"
139139
hoplite = "2.9.0"
140140
config4k = "0.7.0"
141-
shedlock = "6.2.0"
141+
shedlock = "6.3.0"
142142
sherlock = "1.0.3"
143143
sqids = "0.1.0"
144144
tsid = "2.1.3"
@@ -156,7 +156,7 @@ async-profiler = "3.0"
156156
ap-loader-all = "3.0-9"
157157
openjdk-jmc = "9.0.0"
158158
airlift-aircompressor = "2.0.2"
159-
airlift-security = "303"
159+
airlift-security = "305"
160160
directory-keystore = "1.1.0"
161161
maven-mima = "3.0.0-alpha-3"
162162
maven-archeologist = "0.0.10"
@@ -177,6 +177,7 @@ mcp4k = "0.3.4"
177177
dflib = "2.0.0-M2"
178178
ldaptive = "2.4.0"
179179
chicory = "1.0.0"
180+
weh-bindings = "0.2"
180181
log4k = "0.30.0"
181182
rwmutex = "1.0.0"
182183
bluesky-ozone = "0.3.1"
@@ -219,13 +220,13 @@ kmpmt = "0.1.1"
219220
tasktree = "4.0.0"
220221
sigstore = "1.1.0"
221222
reproducible-builds = "1.0"
222-
autonomousapps-depanalysis = "2.8.1"
223+
autonomousapps-depanalysis = "2.8.2"
223224
autonomousapps-bestpractices = "0.10"
224225
graalvm-nativeimage = "0.10.5"
225226
github-depgraph = "0.1.0"
226227
github-changelog = "2.2.0"
227-
wire-plugin = "5.2.1"
228-
buildkonfig = "0.15.2"
228+
wire-plugin = "5.3.0"
229+
buildkonfig = "0.16.0"
229230
gmazzo-buildconfig = "3.1.0"
230231
cyclonedx-plugin = "1.10.0"
231232
modulegraph = "0.10.1"
@@ -607,7 +608,6 @@ okapibarcode = { module = "uk.org.okapibarcode:okapibarc
607608
# OpenTelemetry
608609
otel-bom = { module = "io.opentelemetry:opentelemetry-bom" , version.ref = "otel"}
609610
otel-api = { module = "io.opentelemetry:opentelemetry-api" , version.ref = "otel"}
610-
otel-extension-kotlin = { module = "io.opentelemetry:opentelemetry-extension-kotlin" , version.ref = "otel"}
611611
otel-autoconfigure = { module = "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure" , version.ref = "otel"}
612612
otel-autoconfigure-spi = { module = "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi" , version.ref = "otel"}
613613
otel-semconv = { module = "io.opentelemetry.semconv:opentelemetry-semconv" , version.ref = "otel-semconv"}
@@ -618,8 +618,7 @@ otel-instr-javaagent = { module = "io.opentelemetry.javaagent:op
618618
otel-instr-annotations = { module = "io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations" , version.ref = "otel-instr"}
619619
otel-instr-api = { module = "io.opentelemetry.instrumentation:opentelemetry-instrumentation-api" , version.ref = "otel-instr"}
620620
otel-instr-extension-api = { module = "io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api" , version.ref = "otel-instr-alpha"}
621-
otel-instr-ktor = { module = "io.opentelemetry.instrumentation:opentelemetry-ktor-2.0" , version.ref = "otel-instr-alpha"}
622-
otel-instr-coroutines = { module = "io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-kotlinx-coroutines" , version.ref = "otel-instr-alpha"}
621+
otel-instr-ktor = { module = "io.opentelemetry.instrumentation:opentelemetry-ktor-3.0" , version.ref = "otel-instr-alpha"}
623622
otel-instr-logback-appender = { module = "io.opentelemetry.instrumentation:opentelemetry-logback-appender-1.0" , version.ref = "otel-instr-alpha"}
624623
otel-instr-logback-mdc = { module = "io.opentelemetry.instrumentation:opentelemetry-logback-mdc-1.0" , version.ref = "otel-instr-alpha"}
625624

@@ -656,9 +655,16 @@ rwmutex = { module = "com.mayakapps.rwmutex:rwmutex
656655

657656
# Wasm
658657
chicory = { module = "com.dylibso.chicory:runtime" , version.ref = "chicory" }
658+
chicory-bom = { module = "com.dylibso.chicory:bom" , version.ref = "chicory" }
659659
chicory-aot = { module = "com.dylibso.chicory:aot-experimental" , version.ref = "chicory" }
660660
chicory-hostmodule-annproc = { module = "com.dylibso.chicory:host-module-annotations-experimental" , version.ref = "chicory" }
661+
chicory-wasi = { module = "com.dylibso.chicory:wasi" , version.ref = "chicory" }
662+
chicory-simd = { module = "com.dylibso.chicory:simd-experimental" , version.ref = "chicory" }
661663
chasm = { module = "io.github.charlietap.chasm:chasm" , version.ref = "chasm" }
664+
weh-chasm-wasip1 = { module = "at.released.weh:bindings-chasm-wasip1" , version.ref = "weh-bindings" }
665+
weh-chasm-emscripten = { module = "at.released.weh:bindings-chasm-emscripten" , version.ref = "weh-bindings" }
666+
weh-chicory-wasip1 = { module = "at.released.weh:bindings-chicory-wasip1" , version.ref = "weh-bindings" }
667+
weh-chicory-emscripten = { module = "at.released.weh:bindings-chicory-emscripten" , version.ref = "weh-bindings" }
662668

663669
# AI/ML
664670
langchain4j = { module = "dev.langchain4j:langchain4j" , version.ref = "langchain4j" }

0 commit comments

Comments
 (0)