Skip to content

Commit c35eb5f

Browse files
committed
Merge branch 'main' of https://github.com/open-telemetry/opentelemetry-java into jh-profiling-j
2 parents 0c658b1 + 394cd35 commit c35eb5f

24 files changed

+32
-153
lines changed

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ jobs:
188188
git add docs/apidiffs
189189
190190
- name: Use CLA approved bot
191-
run: .github/scripts/use-cla-approved-bot.sh
191+
run: .github/scripts/use-cla-approved-github-bot.sh
192192

193193
- uses: actions/create-github-app-token@3ff1caaa28b64c9cc276ce0a02e2ff584f3900c5 # v2.0.2
194194
id: otelbot-token
Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
1-
Comparing source compatibility of opentelemetry-api-1.51.0-SNAPSHOT.jar against opentelemetry-api-1.49.0.jar
2-
*** MODIFIED INTERFACE: PUBLIC ABSTRACT io.opentelemetry.api.logs.LogRecordBuilder (not serializable)
3-
=== CLASS FILE FORMAT VERSION: 52.0 <- 52.0
4-
+++ NEW METHOD: PUBLIC(+) io.opentelemetry.api.logs.LogRecordBuilder setEventName(java.lang.String)
1+
Comparing source compatibility of opentelemetry-api-1.51.0-SNAPSHOT.jar against opentelemetry-api-1.50.0.jar
2+
No changes.
Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,2 @@
1-
Comparing source compatibility of opentelemetry-context-1.51.0-SNAPSHOT.jar against opentelemetry-context-1.49.0.jar
2-
*** MODIFIED INTERFACE: PUBLIC ABSTRACT io.opentelemetry.context.propagation.TextMapGetter (not serializable)
3-
=== CLASS FILE FORMAT VERSION: 52.0 <- 52.0
4-
GENERIC TEMPLATES: === C:java.lang.Object
5-
+++ NEW METHOD: PUBLIC(+) java.util.Iterator<java.lang.String> getAll(java.lang.Object, java.lang.String)
1+
Comparing source compatibility of opentelemetry-context-1.51.0-SNAPSHOT.jar against opentelemetry-context-1.50.0.jar
2+
No changes.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Comparing source compatibility of opentelemetry-exporter-common-1.51.0-SNAPSHOT.jar against opentelemetry-exporter-common-1.49.0.jar
1+
Comparing source compatibility of opentelemetry-exporter-common-1.51.0-SNAPSHOT.jar against opentelemetry-exporter-common-1.50.0.jar
22
No changes.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Comparing source compatibility of opentelemetry-exporter-logging-otlp-1.51.0-SNAPSHOT.jar against opentelemetry-exporter-logging-otlp-1.49.0.jar
1+
Comparing source compatibility of opentelemetry-exporter-logging-otlp-1.51.0-SNAPSHOT.jar against opentelemetry-exporter-logging-otlp-1.50.0.jar
22
No changes.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Comparing source compatibility of opentelemetry-exporter-logging-1.51.0-SNAPSHOT.jar against opentelemetry-exporter-logging-1.49.0.jar
1+
Comparing source compatibility of opentelemetry-exporter-logging-1.51.0-SNAPSHOT.jar against opentelemetry-exporter-logging-1.50.0.jar
22
No changes.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Comparing source compatibility of opentelemetry-exporter-otlp-common-1.51.0-SNAPSHOT.jar against opentelemetry-exporter-otlp-common-1.49.0.jar
1+
Comparing source compatibility of opentelemetry-exporter-otlp-common-1.51.0-SNAPSHOT.jar against opentelemetry-exporter-otlp-common-1.50.0.jar
22
No changes.
Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,2 @@
1-
Comparing source compatibility of opentelemetry-exporter-otlp-1.51.0-SNAPSHOT.jar against opentelemetry-exporter-otlp-1.49.0.jar
2-
*** MODIFIED CLASS: PUBLIC FINAL io.opentelemetry.exporter.otlp.http.metrics.OtlpHttpMetricExporterBuilder (not serializable)
3-
=== CLASS FILE FORMAT VERSION: 52.0 <- 52.0
4-
+++ NEW METHOD: PUBLIC(+) io.opentelemetry.exporter.otlp.http.metrics.OtlpHttpMetricExporterBuilder setMeterProvider(io.opentelemetry.api.metrics.MeterProvider)
5-
+++ NEW METHOD: PUBLIC(+) io.opentelemetry.exporter.otlp.http.metrics.OtlpHttpMetricExporterBuilder setMeterProvider(java.util.function.Supplier<io.opentelemetry.api.metrics.MeterProvider>)
6-
*** MODIFIED CLASS: PUBLIC FINAL io.opentelemetry.exporter.otlp.metrics.OtlpGrpcMetricExporterBuilder (not serializable)
7-
=== CLASS FILE FORMAT VERSION: 52.0 <- 52.0
8-
+++ NEW METHOD: PUBLIC(+) io.opentelemetry.exporter.otlp.metrics.OtlpGrpcMetricExporterBuilder setMeterProvider(io.opentelemetry.api.metrics.MeterProvider)
9-
+++ NEW METHOD: PUBLIC(+) io.opentelemetry.exporter.otlp.metrics.OtlpGrpcMetricExporterBuilder setMeterProvider(java.util.function.Supplier<io.opentelemetry.api.metrics.MeterProvider>)
1+
Comparing source compatibility of opentelemetry-exporter-otlp-1.51.0-SNAPSHOT.jar against opentelemetry-exporter-otlp-1.50.0.jar
2+
No changes.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Comparing source compatibility of opentelemetry-exporter-sender-grpc-managed-channel-1.51.0-SNAPSHOT.jar against opentelemetry-exporter-sender-grpc-managed-channel-1.49.0.jar
1+
Comparing source compatibility of opentelemetry-exporter-sender-grpc-managed-channel-1.51.0-SNAPSHOT.jar against opentelemetry-exporter-sender-grpc-managed-channel-1.50.0.jar
22
No changes.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Comparing source compatibility of opentelemetry-exporter-sender-jdk-1.51.0-SNAPSHOT.jar against opentelemetry-exporter-sender-jdk-1.49.0.jar
1+
Comparing source compatibility of opentelemetry-exporter-sender-jdk-1.51.0-SNAPSHOT.jar against opentelemetry-exporter-sender-jdk-1.50.0.jar
22
No changes.

0 commit comments

Comments
 (0)