Merge branch 'main' into sparkEndLSNImprovement

Author: annie-mac

.github/CODEOWNERS

@@ -32,28 +32,28 @@
 # ######## Core Libraries ########
 
 # PRLabel: %Azure.Core
-/sdk/core/                                           @alzimmermsft @samvaity @srnagar @anuchandy @lmolkova @vcolin7 @jonathangiles @Azure/azure-java-sdk
+/sdk/core/                                           @alzimmermsft @samvaity @srnagar @anuchandy @vcolin7 @jonathangiles @Azure/azure-java-sdk
 
 # ServiceLabel: %Azure.Core
 # AzureSdkOwners:                                    @alzimmermsft @samvaity
 
 # PRLabel: %Azure.Core.V2
-/sdk/core-v2/                                         @alzimmermsft @samvaity @srnagar @anuchandy @lmolkova @vcolin7 @jonathangiles @Azure/azure-java-sdk
+/sdk/core-v2/                                         @alzimmermsft @samvaity @srnagar @anuchandy @vcolin7 @jonathangiles @Azure/azure-java-sdk
 
 # ServiceLabel: %Azure.Core.V2
 # AzureSdkOwners:                                    @alzimmermsft @samvaity
 
 # PRLabel: %Azure.Core.AMQP
-/sdk/core/azure-core-amqp/                           @anuchandy @conniey @lmolkova @Azure/azure-java-sdk
+/sdk/core/azure-core-amqp/                           @anuchandy @conniey @Azure/azure-java-sdk
 
 # ServiceLabel: %Azure.Core.AMQP
-# AzureSdkOwners:                                    @anuchandy @conniey @lmolkova
+# AzureSdkOwners:                                    @anuchandy @conniey
 
 # PRLabel: %OpenTelemetry
-/sdk/core/azure-core-tracing-opentelemetry/          @lmolkova @trask @Azure/azure-java-sdk
+/sdk/core/azure-core-tracing-opentelemetry/          @trask @Azure/azure-java-sdk
 
 # ServiceLabel: %OpenTelemetry
-# AzureSdkOwners:                                    @lmolkova
+# AzureSdkOwners:                                    @jonathangiles
 # ServiceOwners:                                     @trask @ramthi @jeanbisutti @harsimar @rajkumar-rangaraj @xiang17
 
 # PRLabel: %Azure.Core
@@ -98,9 +98,6 @@
 # AzureSdkOwners:                                    @alzimmermsft
 # ServiceOwners:                                     @shenmuxiaosen @avanigupta
 
-# ServiceLabel: %Application Insights
-# ServiceOwners:                                     @azmonapplicationinsights
-
 # ServiceLabel: %App Services
 # ServiceOwners:                                     @antcp @AzureAppServiceCLI
 
@@ -349,10 +346,10 @@
 # ServiceOwners:                                     @macolso
 
 # PRLabel: %Container Registry
-/sdk/containerregistry/                              @lmolkova @alzimmermsft @Azure/azsdk-acr @Azure/azure-java-sdk
+/sdk/containerregistry/                              @alzimmermsft @Azure/azsdk-acr @Azure/azure-java-sdk
 
 # ServiceLabel: %Container Registry
-# AzureSdkOwners:                                    @lmolkova
+# AzureSdkOwners:                                    @Azure/azure-java-sdk
 # ServiceOwners:                                     @toddysm @northtyphoon
 
 # ServiceLabel: %Container Service
@@ -461,17 +458,17 @@
 # ServiceOwners:                                     @berndverst @kaibocai @torosent @RyanLettieri @philliphoff @cgillum
 
 # PRLabel: %Event Grid
-/sdk/eventgrid/                                      @samvaity @srnagar @lmolkova @Azure/azure-java-sdk
+/sdk/eventgrid/                                      @samvaity @srnagar @Azure/azure-java-sdk
 
 # ServiceLabel: %Event Grid
 # AzureSdkOwners:                                    @Kishp01 @shankarsama @rajeshka
 # ServiceOwners:                                     @Kishp01 @shankarsama @rajeshka
 
 # PRLabel: %Event Hubs
