Merge branch 'main' into AddSelfDiagnosticsLogging

.editorconfig

@@ -1,129 +1,127 @@
 # To learn more about .editorconfig see https://aka.ms/editorconfigdocs
-############################### 
-# Core EditorConfig Options # 
-############################### 
-# All files 
-[*] 
-indent_style = space 
-insert_final_newline = true 
-# Code files 
-[*.{cs,csx,vb,vbx}] 
-indent_size = 4 
-trim_trailing_whitespace = true 
-charset = utf-8 
-############################### 
-# .NET Coding Conventions # 
-############################### 
-[*.{cs,vb}] 
-# Organize usings 
-dotnet_sort_system_directives_first = true 
-# this. preferences 
-dotnet_style_qualification_for_field = true:suggestion 
-dotnet_style_qualification_for_property = true:suggestion 
-dotnet_style_qualification_for_method = true:suggestion 
-dotnet_style_qualification_for_event = true:suggestion 
-# Language keywords vs BCL types preferences 
-dotnet_style_predefined_type_for_locals_parameters_members = true:silent 
-dotnet_style_predefined_type_for_member_access = true:silent 
-# Parentheses preferences 
-dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:silent 
-dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:silent 
-dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:silent 
-dotnet_style_parentheses_in_other_operators = never_if_unnecessary:silent 
-# Modifier preferences 
-dotnet_style_require_accessibility_modifiers = for_non_interface_members:silent 
-dotnet_style_readonly_field = true:suggestion 
-# Expression-level preferences 
-dotnet_style_object_initializer = true:suggestion 
-dotnet_style_collection_initializer = true:suggestion 
-dotnet_style_explicit_tuple_names = true:suggestion 
-dotnet_style_null_propagation = true:suggestion 
-dotnet_style_coalesce_expression = true:suggestion 
-dotnet_style_prefer_is_null_check_over_reference_equality_method = true:silent 
-dotnet_prefer_inferred_tuple_names = true:suggestion 
-dotnet_prefer_inferred_anonymous_type_member_names = true:suggestion 
-dotnet_style_prefer_auto_properties = true:silent 
-dotnet_style_prefer_conditional_expression_over_assignment = true:silent 
-dotnet_style_prefer_conditional_expression_over_return = true:silent 
-############################### 
-# Naming Conventions # 
-############################### 
-# Style Definitions 
-dotnet_naming_style.pascal_case_style.capitalization  = pascal_case 
-# Use PascalCase for constant fields 
-dotnet_naming_rule.constant_fields_should_be_pascal_case.severity = suggestion 
-dotnet_naming_rule.constant_fields_should_be_pascal_case.symbols  = constant_fields 
-dotnet_naming_rule.constant_fields_should_be_pascal_case.style  = pascal_case_style 
-dotnet_naming_symbols.constant_fields.applicable_kinds  = field 
-dotnet_naming_symbols.constant_fields.applicable_accessibilities  = * 
-dotnet_naming_symbols.constant_fields.required_modifiers  = const 
-############################### 
-# C# Coding Conventions # 
-############################### 
-[*.cs] 
+###############################
+# Core EditorConfig Options #
+###############################
+# All files
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 2
+insert_final_newline = true
+trim_trailing_whitespace = true
+[*.{cs,cshtml,htm,html,md,py,sln,xml}]
+indent_size = 4
+###############################
+# .NET Coding Conventions #
+###############################
+[*.cs]
+# Organize usings
+dotnet_sort_system_directives_first = true
+# this. preferences
+dotnet_style_qualification_for_field = true:suggestion
+dotnet_style_qualification_for_property = true:suggestion
+dotnet_style_qualification_for_method = true:suggestion
+dotnet_style_qualification_for_event = true:suggestion
+# Language keywords vs BCL types preferences
+dotnet_style_predefined_type_for_locals_parameters_members = true:silent
+dotnet_style_predefined_type_for_member_access = true:silent
+# Parentheses preferences
+dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:silent
+dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:silent
+dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:silent
+dotnet_style_parentheses_in_other_operators = never_if_unnecessary:silent
+# Modifier preferences
+dotnet_style_require_accessibility_modifiers = for_non_interface_members:silent
+dotnet_style_readonly_field = true:suggestion
+# Expression-level preferences
+dotnet_style_object_initializer = true:suggestion
+dotnet_style_collection_initializer = true:suggestion
+dotnet_style_explicit_tuple_names = true:suggestion
+dotnet_style_null_propagation = true:suggestion
+dotnet_style_coalesce_expression = true:suggestion
+dotnet_style_prefer_is_null_check_over_reference_equality_method = true:silent
+dotnet_prefer_inferred_tuple_names = true:suggestion
+dotnet_prefer_inferred_anonymous_type_member_names = true:suggestion
+dotnet_style_prefer_auto_properties = true:silent
+dotnet_style_prefer_conditional_expression_over_assignment = true:silent
+dotnet_style_prefer_conditional_expression_over_return = true:silent
+###############################
+# Naming Conventions #
+###############################
+# Style Definitions
+dotnet_naming_style.pascal_case_style.capitalization = pascal_case
+# Use PascalCase for constant fields
+dotnet_naming_rule.constant_fields_should_be_pascal_case.severity = suggestion
+dotnet_naming_rule.constant_fields_should_be_pascal_case.symbols = constant_fields
+dotnet_naming_rule.constant_fields_should_be_pascal_case.style = pascal_case_style
+dotnet_naming_symbols.constant_fields.applicable_kinds = field
+dotnet_naming_symbols.constant_fields.applicable_accessibilities = *
+dotnet_naming_symbols.constant_fields.required_modifiers = const
+###############################
+# C# Coding Conventions #
+###############################
+[*.cs]
 dotnet_diagnostic.CA1031.severity = none
 dotnet_diagnostic.CA1303.severity = none
