diff --git a/.vscode/cspell.json b/.vscode/cspell.json index 7e3eb65a8150f..0e03abf1376f1 100644 --- a/.vscode/cspell.json +++ b/.vscode/cspell.json @@ -334,6 +334,7 @@ "Onco", "onenote", "openai", + "Pnative", "premf", "pwsh", "protonj", diff --git a/eng/.docsettings.yml b/eng/.docsettings.yml index 036c1b925f693..ff2e083c9cca9 100644 --- a/eng/.docsettings.yml +++ b/eng/.docsettings.yml @@ -133,6 +133,7 @@ known_content_issues: - ['sdk/keyvault/README.md', '#3113'] - ['sdk/keyvault/azure-security-keyvault-administration/README.md', '#3113'] - ['sdk/loganalytics/microsoft-azure-loganalytics/README.md', '#3113'] + - ['sdk/monitor/azure-monitor-spring-native/README.md', '#3113'] - ['sdk/parents/azure-client-sdk-parent/README.md', '#3113'] - ['sdk/parents/azure-code-customization-parent/README.md', '#3113'] - ['sdk/parents/azure-perf-test-parent/README.md', '#3113'] diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt index b1e75cf851798..baa3462015ec4 100644 --- a/eng/versioning/version_client.txt +++ b/eng/versioning/version_client.txt @@ -187,7 +187,7 @@ com.azure:azure-communication-email;1.0.3;1.1.0-beta.1 com.azure:azure-developer-loadtesting;1.0.3;1.1.0-beta.1 com.azure:azure-identity-extensions;1.1.5;1.2.0-beta.2 com.azure:azure-analytics-purview-sharing;1.0.0-beta.2;1.0.0-beta.3 -com.azure.spring:applicationinsights-spring-native;1.0.0-beta.1;1.0.0-beta.1 +com.azure.spring:azure-monitor-spring-native;1.0.0-beta.1;1.0.0-beta.1 com.azure.spring:azure-monitor-spring-native-test;1.0.0-beta.1;1.0.0-beta.1 com.azure.spring:spring-cloud-azure-appconfiguration-config-web;4.9.0;4.10.0-beta.1 com.azure.spring:spring-cloud-azure-appconfiguration-config;4.9.0;4.10.0-beta.1 diff --git a/sdk/monitor/azure-monitor-spring-native-test/pom.xml b/sdk/monitor/azure-monitor-spring-native-test/pom.xml index 8897a2d15742d..a53da6ddd8b5b 100644 --- a/sdk/monitor/azure-monitor-spring-native-test/pom.xml +++ b/sdk/monitor/azure-monitor-spring-native-test/pom.xml @@ -26,8 +26,8 @@ com.azure.spring - applicationinsights-spring-native - 1.0.0-beta.1 + azure-monitor-spring-native + 1.0.0-beta.1 org.springframework.boot @@ -48,4 +48,90 @@ + + + + belowJava17 + + [,17) + + + + + org.jacoco + jacoco-maven-plugin + 0.8.9 + + true + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.10.1 + + true + true + + + + + org.apache.maven.plugins + maven-surefire-plugin + 3.1.0 + + true + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.4.1 + + true + + + + + org.apache.maven.plugins + maven-jar-plugin + 3.2.2 + + true + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + 3.1.2 + + true + + + + + com.github.spotbugs + spotbugs-maven-plugin + 4.2.2 + + true + + + + + org.revapi + revapi-maven-plugin + 0.14.6 + + true + + + + + + + diff --git a/sdk/monitor/azure-monitor-spring-native/CHANGELOG.md b/sdk/monitor/azure-monitor-spring-native/CHANGELOG.md index 125a8d83d2203..13dd08af78abe 100644 --- a/sdk/monitor/azure-monitor-spring-native/CHANGELOG.md +++ b/sdk/monitor/azure-monitor-spring-native/CHANGELOG.md @@ -1 +1,11 @@ # Release History + +## 1.0.0-beta.1 (Unreleased) + +### Features Added + +### Breaking Changes + +### Bugs Fixed + +### Other Changes diff --git a/sdk/monitor/azure-monitor-spring-native/README.md b/sdk/monitor/azure-monitor-spring-native/README.md index 5b73f263baa07..ed6411f38435e 100644 --- a/sdk/monitor/azure-monitor-spring-native/README.md +++ b/sdk/monitor/azure-monitor-spring-native/README.md @@ -1,4 +1,4 @@ -# Application Insights for Spring native +# Azure Monitor Spring native library for Java This project allows providing telemetry data to Azure Monitor for Spring Boot applications packaged as GraalVM native images. @@ -19,7 +19,7 @@ For more information, please read [introduction to Application Insights][applica ```xml com.azure - applicationinsights-spring-native + azure-monitor-spring-native 1.0.0-beta.1 ``` diff --git a/sdk/monitor/azure-monitor-spring-native/pom.xml b/sdk/monitor/azure-monitor-spring-native/pom.xml index e156f47e8f365..83f0d2f652372 100644 --- a/sdk/monitor/azure-monitor-spring-native/pom.xml +++ b/sdk/monitor/azure-monitor-spring-native/pom.xml @@ -19,13 +19,11 @@ ${jdk.version} ${jdk-test.version} ${jdk-test.version} - true - com.azure.spring - applicationinsights-spring-native - 1.0.0-beta.1 + azure-monitor-spring-native + 1.0.0-beta.1 @@ -85,6 +83,77 @@ + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.4.1 + + + attach-javadocs + + jar + + + true + + + + + + org.apache.maven.plugins + maven-jar-plugin + 3.2.2 + + + empty-javadoc-jar-with-readme + package + + jar + + + javadoc + ${project.basedir}/javadocTemp + + + + + + org.apache.maven.plugins + maven-antrun-plugin + 3.0.0 + + + copy-readme-to-javadocTemp + prepare-package + + + Deleting existing ${project.basedir}/javadocTemp + + + + Copying ${project.basedir}/README.md to + ${project.basedir}/javadocTemp/README.md + + + + + + run + + + + + diff --git a/sdk/monitor/ci.yml b/sdk/monitor/ci.yml index 89e78ed9c34de..1c4bc1d70e9c3 100644 --- a/sdk/monitor/ci.yml +++ b/sdk/monitor/ci.yml @@ -8,19 +8,15 @@ trigger: - release/* paths: include: - - sdk/monitor/ci.yml - - sdk/monitor/azure-monitor-ingestion/ - - sdk/monitor/azure-monitor-opentelemetry-exporter/ - - sdk/monitor/azure-monitor-spring-native/ - - sdk/monitor/azure-monitor-query/ + - sdk/monitor/ exclude: - - sdk/monitor/pom.xml - sdk/monitor/azure-monitor-ingestion/pom.xml - sdk/monitor/azure-monitor-ingestion-perf/pom.xml - sdk/monitor/azure-monitor-opentelemetry-exporter/pom.xml - - sdk/monitor/azure-monitor-spring-native/pom.xml - sdk/monitor/azure-monitor-query/pom.xml - sdk/monitor/azure-monitor-query-perf/pom.xml + - sdk/monitor/azure-monitor-spring-native/pom.xml + - sdk/monitor/azure-monitor-spring-native-test/pom.xml pr: branches: @@ -31,16 +27,15 @@ pr: - release/* paths: include: - - sdk/monitor/ci.yml - - sdk/monitor/azure-monitor-ingestion/ - - sdk/monitor/azure-monitor-opentelemetry-exporter/ - - sdk/monitor/azure-monitor-spring-native/ - - sdk/monitor/azure-monitor-query/ + - sdk/monitor/ exclude: - - sdk/monitor/pom.xml + - sdk/monitor/azure-monitor-ingestion/pom.xml + - sdk/monitor/azure-monitor-ingestion-perf/pom.xml - sdk/monitor/azure-monitor-opentelemetry-exporter/pom.xml - - sdk/monitor/azure-monitor-spring-native/pom.xml - sdk/monitor/azure-monitor-query/pom.xml + - sdk/monitor/azure-monitor-query-perf/pom.xml + - sdk/monitor/azure-monitor-spring-native/pom.xml + - sdk/monitor/azure-monitor-spring-native-test/pom.xml parameters: - name: release_dependsonlivetests @@ -54,11 +49,11 @@ parameters: - name: release_azuremonitoropentelemetryexporter displayName: 'azure-monitor-opentelemetry-exporter' type: boolean - default: + default: true - name: release_azuremonitorspringnative - displayName: 'azure-monitor-azure-monitor-spring-native' + displayName: 'azure-monitor-spring-native' type: boolean - default: + default: true - name: release_azuremonitorquery displayName: 'azure-monitor-query' type: boolean @@ -79,7 +74,7 @@ extends: safeName: azuremonitoropentelemetryexporter releaseInBatch: ${{ parameters.release_azuremonitoropentelemetryexporter }} - name: azure-monitor-spring-native - groupId: com.azure + groupId: com.azure.spring safeName: azuremonitorspringnative releaseInBatch: ${{ parameters.release_azuremonitorspringnative }} - name: azure-monitor-query @@ -88,7 +83,7 @@ extends: releaseInBatch: ${{ parameters.release_azuremonitorquery }} AdditionalModules: - name: azure-monitor-spring-native-test - groupId: com.azure + groupId: com.azure.spring - name: azure-monitor-query-perf groupId: com.azure - name: azure-monitor-ingestion-perf