Skip to content

Commit 40a551b

Browse files
jaydelucajaydeluca
committed
merge
2 parents 043ba1e + 0e7a006 commit 40a551b

File tree

132 files changed

+3030
-653
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

132 files changed

+3030
-653
lines changed

‎.github/renovate.json5‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -377,11 +377,11 @@
377377
datasourceTemplate: 'java-version',
378378
managerFilePatterns: [
379379
'.github/workflows/**',
380-
'**/*.gradle.kts'
380+
'**/*.gradle.kts',
381381
],
382382
matchStrings: [
383-
'(?<currentValue>\\d+) # renovate: datasource=java-version',
384-
'"(?<currentValue>\\d+)" // renovate: datasource=java-version',
383+
'(?<currentValue>\\d+) # renovate\\(java-version\\)',
384+
'"(?<currentValue>\\d+)" // renovate\\(java-version\\)',
385385
],
386386
depNameTemplate: 'java',
387387
extractVersionTemplate: '^(?<version>\\d+)',
@@ -390,7 +390,7 @@
390390
customType: 'regex',
391391
datasourceTemplate: 'pypi',
392392
managerFilePatterns: [
393-
'/^.github/workflows//',
393+
'.github/workflows/**',
394394
],
395395
matchStrings: [
396396
'pip install (?<depName>[^=]+)==(?<currentValue>[^\\s]+)',
@@ -400,7 +400,7 @@
400400
customType: 'regex',
401401
datasourceTemplate: 'npm',
402402
managerFilePatterns: [
403-
'/^.github/workflows//',
403+
'.github/workflows/**',
404404
],
405405
matchStrings: [
406406
'npx (?<depName>[^@]+)@(?<currentValue>[^\\s]+)',

‎.github/workflows/build-common.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ jobs:
246246
- 11
247247
- 17
248248
- 21
249-
- 25 # renovate: datasource=java-version
249+
- 25 # renovate(java-version)
250250
- 25-deny-unsafe
251251
vm:
252252
- hotspot

‎.github/workflows/reusable-pr-smoke-test-images.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
build:
3131
runs-on: ubuntu-latest
3232
env:
33-
LATEST_JAVA_VERSION: 25 # renovate: datasource=java-version
33+
LATEST_JAVA_VERSION: 25 # renovate(java-version)
3434
steps:
3535
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
3636

‎.github/workflows/reusable-publish-smoke-test-images.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
contents: read
3434
packages: write
3535
env:
36-
LATEST_JAVA_VERSION: 25 # renovate: datasource=java-version
36+
LATEST_JAVA_VERSION: 25 # renovate(java-version)
3737
steps:
3838
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
3939

‎benchmark-overhead/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ repositories {
1818
dependencies {
1919
implementation(enforcedPlatform("org.junit:junit-bom:5.14.1"))
2020

21-
testImplementation(platform("org.testcontainers:testcontainers-bom:2.0.1"))
22-
testImplementation("org.testcontainers:testcontainers:2.0.1")
21+
testImplementation(platform("org.testcontainers:testcontainers-bom:2.0.2"))
22+
testImplementation("org.testcontainers:testcontainers:2.0.2")
2323
testImplementation("org.testcontainers:testcontainers-postgresql")
2424
testImplementation("org.junit.jupiter:junit-jupiter-api")
2525
testImplementation("org.junit.jupiter:junit-jupiter-params")

‎dependencyManagement/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ val DEPENDENCY_BOMS = listOf(
3232
"org.apache.groovy:groovy-bom:${groovyVersion}",
3333
"io.opentelemetry:opentelemetry-bom:${otelSdkVersion}",
3434
"io.opentelemetry:opentelemetry-bom-alpha:${otelSdkAlphaVersion}",
35-
"org.testcontainers:testcontainers-bom:2.0.1"
35+
"org.testcontainers:testcontainers-bom:2.0.2"
3636
)
3737

3838
val autoServiceVersion = "1.1.1"
@@ -104,7 +104,7 @@ val DEPENDENCIES = listOf(
104104
"io.opentelemetry.contrib:opentelemetry-cloudfoundry-resources:${otelContribVersion}",
105105
"io.opentelemetry.contrib:opentelemetry-baggage-processor:${otelContribVersion}",
106106
"io.opentelemetry.contrib:opentelemetry-samplers:${otelContribVersion}",
107-
"io.opentelemetry.proto:opentelemetry-proto:1.8.0-alpha",
107+
"io.opentelemetry.proto:opentelemetry-proto:1.9.0-alpha",
108108
"io.opentelemetry:opentelemetry-extension-annotations:1.18.0", // deprecated, no longer part of bom
109109
"org.assertj:assertj-core:3.27.6",
110110
"org.awaitility:awaitility:4.3.0",

‎docs/apidiffs/current_vs_latest/opentelemetry-spring-boot-autoconfigure.txt‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
Comparing source compatibility of opentelemetry-spring-boot-autoconfigure-2.22.0-SNAPSHOT.jar against opentelemetry-spring-boot-autoconfigure-2.21.0.jar
2-
No changes.
2+
=== UNCHANGED CLASS: PUBLIC io.opentelemetry.instrumentation.spring.autoconfigure.OpenTelemetryAutoConfiguration (not serializable)
3+
=== CLASS FILE FORMAT VERSION: 52.0 <- 52.0
4+
--- REMOVED ANNOTATION: org.springframework.boot.context.properties.EnableConfigurationProperties
5+
--- REMOVED ELEMENT: value=io.opentelemetry.instrumentation.spring.autoconfigure.internal.properties.OtlpExporterProperties,io.opentelemetry.instrumentation.spring.autoconfigure.internal.properties.OtelResourceProperties,io.opentelemetry.instrumentation.spring.autoconfigure.internal.properties.OtelSpringProperties (-)

‎examples/distro/smoke-tests/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ plugins {
33
}
44

55
dependencies {
6-
testImplementation("org.testcontainers:testcontainers:2.0.1")
6+
testImplementation("org.testcontainers:testcontainers:2.0.2")
77
testImplementation("com.fasterxml.jackson.core:jackson-databind:2.20.1")
8-
testImplementation("com.google.protobuf:protobuf-java-util:4.33.0")
8+
testImplementation("com.google.protobuf:protobuf-java-util:4.33.1")
99
testImplementation("com.squareup.okhttp3:okhttp:5.3.0")
10-
testImplementation("io.opentelemetry.proto:opentelemetry-proto:1.8.0-alpha")
10+
testImplementation("io.opentelemetry.proto:opentelemetry-proto:1.9.0-alpha")
1111
testImplementation("io.opentelemetry:opentelemetry-api")
1212

1313
testImplementation("ch.qos.logback:logback-classic:1.5.21")

‎examples/extension/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,12 +98,12 @@ dependencies {
9898
implementation 'org.apache.commons:commons-lang3:3.19.0'
9999

100100
//All dependencies below are only for tests
101-
testImplementation("org.testcontainers:testcontainers:2.0.1")
101+
testImplementation("org.testcontainers:testcontainers:2.0.2")
102102
testImplementation("com.fasterxml.jackson.core:jackson-databind:2.20.1")
103-
testImplementation("com.google.protobuf:protobuf-java-util:4.33.0")
103+
testImplementation("com.google.protobuf:protobuf-java-util:4.33.1")
104104
testImplementation("com.squareup.okhttp3:okhttp:5.3.0")
105105
testImplementation("io.opentelemetry:opentelemetry-api")
106-
testImplementation("io.opentelemetry.proto:opentelemetry-proto:1.8.0-alpha")
106+
testImplementation("io.opentelemetry.proto:opentelemetry-proto:1.9.0-alpha")
107107

108108
testImplementation(enforcedPlatform("org.junit:junit-bom:5.14.1"))
109109
testImplementation("org.junit.jupiter:junit-jupiter-api")

‎instrumentation-api-incubator/build.gradle.kts‎

Lines changed: 45 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
plugins {
2-
id("org.xbib.gradle.plugin.jflex")
3-
42
id("otel.java-conventions")
53
id("otel.animalsniffer-conventions")
64
id("otel.jacoco-conventions")
@@ -10,7 +8,11 @@ plugins {
108

119
group = "io.opentelemetry.instrumentation"
1210

11+
val jflex = configurations.create("jflex")
12+
1313
dependencies {
14+
jflex("de.jflex:jflex:1.9.1")
15+
1416
api("io.opentelemetry.semconv:opentelemetry-semconv")
1517
api(project(":instrumentation-api"))
1618
api("io.opentelemetry:opentelemetry-api-incubator")
@@ -24,6 +26,42 @@ dependencies {
2426
testImplementation("io.opentelemetry.semconv:opentelemetry-semconv-incubating")
2527
}
2628

29+
val jflexSourceDir = layout.projectDirectory.dir("src/main/jflex")
30+
val jflexOutputDir = layout.buildDirectory.dir("generated/sources/jflex")
31+
32+
val generateJflex by tasks.registering(JavaExec::class) {
33+
classpath(jflex)
34+
mainClass.set("jflex.Main")
35+
36+
inputs.dir(jflexSourceDir)
37+
outputs.dir(jflexOutputDir)
38+
39+
val sourceDir = jflexSourceDir
40+
val outputDirProvider = jflexOutputDir
41+
42+
doFirst {
43+
val outputDir = outputDirProvider.get().asFile
44+
outputDir.mkdirs()
45+
val specFile = sourceDir.asFile.resolve("SqlSanitizer.jflex")
46+
args(
47+
"-d",
48+
outputDir.absolutePath,
49+
"--nobak",
50+
specFile.absolutePath,
51+
)
52+
}
53+
}
54+
55+
sourceSets {
56+
main {
57+
java.srcDir(jflexOutputDir)
58+
}
59+
}
60+
61+
tasks.compileJava {
62+
dependsOn(generateJflex)
63+
}
64+
2765
tasks {
2866
// exclude auto-generated code
2967
named<Checkstyle>("checkstyleMain") {
@@ -38,7 +76,11 @@ tasks {
3876
}
3977

4078
sourcesJar {
41-
dependsOn("generateJflex")
79+
dependsOn(generateJflex)
80+
// Avoid configuration cache issue by not capturing task reference
81+
from("src/main/jflex") {
82+
include("**/*.java")
83+
}
4284
}
4385

4486
val testStableSemconv by registering(Test::class) {

0 commit comments

Comments
 (0)