Merge branch 'main' into expose-logger-provider

open-telemetry · May 24, 2024 · 98461e4 · 98461e4
2 parents d7286d4 + 361a4b9
commit 98461e4
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 0 deletions.
diff --git a/docs/metrics/exemplars/docker-compose.yaml → examples/AspNetCore/docker-compose.yaml b/docs/metrics/exemplars/docker-compose.yaml → examples/AspNetCore/docker-compose.yaml
diff --git a/...etrics/exemplars/grafana-datasources.yaml → examples/AspNetCore/grafana-datasources.yaml b/...etrics/exemplars/grafana-datasources.yaml → examples/AspNetCore/grafana-datasources.yaml
diff --git a/docs/metrics/exemplars/otel-collector.yaml → examples/AspNetCore/otel-collector.yaml b/docs/metrics/exemplars/otel-collector.yaml → examples/AspNetCore/otel-collector.yaml
diff --git a/docs/metrics/exemplars/prometheus.yaml → examples/AspNetCore/prometheus.yaml b/docs/metrics/exemplars/prometheus.yaml → examples/AspNetCore/prometheus.yaml
diff --git a/docs/metrics/exemplars/tempo.yaml → examples/AspNetCore/tempo.yaml b/docs/metrics/exemplars/tempo.yaml → examples/AspNetCore/tempo.yaml