-/sdk/eventhubs/                                      @conniey @anuchandy @lmolkova @Azure/azure-java-sdk
+/sdk/eventhubs/                                      @conniey @anuchandy @Azure/azure-java-sdk
 
 # ServiceLabel: %Event Hubs
-# AzureSdkOwners:                                    @conniey @anuchandy @lmolkova
+# AzureSdkOwners:                                    @conniey @anuchandy
 # ServiceOwners:                                     @serkantkaraca @sjkwak
 
 # PRLabel: %Event Hubs
@@ -565,7 +562,7 @@
 # ServiceLabel: %Machine Learning Experimentation
 # ServiceOwners:                                     @aashishb
 
-# ServiceLabel: %Managed Services
+# ServiceLabel: %ManagedServices
 # ServiceOwners:                                     @Lighthouse-Azure
 
 # ServiceLabel: %MariaDB
@@ -609,7 +606,7 @@
 # ServiceOwners:                                     @SameergMS @dadunl @AzMonEssential @AzmonAlerts @AzmonActionG @AzmonLogA
 
 # ServiceLabel: %Monitor - ApplicationInsights
-# ServiceOwners:                                     @azmonapplicationinsights
+# ServiceOwners:                                     @regexrowboat
 
 # ServiceLabel: %MySQL
 # ServiceOwners:                                     @ambhatna @savjani
@@ -764,11 +761,11 @@
 # ServiceOwners:                                     @amirkeren
 
 # ServiceLabel: %Service Bus
-# AzureSdkOwners:                                    @anuchandy @conniey @lmolkova
+# AzureSdkOwners:                                    @anuchandy @conniey
 # ServiceOwners:                                     @EldertGrootenboer
 
 # PRLabel: %Service Bus
-/sdk/servicebus/                                     @anuchandy @conniey @lmolkova @Azure/azure-java-sdk
+/sdk/servicebus/                                     @anuchandy @conniey @Azure/azure-java-sdk
 
 # PRLabel: %Service Bus %Track 1
 /sdk/servicebus/microsoft-azure-servicebus/          @shankarsama @yvgopal
@@ -943,6 +940,7 @@
 /eng/automation/                                              @weidongxu-microsoft @haolingdong-msft @XiaofeiCao @arthurma1978 @raych1 @weshaggard @benbp
 /eng/bomgenerator/                                            @vcolin7 @alzimmermsft @srnagar @jonathangiles @Azure/azure-java-sdk
 /eng/code-quality-reports/                                    @JonathanGiles @alzimmermsft @srnagar @rujche @netyyyy @saragluna @moarychan @Azure/azure-java-sdk
+/eng/lintingconfigs/                                          @JonathanGiles @alzimmermsft @srnagar @rujche @netyyyy @saragluna @moarychan @Azure/azure-java-sdk
 /eng/common/                                                  @Azure/azure-sdk-eng
 /eng/versioning/                                              @alzimmermsft @samvaity @g2vinay @Azure/azure-java-sdk
 /eng/versioning/external_dependencies.txt                     @alzimmermsft @samvaity @g2vinay @jonathangiles @rujche @netyyyy @saragluna @moarychan @Azure/azure-java-sdk
@@ -957,7 +955,7 @@
 
 # Add owners for notifications for specific pipelines
 /eng/pipelines/aggregate-reports.yml                          @joshfree @jonathangiles @Azure/azure-java-sdk
-/eng/common/pipelines/codeowners-linter.yml                   @alzimmermsft @srnagar @lmolkova @Azure/azure-java-sdk
+/eng/common/pipelines/codeowners-linter.yml                   @alzimmermsft @srnagar @Azure/azure-java-sdk
 /eng/pipelines/docindex.yml                                   @danieljurek @raych1 @weshaggard @benbp
 
 # Add Cosmos source owners as the owners of their specialized matrix

.github/CODEOWNERS_baseline_errors.txt

@@ -11,7 +11,6 @@ taiwu is an invalid user. Ensure the user exists, is public member of Azure and
 minghan is an invalid user. Ensure the user exists, is public member of Azure and has write permissions.
 miaojiang is an invalid user. Ensure the user exists, is public member of Azure and has write permissions.
 shenmuxiaosen is an invalid user. Ensure the user exists, is public member of Azure and has write permissions.
