zeekay 8eb04ec95d merge: upstream/main (-X ours, brand preserved) ...

# Conflicts:
#	.chloggen/add-cors-exposed-headers.yaml
#	.chloggen/feature_configtls-insecure-cipher-suites.yaml
#	.chloggen/fix-mdatagen-underscore-in-semconv-bug.yaml
#	.chloggen/mdatagen_numeric_validators.yaml
#	AGENTS.md
#	AGENTS.md~upstream_main
#	CLAUDE.md
#	CLAUDE.md~upstream_main
#	confmap/internal/featuregates.go
#	service/telemetry/otelconftelemetry/internal/migration/v0.3.0_test.go

2026-06-02 10:21:37 -07:00

..

generated_status.go

[chore][cmd/mdatagen]: add package comment to generated package (#15055)

2026-04-22 00:21:41 +00:00

generated_telemetry_test.go

Remove deprecated LeveledMeter from the generated code (#11696)

2024-11-19 10:50:15 -08:00

generated_telemetry.go

fix: change metric units to singular (#14753)

2026-03-12 10:45:27 +00:00