Merge branch 'main' into bryce/otelp-metrics

Author: Ignacio Bonafonte

Examples/Datadog Sample/main.swift

@@ -35,7 +35,7 @@ let exporterConfiguration = ExporterConfiguration(
     serviceName: "Opentelemetry exporter Example",
     resource: "Opentelemetry exporter",
     applicationName: "SimpleExample",
-    applicationVersion: "0.0.1",
+    applicationVersion: "1.0.0",
     environment: "test",
     clientToken: clientKey,
     apiKey: apikey,

Sources/Exporters/DatadogExporter/ExporterConfiguration.swift

@@ -23,8 +23,8 @@ public struct ExporterConfiguration {
     /// The name of the service, resource, version,... that will be reported to the backend.
     var serviceName: String
     var resource: String
-    var applicationName: String
-    var applicationVersion: String
+    var applicationName: String 
+    var version: String
     var environment: String
 
     /// Either the RUM client token (which supports RUM, Logging and APM) or regular client token, only for Logging and APM.
@@ -51,7 +51,7 @@ public struct ExporterConfiguration {
         self.serviceName = serviceName
         self.resource = resource
         self.applicationName = applicationName
-        self.applicationVersion = applicationVersion
+        self.version = applicationVersion
         self.environment = environment
         self.clientToken = clientToken
         self.apiKey = apiKey

Sources/Exporters/DatadogExporter/Logs/LogEncoder.swift

@@ -88,7 +88,7 @@ internal struct DDLog: Encodable {
         self.loggerName = attributes.removeValue(forKey: "loggerName")?.description ?? "logger"
         self.loggerVersion = "1.0" // loggerVersion
         self.threadName = attributes.removeValue(forKey: "threadName")?.description ?? "unkown"
-        self.applicationVersion = configuration.applicationVersion
+        self.applicationVersion = configuration.version
 
         self.attributes = LogAttributes(userAttributes: event.attributes, internalAttributes: internalAttributes)
         self.tags = nil // tags

Sources/Exporters/DatadogExporter/Logs/LogsExporter.swift

@@ -77,7 +77,7 @@ internal class LogsExporter {
             .contentTypeHeader(contentType: .textPlainUTF8),
             .userAgentHeader(
                 appName: configuration.applicationName,
-                appVersion: configuration.applicationVersion,
+                appVersion: configuration.version,
                 device: Device.current
             )
         ])

Sources/Exporters/DatadogExporter/Metrics/MetricsExporter.swift

@@ -67,7 +67,7 @@ internal class MetricsExporter {
             .contentTypeHeader(contentType: .textPlainUTF8),
             .userAgentHeader(
                 appName: configuration.applicationName,
-                appVersion: configuration.applicationVersion,
+                appVersion: configuration.version,
                 device: Device.current
             ),
         ])

Sources/Exporters/DatadogExporter/Spans/SpanEncoder.swift

@@ -62,7 +62,6 @@ internal struct DDSpan: Encodable {
 
     // MARK: - Meta
 
-    let tracerVersion: String
     let applicationVersion: String
 
     /// Custom tags, received from user
@@ -107,8 +106,7 @@ internal struct DDSpan: Encodable {
         let spanType = spanData.attributes["type"] ?? spanData.attributes["db.type"]
         self.type = spanType?.description ?? spanData.kind.rawValue
 
-        self.tracerVersion = "1.0" // spanData.tracerVersion
-        self.applicationVersion = "0.0.1" // spanData.applicationVersion
+        self.applicationVersion = configuration.version
         self.tags = spanData.attributes.filter {
             !DDSpan.errorTagKeys.contains($0.key)
         }.mapValues { $0 }
@@ -144,7 +142,6 @@ internal struct SpanEncoder {
 
         case source = "meta._dd.source"
         case applicationVersion = "meta.version"
-        case tracerVersion = "meta.tracer.version"
     }
 
     /// Coding keys for dynamic `Span` attributes specified by user.
@@ -201,7 +198,6 @@ internal struct SpanEncoder {
     private func encodeDefaultMeta(_ span: DDSpan, to container: inout KeyedEncodingContainer<StaticCodingKeys>) throws {
         // NOTE: RUMM-299 only string values are supported for `meta.*` attributes
         try container.encode(Constants.ddsource, forKey: .source)
-        try container.encode(span.tracerVersion, forKey: .tracerVersion)
         try container.encode(span.applicationVersion, forKey: .applicationVersion)
     }
 

Sources/Exporters/DatadogExporter/Spans/SpansExporter.swift

@@ -67,7 +67,7 @@ internal class SpansExporter {
             .contentTypeHeader(contentType: .textPlainUTF8),
             .userAgentHeader(
                 appName: configuration.applicationName,
-                appVersion: configuration.applicationVersion,
+                appVersion: configuration.version,
                 device: Device.current
             )
         ])