Skip to content

Commit ced8572

Browse files
committed
Merge branch 'main' of https://github.com/open-telemetry/opentelemetry-java-contrib into xray-component-provider
2 parents ba04eba + b9bbae6 commit ced8572

File tree

6 files changed

+16
-9
lines changed

6 files changed

+16
-9
lines changed

README.md

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,26 @@ feature or via instrumentation, this project is hopefully for you.
1212
* [AWS Resources](./aws-resources/README.md)
1313
* [AWS X-Ray SDK Support](./aws-xray/README.md)
1414
* [AWS X-Ray Propagator](./aws-xray-propagator/README.md)
15+
* [Baggage Span Processor](./baggage-processor/README.md)
1516
* [zstd Compressor](./compressors/compressor-zstd/README.md)
1617
* [Consistent Sampling](./consistent-sampling/README.md)
1718
* [Disk Buffering](./disk-buffering/README.md)
1819
* [GCP Resources](./gcp-resources/README.md)
20+
* [Inferred Spans](./inferred-spans/README.md)
21+
* [JFR Connection](./jfr-connection/README.md)
22+
* [JFR Events](./jfr-events/README.md)
1923
* [JMX Metric Gatherer](./jmx-metrics/README.md)
20-
* [No-Op API](./noop-api/README.md)
24+
* [Kafka Support](./kafka-exporter/README.md)
2125
* [OpenTelemetry Maven Extension](./maven-extension/README.md)
26+
* [Micrometer MeterProvider](./micrometer-meter-provider/README.md)
27+
* [No-Op API](./noop-api/README.md)
28+
* [Intercept and Process Signals Globally](./processors/README.md)
2229
* [Prometheus Client Bridge](./prometheus-client-bridge/README.md)
2330
* [Resource Providers](./resource-providers/README.md)
2431
* [Runtime Attach](./runtime-attach/README.md)
2532
* [Samplers](./samplers/README.md)
33+
* [Span Stacktrace Capture](./span-stacktrace/README.md)
2634
* [Static Instrumenter](./static-instrumenter/README.md)
27-
* [Kafka Support](./kafka-exporter/README.md)
2835

2936
## Getting Started
3037

compressors/compressor-zstd/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ otelJava.moduleName.set("io.opentelemetry.contrib.compressor.zstd")
99
dependencies {
1010
api("io.opentelemetry:opentelemetry-exporter-common")
1111

12-
implementation("com.github.luben:zstd-jni:1.5.6-4")
12+
implementation("com.github.luben:zstd-jni:1.5.6-5")
1313

1414
testImplementation("io.opentelemetry:opentelemetry-sdk-testing")
1515
testImplementation("io.opentelemetry:opentelemetry-exporter-otlp")

dependencyManagement/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ val DEPENDENCY_BOMS = listOf(
2121

2222
val autoServiceVersion = "1.1.1"
2323
val autoValueVersion = "1.11.0"
24-
val errorProneVersion = "2.30.0"
24+
val errorProneVersion = "2.31.0"
2525
val prometheusVersion = "0.16.0"
2626
val mockitoVersion = "4.11.0"
2727
val slf4jVersion = "2.0.16"

gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionSha256Sum=5b9c5eb3f9fc2c94abaea57d90bd78747ca117ddbbf96c859d3741181a12bf2a
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
3+
distributionSha256Sum=1541fa36599e12857140465f3c91a97409b4512501c26f9631fb113e392c5bd1
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
55
networkTimeout=10000
66
validateDistributionUrl=true
77
zipStoreBase=GRADLE_USER_HOME

runtime-attach/runtime-attach-core/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ description = "To help in create an OpenTelemetry distro able to runtime attach
77
otelJava.moduleName.set("io.opentelemetry.contrib.attach.core")
88

99
dependencies {
10-
implementation("net.bytebuddy:byte-buddy-agent:1.15.0")
10+
implementation("net.bytebuddy:byte-buddy-agent:1.15.1")
1111

1212
// Used by byte-buddy but not brought in as a transitive dependency.
1313
compileOnly("com.google.code.findbugs:annotations")

static-instrumenter/maven-plugin/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ otelJava {
1717
dependencies {
1818
implementation("org.apache.maven:maven-plugin-api:3.5.0") // do not auto-update this version
1919
implementation("org.apache.maven:maven-project:2.2.1")
20-
compileOnly("org.apache.maven.plugin-tools:maven-plugin-annotations:3.14.0")
20+
compileOnly("org.apache.maven.plugin-tools:maven-plugin-annotations:3.15.0")
2121
compileOnly("org.apache.maven:maven-core:3.5.0") // do not auto-update this version
2222
compileOnly("org.slf4j:slf4j-api")
2323

24-
testImplementation("org.apache.maven.plugin-tools:maven-plugin-annotations:3.14.0")
24+
testImplementation("org.apache.maven.plugin-tools:maven-plugin-annotations:3.15.0")
2525
testImplementation("org.apache.maven:maven-core:3.5.0")
2626
testImplementation("org.slf4j:slf4j-simple")
2727
}

0 commit comments

Comments
 (0)