Skip to content

Commit

Permalink
Merge branch 'main' into opentelemetrybot/auto-update-opentelemetry-j…
Browse files Browse the repository at this point in the history
…ava-instrumentation-v2.5.0
  • Loading branch information
theletterf authored Jun 18, 2024
2 parents 07113ae + 11670ff commit 7a12461
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion content/en/docs/languages/java/configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ exporters.
| `otel.exporter.otlp.protocol` | The transport protocol to use on OTLP trace, metric, and log requests. Options include `grpc` and `http/protobuf`. | `grpc` [^2] |
| `otel.exporter.otlp.{signal}.protocol` | The transport protocol to use on OTLP {signal} requests. Options include `grpc` and `http/protobuf`. | `grpc` [^2] |
| `otel.exporter.otlp.metrics.temporality.preference` | The preferred output aggregation temporality. Options include `DELTA`, `LOWMEMORY`, and `CUMULATIVE`. If `CUMULATIVE`, all instruments will have cumulative temporality. If `DELTA`, counter (sync and async) and histograms will be delta, up down counters (sync and async) will be cumulative. If `LOWMEMORY`, sync counter and histograms will be delta, async counter and up down counters (sync and async) will be cumulative. | `CUMULATIVE` |
| `otel.exporter.otlp.metrics.default.histogram.aggregation` | The preferred default histogram aggregation. Options include `BASE2.EXPONENTIAL.BUCKET.HISTOGRAM` and `EXPLICIT.BUCKET.HISTOGRAM`. | `EXPLICIT.BUCKET.HISTOGRAM` |
| `otel.exporter.otlp.metrics.default.histogram.aggregation` | The preferred default histogram aggregation. Options include `BASE2_EXPONENTIAL_BUCKET_HISTOGRAM` and `EXPLICIT_BUCKET_HISTOGRAM`. | `EXPLICIT_BUCKET_HISTOGRAM` |
| `otel.experimental.exporter.otlp.retry.enabled` | If `true`, enable [experimental retry support](#otlp-exporter-retry). | `false` |

[^2]: OpenTelemetry Java agent 2.x uses `http/protobuf` by default.
Expand Down
2 changes: 1 addition & 1 deletion data/registry/exporter-dotnet-geneva.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ createdAt: 2022-11-07
package:
registry: nuget
name: OpenTelemetry.Exporter.Geneva
version: 1.9.0-rc.1
version: 1.9.0-rc.2
2 changes: 1 addition & 1 deletion data/registry/exporter-dotnet-onecollector.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ createdAt: 2023-03-03
package:
registry: nuget
name: OpenTelemetry.Exporter.OneCollector
version: 1.9.0-rc.1
version: 1.9.0
2 changes: 1 addition & 1 deletion data/registry/instrumentation-dotnet-aspnetcore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ createdAt: 2022-11-07
package:
registry: nuget
name: OpenTelemetry.Instrumentation.AspNetCore
version: 1.8.1
version: 1.9.0
2 changes: 1 addition & 1 deletion data/registry/instrumentation-dotnet-grpcnetclient.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ createdAt: 2022-11-07
package:
registry: nuget
name: OpenTelemetry.Instrumentation.GrpcNetClient
version: 1.8.0-beta.1
version: 1.9.0-beta.1
2 changes: 1 addition & 1 deletion data/registry/instrumentation-dotnet-http.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ createdAt: 2022-11-07
package:
registry: nuget
name: OpenTelemetry.Instrumentation.Http
version: 1.8.1
version: 1.9.0
2 changes: 1 addition & 1 deletion data/registry/instrumentation-dotnet-sqlclient.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ createdAt: 2022-11-07
package:
registry: nuget
name: OpenTelemetry.Instrumentation.SqlClient
version: 1.8.0-beta.1
version: 1.9.0-beta.1

0 comments on commit 7a12461

Please sign in to comment.