Back to build on MacOS due to extensive changes for Linux

PassiveLogic · Oct 10, 2023 · 7b62c4e · 7b62c4e
1 parent 79394c3
commit 7b62c4e
Show file tree

Hide file tree

Showing 11 changed files with 57 additions and 2 deletions.
diff --git a/Package.resolved b/Package.resolved
@@ -9,6 +9,15 @@
         "version" : "1.11.0"
       }
     },
+    {
+      "identity" : "opentracing-objc",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/undefinedlabs/opentracing-objc",
+      "state" : {
+        "revision" : "18c1a35ca966236cee0c5a714a51a73ff33384c1",
+        "version" : "0.5.2"
+      }
+    },
     {
       "identity" : "reachability.swift",
       "kind" : "remoteSourceControl",
@@ -107,6 +116,15 @@
         "revision" : "88c7d15e1242fdb6ecbafbc7926426a19be1e98a",
         "version" : "1.20.2"
       }
+    },
+    {
+      "identity" : "thrift-swift",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/undefinedlabs/Thrift-Swift",
+      "state" : {
+        "revision" : "52c6395f7f1c7af8d814a22d4a8665f335f2efa2",
+        "version" : "1.1.1"
+      }
     }
   ],
   "version" : 2

diff --git a/Package@swift-5.6.swift b/Package@swift-5.6.swift
@@ -14,6 +14,7 @@ let package = Package(
       .library(name: "SignPostIntegration", type: .static, targets: ["SignPostIntegration"]),
       .library(name: "OpenTracingShim-experimental", type: .static, targets: ["OpenTracingShim"]),
       .library(name: "SwiftMetricsShim", type: .static, targets: ["SwiftMetricsShim"]),
+      .library(name: "JaegerExporter", type: .static, targets: ["JaegerExporter"]),
       .library(name: "ZipkinExporter", type: .static, targets: ["ZipkinExporter"]),
       .library(name: "StdoutExporter", type: .static, targets: ["StdoutExporter"]),
       .library(name: "PrometheusExporter", type: .static, targets: ["PrometheusExporter"]),
@@ -30,15 +31,17 @@ let package = Package(
     ],
     dependencies: [
       .package(url: "https://github.com/undefinedlabs/opentracing-objc", from: "0.5.2"),
+      .package(url: "https://github.com/undefinedlabs/Thrift-Swift", exact: "1.1.1"),
       .package(url: "https://github.com/apple/swift-nio.git", from: "2.0.0"),
       .package(url: "https://github.com/grpc/grpc-swift.git", from: "1.0.0"),
       .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(name: "Reachability.swift", url: "https://github.com/ashleymills/Reachability.swift", exact: "5.1.0"),
+      .package(url: "https://github.com/ashleymills/Reachability.swift", exact: "5.1.0"),
     ],
     targets: [
-      .target(name: "TaskSupport", dependencies: []),
+      .systemLibrary(name: "ucontext"),
+      .target(name: "TaskSupport", dependencies: ["ucontext"]),
       .target(name: "OpenTelemetryApi", dependencies: ["TaskSupport"]),
       .target(name: "OpenTelemetrySdk",
               dependencies: ["OpenTelemetryApi"]),
@@ -73,6 +76,10 @@ let package = Package(
                              .product(name: "CoreMetrics", package: "swift-metrics")],
               path: "Sources/Importers/SwiftMetricsShim",
               exclude: ["README.md"]),
+      .target(name: "JaegerExporter",
+              dependencies: ["OpenTelemetrySdk",
+                             .product(name: "Thrift", package: "Thrift-Swift")],
+              path: "Sources/Exporters/Jaeger"),
       .target(name: "ZipkinExporter",
               dependencies: ["OpenTelemetrySdk"],
               path: "Sources/Exporters/Zipkin"),
@@ -119,6 +126,9 @@ let package = Package(
                   dependencies: ["OpenTracingShim",
                                  "OpenTelemetrySdk"],
                   path: "Tests/ImportersTests/OpenTracingShim"),
+      .testTarget(name: "JaegerExporterTests",
+                  dependencies: ["JaegerExporter"],
+                  path: "Tests/ExportersTests/Jaeger"),
       .testTarget(name: "SwiftMetricsShimTests",
                   dependencies: ["SwiftMetricsShim",
                                  "OpenTelemetrySdk"],

diff --git a/Sources/Exporters/OpenTelemetryProtocolHttp/HTTPClient.swift b/Sources/Exporters/OpenTelemetryProtocolHttp/HTTPClient.swift
@@ -4,7 +4,10 @@
  */
 
 import Foundation
+
+#if os(Linux)
 import FoundationNetworking
+#endif
 
 /// Client for sending requests over HTTP.
 internal final class HTTPClient {

diff --git a/Sources/Exporters/OpenTelemetryProtocolHttp/OtlpHttpExporterBase.swift b/Sources/Exporters/OpenTelemetryProtocolHttp/OtlpHttpExporterBase.swift
@@ -4,7 +4,10 @@
 //
 
 import Foundation
+
+#if os(Linux)
 import FoundationNetworking
+#endif
 
 import SwiftProtobuf
 import OpenTelemetryProtocolExporterCommon

diff --git a/Sources/Exporters/OpenTelemetryProtocolHttp/logs/OtlpHttpLogExporter.swift b/Sources/Exporters/OpenTelemetryProtocolHttp/logs/OtlpHttpLogExporter.swift
@@ -4,7 +4,10 @@
 //
 
 import Foundation
+
+#if os(Linux)
 import FoundationNetworking
+#endif
 
 import OpenTelemetrySdk
 import OpenTelemetryProtocolExporterCommon

diff --git a/Sources/Exporters/OpenTelemetryProtocolHttp/metric/OltpHTTPMetricExporter.swift b/Sources/Exporters/OpenTelemetryProtocolHttp/metric/OltpHTTPMetricExporter.swift
@@ -4,7 +4,10 @@
 //
 
 import Foundation
+
+#if os(Linux)
 import FoundationNetworking
+#endif
 
 import OpenTelemetrySdk
 import OpenTelemetryProtocolExporterCommon

diff --git a/Sources/Exporters/OpenTelemetryProtocolHttp/trace/OtlpHttpTraceExporter.swift b/Sources/Exporters/OpenTelemetryProtocolHttp/trace/OtlpHttpTraceExporter.swift
@@ -4,7 +4,10 @@
 //
 
 import Foundation
+
+#if os(Linux)
 import FoundationNetworking
+#endif
 
 import OpenTelemetrySdk
 import OpenTelemetryProtocolExporterCommon

diff --git a/Sources/Exporters/Zipkin/ZipkinTraceExporter.swift b/Sources/Exporters/Zipkin/ZipkinTraceExporter.swift
@@ -4,7 +4,10 @@
  */
 
 import Foundation
+
+#if os(Linux)
 import FoundationNetworking
+#endif
 
 import OpenTelemetrySdk
 

diff --git a/Sources/Instrumentation/URLSession/URLSessionInstrumentation.swift b/Sources/Instrumentation/URLSession/URLSessionInstrumentation.swift
@@ -4,7 +4,10 @@
  */
 
 import Foundation
+
+#if os(Linux)
 import FoundationNetworking
+#endif
 
 import OpenTelemetryApi
 import OpenTelemetrySdk

diff --git a/Sources/Instrumentation/URLSession/URLSessionInstrumentationConfiguration.swift b/Sources/Instrumentation/URLSession/URLSessionInstrumentationConfiguration.swift
@@ -4,7 +4,10 @@
  */
 
 import Foundation
+
+#if os(Linux)
 import FoundationNetworking
+#endif
 
 import OpenTelemetryApi
 import OpenTelemetrySdk

diff --git a/Sources/Instrumentation/URLSession/URLSessionLogger.swift b/Sources/Instrumentation/URLSession/URLSessionLogger.swift
@@ -4,7 +4,10 @@
  */
 
 import Foundation
+
+#if os(Linux)
 import FoundationNetworking
+#endif
 
 import OpenTelemetryApi
 import OpenTelemetrySdk