-'Application Insights' is not a valid label for this repository.
 azmonapplicationinsights is an invalid user. Ensure the user exists, is public member of Azure and has write permissions.
 antcp is an invalid user. Ensure the user exists, is public member of Azure and has write permissions.
 AzureAppServiceCLI is an invalid user. Ensure the user exists, is public member of Azure and has write permissions.
@@ -155,7 +154,6 @@ minamnmik is an invalid user. Ensure the user exists, is public member of Azure
 varunkch is an invalid user. Ensure the user exists, is public member of Azure and has write permissions.
 azureml-github is an invalid user. Ensure the user exists, is public member of Azure and has write permissions.
 aashishb is an invalid user. Ensure the user exists, is public member of Azure and has write permissions.
-'Managed Services' is not a valid label for this repository.
 Lighthouse-Azure is an invalid user. Ensure the user exists, is public member of Azure and has write permissions.
 ambhatna is an invalid user. Ensure the user exists, is public member of Azure and has write permissions.
 savjani is an invalid user. Ensure the user exists, is public member of Azure and has write permissions.

eng/common/instructions/azsdk-tools/typespec-to-sdk.instructions.md

@@ -88,19 +88,29 @@ Your goal is to guide user through the process of generating SDKs from TypeSpec
 **Actions**:
 1. Run `GetSDKPullRequestDetails` to fetch generated SDK PR info.
 
-## Step 9: Create release plan
+## Step 9: Validate Label and Codeowners
+**Goal**: Validate the label and all codeowners for a service. Create new label and codeowner entry if none exist.
+**Actions**:
+1. To validate a service label refer to #file:./validate-service-label.instructions.md
+2. After service label is validated or created refer to #file:./validate-codeowners.instructions.md
+3. Handle post-validation actions based on results:
+   - **If both label and codeowners were already valid**: Prompt user "Your service label and codeowners are already properly configured. Would you like to modify the existing codeowners entry for your service?"
+   - **If new label or codeowner entries were created**: Display details of the label and codeowners PR if they were created, then prompt user "The following PRs have been created for your service configuration: [list PRs]. Would you like to make any additional modifications to these entries?"
+**Success Criteria**: Service label exists and codeowners are properly configured with at least 2 valid owners. For created entries, showcase all PR's.
+
+## Step 10: Create release plan
 **Goal**: Create a release plan for the generated SDKs
 **Actions**:
 1. Refer to #file:create-release-plan.instructions.md to create a release plan using the spec pull request.
 2. If the release plan already exists, display the existing plan details.
 
-## Step 10: Mark Spec PR as Ready for Review
+## Step 11: Mark Spec PR as Ready for Review
 **Goal**: Update spec PR to ready for review status
 **Actions**:
 1. Prompt user to change spec PR to ready for review: "Please change the spec pull request to ready for review status"
 2. Get approval and merge the spec PR
 
-## Step 11: Release SDK Package
+## Step 12: Release SDK Package
 **Goal**: Release the SDK package using the release plan
 **Actions**:
 1. Run `ReleaseSdkPackage` to release the SDK package.

eng/common/instructions/azsdk-tools/validate-codeowners.instructions.md

