Rename InstrumentationLibrary to InstrumentationScope

opentelemetry/proto/common/v1/common.proto

@@ -65,10 +65,10 @@ message KeyValue {
   AnyValue value = 2;
 }
 
-// InstrumentationLibrary is a message representing the instrumentation library information
+// InstrumentationScope is a message representing the instrumentation scope information
 // such as the fully qualified name and version. 
-message InstrumentationLibrary {
-  // An empty instrumentation library name means the name is unknown. 
+message InstrumentationScope {
+  // An empty instrumentation scope name means the name is unknown.
   string name = 1;
   string version = 2;
 }

opentelemetry/proto/logs/v1/logs.proto

@@ -43,27 +43,26 @@ message LogsData {
   repeated ResourceLogs resource_logs = 1;
 }
 
-// A collection of InstrumentationLibraryLogs from a Resource.
+// A collection of ScopeLogs from a Resource.
 message ResourceLogs {
   // The resource for the logs in this message.
   // If this field is not set then resource info is unknown.
   opentelemetry.proto.resource.v1.Resource resource = 1;
 
-  // A list of InstrumentationLibraryLogs that originate from a resource.
-  repeated InstrumentationLibraryLogs instrumentation_library_logs = 2;
+  // A list of ScopeLogs that originate from a resource.
+  repeated ScopeLogs scope_logs = 2;
 
   // This schema_url applies to the data in the "resource" field. It does not apply
-  // to the data in the "instrumentation_library_logs" field which have their own
-  // schema_url field.
+  // to the data in the "scope_logs" field which have their own schema_url field.
   string schema_url = 3;
 }
 
-// A collection of Logs produced by an InstrumentationLibrary.
-message InstrumentationLibraryLogs {
-  // The instrumentation library information for the logs in this message.
-  // Semantically when InstrumentationLibrary isn't set, it is equivalent with
-  // an empty instrumentation library name (unknown).
-  opentelemetry.proto.common.v1.InstrumentationLibrary instrumentation_library = 1;
+// A collection of Logs produced by a Scope.
+message ScopeLogs {
+  // The instrumentation scope information for the logs in this message.
+  // Semantically when InstrumentationScope isn't set, it is equivalent with
+  // an empty instrumentation scope name (unknown).
+  opentelemetry.proto.common.v1.InstrumentationScope scope = 1;
 
   // A list of log records.
   repeated LogRecord log_records = 2;

opentelemetry/proto/metrics/v1/metrics.proto

@@ -43,27 +43,26 @@ message MetricsData {
   repeated ResourceMetrics resource_metrics = 1;
 }
 
-// A collection of InstrumentationLibraryMetrics from a Resource.
+// A collection of ScopeMetrics from a Resource.
 message ResourceMetrics {
   // The resource for the metrics in this message.
   // If this field is not set then no resource info is known.
   opentelemetry.proto.resource.v1.Resource resource = 1;
 
   // A list of metrics that originate from a resource.
-  repeated InstrumentationLibraryMetrics instrumentation_library_metrics = 2;
+  repeated ScopeMetrics scope_metrics = 2;
 
   // This schema_url applies to the data in the "resource" field. It does not apply
-  // to the data in the "instrumentation_library_metrics" field which have their own
-  // schema_url field.
+  // to the data in the "scope_metrics" field which have their own schema_url field.
   string schema_url = 3;
 }
 
-// A collection of Metrics produced by an InstrumentationLibrary.
-message InstrumentationLibraryMetrics {
-  // The instrumentation library information for the metrics in this message.
-  // Semantically when InstrumentationLibrary isn't set, it is equivalent with
-  // an empty instrumentation library name (unknown).
-  opentelemetry.proto.common.v1.InstrumentationLibrary instrumentation_library = 1;
+// A collection of Metrics produced by an Scope.
+message ScopeMetrics {
+  // The instrumentation scope information for the metrics in this message.
+  // Semantically when InstrumentationScope isn't set, it is equivalent with
+  // an empty instrumentation scope name (unknown).
+  opentelemetry.proto.common.v1.InstrumentationScope scope = 1;
 
   // A list of metrics that originate from an instrumentation library.
   repeated Metric metrics = 2;

opentelemetry/proto/trace/v1/trace.proto

@@ -43,29 +43,28 @@ message TracesData {
   repeated ResourceSpans resource_spans = 1;
 }
 
-// A collection of InstrumentationLibrarySpans from a Resource.
+// A collection of ScopeSpans from a Resource.
 message ResourceSpans {
   // The resource for the spans in this message.
   // If this field is not set then no resource info is known.
   opentelemetry.proto.resource.v1.Resource resource = 1;
 
-  // A list of InstrumentationLibrarySpans that originate from a resource.
-  repeated InstrumentationLibrarySpans instrumentation_library_spans = 2;
+  // A list of ScopeSpans that originate from a resource.
+  repeated ScopeSpans scope_spans = 2;
 
   // This schema_url applies to the data in the "resource" field. It does not apply
-  // to the data in the "instrumentation_library_spans" field which have their own
-  // schema_url field.
+  // to the data in the "scope_spans" field which have their own schema_url field.
   string schema_url = 3;
 }
 
-// A collection of Spans produced by an InstrumentationLibrary.
-message InstrumentationLibrarySpans {
-  // The instrumentation library information for the spans in this message.
-  // Semantically when InstrumentationLibrary isn't set, it is equivalent with
-  // an empty instrumentation library name (unknown).
-  opentelemetry.proto.common.v1.InstrumentationLibrary instrumentation_library = 1;
+// A collection of Spans produced by an InstrumentationScope.
+message ScopeSpans {
+  // The instrumentation scope information for the spans in this message.
+  // Semantically when InstrumentationScope isn't set, it is equivalent with
+  // an empty instrumentation scope name (unknown).
+  opentelemetry.proto.common.v1.InstrumentationScope scope = 1;
 
-  // A list of Spans that originate from an instrumentation library.
+  // A list of Spans that originate from an instrumentation scope.
   repeated Span spans = 2;
 
   // This schema_url applies to all spans and span events in the "spans" field.