Skip to content

Commit ff88561

Browse files
authored
Merge branch 'open-telemetry:main' into krajo/nh-prom-to-otel
2 parents 06bab9f + 5beb85b commit ff88561

File tree

6 files changed

+1015
-329
lines changed

6 files changed

+1015
-329
lines changed

spec-compliance-matrix.md

Lines changed: 326 additions & 326 deletions
Large diffs are not rendered by default.

spec-compliance-matrix/go.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -502,7 +502,7 @@ sections:
502502
- name: OTEL_EXPORTER_OTLP_METRICS_DEFAULT_HISTOGRAM_AGGREGATION
503503
status: '+'
504504
- name: OTEL_CONFIG_FILE
505-
status: '-'
505+
status: '+'
506506
- name: Declarative configuration
507507
features:
508508
- name: '`Parse` a configuration file'

spec-compliance-matrix/java.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -502,7 +502,7 @@ sections:
502502
- name: OTEL_EXPORTER_OTLP_METRICS_DEFAULT_HISTOGRAM_AGGREGATION
503503
status: '+'
504504
- name: OTEL_CONFIG_FILE
505-
status: '?'
505+
status: '+'
506506
- name: Declarative configuration
507507
features:
508508
- name: '`Parse` a configuration file'

0 commit comments

Comments
 (0)