@@ -0,0 +1,74 @@
+---
+mode: 'agent'
+tools: ['azsdk_check_service_label', 'azsdk_engsys_validate_codeowners_entry_for_service', 'azsdk_engsys_codeowner_update'] 
+---
+
+## Goal: 
+Validate service label and ensure at least 2 valid code owners exist for SDK repositories.
+
+## Step 1: Validate Service Label
+Use `azsdk_check_service_label` to verify the service label exists:
+- **DoesNotExist/NotAServiceLabel**: Direct user to create valid service label first. Stop validation process until service label is created.
+- **Exists/InReview**: Proceed to Step 2
+
+## Step 2: Validate Code Owners  
+Ask user to specify SDK repository they want to validate codeowners for or detect from context.
+
+Repository name mapping:
+- .NET/dotnet: use "azure-sdk-for-net"
+- Python: use "azure-sdk-for-python" 
+- Java: use "azure-sdk-for-java"
+- JavaScript: use "azure-sdk-for-js"
+- Go: use "azure-sdk-for-go"
+
+Use `azsdk_engsys_validate_codeowners_entry_for_service` with either `serviceLabel` OR `repoPath` or both, but at least one must be used. If one isn't provided, leave the parameter field empty.
+
+**If entry exists**: Go to Step 3
+**If no entry exists**: Go to Step 4
+
+## Step 3: Check Existing Code Owners
+Valid code owners must be:
+- PUBLIC members of Microsoft and Azure GitHub organizations  
+- Have write access to the SDK repository
+
+**If at least 2 valid owners**: Success - optionally add or delete additional owners
+**If less than 2 valid owners**: CRITICAL - must fix before proceeding:
+
+After any changes, re-validate with `azsdk_engsys_validate_codeowners_entry_for_service`.
+
+## Step 4: Create New Code Owner Entry
+When no CODEOWNERS entry exists yet:
+1. Ensure you have the following information
+   - repo - **Required** - Repository name mapping:
+      - .NET/dotnet: use "azure-sdk-for-net"
+      - Python: use "azure-sdk-for-python" 
+      - Java: use "azure-sdk-for-java"
+      - JavaScript: use "azure-sdk-for-js"
+      - Go: use "azure-sdk-for-go"
+   - typeSpecProjectRoot - **Optional** This should be acquired only if the information is present in the previous chat history, if not, ignore and input `""`.
+   - path - **Optional** only if there is a service label and we're not making a new entry - This should be acquired when creating a new code owner entry, if no information is present ask the user. Typically looks like `/sdk/projectpath`
+   - serviceLabel - **Optional** only if there is a path and we're not making a new entry - This should be acquired from the previous step of Check or Create Service Label.
+   - serviceOwners - **Optional** if no ServiceLabel is present. Can be either owners to add or delete, depending on isAdding.
+   - sourceOwners - **Optional** if no path or PRLabel are present. Can be either owners to add or delete, depending on isAdding.
+   - isAdding - **Required** Should be true if adding owners to an existing entry, false if deleting owners from an existing entry. Should also be false when adding a brand new entry.
+1. Provide information to the user about what codeowners is for:
+   - [Learn about CODEOWNERS](https://eng.ms/docs/products/azure-developer-experience/develop/supporting-sdk-customers/overview)
+   - Service owners is for getting mentioned on issues.
+   - Source owners is for getting mentioned in PRs.
+2. Collect service owners and source owners (GitHub usernames)
+3. Use `azsdk_engsys_codeowner_update` with required parameters
+4. Must have at least 2 valid owners from the start
+
+### Fix Options:
+1. **Fix invalid owners** - If there are invalid owners after modifing the CODEOWNERS file ALWAYS provide guidance.
+   Follow instructions [here](https://aka.ms/azsdk/access) for:
+   - Joining Microsoft and Azure GitHub orgs
+   - Setting public visibility
+   - Requesting write access
+2. **Add new owners** using `azsdk_engsys_codeowner_update` with `isAdding: true`
+3. **Remove invalid + add valid** owners using `azsdk_engsys_codeowner_update`
+
+## Requirements
+- **MINIMUM**: At least 2 valid code owners at all times
+- **NO EXCEPTIONS**: Cannot proceed with insufficient owners
+- **RESPONSE HANDLING**: If any exception occurs during validation or creation, ALWAYS provide documentation link [Codeowners documentation](https://eng.ms/docs/products/azure-developer-experience/develop/supporting-sdk-customers/codeowners)

eng/common/instructions/azsdk-tools/validate-service-label.instruction.md

@@ -0,0 +1,32 @@
+---
+mode: 'agent'
+tools: ['azsdk_check_service_label', 'azsdk_create_service_label']
+---
+
+## Goal
+Validate service label exists or create new one for SDK release process.
+
+## Step 1: Get Service Label
+Ask user for their service label. If none provided, explain that a valid service label is required for SDK release.
+
+## Step 2: Validate Label
+Use `azsdk_check_service_label` to check status:
+
+- **Exists**: Success - user can proceed with next steps in SDK release process
+- **InReview**: Label pending approval - user can proceed (will be available once merged)
+- **DoesNotExist**: Go to Step 3 to create new label
+- **NotAServiceLabel**: Label exists but it is not a service label - go to Step 3 for new service label
+
+## Step 3: Create New Service Label
+If no valid service label exists, guide the user through creating a new one.
+
+1. **Check existing labels**: Search for related service labels, offer alternatives
+2. **Generate recommendation**: Suggest label name following guidelines:
+   - No "Microsoft/Azure" in name
+   - Title Case (except short prepositions)
+   - Avoid Service Groups: Use "Communication Rooms" instead of "Communication - Rooms"
+   - Single label per service
+3. **Get confirmation**: User confirms or modifies suggested name
+4. **Create label**: Use `azsdk_create_service_label` with confirmed name and documentation link given by user
+
+Inform user they can proceed.

eng/common/pipelines/templates/steps/mark-release-completion.yml

@@ -0,0 +1,17 @@
+parameters:
+  ConfigFileDir: ''
+  PackageArtifactName: ''
+  SourceRootPath: $(Build.SourcesDirectory)
+
+steps:
+  - task: AzureCLI@2
+    inputs:
+      azureSubscription: opensource-api-connection
+      scriptType: pscore
+      scriptLocation: scriptPath
+      scriptPath: ${{ parameters.SourceRootPath }}/eng/common/scripts/Mark-ReleasePlanCompletion.ps1
+      arguments: -PackageInfoFilePath '${{ parameters.ConfigFileDir }}/${{ parameters.PackageArtifactName }}.json'
+      workingDirectory: $(Pipeline.Workspace)
+    displayName: Mark package as released
+    continueOnError: true
+    condition: and(succeeded(), ne(variables['Skip.MarkReleaseCompletion'], 'true'))

eng/common/scripts/ChangeLog-Operations.ps1

@@ -52,6 +52,7 @@ function Get-ChangeLogEntriesFromContent {
   $sectionHeaderRegex = "^${initialAtxHeader}${SECTION_HEADER_REGEX_SUFFIX}"
   $changeLogEntries | Add-Member -NotePropertyName "InitialAtxHeader" -NotePropertyValue $initialAtxHeader
   $releaseTitleAtxHeader = $initialAtxHeader + "#"
+  $headerLines = @()
 
   try {
     # walk the document, finding where the version specifiers are and creating lists
@@ -83,13 +84,18 @@ function Get-ChangeLogEntriesFromContent {
 
           $changeLogEntry.ReleaseContent += $line
         }
+        else {
+          $headerLines += $line
+        }
       }
     }
   }
   catch {
     Write-Error "Error parsing Changelog."
     Write-Error $_
   }
+
+  $changeLogEntries | Add-Member -NotePropertyName "HeaderBlock" -NotePropertyValue ($headerLines -Join [Environment]::NewLine)
   return $changeLogEntries
 }
 
@@ -265,8 +271,13 @@ function Set-ChangeLogContent {
   )
 
   $changeLogContent = @()
-  $changeLogContent += "$($ChangeLogEntries.InitialAtxHeader) Release History"
-  $changeLogContent += ""
+  if ($ChangeLogEntries.HeaderBlock) {
+    $changeLogContent += $ChangeLogEntries.HeaderBlock
+  }
+  else {
+    $changeLogContent += "$($ChangeLogEntries.InitialAtxHeader) Release History"
+    $changeLogContent += ""
+  }
 
   $ChangeLogEntries = Sort-ChangeLogEntries -changeLogEntries $ChangeLogEntries
 

eng/common/scripts/Helpers/DevOps-WorkItem-Helpers.ps1

@@ -1051,7 +1051,8 @@ function Get-ReleasePlanForPackage($packageName)
     $fieldList = ($fields | ForEach-Object { "[$_]"}) -join ", "
     $query = "SELECT ${fieldList} FROM WorkItems WHERE [Work Item Type] = 'Release Plan' AND [${packageNameFieldName}] = '${packageName}'"
     $query += " AND [${prStatusFieldName}] = 'merged'"
-    $query += " AND [System.State] IN ('In Progress') ORDER BY [System.CreatedDate]"
+    $query += " AND [System.State] IN ('In Progress')"
+    $query += " AND [System.Tags] NOT CONTAINS 'Release Planner App Test'"
     $workItems = Invoke-Query $fields $query
     return $workItems
 }