Merge branch 'main' into fix-Headers-not-sent-in-HTTP

* main: Revert automatic version number (open-telemetry#511) Removed duplicate appending of log records (open-telemetry#504) # Conflicts: # Sources/Exporters/OpenTelemetryProtocolHttp/logs/OtlpHttpLogExporter.swift
nachoBonafonte · Feb 1, 2024 · 8cf3d42 · 8cf3d42
2 parents ebca8c9 + 0033445
commit 8cf3d42
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 33 deletions.
diff --git a/.github/workflows/createRelease.yml b/.github/workflows/createRelease.yml
diff --git a/Scripts/updateVersion.sh b/Scripts/updateVersion.sh
diff --git a/Sources/OpenTelemetrySdk/Version.swift b/Sources/OpenTelemetrySdk/Version.swift
@@ -6,5 +6,5 @@
 import Foundation
 
 extension Resource {
-public static let OTEL_SWIFT_SDK_VERSION = "1.8.0"
+    public static let OTEL_SWIFT_SDK_VERSION : String = "1.8.0"
 }