Merge branch 'main' into mark_logs_stable

open-telemetry · Jul 28, 2023 · 8253dd4 · 8253dd4
2 parents 66b069b + 8f97cab
commit 8253dd4
Show file tree

Hide file tree

Showing 7 changed files with 581 additions and 241 deletions.
diff --git a/.gitignore b/.gitignore
@@ -57,7 +57,7 @@ tags
 .cache/clangd/*
 
 # Temporary dir used when generating semconv
-./buildscripts/semantic-convention/opentelemetry-specification
+buildscripts/semantic-convention/tmp-semconv/
 
 # Generated cert keys in functional tests
 functional/cert/ca.csr