Added support for embedded arrays for AttributeValues.

open-telemetry · Jun 11, 2024 · ad2b739 · ad2b739
1 parent 5648f1f
commit ad2b739
Show file tree

Hide file tree

Showing 18 changed files with 359 additions and 427 deletions.
diff --git a/Package.swift b/Package.swift
@@ -28,6 +28,7 @@ let package = Package(
         .library(name: "InMemoryExporter", type: .static, targets: ["InMemoryExporter"]),
         .library(name: "DatadogExporter", type: .static, targets: ["DatadogExporter"]),
         .library(name: "NetworkStatus", type: .static, targets: ["NetworkStatus"]),
+        .library(name: "OTelSwiftLog" type: .static, targets: ["OTelSwiftLog"])
         .executable(name: "simpleExporter", targets: ["SimpleExporter"]),
         .executable(name: "OTLPExporter", targets: ["OTLPExporter"]),
         .executable(name: "OTLPHTTPExporter", targets: ["OTLPHTTPExporter"]),
@@ -130,8 +131,7 @@ let package = Package(
                     dependencies: ["OpenTelemetryApi"],
                     path: "Tests/OpenTelemetryApiTests"),
         .testTarget(name: "OpenTelemetrySdkTests",
-                    dependencies: ["OpenTelemetryApi",
-                                   "OpenTelemetrySdk"],
+                    dependencies: ["OpenTelemetrySdk"],
                     path: "Tests/OpenTelemetrySdkTests"),
         .testTarget(name: "ResourceExtensionTests",
                     dependencies: ["ResourceExtension", "OpenTelemetrySdk"],
@@ -180,27 +180,27 @@ let package = Package(
                 dependencies: ["OpenTelemetryApi"],
                 path: "Examples/Logging Tracer"),
         .target(name: "SimpleExporter",
-                dependencies: ["OpenTelemetrySdk", "JaegerExporter", "StdoutExporter", "ZipkinExporter", "ResourceExtension", "SignPostIntegration"],
+                dependencies: ["JaegerExporter", "StdoutExporter", "ZipkinExporter", "ResourceExtension", "SignPostIntegration"],
                 path: "Examples/Simple Exporter",
                 exclude: ["README.md"]),
         .target(name: "OTLPExporter",
-                dependencies: ["OpenTelemetrySdk", "OpenTelemetryProtocolExporterGrpc", "StdoutExporter", "ZipkinExporter", "ResourceExtension", "SignPostIntegration"],
+                dependencies: ["OpenTelemetryProtocolExporterGrpc", "StdoutExporter", "ZipkinExporter", "ResourceExtension", "SignPostIntegration"],
                 path: "Examples/OTLP Exporter",
                 exclude: ["README.md"]),
         .target(name: "OTLPHTTPExporter",
-                dependencies: ["OpenTelemetrySdk", "OpenTelemetryProtocolExporterHttp", "StdoutExporter", "ZipkinExporter", "ResourceExtension", "SignPostIntegration"],
+                dependencies: ["OpenTelemetryProtocolExporterHttp", "StdoutExporter", "ZipkinExporter", "ResourceExtension", "SignPostIntegration"],
                 path: "Examples/OTLP HTTP Exporter",
                 exclude: ["README.md"]),
         .target(name: "PrometheusSample",
-                dependencies: ["OpenTelemetrySdk", "PrometheusExporter"],
+                dependencies: ["PrometheusExporter"],
                 path: "Examples/Prometheus Sample",
                 exclude: ["README.md"]),
         .target(name: "DatadogSample",
                 dependencies: ["DatadogExporter"],
                 path: "Examples/Datadog Sample",
                 exclude: ["README.md"]),
         .target(name: "StableMetricSample",
-                dependencies: ["OpenTelemetrySdk", "OpenTelemetryApi", "OpenTelemetryProtocolExporter", .product(name: "GRPC", package:  "grpc-swift")],
+                dependencies: ["OpenTelemetryProtocolExporter", .product(name: "GRPC", package:  "grpc-swift")],
                 path: "Examples/Stable Metric Sample",
                 exclude: ["README.md"]),
         .target(name: "NetworkSample",

diff --git a/[email protected] b/[email protected]
@@ -29,6 +29,7 @@ let package = Package(
         .library(name: "InMemoryExporter", type: .static, targets: ["InMemoryExporter"]),
         .library(name: "DatadogExporter", type: .static, targets: ["DatadogExporter"]),
         .library(name: "NetworkStatus", type: .static, targets: ["NetworkStatus"]),
+        .library(name: "OTelSwiftLog", type: .static, targets: ["OTelSwiftLog"]),
         .executable(name: "simpleExporter", targets: ["SimpleExporter"]),
         .executable(name: "OTLPExporter", targets: ["OTLPExporter"]),
         .executable(name: "OTLPHTTPExporter", targets: ["OTLPHTTPExporter"]),
@@ -74,8 +75,8 @@ let package = Package(
                 exclude: ["README.md"]),
         .target(name: "OpenTracingShim",
                 dependencies: [
-                    "OpenTelemetrySdk",
-                    .product(name: "Opentracing", package: "opentracing-objc")
+                  "OpenTelemetrySdk",
+                  .product(name: "Opentracing", package: "opentracing-objc")
                 ],
                 path: "Sources/Importers/OpenTracingShim",
                 exclude: ["README.md"]),
@@ -151,7 +152,7 @@ let package = Package(
                     path: "Tests/InstrumentationTests/URLSessionTests"),
         .testTarget(name: "OpenTracingShimTests",
                     dependencies: ["OpenTracingShim",
-                                   "OpenTelemetrySdk"],
+                                           "OpenTelemetrySdk"],
                     path: "Tests/ImportersTests/OpenTracingShim"),
         .testTarget(name: "SwiftMetricsShimTests",
                     dependencies: ["SwiftMetricsShim",

diff --git a/[email protected] b/[email protected]
@@ -29,6 +29,7 @@ let package = Package(
         .library(name: "InMemoryExporter", type: .static, targets: ["InMemoryExporter"]),
         .library(name: "DatadogExporter", type: .static, targets: ["DatadogExporter"]),
         .library(name: "NetworkStatus", type: .static, targets: ["NetworkStatus"]),
+        .library(name: "OTelSwiftLog", type: .static, targets: ["OTelSwiftLog"]),
         .executable(name: "simpleExporter", targets: ["SimpleExporter"]),
         .executable(name: "OTLPExporter", targets: ["OTLPExporter"]),
         .executable(name: "OTLPHTTPExporter", targets: ["OTLPHTTPExporter"]),
@@ -72,8 +73,8 @@ let package = Package(
                 exclude: ["README.md"]),
         .target(name: "OpenTracingShim",
                 dependencies: [
-                    "OpenTelemetrySdk",
-                    .product(name: "Opentracing", package: "opentracing-objc")
+                  "OpenTelemetrySdk",
+                  .product(name: "Opentracing", package: "opentracing-objc")
                 ],
                 path: "Sources/Importers/OpenTracingShim",
                 exclude: ["README.md"]),
@@ -135,8 +136,7 @@ let package = Package(
                     dependencies: ["OpenTelemetryApi"],
                     path: "Tests/OpenTelemetryApiTests"),
         .testTarget(name: "OpenTelemetrySdkTests",
-                    dependencies: ["OpenTelemetryApi",
-                                   "OpenTelemetrySdk"],
+                    dependencies: ["OpenTelemetrySdk"],
                     path: "Tests/OpenTelemetrySdkTests"),
         .testTarget(name: "ResourceExtensionTests",
                     dependencies: ["ResourceExtension", "OpenTelemetrySdk"],