Merge branch 'main' into fix_3644

open-telemetry · Oct 10, 2022 · f21cd5f · f21cd5f
2 parents 80ce884 + a6c3cac
commit f21cd5f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/.github/workflows/windows-ci-md.yml b/.github/workflows/windows-ci-md.yml
@@ -19,7 +19,7 @@ jobs:
 
     strategy:
       matrix:
-        version: [net462,net6.0]
+        version: [net462,net6.0,net7.0]
 
     steps:
       - run: 'echo "No build required"'
diff --git a/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/README.md b/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/README.md
@@ -77,14 +77,15 @@ supported environment variables.
 
 ## OTLP Logs
 
-This package currently only supports exporting traces and metrics. Once the
-[OTLP log data model](https://github.com/open-telemetry/opentelemetry-proto#maturity-level)
-is deemed stable, the OTLP log exporter will be folded into this package.
-
-In the meantime, support for exporting logs is provided by installing the
+This package currently only supports exporting traces and metrics. Support for
+exporting logs is provided by installing the
 [`OpenTelemetry.Exporter.OpenTelemetryProtocol.Logs`](../OpenTelemetry.Exporter.OpenTelemetryProtocol.Logs/README.md)
 package.
 
+Once the OTLP log exporter is stable, it'll be folded into this package. Check
+[this](https://github.com/open-telemetry/opentelemetry-dotnet/milestone/35)
+milestone for tracking.
+
 ## Special case when using insecure channel
 
 If your application is targeting .NET Core 3.1, and you are using an insecure

diff --git a/src/OpenTelemetry/Metrics/MetricReaderExt.cs b/src/OpenTelemetry/Metrics/MetricReaderExt.cs
@@ -139,7 +139,7 @@ internal List<Metric> AddMetricsListWithViews(Instrument instrument, List<Metric
                         OpenTelemetrySdkEventSource.Log.DuplicateMetricInstrument(
                             metricStreamIdentity.InstrumentName,
                             metricStreamIdentity.MeterName,
-                            "Metric instrument has the same name as an existing one but differs by description, unit, or instrument type. Measurements from this instrument will still be exported but may result in conflicts.",
+                            "Metric instrument has the same name as an existing one but differs by description, unit, instrument type, or aggregation configuration (like histogram bounds, tag keys etc. ). Measurements from this instrument will still be exported but may result in conflicts.",
                             "Either change the name of the instrument or use MeterProviderBuilder.AddView to resolve the conflict.");
                     }
 

diff --git a/src/OpenTelemetry/Metrics/MetricReaderTemporalityPreference.cs b/src/OpenTelemetry/Metrics/MetricReaderTemporalityPreference.cs
@@ -23,7 +23,7 @@ namespace OpenTelemetry.Metrics;
 public enum MetricReaderTemporalityPreference
 {
     /// <summary>
-    /// All aggregations are performed using cumulative temporatlity.
+    /// All aggregations are performed using cumulative temporality.
     /// </summary>
     Cumulative = 1,