From cfd233c9cae249891fa615a3bb6f74da44bd5423 Mon Sep 17 00:00:00 2001 From: Sergey Kanzhelev Date: Tue, 25 Jun 2019 22:47:56 -0700 Subject: [PATCH] moved Stats away to SDK (#121) --- ...enTelemetry.Exporter.ApplicationInsights.csproj | 2 +- .../OpenTelemetry.Exporter.Prometheus.csproj | 2 +- .../Implementation/MetricsConversions.cs | 6 +++--- .../Implementation/StackdriverTraceExporter.cs | 14 +++++++------- .../OpenTelemetry.Exporter.Stackdriver.csproj | 2 +- .../Stats/Aggregations/ICount.cs | 0 .../Stats/Aggregations/ICountData.cs | 0 .../Stats/Aggregations/IDistribution.cs | 0 .../Stats/Aggregations/IDistributionData.cs | 0 .../Stats/Aggregations/ILastValue.cs | 0 .../Stats/Aggregations/ILastValueDataDouble.cs | 0 .../Stats/Aggregations/ILastValueDataLong.cs | 0 .../Stats/Aggregations/IMean.cs | 0 .../Stats/Aggregations/IMeanData.cs | 0 .../Stats/Aggregations/ISum.cs | 0 .../Stats/Aggregations/ISumDataDouble.cs | 0 .../Stats/Aggregations/ISumDataLong.cs | 0 .../Stats/IAggregation.cs | 0 .../Stats/IAggregationData.cs | 0 .../Stats/IBucketBoundaries.cs | 0 .../Stats/IMeasure.cs | 0 .../Stats/IMeasureMap.cs | 0 .../Stats/IMeasurement.cs | 0 .../Stats/IStatsComponent.cs | 0 .../Stats/IStatsRecorder.cs | 0 .../Stats/IView.cs | 0 .../Stats/IViewData.cs | 0 .../Stats/IViewManager.cs | 0 .../Stats/IViewName.cs | 0 .../Stats/Measurements/IMeasurementDouble.cs | 0 .../Stats/Measurements/IMeasurementLong.cs | 0 .../Stats/Measures/IMeasureDouble.cs | 0 .../Stats/Measures/IMeasureLong.cs | 0 .../Stats/StatsCollectionState.cs | 0 34 files changed, 13 insertions(+), 13 deletions(-) rename src/{OpenTelemetry.Abstractions => OpenTelemetry}/Stats/Aggregations/ICount.cs (100%) rename src/{OpenTelemetry.Abstractions => OpenTelemetry}/Stats/Aggregations/ICountData.cs (100%) rename src/{OpenTelemetry.Abstractions => OpenTelemetry}/Stats/Aggregations/IDistribution.cs (100%) rename src/{OpenTelemetry.Abstractions => OpenTelemetry}/Stats/Aggregations/IDistributionData.cs (100%) rename src/{OpenTelemetry.Abstractions => OpenTelemetry}/Stats/Aggregations/ILastValue.cs (100%) rename src/{OpenTelemetry.Abstractions => OpenTelemetry}/Stats/Aggregations/ILastValueDataDouble.cs (100%) rename src/{OpenTelemetry.Abstractions => OpenTelemetry}/Stats/Aggregations/ILastValueDataLong.cs (100%) rename src/{OpenTelemetry.Abstractions => OpenTelemetry}/Stats/Aggregations/IMean.cs (100%) rename src/{OpenTelemetry.Abstractions => OpenTelemetry}/Stats/Aggregations/IMeanData.cs (100%) rename src/{OpenTelemetry.Abstractions => OpenTelemetry}/Stats/Aggregations/ISum.cs (100%) rename src/{OpenTelemetry.Abstractions => OpenTelemetry}/Stats/Aggregations/ISumDataDouble.cs (100%) rename src/{OpenTelemetry.Abstractions => OpenTelemetry}/Stats/Aggregations/ISumDataLong.cs (100%) rename src/{OpenTelemetry.Abstractions => OpenTelemetry}/Stats/IAggregation.cs (100%) rename src/{OpenTelemetry.Abstractions => OpenTelemetry}/Stats/IAggregationData.cs (100%) rename src/{OpenTelemetry.Abstractions => OpenTelemetry}/Stats/IBucketBoundaries.cs (100%) rename src/{OpenTelemetry.Abstractions => OpenTelemetry}/Stats/IMeasure.cs (100%) rename src/{OpenTelemetry.Abstractions => OpenTelemetry}/Stats/IMeasureMap.cs (100%) rename src/{OpenTelemetry.Abstractions => OpenTelemetry}/Stats/IMeasurement.cs (100%) rename src/{OpenTelemetry.Abstractions => OpenTelemetry}/Stats/IStatsComponent.cs (100%) rename src/{OpenTelemetry.Abstractions => OpenTelemetry}/Stats/IStatsRecorder.cs (100%) rename src/{OpenTelemetry.Abstractions => OpenTelemetry}/Stats/IView.cs (100%) rename src/{OpenTelemetry.Abstractions => OpenTelemetry}/Stats/IViewData.cs (100%) rename src/{OpenTelemetry.Abstractions => OpenTelemetry}/Stats/IViewManager.cs (100%) rename src/{OpenTelemetry.Abstractions => OpenTelemetry}/Stats/IViewName.cs (100%) rename src/{OpenTelemetry.Abstractions => OpenTelemetry}/Stats/Measurements/IMeasurementDouble.cs (100%) rename src/{OpenTelemetry.Abstractions => OpenTelemetry}/Stats/Measurements/IMeasurementLong.cs (100%) rename src/{OpenTelemetry.Abstractions => OpenTelemetry}/Stats/Measures/IMeasureDouble.cs (100%) rename src/{OpenTelemetry.Abstractions => OpenTelemetry}/Stats/Measures/IMeasureLong.cs (100%) rename src/{OpenTelemetry.Abstractions => OpenTelemetry}/Stats/StatsCollectionState.cs (100%) diff --git a/src/OpenTelemetry.Exporter.ApplicationInsights/OpenTelemetry.Exporter.ApplicationInsights.csproj b/src/OpenTelemetry.Exporter.ApplicationInsights/OpenTelemetry.Exporter.ApplicationInsights.csproj index 7f2e40a62..f56d57ee1 100644 --- a/src/OpenTelemetry.Exporter.ApplicationInsights/OpenTelemetry.Exporter.ApplicationInsights.csproj +++ b/src/OpenTelemetry.Exporter.ApplicationInsights/OpenTelemetry.Exporter.ApplicationInsights.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/OpenTelemetry.Exporter.Prometheus/OpenTelemetry.Exporter.Prometheus.csproj b/src/OpenTelemetry.Exporter.Prometheus/OpenTelemetry.Exporter.Prometheus.csproj index 6a2006be0..5a8670207 100644 --- a/src/OpenTelemetry.Exporter.Prometheus/OpenTelemetry.Exporter.Prometheus.csproj +++ b/src/OpenTelemetry.Exporter.Prometheus/OpenTelemetry.Exporter.Prometheus.csproj @@ -7,6 +7,6 @@ - + diff --git a/src/OpenTelemetry.Exporter.Stackdriver/Implementation/MetricsConversions.cs b/src/OpenTelemetry.Exporter.Stackdriver/Implementation/MetricsConversions.cs index 73d5fccf4..5376b3f9a 100644 --- a/src/OpenTelemetry.Exporter.Stackdriver/Implementation/MetricsConversions.cs +++ b/src/OpenTelemetry.Exporter.Stackdriver/Implementation/MetricsConversions.cs @@ -89,12 +89,12 @@ namespace OpenTelemetry.Exporter.Stackdriver.Implementation return labelDescriptor; } - public static Distribution CreateDistribution( + public static Google.Api.Distribution CreateDistribution( IDistributionData distributionData, IBucketBoundaries bucketBoundaries) { var bucketOptions = bucketBoundaries.ToBucketOptions(); - var distribution = new Distribution + var distribution = new Google.Api.Distribution { BucketOptions = bucketOptions, BucketCounts = { CreateBucketCounts(distributionData.BucketCounts) }, @@ -333,4 +333,4 @@ namespace OpenTelemetry.Exporter.Stackdriver.Implementation return label.Replace('/', '_'); } } -} \ No newline at end of file +} diff --git a/src/OpenTelemetry.Exporter.Stackdriver/Implementation/StackdriverTraceExporter.cs b/src/OpenTelemetry.Exporter.Stackdriver/Implementation/StackdriverTraceExporter.cs index 94c598b6b..da6e0f850 100644 --- a/src/OpenTelemetry.Exporter.Stackdriver/Implementation/StackdriverTraceExporter.cs +++ b/src/OpenTelemetry.Exporter.Stackdriver/Implementation/StackdriverTraceExporter.cs @@ -37,12 +37,12 @@ namespace OpenTelemetry.Exporter.Stackdriver.Implementation /// Span in OpenTelemetry format /// Google Cloud Platform Project Id /// - public static Span ToSpan(this SpanData spanData, string projectId) + public static Google.Cloud.Trace.V2.Span ToSpan(this SpanData spanData, string projectId) { var spanId = spanData.Context.SpanId.ToLowerBase16(); // Base span settings - var span = new Span + var span = new Google.Cloud.Trace.V2.Span { SpanName = new SpanName(projectId, spanData.Context.TraceId.ToLowerBase16(), spanId), SpanId = spanId, @@ -63,7 +63,7 @@ namespace OpenTelemetry.Exporter.Stackdriver.Implementation // Span Links if (spanData.Links != null) { - span.Links = new Span.Types.Links + span.Links = new Google.Cloud.Trace.V2.Span.Types.Links { DroppedLinksCount = spanData.Links.DroppedLinksCount, Link = { spanData.Links.Links.Select(l => l.ToLink()) } @@ -73,7 +73,7 @@ namespace OpenTelemetry.Exporter.Stackdriver.Implementation // Span Attributes if (spanData.Attributes != null) { - span.Attributes = new Span.Types.Attributes + span.Attributes = new Google.Cloud.Trace.V2.Span.Types.Attributes { DroppedAttributesCount = spanData.Attributes != null ? spanData.Attributes.DroppedAttributesCount : 0, @@ -86,15 +86,15 @@ namespace OpenTelemetry.Exporter.Stackdriver.Implementation return span; } - public static Span.Types.Link ToLink(this ILink link) + public static Google.Cloud.Trace.V2.Span.Types.Link ToLink(this ILink link) { - var ret = new Span.Types.Link(); + var ret = new Google.Cloud.Trace.V2.Span.Types.Link(); ret.SpanId = link.Context.SpanId.ToLowerBase16(); ret.TraceId = link.Context.TraceId.ToLowerBase16(); if (link.Attributes != null) { - ret.Attributes = new Span.Types.Attributes + ret.Attributes = new Google.Cloud.Trace.V2.Span.Types.Attributes { DroppedAttributesCount = OpenTelemetry.Trace.Config.TraceParams.Default.MaxNumberOfAttributes - link.Attributes.Count, diff --git a/src/OpenTelemetry.Exporter.Stackdriver/OpenTelemetry.Exporter.Stackdriver.csproj b/src/OpenTelemetry.Exporter.Stackdriver/OpenTelemetry.Exporter.Stackdriver.csproj index 6991961c1..eb58484c8 100644 --- a/src/OpenTelemetry.Exporter.Stackdriver/OpenTelemetry.Exporter.Stackdriver.csproj +++ b/src/OpenTelemetry.Exporter.Stackdriver/OpenTelemetry.Exporter.Stackdriver.csproj @@ -17,6 +17,6 @@ - + diff --git a/src/OpenTelemetry.Abstractions/Stats/Aggregations/ICount.cs b/src/OpenTelemetry/Stats/Aggregations/ICount.cs similarity index 100% rename from src/OpenTelemetry.Abstractions/Stats/Aggregations/ICount.cs rename to src/OpenTelemetry/Stats/Aggregations/ICount.cs diff --git a/src/OpenTelemetry.Abstractions/Stats/Aggregations/ICountData.cs b/src/OpenTelemetry/Stats/Aggregations/ICountData.cs similarity index 100% rename from src/OpenTelemetry.Abstractions/Stats/Aggregations/ICountData.cs rename to src/OpenTelemetry/Stats/Aggregations/ICountData.cs diff --git a/src/OpenTelemetry.Abstractions/Stats/Aggregations/IDistribution.cs b/src/OpenTelemetry/Stats/Aggregations/IDistribution.cs similarity index 100% rename from src/OpenTelemetry.Abstractions/Stats/Aggregations/IDistribution.cs rename to src/OpenTelemetry/Stats/Aggregations/IDistribution.cs diff --git a/src/OpenTelemetry.Abstractions/Stats/Aggregations/IDistributionData.cs b/src/OpenTelemetry/Stats/Aggregations/IDistributionData.cs similarity index 100% rename from src/OpenTelemetry.Abstractions/Stats/Aggregations/IDistributionData.cs rename to src/OpenTelemetry/Stats/Aggregations/IDistributionData.cs diff --git a/src/OpenTelemetry.Abstractions/Stats/Aggregations/ILastValue.cs b/src/OpenTelemetry/Stats/Aggregations/ILastValue.cs similarity index 100% rename from src/OpenTelemetry.Abstractions/Stats/Aggregations/ILastValue.cs rename to src/OpenTelemetry/Stats/Aggregations/ILastValue.cs diff --git a/src/OpenTelemetry.Abstractions/Stats/Aggregations/ILastValueDataDouble.cs b/src/OpenTelemetry/Stats/Aggregations/ILastValueDataDouble.cs similarity index 100% rename from src/OpenTelemetry.Abstractions/Stats/Aggregations/ILastValueDataDouble.cs rename to src/OpenTelemetry/Stats/Aggregations/ILastValueDataDouble.cs diff --git a/src/OpenTelemetry.Abstractions/Stats/Aggregations/ILastValueDataLong.cs b/src/OpenTelemetry/Stats/Aggregations/ILastValueDataLong.cs similarity index 100% rename from src/OpenTelemetry.Abstractions/Stats/Aggregations/ILastValueDataLong.cs rename to src/OpenTelemetry/Stats/Aggregations/ILastValueDataLong.cs diff --git a/src/OpenTelemetry.Abstractions/Stats/Aggregations/IMean.cs b/src/OpenTelemetry/Stats/Aggregations/IMean.cs similarity index 100% rename from src/OpenTelemetry.Abstractions/Stats/Aggregations/IMean.cs rename to src/OpenTelemetry/Stats/Aggregations/IMean.cs diff --git a/src/OpenTelemetry.Abstractions/Stats/Aggregations/IMeanData.cs b/src/OpenTelemetry/Stats/Aggregations/IMeanData.cs similarity index 100% rename from src/OpenTelemetry.Abstractions/Stats/Aggregations/IMeanData.cs rename to src/OpenTelemetry/Stats/Aggregations/IMeanData.cs diff --git a/src/OpenTelemetry.Abstractions/Stats/Aggregations/ISum.cs b/src/OpenTelemetry/Stats/Aggregations/ISum.cs similarity index 100% rename from src/OpenTelemetry.Abstractions/Stats/Aggregations/ISum.cs rename to src/OpenTelemetry/Stats/Aggregations/ISum.cs diff --git a/src/OpenTelemetry.Abstractions/Stats/Aggregations/ISumDataDouble.cs b/src/OpenTelemetry/Stats/Aggregations/ISumDataDouble.cs similarity index 100% rename from src/OpenTelemetry.Abstractions/Stats/Aggregations/ISumDataDouble.cs rename to src/OpenTelemetry/Stats/Aggregations/ISumDataDouble.cs diff --git a/src/OpenTelemetry.Abstractions/Stats/Aggregations/ISumDataLong.cs b/src/OpenTelemetry/Stats/Aggregations/ISumDataLong.cs similarity index 100% rename from src/OpenTelemetry.Abstractions/Stats/Aggregations/ISumDataLong.cs rename to src/OpenTelemetry/Stats/Aggregations/ISumDataLong.cs diff --git a/src/OpenTelemetry.Abstractions/Stats/IAggregation.cs b/src/OpenTelemetry/Stats/IAggregation.cs similarity index 100% rename from src/OpenTelemetry.Abstractions/Stats/IAggregation.cs rename to src/OpenTelemetry/Stats/IAggregation.cs diff --git a/src/OpenTelemetry.Abstractions/Stats/IAggregationData.cs b/src/OpenTelemetry/Stats/IAggregationData.cs similarity index 100% rename from src/OpenTelemetry.Abstractions/Stats/IAggregationData.cs rename to src/OpenTelemetry/Stats/IAggregationData.cs diff --git a/src/OpenTelemetry.Abstractions/Stats/IBucketBoundaries.cs b/src/OpenTelemetry/Stats/IBucketBoundaries.cs similarity index 100% rename from src/OpenTelemetry.Abstractions/Stats/IBucketBoundaries.cs rename to src/OpenTelemetry/Stats/IBucketBoundaries.cs diff --git a/src/OpenTelemetry.Abstractions/Stats/IMeasure.cs b/src/OpenTelemetry/Stats/IMeasure.cs similarity index 100% rename from src/OpenTelemetry.Abstractions/Stats/IMeasure.cs rename to src/OpenTelemetry/Stats/IMeasure.cs diff --git a/src/OpenTelemetry.Abstractions/Stats/IMeasureMap.cs b/src/OpenTelemetry/Stats/IMeasureMap.cs similarity index 100% rename from src/OpenTelemetry.Abstractions/Stats/IMeasureMap.cs rename to src/OpenTelemetry/Stats/IMeasureMap.cs diff --git a/src/OpenTelemetry.Abstractions/Stats/IMeasurement.cs b/src/OpenTelemetry/Stats/IMeasurement.cs similarity index 100% rename from src/OpenTelemetry.Abstractions/Stats/IMeasurement.cs rename to src/OpenTelemetry/Stats/IMeasurement.cs diff --git a/src/OpenTelemetry.Abstractions/Stats/IStatsComponent.cs b/src/OpenTelemetry/Stats/IStatsComponent.cs similarity index 100% rename from src/OpenTelemetry.Abstractions/Stats/IStatsComponent.cs rename to src/OpenTelemetry/Stats/IStatsComponent.cs diff --git a/src/OpenTelemetry.Abstractions/Stats/IStatsRecorder.cs b/src/OpenTelemetry/Stats/IStatsRecorder.cs similarity index 100% rename from src/OpenTelemetry.Abstractions/Stats/IStatsRecorder.cs rename to src/OpenTelemetry/Stats/IStatsRecorder.cs diff --git a/src/OpenTelemetry.Abstractions/Stats/IView.cs b/src/OpenTelemetry/Stats/IView.cs similarity index 100% rename from src/OpenTelemetry.Abstractions/Stats/IView.cs rename to src/OpenTelemetry/Stats/IView.cs diff --git a/src/OpenTelemetry.Abstractions/Stats/IViewData.cs b/src/OpenTelemetry/Stats/IViewData.cs similarity index 100% rename from src/OpenTelemetry.Abstractions/Stats/IViewData.cs rename to src/OpenTelemetry/Stats/IViewData.cs diff --git a/src/OpenTelemetry.Abstractions/Stats/IViewManager.cs b/src/OpenTelemetry/Stats/IViewManager.cs similarity index 100% rename from src/OpenTelemetry.Abstractions/Stats/IViewManager.cs rename to src/OpenTelemetry/Stats/IViewManager.cs diff --git a/src/OpenTelemetry.Abstractions/Stats/IViewName.cs b/src/OpenTelemetry/Stats/IViewName.cs similarity index 100% rename from src/OpenTelemetry.Abstractions/Stats/IViewName.cs rename to src/OpenTelemetry/Stats/IViewName.cs diff --git a/src/OpenTelemetry.Abstractions/Stats/Measurements/IMeasurementDouble.cs b/src/OpenTelemetry/Stats/Measurements/IMeasurementDouble.cs similarity index 100% rename from src/OpenTelemetry.Abstractions/Stats/Measurements/IMeasurementDouble.cs rename to src/OpenTelemetry/Stats/Measurements/IMeasurementDouble.cs diff --git a/src/OpenTelemetry.Abstractions/Stats/Measurements/IMeasurementLong.cs b/src/OpenTelemetry/Stats/Measurements/IMeasurementLong.cs similarity index 100% rename from src/OpenTelemetry.Abstractions/Stats/Measurements/IMeasurementLong.cs rename to src/OpenTelemetry/Stats/Measurements/IMeasurementLong.cs diff --git a/src/OpenTelemetry.Abstractions/Stats/Measures/IMeasureDouble.cs b/src/OpenTelemetry/Stats/Measures/IMeasureDouble.cs similarity index 100% rename from src/OpenTelemetry.Abstractions/Stats/Measures/IMeasureDouble.cs rename to src/OpenTelemetry/Stats/Measures/IMeasureDouble.cs diff --git a/src/OpenTelemetry.Abstractions/Stats/Measures/IMeasureLong.cs b/src/OpenTelemetry/Stats/Measures/IMeasureLong.cs similarity index 100% rename from src/OpenTelemetry.Abstractions/Stats/Measures/IMeasureLong.cs rename to src/OpenTelemetry/Stats/Measures/IMeasureLong.cs diff --git a/src/OpenTelemetry.Abstractions/Stats/StatsCollectionState.cs b/src/OpenTelemetry/Stats/StatsCollectionState.cs similarity index 100% rename from src/OpenTelemetry.Abstractions/Stats/StatsCollectionState.cs rename to src/OpenTelemetry/Stats/StatsCollectionState.cs