Merge branch 'main' into fix-metrics-thread-races

Author: Ignacio Bonafonte

README.md

@@ -39,20 +39,20 @@ or
 Official documentation for the library can be found in the official opentelemetry [documentation  page](https://opentelemetry.io/docs/instrumentation/swift/), including:
 
  * Documentation about installation and [manual instrumentation](https://opentelemetry.io/docs/instrumentation/swift/manual/)
-    
+   
 * [Libraries](https://opentelemetry.io/docs/instrumentation/swift/libraries/) that provide automatic instrumentation
 
 ## Current status
 
 ### API and SDK
 
-Tracing and Baggage should be considered stable
+Tracing and Baggage are considered stable
 
-Metrics is implemented using an outdated spec, is fully functional but will change in the future
+Logs are considered beta quality
 
-Logs are currently in development
+Metrics is implemented using an outdated spec, is fully functional but will change in the future
 
-### Supported exporters, importers and instrumentation libraries
+### Supported exporters and importers
 
 #### Traces
 * Exporters: Stdout, Jaeger, Zipkin, Datadog and OpenTelemetry (OTLP) collector
@@ -62,7 +62,12 @@ Logs are currently in development
 * Exporters: Prometheus, Datadog, and OpenTelemetry (OTLP) collector
 * Importers: SwiftMetricsShim
 
-#### Instrumentation libraries
+#### Logs 
+* Exporters: OpenTelemetry (OTLP) collector
+
+> **_NOTE:_** OTLP exporters are supported both in GRPC and HTTP/JSON, only GRPC is production ready, HTTP/JSON is still experimental
+
+### Instrumentation libraries
 * URLSession
 * NetworkStatus
 * SDKResourceExtension
@@ -79,5 +84,3 @@ The package includes some example projects with basic functionality:
 - `Simple Exporter` - Shows the Jaeger an Stdout exporters in action using a MultiSpanExporter. Can be easily modified for other exporters
 - `Prometheus Sample` - Shows the Prometheus exporter reporting metrics to a Prometheus instance
 - `OTLP Exporter` - Shows the OTLP exporter reporting traces to Zipkin and metrics to a Prometheus via the otel-collector
-
-

Scripts/semantic-convention/generate.sh

@@ -41,3 +41,7 @@ docker run --rm \
   -Denum=ResourceAttributes \
 
 cd "$ROOT_DIR"
+
+
+# update spec version reported by library
+sed -E -i '' 's/public static var version = ".+"/public static var version = "'$SPEC_VERSION\"/ ${ROOT_DIR}/Sources/OpenTelemetryApi/OpenTelemetry.swift

Sources/OpenTelemetryApi/OpenTelemetry.swift

@@ -9,6 +9,9 @@ import Foundation
 ///  and BaggageManager.
 ///  The telemetry objects are lazy-loaded singletons resolved via ServiceLoader mechanism.
 public struct OpenTelemetry {
+    
+    public static var version = "v1.7.0"
+    
     public static var instance = OpenTelemetry()
 
     /// Registered tracerProvider or default via DefaultTracerProvider.instance.