Merge pull request #1 from open-telemetry/main

Repo update from upstream.

Author: c0mtru1se

Examples/Datadog Sample/README.md

@@ -2,6 +2,6 @@
 
 This example shows the Datadog exporter used with a Simple Exporter, showing how to configure for sending.
 
-User must write the clientKey for Datadog at the begining of code.
+User must write the clientKey for Datadog at the beginning of code.
 
 

Examples/Simple Exporter/main.swift

@@ -21,8 +21,8 @@ let instrumentationScopeName = "SimpleExporter"
 let instrumentationScopeVersion = "semver:0.1.0"
 
 var tracer: TracerSdk
-let jaegerCollectorAdress = "localhost"
-let jaegerExporter = JaegerSpanExporter(serviceName: "SimpleExporter", collectorAddress: jaegerCollectorAdress)
+let jaegerCollectorAddress = "localhost"
+let jaegerExporter = JaegerSpanExporter(serviceName: "SimpleExporter", collectorAddress: jaegerCollectorAddress)
 let stdoutExporter = StdoutExporter()
 
 // let zipkinExporterOptions = ZipkinTraceExporterOptions()

Package.resolved

@@ -42,7 +42,6 @@ let package = Package(
         .package(url: "https://github.com/apple/swift-protobuf.git", from: "1.20.2"),
         .package(url: "https://github.com/apple/swift-log.git", from: "1.4.4"),
         .package(url: "https://github.com/apple/swift-metrics.git", from: "2.1.1"),
-        .package(url: "https://github.com/ashleymills/Reachability.swift", from: "5.1.0")
     ],
     targets: [
         .target(name: "OpenTelemetryApi",
@@ -60,7 +59,6 @@ let package = Package(
         .target(name: "NetworkStatus",
                 dependencies: [
                     "OpenTelemetryApi",
-                    .product(name: "Reachability", package: "Reachability.swift", condition: .when(platforms: [.iOS, .macOS, .tvOS, .macCatalyst, .linux]))
                 ],
                 path: "Sources/Instrumentation/NetworkStatus",
                 linkerSettings: [.linkedFramework("CoreTelephony", .when(platforms: [.iOS], configuration: nil))]),
@@ -124,7 +122,6 @@ let package = Package(
         .testTarget(name: "NetworkStatusTests",
                     dependencies: [
                         "NetworkStatus",
-                        .product(name: "Reachability", package: "Reachability.swift", condition: .when(platforms: [.iOS, .macOS, .tvOS, .macCatalyst, .linux]))
                     ],
                     path: "Tests/InstrumentationTests/NetworkStatusTests"),
         .testTarget(name: "OpenTelemetryApiTests",

Package@swift-5.9.swift

@@ -26,7 +26,7 @@ public struct ExporterConfiguration {
     var payloadCompression: Bool
 
     var source: String
-    /// This conditon will be evaluated before trying to upload data
+    /// This condition will be evaluated before trying to upload data
     /// Can be used to avoid reporting when no connection
     var uploadCondition: () -> Bool
     /// Performance preset for reporting

Sources/Exporters/DatadogExporter/ExporterConfiguration.swift

@@ -77,7 +77,7 @@ internal struct DDLog: Encodable {
         self.environment = configuration.environment
         self.loggerName = attributes.removeValue(forKey: "loggerName")?.description ?? "logger"
         self.loggerVersion = "1.0" // loggerVersion
-        self.threadName = attributes.removeValue(forKey: "threadName")?.description ?? "unkown"
+        self.threadName = attributes.removeValue(forKey: "threadName")?.description ?? "unknown"
         self.applicationVersion = configuration.version
 
         let userAttributes: [String: Encodable] = attributes.mapValues {

Sources/Exporters/DatadogExporter/Logs/LogEncoder.swift

@@ -24,8 +24,8 @@ internal struct LogSanitizer {
         /// Allowed first character of a tag name (given as ASCII values ranging from lowercased `a` to `z`) .
         /// Tags with name starting with different character will be dropped.
         static let allowedTagNameFirstCharacterASCIIRange: [UInt8] = Array(97 ... 122)
-        /// Maximum lenght of the tag.
-        /// Tags exceeting this lenght will be trunkated.
+        /// Maximum length of the tag.
+        /// Tags exceeting this length will be trunkated.
         static let maxTagLength: Int = 200
         /// Tag keys reserved for Datadog.
         /// If any of those is used by user, the tag will be ignored.

Sources/Exporters/DatadogExporter/Logs/LogSanitizer.swift

@@ -6,7 +6,7 @@
 import Foundation
 
 internal final class FileWriter {
-    /// Data writting format.
+    /// Data writing format.
     private let dataFormat: DataFormat
     /// Orchestrator producing reference to writable file.
     private let orchestrator: FilesOrchestrator

Sources/Exporters/DatadogExporter/Persistence/FileWriter.swift

@@ -47,7 +47,7 @@ private enum HTTPResponseStatusCode: Int {
 /// The status of a single upload attempt.
 internal struct DataUploadStatus {
     /// If upload needs to be retried (`true`) because its associated data was not delivered but it may succeed
-    /// in the next attempt (i.e. it failed due to device leaving signal range or a temporary server unavailability occured).
+    /// in the next attempt (i.e. it failed due to device leaving signal range or a temporary server unavailability occurred).
     /// If set to `false` then data associated with the upload should be deleted as it does not need any more upload
     /// attempts (i.e. the upload succeeded or failed due to unrecoverable client error).
     let needsRetry: Bool

Sources/Exporters/DatadogExporter/Upload/DataUploadStatus.swift

@@ -40,7 +40,7 @@ internal protocol UploadPerformancePreset {
     /// At runtime, the upload interval ranges from `minUploadDelay` to `maxUploadDelay` depending
     /// on delivery success or failure.
     var defaultUploadDelay: TimeInterval { get }
-    /// Mininum  interval of data upload (in seconds).
+    /// Minimum interval of data upload (in seconds).
     var minUploadDelay: TimeInterval { get }
     /// Maximum interval of data upload (in seconds).
     var maxUploadDelay: TimeInterval { get }