Skip to content

Commit

Permalink
Merge branch 'main' into svrnm-patch-3
Browse files Browse the repository at this point in the history
  • Loading branch information
svrnm authored Jun 18, 2024
2 parents 5aa2f1f + 7591d4d commit 6eb7fcd
Show file tree
Hide file tree
Showing 13 changed files with 112 additions and 55 deletions.
7 changes: 4 additions & 3 deletions content/en/docs/demo/services/cart.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ and resource attributes is performed through environment variables.
```cs
Action<ResourceBuilder> appResourceBuilder =
resource => resource
.AddDetector(new ContainerResourceDetector())
.AddDetector(new HostDetector());
.AddContainerDetector()
.AddHostDetector();

builder.Services.AddOpenTelemetry()
.ConfigureResource(appResourceBuilder)
Expand Down Expand Up @@ -81,7 +81,8 @@ desired instrumentation libraries, exporters, etc.
```cs
Action<ResourceBuilder> appResourceBuilder =
resource => resource
.AddDetector(new ContainerResourceDetector());
.AddContainerDetector()
.AddHostDetector();

builder.Services.AddOpenTelemetry()
.ConfigureResource(appResourceBuilder)
Expand Down
2 changes: 1 addition & 1 deletion content/en/docs/languages/java/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ description: >-
aliases: [/java, /java/metrics, /java/tracing]
cascade:
vers:
instrumentation: 2.4.0
instrumentation: 2.5.0
otel: 1.39.0
semconv: 1.25.0
weight: 18
Expand Down
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 content/en/docs/zero-code/net/configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ Important environment variables include:
- On .NET 6 and higher, the application must reference
[`Grpc.Net.Client`](https://www.nuget.org/packages/Grpc.Net.Client/) to use
the `grpc` OTLP exporter protocol. For example, by adding
`<PackageReference Include="Grpc.Net.Client" Version="2.43.0" />` to the
`<PackageReference Include="Grpc.Net.Client" Version="2.63.0" />` to the
`.csproj` file.
- On .NET Framework, the `grpc` OTLP exporter protocol is not supported.

Expand Down
Loading

0 comments on commit 6eb7fcd

Please sign in to comment.