From b1f373db93f7be7479417cb09b5814c6d2628ec8 Mon Sep 17 00:00:00 2001 From: Vinod Vydier Date: Wed, 22 Oct 2025 21:05:40 -0500 Subject: [PATCH 1/5] fixes to README.md and Examples --- Package.resolved | 20 +++++++++---------- .../OtlpHttpTraceExporterTests.swift | 1 - 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/Package.resolved b/Package.resolved index 087c066d..96116a88 100644 --- a/Package.resolved +++ b/Package.resolved @@ -5,8 +5,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/grpc/grpc-swift.git", "state" : { - "revision" : "a56a157218877ef3e9625f7e1f7b2cb7e46ead1b", - "version" : "1.26.1" + "revision" : "f857994e146f5146d702e9c31ac6f3c27d55d18a", + "version" : "1.27.0" } }, { @@ -59,8 +59,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-log.git", "state" : { - "revision" : "3d8596ed08bd13520157f0355e35caed215ffbfa", - "version" : "1.6.3" + "revision" : "ce592ae52f982c847a4efc0dd881cc9eb32d29f2", + "version" : "1.6.4" } }, { @@ -68,8 +68,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-metrics.git", "state" : { - "revision" : "4c83e1cdf4ba538ef6e43a9bbd0bcc33a0ca46e3", - "version" : "2.7.0" + "revision" : "0743a9364382629da3bf5677b46a2c4b1ce5d2a6", + "version" : "2.7.1" } }, { @@ -77,8 +77,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-nio.git", "state" : { - "revision" : "1c30f0f2053b654e3d1302492124aa6d242cdba7", - "version" : "2.86.0" + "revision" : "4e8f4b1c9adaa59315c523540c1ff2b38adc20a9", + "version" : "2.87.0" } }, { @@ -122,8 +122,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-protobuf.git", "state" : { - "revision" : "102a647b573f60f73afdce5613a51d71349fe507", - "version" : "1.30.0" + "revision" : "c6fe6442e6a64250495669325044052e113e990c", + "version" : "1.32.0" } }, { diff --git a/Tests/ExportersTests/OpenTelemetryProtocol/OtlpHttpTraceExporterTests.swift b/Tests/ExportersTests/OpenTelemetryProtocol/OtlpHttpTraceExporterTests.swift index e2e95fbe..7872ec42 100644 --- a/Tests/ExportersTests/OpenTelemetryProtocol/OtlpHttpTraceExporterTests.swift +++ b/Tests/ExportersTests/OpenTelemetryProtocol/OtlpHttpTraceExporterTests.swift @@ -63,7 +63,6 @@ class OtlpHttpTraceExporterTests: XCTestCase { } // This is not a thorough test of HTTPClient, but just enough to keep code coverage happy. - // There is a more complete test as part of the DataDog exporter test func testHttpClient() { // Clear any previous requests testServer.clearReceivedRequests() From 3ad065d0aae81ae353231a29fdf0ffd7a1f68917 Mon Sep 17 00:00:00 2001 From: Vinod Vydier Date: Wed, 22 Oct 2025 21:16:20 -0500 Subject: [PATCH 2/5] fixes to README.md and Examples --- Examples/OTLP Exporter/docker-compose.yaml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Examples/OTLP Exporter/docker-compose.yaml b/Examples/OTLP Exporter/docker-compose.yaml index 196d0bf7..accc8181 100644 --- a/Examples/OTLP Exporter/docker-compose.yaml +++ b/Examples/OTLP Exporter/docker-compose.yaml @@ -2,7 +2,8 @@ version: "3" services: # Collector collector: - image: otel/opentelemetry-collector:0.137.0@sha256:089a8b3c81d328a190f6f0740b30c15b0c7f1f2cfeadeb810355574d5158b31c + platform: linux/amd64 + image: otel/opentelemetry-collector:0.137.0 # The latest image of the otel-collector may not work, so specifying the version that works with this release # image: otel/opentelemetry-collector:latest command: ["--config=/conf/collector-config.yaml"] @@ -17,14 +18,16 @@ services: # Zipkin zipkin-all-in-one: - image: openzipkin/zipkin:latest@sha256:bb570eb45c2994eaf32da783cc098b3d51d1095b73ec92919863d73d0a9eaafb + platform: linux/amd64 + image: openzipkin/zipkin:latest ports: - "9411:9411" # Prometheus prometheus: + platform: linux/amd64 container_name: prometheus - image: prom/prometheus:latest@sha256:ff7e389acbe064a4823212a500393d40a28a8f362e4b05cbf6742a9a3ef736b2 + image: prom/prometheus:latest volumes: - ./prometheus.yaml:/etc/prometheus/prometheus.yml ports: From 437cb73fe38bb6b5c362bc4e7d9de4d7815a8140 Mon Sep 17 00:00:00 2001 From: Vinod Vydier Date: Wed, 22 Oct 2025 21:25:13 -0500 Subject: [PATCH 3/5] fixes to README.md and Examples --- README.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index b80925d7..2ec7d6bd 100644 --- a/README.md +++ b/README.md @@ -74,17 +74,17 @@ Metrics is implemented using an outdated spec, is fully functional but will chan #### Traces -* Exporters: Stdout, Jaeger, Zipkin, Datadog and OpenTelemetry (OTLP) collector +* Exporters: Stdout, Jaeger, Zipkin and OpenTelemetry (OTLP) grpc/http * Importers: OpenTracingShim #### Metrics -* Exporters: Prometheus, Datadog, and OpenTelemetry (OTLP) collector +* Exporters: Prometheus and OpenTelemetry (OTLP) grpc/http * Importers: SwiftMetricsShim #### Logs -* Exporters: OpenTelemetry (OTLP) collector +* Exporters: OpenTelemetry (OTLP) grpc/http > **_NOTE:_** OTLP exporters are supported both in GRPC and HTTP, only GRPC is production ready, HTTP is still experimental @@ -104,7 +104,6 @@ In addition to the specified OpenTelemetry exporters, some third-party exporters The package includes some example projects with basic functionality: -* `Datadog Sample` - Shows the Datadog exporter used with a Simple Exporter, showing how to configure for sending. * `Logging Tracer` - Simple api implementation of a Tracer that logs every api call * `Network Tracer` - Shows how to use the `URLSessionInstrumentation` instrumentation in your application * `Simple Exporter` - Shows the Jaeger an Stdout exporters in action using a MultiSpanExporter. Can be easily modified for other exporters From 334a6ac1a94f2635c6ddde672a8e998f64a4a314 Mon Sep 17 00:00:00 2001 From: Vinod Vydier Date: Wed, 22 Oct 2025 21:34:43 -0500 Subject: [PATCH 4/5] update to the directory name in the test --- .../PersistenceExporter/Helpers/TestsDirectory.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tests/ExportersTests/PersistenceExporter/Helpers/TestsDirectory.swift b/Tests/ExportersTests/PersistenceExporter/Helpers/TestsDirectory.swift index a7bfea91..55098d1b 100644 --- a/Tests/ExportersTests/PersistenceExporter/Helpers/TestsDirectory.swift +++ b/Tests/ExportersTests/PersistenceExporter/Helpers/TestsDirectory.swift @@ -24,7 +24,7 @@ import XCTest } init() { - let subdirectoryName = "com.datadoghq.ios-sdk-tests-\(UUID().uuidString)" + let subdirectoryName = "io.opentelemetry.ios-sdk-tests-\(UUID().uuidString)" let osTemporaryDirectoryURL = URL(fileURLWithPath: NSTemporaryDirectory(), isDirectory: true).appendingPathComponent(subdirectoryName, isDirectory: true) directory = Directory(url: osTemporaryDirectoryURL) } From de85962a753b3c31a7e1cdaee1f0f1ba1bfd0a10 Mon Sep 17 00:00:00 2001 From: Bryce Buchanan <75274611+bryce-b@users.noreply.github.com> Date: Thu, 23 Oct 2025 09:53:04 -0700 Subject: [PATCH 5/5] Delete Package.resolved --- Package.resolved | 149 ----------------------------------------------- 1 file changed, 149 deletions(-) delete mode 100644 Package.resolved diff --git a/Package.resolved b/Package.resolved deleted file mode 100644 index 96116a88..00000000 --- a/Package.resolved +++ /dev/null @@ -1,149 +0,0 @@ -{ - "pins" : [ - { - "identity" : "grpc-swift", - "kind" : "remoteSourceControl", - "location" : "https://github.com/grpc/grpc-swift.git", - "state" : { - "revision" : "f857994e146f5146d702e9c31ac6f3c27d55d18a", - "version" : "1.27.0" - } - }, - { - "identity" : "opentelemetry-swift-core", - "kind" : "remoteSourceControl", - "location" : "https://github.com/open-telemetry/opentelemetry-swift-core.git", - "state" : { - "revision" : "fd787757decabfa93319cc3c04f03a49e0cf40b6", - "version" : "2.2.0" - } - }, - { - "identity" : "opentracing-objc", - "kind" : "remoteSourceControl", - "location" : "https://github.com/undefinedlabs/opentracing-objc", - "state" : { - "revision" : "18c1a35ca966236cee0c5a714a51a73ff33384c1", - "version" : "0.5.2" - } - }, - { - "identity" : "swift-atomics", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-atomics.git", - "state" : { - "revision" : "b601256eab081c0f92f059e12818ac1d4f178ff7", - "version" : "1.3.0" - } - }, - { - "identity" : "swift-collections", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-collections.git", - "state" : { - "revision" : "ee97538f5b81ae89698fd95938896dec5217b148", - "version" : "1.1.1" - } - }, - { - "identity" : "swift-http-types", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-http-types", - "state" : { - "revision" : "9bee2fdb79cc740081abd8ebd80738063d632286", - "version" : "1.1.0" - } - }, - { - "identity" : "swift-log", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-log.git", - "state" : { - "revision" : "ce592ae52f982c847a4efc0dd881cc9eb32d29f2", - "version" : "1.6.4" - } - }, - { - "identity" : "swift-metrics", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-metrics.git", - "state" : { - "revision" : "0743a9364382629da3bf5677b46a2c4b1ce5d2a6", - "version" : "2.7.1" - } - }, - { - "identity" : "swift-nio", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-nio.git", - "state" : { - "revision" : "4e8f4b1c9adaa59315c523540c1ff2b38adc20a9", - "version" : "2.87.0" - } - }, - { - "identity" : "swift-nio-extras", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-nio-extras.git", - "state" : { - "revision" : "2e9746cfc57554f70b650b021b6ae4738abef3e6", - "version" : "1.24.1" - } - }, - { - "identity" : "swift-nio-http2", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-nio-http2.git", - "state" : { - "revision" : "4281466512f63d1bd530e33f4aa6993ee7864be0", - "version" : "1.36.0" - } - }, - { - "identity" : "swift-nio-ssl", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-nio-ssl.git", - "state" : { - "revision" : "2b09805797f21c380f7dc9bedaab3157c5508efb", - "version" : "2.27.0" - } - }, - { - "identity" : "swift-nio-transport-services", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-nio-transport-services.git", - "state" : { - "revision" : "cd1e89816d345d2523b11c55654570acd5cd4c56", - "version" : "1.24.0" - } - }, - { - "identity" : "swift-protobuf", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-protobuf.git", - "state" : { - "revision" : "c6fe6442e6a64250495669325044052e113e990c", - "version" : "1.32.0" - } - }, - { - "identity" : "swift-system", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-system.git", - "state" : { - "revision" : "c8a44d836fe7913603e246acab7c528c2e780168", - "version" : "1.4.0" - } - }, - { - "identity" : "thrift-swift", - "kind" : "remoteSourceControl", - "location" : "https://github.com/undefinedlabs/Thrift-Swift", - "state" : { - "revision" : "18ff09e6b30e589ed38f90a1af23e193b8ecef8e", - "version" : "1.1.2" - } - } - ], - "version" : 2 -}