Skip to content

Commit d39a7eb

Browse files
trasktrask
authored
Merge branch 'main' into log4j-appender
2 parents ab2efb8 + 9fc8b20 commit d39a7eb

File tree

202 files changed

+6961
-1550
lines changed

Some content is hidden

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

202 files changed

+6961
-1550
lines changed

‎.fossa.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -721,6 +721,12 @@ targets:
721721
- type: gradle
722722
path: ./
723723
target: ':instrumentation:okhttp:okhttp-3.0:library'
724+
- type: gradle
725+
path: ./
726+
target: ':instrumentation:openai:openai-java-1.1:javaagent'
727+
- type: gradle
728+
path: ./
729+
target: ':instrumentation:openai:openai-java-1.1:library'
724730
- type: gradle
725731
path: ./
726732
target: ':instrumentation:opensearch:opensearch-rest-1.0:javaagent'
@@ -769,6 +775,9 @@ targets:
769775
- type: gradle
770776
path: ./
771777
target: ':instrumentation:opentelemetry-api:opentelemetry-api-1.50:javaagent'
778+
- type: gradle
779+
path: ./
780+
target: ':instrumentation:opentelemetry-api:opentelemetry-api-1.52:javaagent'
772781
- type: gradle
773782
path: ./
774783
target: ':instrumentation:pekko:pekko-actor-1.0:javaagent'

‎benchmark-overhead/Dockerfile.petclinic‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM eclipse-temurin:11.0.27_6-jdk@sha256:0296b46d1949f49054497db63a7630d4805ef587c2937eb23a582a2ffdde88da as app-build
1+
FROM eclipse-temurin:11.0.27_6-jdk@sha256:2fd4e5e0ba72f725016e757a5688ce14fda6a792da566fca62ef6ff73f50df35 as app-build
22

33
# This is the base image that will contain a built version of the spring-petclinic-rest
44
# application. Installing the dependencies and maven compiling the application is time

‎buildscripts/checkstyle.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,7 @@
254254
<property name="arrayInitIndent" value="2"/>
255255
</module>
256256
-->
257+
<!-- handled by error prone
257258
<module name="AbbreviationAsWordInName">
258259
<property name="ignoreFinal" value="false"/>
259260
<property name="allowedAbbreviationLength" value="0"/>
@@ -262,6 +263,7 @@
262263
PARAMETER_DEF, VARIABLE_DEF, METHOD_DEF, PATTERN_VARIABLE_DEF, RECORD_DEF,
263264
RECORD_COMPONENT_DEF"/>
264265
</module>
266+
-->
265267
<module name="OverloadMethodsDeclarationOrder"/>
266268
<!-- there are only a few violations of this, and they all appear to be for good reasons
267269
<module name="VariableDeclarationUsageDistance"/>

‎conventions/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ dependencies {
5959
implementation("gradle.plugin.com.google.protobuf:protobuf-gradle-plugin:0.8.18")
6060
implementation("com.gradleup.shadow:shadow-gradle-plugin:8.3.8")
6161
implementation("org.apache.httpcomponents:httpclient:4.5.14")
62-
implementation("com.gradle.develocity:com.gradle.develocity.gradle.plugin:4.0.2")
62+
implementation("com.gradle.develocity:com.gradle.develocity.gradle.plugin:4.1")
6363
implementation("org.owasp:dependency-check-gradle:12.1.3")
6464
implementation("ru.vyarus:gradle-animalsniffer-plugin:2.0.1")
6565
implementation("org.spdx:spdx-gradle-plugin:0.9.0")

‎conventions/src/main/kotlin/otel.java-conventions.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ abstract class NettyAlignmentRule : ComponentMetadataRule {
143143
with(ctx.details) {
144144
if (id.group == "io.netty" && id.name != "netty") {
145145
if (id.version.startsWith("4.1.")) {
146-
belongsTo("io.netty:netty-bom:4.1.122.Final", false)
146+
belongsTo("io.netty:netty-bom:4.1.123.Final", false)
147147
} else if (id.version.startsWith("4.0.")) {
148148
belongsTo("io.netty:netty-bom:4.0.56.Final", false)
149149
}

‎conventions/src/main/kotlin/otel.scala-conventions.gradle.kts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ plugins {
55
}
66

77
dependencies {
8+
compileOnly("org.scala-lang:scala-library:2.11.12")
89
testCompileOnly("org.scala-lang:scala-library:2.11.12")
910
}
1011

‎dependencyManagement/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ plugins {
55
data class DependencySet(val group: String, val version: String, val modules: List<String>)
66

77
// this line is managed by .github/scripts/update-sdk-version.sh
8-
val otelSdkVersion = "1.51.0"
8+
val otelSdkVersion = "1.52.0"
99
val otelContribVersion = "1.47.0-alpha"
1010
val otelSdkAlphaVersion = otelSdkVersion.replaceFirst("(-SNAPSHOT)?$".toRegex(), "-alpha$1")
1111

@@ -120,7 +120,7 @@ val DEPENDENCIES = listOf(
120120
"org.junit-pioneer:junit-pioneer:1.9.1",
121121
"org.objenesis:objenesis:3.4",
122122
"javax.validation:validation-api:2.0.1.Final",
123-
"org.snakeyaml:snakeyaml-engine:2.9",
123+
"org.snakeyaml:snakeyaml-engine:2.10",
124124
"org.elasticmq:elasticmq-rest-sqs_2.13:1.6.12"
125125
)
126126

0 commit comments

Comments
 (0)