-# var preferences 
-csharp_style_var_for_built_in_types = true:silent 
-csharp_style_var_when_type_is_apparent = true:silent 
-csharp_style_var_elsewhere = true:silent 
-# Expression-bodied members 
-csharp_style_expression_bodied_methods = false:silent 
-csharp_style_expression_bodied_constructors = false:silent 
-csharp_style_expression_bodied_operators = false:silent 
-csharp_style_expression_bodied_properties = true:silent 
-csharp_style_expression_bodied_indexers = true:silent 
-csharp_style_expression_bodied_accessors = true:silent 
-# Pattern matching preferences 
-csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion 
-csharp_style_pattern_matching_over_as_with_null_check = true:suggestion 
-# Null-checking preferences 
-csharp_style_throw_expression = true:suggestion 
-csharp_style_conditional_delegate_call = true:suggestion 
-# Modifier preferences 
-csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async:suggestion 
-# Expression-level preferences 
-csharp_prefer_braces = true:silent 
-csharp_style_deconstructed_variable_declaration = true:suggestion 
-csharp_prefer_simple_default_expression = true:suggestion 
-csharp_style_pattern_local_over_anonymous_function = true:suggestion 
-csharp_style_inlined_variable_declaration = true:suggestion 
-############################### 
-# C# Formatting Rules # 
-############################### 
-# New line preferences 
-csharp_new_line_before_open_brace = all 
-csharp_new_line_before_else = true 
-csharp_new_line_before_catch = true 
-csharp_new_line_before_finally = true 
-csharp_new_line_before_members_in_object_initializers = true 
-csharp_new_line_before_members_in_anonymous_types = true 
-csharp_new_line_between_query_expression_clauses = true 
-# Indentation preferences 
-csharp_indent_case_contents = true 
-csharp_indent_switch_labels = true 
-csharp_indent_labels = flush_left 
-# Space preferences 
-csharp_space_after_cast = false 
-csharp_space_after_keywords_in_control_flow_statements = true 
-csharp_space_between_method_call_parameter_list_parentheses = false 
-csharp_space_between_method_declaration_parameter_list_parentheses = false 
-csharp_space_between_parentheses = false 
-csharp_space_before_colon_in_inheritance_clause = true 
-csharp_space_after_colon_in_inheritance_clause = true 
-csharp_space_around_binary_operators = before_and_after 
-csharp_space_between_method_declaration_empty_parameter_list_parentheses = false 
-csharp_space_between_method_call_name_and_opening_parenthesis = false 
-csharp_space_between_method_call_empty_parameter_list_parentheses = false 
-# Wrapping preferences 
-csharp_preserve_single_line_statements = true 
-csharp_preserve_single_line_blocks = true 
-############################### 
-# VB Coding Conventions # 
-############################### 
-[*.vb] 
-# Modifier preferences 
-visual_basic_preferred_modifier_order = Partial,Default,Private,Protected,Public,Friend,NotOverridable,Overridable,MustOverride,Overloads,Overrides,MustInherit,NotInheritable,Static,Shared,Shadows,ReadOnly,WriteOnly,Dim,Const,WithEvents,Widening,Narrowing,Custom,Async:suggestion 
+dotnet_diagnostic.IDE0001.severity = warning
+dotnet_diagnostic.IDE0002.severity = warning
+dotnet_diagnostic.IDE0005.severity = warning
+# var preferences
+csharp_style_var_for_built_in_types = true:silent
+csharp_style_var_when_type_is_apparent = true:silent
+csharp_style_var_elsewhere = true:silent
+# Expression-bodied members
+csharp_style_expression_bodied_methods = false:silent
+csharp_style_expression_bodied_constructors = false:silent
+csharp_style_expression_bodied_operators = false:silent
+csharp_style_expression_bodied_properties = true:silent
+csharp_style_expression_bodied_indexers = true:silent
+csharp_style_expression_bodied_accessors = true:silent
+# Pattern matching preferences
+csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
+csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
+# Null-checking preferences
+csharp_style_throw_expression = true:suggestion
+csharp_style_conditional_delegate_call = true:suggestion
+# Modifier preferences
+csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async:suggestion
+# Expression-level preferences
+csharp_prefer_braces = true:silent
+csharp_style_deconstructed_variable_declaration = true:suggestion
+csharp_prefer_simple_default_expression = true:suggestion
+csharp_style_pattern_local_over_anonymous_function = true:suggestion
+csharp_style_inlined_variable_declaration = true:suggestion
+###############################
+# C# Formatting Rules #
+###############################
+# New line preferences
+csharp_new_line_before_open_brace = all
+csharp_new_line_before_else = true
+csharp_new_line_before_catch = true
+csharp_new_line_before_finally = true
+csharp_new_line_before_members_in_object_initializers = true
+csharp_new_line_before_members_in_anonymous_types = true
+csharp_new_line_between_query_expression_clauses = true
+# Indentation preferences
+csharp_indent_case_contents = true
+csharp_indent_switch_labels = true
+csharp_indent_labels = flush_left
+# Space preferences
+csharp_space_after_cast = false
+csharp_space_after_keywords_in_control_flow_statements = true
+csharp_space_between_method_call_parameter_list_parentheses = false
+csharp_space_between_method_declaration_parameter_list_parentheses = false
+csharp_space_between_parentheses = false
+csharp_space_before_colon_in_inheritance_clause = true
+csharp_space_after_colon_in_inheritance_clause = true
+csharp_space_around_binary_operators = before_and_after
+csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
+csharp_space_between_method_call_name_and_opening_parenthesis = false
+csharp_space_between_method_call_empty_parameter_list_parentheses = false
+# Wrapping preferences
+csharp_preserve_single_line_statements = true
+csharp_preserve_single_line_blocks = true
+
 [obj/**.cs]
 generated_code = true
 

.github/ISSUE_TEMPLATE/bug_report.md

@@ -7,14 +7,14 @@ labels: bug
 # Bug Report
 
 List of [NuGet packages](https://www.nuget.org/profiles/OpenTelemetry) and
-version that you are using (e.g. `OpenTelemetry 0.4.0-beta.2`):
+version that you are using (e.g. `OpenTelemetry 1.0.2`):
 
-*
+* TBD
 
-Runtime version (e.g. `net461`, `net48`, `netcoreapp2.1`, `netcoreapp3.1`, etc.
-You can find this information from the `*.csproj` file):
+Runtime version (e.g. `net461`, `net48`, `netcoreapp3.1`, `net5.0` etc. You can
+find this information from the `*.csproj` file):
 
-*
+* TBD
 
 ## Symptom
 

.github/PULL_REQUEST_TEMPLATE.md

@@ -6,6 +6,6 @@ Please provide a brief description of the changes here.
 
 For significant contributions please make sure you have completed the following items:
 
-* [ ] `CHANGELOG.md` updated for non-trivial changes
+* [ ] Appropriate `CHANGELOG.md` updated for non-trivial changes
 * [ ] Design discussion issue #
 * [ ] Changes in public API reviewed

.github/workflows/apicompatibility.yml

@@ -9,11 +9,18 @@ on:
 jobs:
  build-test:
  runs-on: windows-latest
+ # https:/actions/setup-dotnet/issues/122
  env:
  CheckAPICompatibility: true
+ DOTNET_MULTILEVEL_LOOKUP: 1
  steps:
  - uses: actions/checkout@v2
 
+ - uses: actions/setup-dotnet@v1
+ with:
+ dotnet-version: '6.0.x'
+ include-prerelease: true
+
  - name: Install dependencies
  run: dotnet restore
 

.github/workflows/code-coverage.yml

@@ -13,19 +13,26 @@ on:
 jobs:
  build-test-report:
  runs-on: ${{ matrix.os }}
+ # https:/actions/setup-dotnet/issues/122
 
  strategy:
  fail-fast: false
  matrix:
  os: [windows-latest]
  env:
  OS: ${{ matrix.os }}
+ DOTNET_MULTILEVEL_LOOKUP: 1
 
  steps:
  - uses: actions/checkout@v2
  with:
  fetch-depth: 0 # fetching all
 
+ - uses: actions/setup-dotnet@v1
+ with:
+ dotnet-version: '6.0.x'
+ include-prerelease: true
+
  - name: Install dependencies
  run: dotnet restore
 

.github/workflows/codeql-analysis.yml

@@ -21,7 +21,7 @@ jobs:
  # Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python']
  language: ['csharp']
  # Learn more...
- # https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection
+ # https://docs.github.com/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection
 
  steps:
  - name: configure Pagefile

.github/workflows/docfx.yml

@@ -15,7 +15,9 @@ jobs:
  uses: actions/checkout@v2
 
  - name: install docfx
- run: choco install docfx -y
+ # specifying 2.58.5 version as latest release (2.58.8) has an issue
+ # https:/dotnet/docfx/issues/7689
+ run: choco install docfx -y --version=2.58.5
 
  - name: run .\build\docfx.cmd
  shell: cmd