diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 969b85217b5..225cb3d795d 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -16,16 +16,9 @@ updates: registries: - gradle-plugin-portal ignore: - - dependency-name: "org.slf4j:*" - # moving to 2.0 is problematic because the SPI mechanism in 2.0 doesn't work in the - # bootstrap class loader because, while we add the agent jar to the bootstrap class loader - # via Instrumentation.appendToBootstrapClassLoaderSearch(), there's nothing similar for - # resources (which is a known problem in the java agent world), and so the META-INF/services - # resource is not found - versions: [ "[2,)" ] - dependency-name: "ch.qos.logback:*" - # logback version is pinned to slf4j version (see above comment for slf4j version) - versions: [ "[1.3,)" ] + # logback 1.4+ requires Java 11+ + versions: [ "[1.4,)" ] - dependency-name: "com.squareup.moshi:*" # 1.12.0 and above use okio 2.x which pulls in kotlin libs (which are large) versions: [ "[1.12,)" ] diff --git a/agent/agent-bootstrap/build.gradle.kts b/agent/agent-bootstrap/build.gradle.kts index 5751edb554e..4246c0f0ab5 100644 --- a/agent/agent-bootstrap/build.gradle.kts +++ b/agent/agent-bootstrap/build.gradle.kts @@ -8,24 +8,4 @@ dependencies { // TODO (heya) remove this when updating to upstream micrometer instrumentation compileOnly("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api") compileOnly("io.opentelemetry:opentelemetry-semconv") - compileOnly("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv") - - compileOnly("com.google.auto.value:auto-value-annotations") - annotationProcessor("com.google.auto.value:auto-value") - - implementation("ch.qos.logback:logback-classic") - implementation("ch.qos.logback.contrib:logback-json-classic") - - // not using gson because it has dependency on java.sql.*, which is not available in Java 9+ bootstrap class loader - // only complaint so far about moshi is that it doesn"t give line numbers when there are json formatting errors - implementation("com.squareup.moshi:moshi") - - implementation(project(":etw:java")) - - testCompileOnly("com.google.code.findbugs:jsr305") - - testImplementation("org.junit.jupiter:junit-jupiter") - testImplementation("org.assertj:assertj-core") - testImplementation("org.mockito:mockito-core") - testImplementation("uk.org.webcompere:system-stubs-jupiter:2.0.2") } diff --git a/agent/agent-bootstrap/gradle.lockfile b/agent/agent-bootstrap/gradle.lockfile index c49741a2be9..e1459ee2c80 100644 --- a/agent/agent-bootstrap/gradle.lockfile +++ b/agent/agent-bootstrap/gradle.lockfile @@ -1,21 +1,14 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. -ch.qos.logback.contrib:logback-json-classic:0.1.5=runtimeClasspath -ch.qos.logback.contrib:logback-json-core:0.1.5=runtimeClasspath -ch.qos.logback:logback-classic:1.2.12=runtimeClasspath -ch.qos.logback:logback-core:1.2.12=runtimeClasspath com.azure:azure-sdk-bom:1.2.14=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.15.2=runtimeClasspath com.google.guava:guava-bom:32.1.1-jre=runtimeClasspath -com.squareup.moshi:moshi:1.11.0=runtimeClasspath -com.squareup.okio:okio:1.17.5=runtimeClasspath io.netty:netty-bom:4.1.94.Final=runtimeClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.27.0-alpha=runtimeClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.27.0=runtimeClasspath io.opentelemetry:opentelemetry-bom-alpha:1.27.0-alpha=runtimeClasspath io.opentelemetry:opentelemetry-bom:1.27.0=runtimeClasspath org.junit:junit-bom:5.9.3=runtimeClasspath -org.slf4j:slf4j-api:1.7.36=runtimeClasspath org.testcontainers:testcontainers-bom:1.18.3=runtimeClasspath empty= diff --git a/agent/agent-gc-monitor/gc-monitor-api/gradle.lockfile b/agent/agent-gc-monitor/gc-monitor-api/gradle.lockfile index 1caf3d5cc0f..9cca8decf88 100644 --- a/agent/agent-gc-monitor/gc-monitor-api/gradle.lockfile +++ b/agent/agent-gc-monitor/gc-monitor-api/gradle.lockfile @@ -11,6 +11,6 @@ io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.27.0=runtim io.opentelemetry:opentelemetry-bom-alpha:1.27.0-alpha=runtimeClasspath io.opentelemetry:opentelemetry-bom:1.27.0=runtimeClasspath org.junit:junit-bom:5.9.3=runtimeClasspath -org.slf4j:slf4j-api:1.7.36=runtimeClasspath +org.slf4j:slf4j-api:2.0.7=runtimeClasspath org.testcontainers:testcontainers-bom:1.18.3=runtimeClasspath empty= diff --git a/agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile b/agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile index 1caf3d5cc0f..9cca8decf88 100644 --- a/agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile +++ b/agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile @@ -11,6 +11,6 @@ io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.27.0=runtim io.opentelemetry:opentelemetry-bom-alpha:1.27.0-alpha=runtimeClasspath io.opentelemetry:opentelemetry-bom:1.27.0=runtimeClasspath org.junit:junit-bom:5.9.3=runtimeClasspath -org.slf4j:slf4j-api:1.7.36=runtimeClasspath +org.slf4j:slf4j-api:2.0.7=runtimeClasspath org.testcontainers:testcontainers-bom:1.18.3=runtimeClasspath empty= diff --git a/agent/agent-profiler/agent-alerting/gradle.lockfile b/agent/agent-profiler/agent-alerting/gradle.lockfile index 6f20abb555b..e303b278bde 100644 --- a/agent/agent-profiler/agent-alerting/gradle.lockfile +++ b/agent/agent-profiler/agent-alerting/gradle.lockfile @@ -10,6 +10,6 @@ io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.27.0=runtim io.opentelemetry:opentelemetry-bom-alpha:1.27.0-alpha=runtimeClasspath io.opentelemetry:opentelemetry-bom:1.27.0=runtimeClasspath org.junit:junit-bom:5.9.3=runtimeClasspath -org.slf4j:slf4j-api:1.7.36=runtimeClasspath +org.slf4j:slf4j-api:2.0.7=runtimeClasspath org.testcontainers:testcontainers-bom:1.18.3=runtimeClasspath empty= diff --git a/agent/agent-tooling/build.gradle.kts b/agent/agent-tooling/build.gradle.kts index 53585c661ce..78349355029 100644 --- a/agent/agent-tooling/build.gradle.kts +++ b/agent/agent-tooling/build.gradle.kts @@ -24,6 +24,7 @@ dependencies { implementation(project(":agent:azure-monitor-exporter")) { exclude("org.ow2.asm", "asm") } + implementation(project(":etw:java")) compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-bootstrap") compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-tooling") @@ -37,9 +38,8 @@ dependencies { // TODO (trask) this is probably still needed for above apache commons projects implementation("org.slf4j:jcl-over-slf4j") - // these are present in the bootstrap class loader - compileOnly("ch.qos.logback:logback-classic") - compileOnly("ch.qos.logback.contrib:logback-json-classic") + implementation("ch.qos.logback:logback-classic") + implementation("ch.qos.logback.contrib:logback-json-classic") implementation("com.azure:azure-core") implementation("com.azure:azure-identity") { @@ -88,4 +88,6 @@ dependencies { testImplementation("org.mockito:mockito-core") testImplementation("uk.org.webcompere:system-stubs-jupiter:2.0.2") testImplementation("io.github.hakky54:logcaptor") + + testCompileOnly("com.google.code.findbugs:jsr305") } diff --git a/agent/agent-tooling/gradle.lockfile b/agent/agent-tooling/gradle.lockfile index fbc48e5a784..8b05fbf9609 100644 --- a/agent/agent-tooling/gradle.lockfile +++ b/agent/agent-tooling/gradle.lockfile @@ -1,6 +1,10 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. +ch.qos.logback.contrib:logback-json-classic:0.1.5=runtimeClasspath +ch.qos.logback.contrib:logback-json-core:0.1.5=runtimeClasspath +ch.qos.logback:logback-classic:1.3.8=runtimeClasspath +ch.qos.logback:logback-core:1.3.8=runtimeClasspath com.azure:azure-core-http-netty:1.13.4=runtimeClasspath com.azure:azure-core:1.40.0=runtimeClasspath com.azure:azure-identity:1.9.1=runtimeClasspath @@ -69,7 +73,7 @@ org.apache.commons:commons-text:1.10.0=runtimeClasspath org.codehaus.woodstox:stax2-api:4.2.1=runtimeClasspath org.junit:junit-bom:5.9.3=runtimeClasspath org.reactivestreams:reactive-streams:1.0.4=runtimeClasspath -org.slf4j:jcl-over-slf4j:1.7.36=runtimeClasspath -org.slf4j:slf4j-api:1.7.36=runtimeClasspath +org.slf4j:jcl-over-slf4j:2.0.7=runtimeClasspath +org.slf4j:slf4j-api:2.0.7=runtimeClasspath org.testcontainers:testcontainers-bom:1.18.3=runtimeClasspath empty= diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/classicsdk/TelemetryClientClassFileTransformer.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/classicsdk/TelemetryClientClassFileTransformer.java index 91d22b10de9..1f24ac45a57 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/classicsdk/TelemetryClientClassFileTransformer.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/classicsdk/TelemetryClientClassFileTransformer.java @@ -30,7 +30,7 @@ import static org.objectweb.asm.Opcodes.NEW; import static org.objectweb.asm.Opcodes.RETURN; -import com.microsoft.applicationinsights.agent.bootstrap.diagnostics.status.StatusFile; +import com.microsoft.applicationinsights.agent.internal.diagnostics.status.StatusFile; import java.lang.instrument.ClassFileTransformer; import java.security.ProtectionDomain; import javax.annotation.Nullable; diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/configuration/Configuration.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/configuration/Configuration.java index b2e4bf534c4..a29c745ff9e 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/configuration/Configuration.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/configuration/Configuration.java @@ -9,9 +9,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import com.microsoft.applicationinsights.agent.bootstrap.diagnostics.DiagnosticsHelper; -import com.microsoft.applicationinsights.agent.bootstrap.diagnostics.status.StatusFile; import com.microsoft.applicationinsights.agent.internal.common.FriendlyException; +import com.microsoft.applicationinsights.agent.internal.diagnostics.DiagnosticsHelper; +import com.microsoft.applicationinsights.agent.internal.diagnostics.status.StatusFile; import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.logs.Severity; import java.io.File; diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/configuration/ConfigurationBuilder.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/configuration/ConfigurationBuilder.java index c4a6d64253d..b7eb74d3925 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/configuration/ConfigurationBuilder.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/configuration/ConfigurationBuilder.java @@ -13,12 +13,12 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.exc.UnrecognizedPropertyException; -import com.microsoft.applicationinsights.agent.bootstrap.diagnostics.DiagnosticsHelper; import com.microsoft.applicationinsights.agent.internal.common.FriendlyException; import com.microsoft.applicationinsights.agent.internal.configuration.Configuration.ConnectionStringOverride; import com.microsoft.applicationinsights.agent.internal.configuration.Configuration.InstrumentationKeyOverride; import com.microsoft.applicationinsights.agent.internal.configuration.Configuration.JmxMetric; import com.microsoft.applicationinsights.agent.internal.configuration.Configuration.SamplingOverride; +import com.microsoft.applicationinsights.agent.internal.diagnostics.DiagnosticsHelper; import java.io.IOException; import java.net.URL; import java.net.URLDecoder; diff --git a/agent/agent-bootstrap/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/AgentExtensionVersionFinder.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/AgentExtensionVersionFinder.java similarity index 90% rename from agent/agent-bootstrap/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/AgentExtensionVersionFinder.java rename to agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/AgentExtensionVersionFinder.java index 56c9c5d7162..7b8e782c551 100644 --- a/agent/agent-bootstrap/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/AgentExtensionVersionFinder.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/AgentExtensionVersionFinder.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.microsoft.applicationinsights.agent.bootstrap.diagnostics; +package com.microsoft.applicationinsights.agent.internal.diagnostics; public class AgentExtensionVersionFinder extends CachedDiagnosticsValueFinder { diff --git a/agent/agent-bootstrap/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/ApplicationMetadataFactory.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/ApplicationMetadataFactory.java similarity index 94% rename from agent/agent-bootstrap/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/ApplicationMetadataFactory.java rename to agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/ApplicationMetadataFactory.java index a4950190eed..ffa53105cb6 100644 --- a/agent/agent-bootstrap/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/ApplicationMetadataFactory.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/ApplicationMetadataFactory.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.microsoft.applicationinsights.agent.bootstrap.diagnostics; +package com.microsoft.applicationinsights.agent.internal.diagnostics; import java.util.Arrays; import java.util.Iterator; diff --git a/agent/agent-bootstrap/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/CachedDiagnosticsValueFinder.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/CachedDiagnosticsValueFinder.java similarity index 84% rename from agent/agent-bootstrap/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/CachedDiagnosticsValueFinder.java rename to agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/CachedDiagnosticsValueFinder.java index 49f07339e05..4b8ee81d448 100644 --- a/agent/agent-bootstrap/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/CachedDiagnosticsValueFinder.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/CachedDiagnosticsValueFinder.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.microsoft.applicationinsights.agent.bootstrap.diagnostics; +package com.microsoft.applicationinsights.agent.internal.diagnostics; public abstract class CachedDiagnosticsValueFinder implements DiagnosticsValueFinder { private volatile String value; diff --git a/agent/agent-bootstrap/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/DiagnosticsHelper.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/DiagnosticsHelper.java similarity index 97% rename from agent/agent-bootstrap/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/DiagnosticsHelper.java rename to agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/DiagnosticsHelper.java index cfb11134549..cb71f52438e 100644 --- a/agent/agent-bootstrap/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/DiagnosticsHelper.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/DiagnosticsHelper.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.microsoft.applicationinsights.agent.bootstrap.diagnostics; +package com.microsoft.applicationinsights.agent.internal.diagnostics; import java.nio.file.Files; import java.nio.file.Path; diff --git a/agent/agent-bootstrap/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/DiagnosticsValueFinder.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/DiagnosticsValueFinder.java similarity index 72% rename from agent/agent-bootstrap/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/DiagnosticsValueFinder.java rename to agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/DiagnosticsValueFinder.java index 8ca48a174d5..2c23154bf30 100644 --- a/agent/agent-bootstrap/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/DiagnosticsValueFinder.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/DiagnosticsValueFinder.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.microsoft.applicationinsights.agent.bootstrap.diagnostics; +package com.microsoft.applicationinsights.agent.internal.diagnostics; public interface DiagnosticsValueFinder { diff --git a/agent/agent-bootstrap/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/InstrumentationKeyFinder.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/InstrumentationKeyFinder.java similarity index 93% rename from agent/agent-bootstrap/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/InstrumentationKeyFinder.java rename to agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/InstrumentationKeyFinder.java index de34b8b6e84..6a3def7a341 100644 --- a/agent/agent-bootstrap/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/InstrumentationKeyFinder.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/InstrumentationKeyFinder.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.microsoft.applicationinsights.agent.bootstrap.diagnostics; +package com.microsoft.applicationinsights.agent.internal.diagnostics; public class InstrumentationKeyFinder implements DiagnosticsValueFinder { diff --git a/agent/agent-bootstrap/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/MachineNameFinder.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/MachineNameFinder.java similarity index 90% rename from agent/agent-bootstrap/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/MachineNameFinder.java rename to agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/MachineNameFinder.java index 66fe69db5b4..8e73686ddab 100644 --- a/agent/agent-bootstrap/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/MachineNameFinder.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/MachineNameFinder.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.microsoft.applicationinsights.agent.bootstrap.diagnostics; +package com.microsoft.applicationinsights.agent.internal.diagnostics; import javax.annotation.Nullable; diff --git a/agent/agent-bootstrap/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/MsgId.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/MsgId.java similarity index 90% rename from agent/agent-bootstrap/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/MsgId.java rename to agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/MsgId.java index d7c98c8b296..3fcda336e42 100644 --- a/agent/agent-bootstrap/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/MsgId.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/MsgId.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.microsoft.applicationinsights.agent.bootstrap.diagnostics; +package com.microsoft.applicationinsights.agent.internal.diagnostics; import org.slf4j.MDC; diff --git a/agent/agent-bootstrap/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/PidFinder.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/PidFinder.java similarity index 96% rename from agent/agent-bootstrap/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/PidFinder.java rename to agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/PidFinder.java index d16f17516d9..3657213bc0f 100644 --- a/agent/agent-bootstrap/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/PidFinder.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/PidFinder.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.microsoft.applicationinsights.agent.bootstrap.diagnostics; +package com.microsoft.applicationinsights.agent.internal.diagnostics; import java.lang.management.ManagementFactory; import java.lang.management.RuntimeMXBean; diff --git a/agent/agent-bootstrap/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/SdkVersionFinder.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/SdkVersionFinder.java similarity index 95% rename from agent/agent-bootstrap/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/SdkVersionFinder.java rename to agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/SdkVersionFinder.java index 95c06144c29..33e70bf2f12 100644 --- a/agent/agent-bootstrap/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/SdkVersionFinder.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/SdkVersionFinder.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.microsoft.applicationinsights.agent.bootstrap.diagnostics; +package com.microsoft.applicationinsights.agent.internal.diagnostics; import java.io.IOException; import java.io.InputStream; diff --git a/agent/agent-bootstrap/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/SiteNameFinder.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/SiteNameFinder.java similarity index 90% rename from agent/agent-bootstrap/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/SiteNameFinder.java rename to agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/SiteNameFinder.java index 5f95854ee8d..51e0e86073a 100644 --- a/agent/agent-bootstrap/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/SiteNameFinder.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/SiteNameFinder.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.microsoft.applicationinsights.agent.bootstrap.diagnostics; +package com.microsoft.applicationinsights.agent.internal.diagnostics; import javax.annotation.Nullable; diff --git a/agent/agent-bootstrap/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/SubscriptionIdFinder.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/SubscriptionIdFinder.java similarity index 90% rename from agent/agent-bootstrap/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/SubscriptionIdFinder.java rename to agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/SubscriptionIdFinder.java index e4a0552ee03..812541308b3 100644 --- a/agent/agent-bootstrap/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/SubscriptionIdFinder.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/SubscriptionIdFinder.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.microsoft.applicationinsights.agent.bootstrap.diagnostics; +package com.microsoft.applicationinsights.agent.internal.diagnostics; public class SubscriptionIdFinder extends CachedDiagnosticsValueFinder { diff --git a/agent/agent-bootstrap/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/etw/EtwAppender.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/etw/EtwAppender.java similarity index 77% rename from agent/agent-bootstrap/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/etw/EtwAppender.java rename to agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/etw/EtwAppender.java index 7bba8d18ba3..e2a5917725d 100644 --- a/agent/agent-bootstrap/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/etw/EtwAppender.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/etw/EtwAppender.java @@ -1,22 +1,22 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.microsoft.applicationinsights.agent.bootstrap.diagnostics.etw; +package com.microsoft.applicationinsights.agent.internal.diagnostics.etw; -import static com.microsoft.applicationinsights.agent.bootstrap.diagnostics.MsgId.INITIALIZATION_SUCCESS; +import static com.microsoft.applicationinsights.agent.internal.diagnostics.MsgId.INITIALIZATION_SUCCESS; import ch.qos.logback.classic.Level; import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.classic.spi.ThrowableProxyUtil; import ch.qos.logback.core.AppenderBase; -import com.microsoft.applicationinsights.agent.bootstrap.diagnostics.ApplicationMetadataFactory; -import com.microsoft.applicationinsights.agent.bootstrap.diagnostics.DiagnosticsHelper; -import com.microsoft.applicationinsights.agent.bootstrap.diagnostics.etw.events.IpaError; -import com.microsoft.applicationinsights.agent.bootstrap.diagnostics.etw.events.IpaInfo; -import com.microsoft.applicationinsights.agent.bootstrap.diagnostics.etw.events.IpaVerbose; -import com.microsoft.applicationinsights.agent.bootstrap.diagnostics.etw.events.IpaWarn; -import com.microsoft.applicationinsights.agent.bootstrap.diagnostics.etw.events.model.IpaEtwEventBase; -import com.microsoft.applicationinsights.agent.bootstrap.diagnostics.status.StatusFile; +import com.microsoft.applicationinsights.agent.internal.diagnostics.ApplicationMetadataFactory; +import com.microsoft.applicationinsights.agent.internal.diagnostics.DiagnosticsHelper; +import com.microsoft.applicationinsights.agent.internal.diagnostics.etw.events.IpaError; +import com.microsoft.applicationinsights.agent.internal.diagnostics.etw.events.IpaInfo; +import com.microsoft.applicationinsights.agent.internal.diagnostics.etw.events.IpaVerbose; +import com.microsoft.applicationinsights.agent.internal.diagnostics.etw.events.IpaWarn; +import com.microsoft.applicationinsights.agent.internal.diagnostics.etw.events.model.IpaEtwEventBase; +import com.microsoft.applicationinsights.agent.internal.diagnostics.status.StatusFile; import java.util.Map; import org.slf4j.LoggerFactory; @@ -63,8 +63,7 @@ public void start() { protected void append(ILoggingEvent logEvent) { String logger = logEvent.getLoggerName(); if (logger != null - && logger.startsWith( - "com.microsoft.applicationinsights.agent.bootstrap.diagnostics.etw.")) { + && logger.startsWith("com.microsoft.applicationinsights.agent.internal.diagnostics.etw.")) { addWarn("Skipping attempt to log to " + logger); return; } diff --git a/agent/agent-bootstrap/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/log/ApplicationInsightsCsvLayout.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/log/ApplicationInsightsCsvLayout.java similarity index 90% rename from agent/agent-bootstrap/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/log/ApplicationInsightsCsvLayout.java rename to agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/log/ApplicationInsightsCsvLayout.java index 674dde00da7..e09c84eb2fc 100644 --- a/agent/agent-bootstrap/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/log/ApplicationInsightsCsvLayout.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/log/ApplicationInsightsCsvLayout.java @@ -1,14 +1,14 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.microsoft.applicationinsights.agent.bootstrap.diagnostics.log; +package com.microsoft.applicationinsights.agent.internal.diagnostics.log; import ch.qos.logback.classic.PatternLayout; import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.classic.spi.IThrowableProxy; import ch.qos.logback.classic.spi.ThrowableProxy; -import com.microsoft.applicationinsights.agent.bootstrap.diagnostics.ApplicationMetadataFactory; -import com.microsoft.applicationinsights.agent.bootstrap.diagnostics.DiagnosticsHelper; +import com.microsoft.applicationinsights.agent.internal.diagnostics.ApplicationMetadataFactory; +import com.microsoft.applicationinsights.agent.internal.diagnostics.DiagnosticsHelper; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.PrintWriter; import java.io.StringWriter; diff --git a/agent/agent-bootstrap/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/log/ApplicationInsightsDiagnosticsLogFilter.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/log/ApplicationInsightsDiagnosticsLogFilter.java similarity index 82% rename from agent/agent-bootstrap/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/log/ApplicationInsightsDiagnosticsLogFilter.java rename to agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/log/ApplicationInsightsDiagnosticsLogFilter.java index 4e53d7826a8..8649ec2b18b 100644 --- a/agent/agent-bootstrap/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/log/ApplicationInsightsDiagnosticsLogFilter.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/log/ApplicationInsightsDiagnosticsLogFilter.java @@ -1,13 +1,13 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.microsoft.applicationinsights.agent.bootstrap.diagnostics.log; +package com.microsoft.applicationinsights.agent.internal.diagnostics.log; import ch.qos.logback.classic.Level; import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.core.filter.Filter; import ch.qos.logback.core.spi.FilterReply; -import com.microsoft.applicationinsights.agent.bootstrap.diagnostics.DiagnosticsHelper; +import com.microsoft.applicationinsights.agent.internal.diagnostics.DiagnosticsHelper; public class ApplicationInsightsDiagnosticsLogFilter extends Filter { @Override diff --git a/agent/agent-bootstrap/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/log/ApplicationInsightsJsonLayout.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/log/ApplicationInsightsJsonLayout.java similarity index 87% rename from agent/agent-bootstrap/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/log/ApplicationInsightsJsonLayout.java rename to agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/log/ApplicationInsightsJsonLayout.java index 4bc6a16c6a1..ecce8536423 100644 --- a/agent/agent-bootstrap/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/log/ApplicationInsightsJsonLayout.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/log/ApplicationInsightsJsonLayout.java @@ -1,13 +1,13 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.microsoft.applicationinsights.agent.bootstrap.diagnostics.log; +package com.microsoft.applicationinsights.agent.internal.diagnostics.log; import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.contrib.json.classic.JsonLayout; -import com.microsoft.applicationinsights.agent.bootstrap.diagnostics.ApplicationMetadataFactory; -import com.microsoft.applicationinsights.agent.bootstrap.diagnostics.DiagnosticsHelper; -import com.microsoft.applicationinsights.agent.bootstrap.diagnostics.DiagnosticsValueFinder; +import com.microsoft.applicationinsights.agent.internal.diagnostics.ApplicationMetadataFactory; +import com.microsoft.applicationinsights.agent.internal.diagnostics.DiagnosticsHelper; +import com.microsoft.applicationinsights.agent.internal.diagnostics.DiagnosticsValueFinder; import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; diff --git a/agent/agent-bootstrap/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/log/MoshiJsonFormatter.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/log/MoshiJsonFormatter.java similarity index 90% rename from agent/agent-bootstrap/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/log/MoshiJsonFormatter.java rename to agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/log/MoshiJsonFormatter.java index 5fd815cbb0c..48222a79fca 100644 --- a/agent/agent-bootstrap/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/log/MoshiJsonFormatter.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/log/MoshiJsonFormatter.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.microsoft.applicationinsights.agent.bootstrap.diagnostics.log; +package com.microsoft.applicationinsights.agent.internal.diagnostics.log; import ch.qos.logback.contrib.json.JsonFormatter; import com.squareup.moshi.Moshi; diff --git a/agent/agent-bootstrap/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/status/StatusFile.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/status/StatusFile.java similarity index 93% rename from agent/agent-bootstrap/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/status/StatusFile.java rename to agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/status/StatusFile.java index cd84e2870f0..5ae33d2c93f 100644 --- a/agent/agent-bootstrap/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/status/StatusFile.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/status/StatusFile.java @@ -1,16 +1,16 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.microsoft.applicationinsights.agent.bootstrap.diagnostics.status; +package com.microsoft.applicationinsights.agent.internal.diagnostics.status; -import static com.microsoft.applicationinsights.agent.bootstrap.diagnostics.DiagnosticsHelper.LINUX_DEFAULT; -import static com.microsoft.applicationinsights.agent.bootstrap.diagnostics.MsgId.STATUS_FILE_ERROR; +import static com.microsoft.applicationinsights.agent.internal.diagnostics.DiagnosticsHelper.LINUX_DEFAULT; +import static com.microsoft.applicationinsights.agent.internal.diagnostics.MsgId.STATUS_FILE_ERROR; -import com.microsoft.applicationinsights.agent.bootstrap.diagnostics.ApplicationMetadataFactory; -import com.microsoft.applicationinsights.agent.bootstrap.diagnostics.DiagnosticsHelper; -import com.microsoft.applicationinsights.agent.bootstrap.diagnostics.DiagnosticsValueFinder; -import com.microsoft.applicationinsights.agent.bootstrap.diagnostics.MachineNameFinder; -import com.microsoft.applicationinsights.agent.bootstrap.diagnostics.PidFinder; +import com.microsoft.applicationinsights.agent.internal.diagnostics.ApplicationMetadataFactory; +import com.microsoft.applicationinsights.agent.internal.diagnostics.DiagnosticsHelper; +import com.microsoft.applicationinsights.agent.internal.diagnostics.DiagnosticsValueFinder; +import com.microsoft.applicationinsights.agent.internal.diagnostics.MachineNameFinder; +import com.microsoft.applicationinsights.agent.internal.diagnostics.PidFinder; import com.squareup.moshi.Moshi; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.File; diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/AzureFunctionsInitializer.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/AzureFunctionsInitializer.java index 7d50367868d..33b4262d9d9 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/AzureFunctionsInitializer.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/AzureFunctionsInitializer.java @@ -4,7 +4,7 @@ package com.microsoft.applicationinsights.agent.internal.init; import com.azure.monitor.opentelemetry.exporter.implementation.utils.Strings; -import com.microsoft.applicationinsights.agent.bootstrap.diagnostics.DiagnosticsHelper; +import com.microsoft.applicationinsights.agent.internal.diagnostics.DiagnosticsHelper; import io.opentelemetry.javaagent.bootstrap.ClassFileTransformerHolder; import io.opentelemetry.javaagent.bootstrap.InstrumentationHolder; import java.lang.instrument.ClassFileTransformer; diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/FirstEntryPoint.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/FirstEntryPoint.java index 24878c62174..2b22582ec68 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/FirstEntryPoint.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/FirstEntryPoint.java @@ -3,22 +3,23 @@ package com.microsoft.applicationinsights.agent.internal.init; -import static com.microsoft.applicationinsights.agent.bootstrap.diagnostics.MsgId.INITIALIZATION_SUCCESS; -import static com.microsoft.applicationinsights.agent.bootstrap.diagnostics.MsgId.STARTUP_FAILURE_ERROR; +import static com.microsoft.applicationinsights.agent.internal.diagnostics.MsgId.INITIALIZATION_SUCCESS; +import static com.microsoft.applicationinsights.agent.internal.diagnostics.MsgId.STARTUP_FAILURE_ERROR; import com.azure.monitor.opentelemetry.exporter.implementation.utils.PropertyHelper; import com.azure.monitor.opentelemetry.exporter.implementation.utils.SystemInformation; import com.google.auto.service.AutoService; -import com.microsoft.applicationinsights.agent.bootstrap.diagnostics.DiagnosticsHelper; -import com.microsoft.applicationinsights.agent.bootstrap.diagnostics.PidFinder; -import com.microsoft.applicationinsights.agent.bootstrap.diagnostics.SdkVersionFinder; -import com.microsoft.applicationinsights.agent.bootstrap.diagnostics.status.StatusFile; import com.microsoft.applicationinsights.agent.internal.common.FriendlyException; import com.microsoft.applicationinsights.agent.internal.configuration.Configuration; import com.microsoft.applicationinsights.agent.internal.configuration.Configuration.SelfDiagnostics; import com.microsoft.applicationinsights.agent.internal.configuration.ConfigurationBuilder; import com.microsoft.applicationinsights.agent.internal.configuration.RpConfiguration; import com.microsoft.applicationinsights.agent.internal.configuration.RpConfigurationBuilder; +import com.microsoft.applicationinsights.agent.internal.diagnostics.DiagnosticsHelper; +import com.microsoft.applicationinsights.agent.internal.diagnostics.PidFinder; +import com.microsoft.applicationinsights.agent.internal.diagnostics.SdkVersionFinder; +import com.microsoft.applicationinsights.agent.internal.diagnostics.status.StatusFile; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import io.opentelemetry.javaagent.bootstrap.InstrumentationHolder; import io.opentelemetry.javaagent.bootstrap.InternalLogger; import io.opentelemetry.javaagent.bootstrap.JavaagentFileHolder; @@ -160,6 +161,10 @@ private static String findSystemProperties() { } @Override + @SuppressFBWarnings( + value = "SECCRLFLOG", // CRLF injection into log messages + justification = + "Logging params cannot be controlled by an end user of the instrumented application") public void onStartupSuccess() { startupLogger.info( "Application Insights Java Agent {} started successfully (PID {}, JVM running for {} s)", @@ -282,6 +287,10 @@ private static void logErrorMessage( } } + @SuppressFBWarnings( + value = "SECCRLFLOG", // CRLF injection into log messages + justification = + "Startup failure message cannot be controlled by an end user of the instrumented application") private static void logStartupFailure(boolean isFriendlyException, String message, Throwable t) { try (MDC.MDCCloseable ignored = STARTUP_FAILURE_ERROR.makeActive()) { if (isFriendlyException) { diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/JvmCompiler.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/JvmCompiler.java index 5395eb562c2..cef6a328ee8 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/JvmCompiler.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/JvmCompiler.java @@ -3,7 +3,7 @@ package com.microsoft.applicationinsights.agent.internal.init; -import com.microsoft.applicationinsights.agent.bootstrap.diagnostics.PidFinder; +import com.microsoft.applicationinsights.agent.internal.diagnostics.PidFinder; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; class JvmCompiler { diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/LoggingConfigurator.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/LoggingConfigurator.java index d02b4b0f000..7ca4b2ab67d 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/LoggingConfigurator.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/LoggingConfigurator.java @@ -3,7 +3,7 @@ package com.microsoft.applicationinsights.agent.internal.init; -import static com.microsoft.applicationinsights.agent.bootstrap.diagnostics.DiagnosticsHelper.LINUX_DEFAULT; +import static com.microsoft.applicationinsights.agent.internal.diagnostics.DiagnosticsHelper.LINUX_DEFAULT; import static org.slf4j.Logger.ROOT_LOGGER_NAME; import ch.qos.logback.classic.Level; @@ -20,13 +20,13 @@ import ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy; import ch.qos.logback.core.util.FileSize; import com.azure.monitor.opentelemetry.exporter.implementation.utils.PropertyHelper; -import com.microsoft.applicationinsights.agent.bootstrap.diagnostics.DiagnosticsHelper; -import com.microsoft.applicationinsights.agent.bootstrap.diagnostics.etw.EtwAppender; -import com.microsoft.applicationinsights.agent.bootstrap.diagnostics.log.ApplicationInsightsCsvLayout; -import com.microsoft.applicationinsights.agent.bootstrap.diagnostics.log.ApplicationInsightsDiagnosticsLogFilter; -import com.microsoft.applicationinsights.agent.bootstrap.diagnostics.log.ApplicationInsightsJsonLayout; -import com.microsoft.applicationinsights.agent.bootstrap.diagnostics.log.MoshiJsonFormatter; import com.microsoft.applicationinsights.agent.internal.configuration.Configuration; +import com.microsoft.applicationinsights.agent.internal.diagnostics.DiagnosticsHelper; +import com.microsoft.applicationinsights.agent.internal.diagnostics.etw.EtwAppender; +import com.microsoft.applicationinsights.agent.internal.diagnostics.log.ApplicationInsightsCsvLayout; +import com.microsoft.applicationinsights.agent.internal.diagnostics.log.ApplicationInsightsDiagnosticsLogFilter; +import com.microsoft.applicationinsights.agent.internal.diagnostics.log.ApplicationInsightsJsonLayout; +import com.microsoft.applicationinsights.agent.internal.diagnostics.log.MoshiJsonFormatter; import com.microsoft.applicationinsights.agent.internal.logbackpatch.FixedWindowRollingPolicy; import java.nio.file.Path; import org.slf4j.LoggerFactory; diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/PerformanceCounterInitializer.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/PerformanceCounterInitializer.java index 0592dc611f0..259b89f6e6c 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/PerformanceCounterInitializer.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/PerformanceCounterInitializer.java @@ -3,7 +3,7 @@ package com.microsoft.applicationinsights.agent.internal.init; -import static com.microsoft.applicationinsights.agent.bootstrap.diagnostics.MsgId.CUSTOM_JMX_METRIC_ERROR; +import static com.microsoft.applicationinsights.agent.internal.diagnostics.MsgId.CUSTOM_JMX_METRIC_ERROR; import com.azure.monitor.opentelemetry.exporter.implementation.utils.PropertyHelper; import com.azure.monitor.opentelemetry.exporter.implementation.utils.Strings; diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/StartupDiagnostics.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/StartupDiagnostics.java index 8a13b91b960..f046e125d59 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/StartupDiagnostics.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/StartupDiagnostics.java @@ -3,7 +3,7 @@ package com.microsoft.applicationinsights.agent.internal.init; -import com.microsoft.applicationinsights.agent.bootstrap.diagnostics.PidFinder; +import com.microsoft.applicationinsights.agent.internal.diagnostics.PidFinder; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.File; import java.io.IOException; diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/perfcounter/AbstractJmxPerformanceCounter.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/perfcounter/AbstractJmxPerformanceCounter.java index fe9793fb782..0c1104ae17e 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/perfcounter/AbstractJmxPerformanceCounter.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/perfcounter/AbstractJmxPerformanceCounter.java @@ -3,7 +3,7 @@ package com.microsoft.applicationinsights.agent.internal.perfcounter; -import static com.microsoft.applicationinsights.agent.bootstrap.diagnostics.MsgId.CUSTOM_JMX_METRIC_ERROR; +import static com.microsoft.applicationinsights.agent.internal.diagnostics.MsgId.CUSTOM_JMX_METRIC_ERROR; import com.microsoft.applicationinsights.agent.internal.telemetry.TelemetryClient; import java.util.Collection; diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/perfcounter/FreeMemoryPerformanceCounter.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/perfcounter/FreeMemoryPerformanceCounter.java index 164d89c3f13..e2dc04a2d98 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/perfcounter/FreeMemoryPerformanceCounter.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/perfcounter/FreeMemoryPerformanceCounter.java @@ -3,7 +3,7 @@ package com.microsoft.applicationinsights.agent.internal.perfcounter; -import static com.microsoft.applicationinsights.agent.bootstrap.diagnostics.MsgId.FREE_MEMORY_METRIC_ERROR; +import static com.microsoft.applicationinsights.agent.internal.diagnostics.MsgId.FREE_MEMORY_METRIC_ERROR; import com.microsoft.applicationinsights.agent.internal.telemetry.TelemetryClient; import java.lang.management.ManagementFactory; diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/perfcounter/JmxDataFetcher.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/perfcounter/JmxDataFetcher.java index bf55bc920e2..6f6c06e5ea6 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/perfcounter/JmxDataFetcher.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/perfcounter/JmxDataFetcher.java @@ -3,7 +3,7 @@ package com.microsoft.applicationinsights.agent.internal.perfcounter; -import static com.microsoft.applicationinsights.agent.bootstrap.diagnostics.MsgId.CUSTOM_JMX_METRIC_ERROR; +import static com.microsoft.applicationinsights.agent.internal.diagnostics.MsgId.CUSTOM_JMX_METRIC_ERROR; import java.lang.management.ManagementFactory; import java.util.ArrayList; diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/profiler/PerformanceMonitoringService.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/profiler/PerformanceMonitoringService.java index 6e07eccef2c..5831c850497 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/profiler/PerformanceMonitoringService.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/profiler/PerformanceMonitoringService.java @@ -4,9 +4,9 @@ package com.microsoft.applicationinsights.agent.internal.profiler; import com.azure.monitor.opentelemetry.exporter.implementation.utils.ThreadPoolUtils; -import com.microsoft.applicationinsights.agent.bootstrap.diagnostics.PidFinder; import com.microsoft.applicationinsights.agent.internal.configuration.Configuration; import com.microsoft.applicationinsights.agent.internal.configuration.GcReportingLevel; +import com.microsoft.applicationinsights.agent.internal.diagnostics.PidFinder; import com.microsoft.applicationinsights.agent.internal.profiler.service.ServiceProfilerClient; import com.microsoft.applicationinsights.agent.internal.profiler.triggers.AlertingSubsystemInit; import com.microsoft.applicationinsights.agent.internal.profiler.upload.UploadService; diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/profiler/ProfilingInitializer.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/profiler/ProfilingInitializer.java index 364cf4f180d..46e14920d54 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/profiler/ProfilingInitializer.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/profiler/ProfilingInitializer.java @@ -9,10 +9,10 @@ import com.azure.core.http.policy.RedirectPolicy; import com.azure.monitor.opentelemetry.exporter.implementation.utils.SystemInformation; import com.azure.monitor.opentelemetry.exporter.implementation.utils.ThreadPoolUtils; -import com.microsoft.applicationinsights.agent.bootstrap.diagnostics.SdkVersionFinder; import com.microsoft.applicationinsights.agent.internal.common.FriendlyException; import com.microsoft.applicationinsights.agent.internal.configuration.Configuration; import com.microsoft.applicationinsights.agent.internal.configuration.GcReportingLevel; +import com.microsoft.applicationinsights.agent.internal.diagnostics.SdkVersionFinder; import com.microsoft.applicationinsights.agent.internal.httpclient.LazyHttpClient; import com.microsoft.applicationinsights.agent.internal.profiler.config.ConfigService; import com.microsoft.applicationinsights.agent.internal.profiler.config.ProfilerConfiguration; diff --git a/agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/configuration/ConfigurationTest.java b/agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/configuration/ConfigurationTest.java index 1c7643b30ce..f7b2f916644 100644 --- a/agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/configuration/ConfigurationTest.java +++ b/agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/configuration/ConfigurationTest.java @@ -10,13 +10,13 @@ import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.exc.UnrecognizedPropertyException; -import com.microsoft.applicationinsights.agent.bootstrap.diagnostics.DiagnosticsHelper; import com.microsoft.applicationinsights.agent.internal.configuration.Configuration.JmxMetric; import com.microsoft.applicationinsights.agent.internal.configuration.Configuration.MatchType; import com.microsoft.applicationinsights.agent.internal.configuration.Configuration.PreviewConfiguration; import com.microsoft.applicationinsights.agent.internal.configuration.Configuration.ProcessorActionType; import com.microsoft.applicationinsights.agent.internal.configuration.Configuration.ProcessorConfig; import com.microsoft.applicationinsights.agent.internal.configuration.Configuration.ProcessorType; +import com.microsoft.applicationinsights.agent.internal.diagnostics.DiagnosticsHelper; import io.opentelemetry.api.common.AttributeKey; import java.io.IOException; import java.nio.file.Paths; diff --git a/agent/agent-bootstrap/src/test/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/DiagnosticsTestHelper.java b/agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/diagnostics/DiagnosticsTestHelper.java similarity index 86% rename from agent/agent-bootstrap/src/test/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/DiagnosticsTestHelper.java rename to agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/diagnostics/DiagnosticsTestHelper.java index d63654d7f91..2b7abb5b78c 100644 --- a/agent/agent-bootstrap/src/test/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/DiagnosticsTestHelper.java +++ b/agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/diagnostics/DiagnosticsTestHelper.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.microsoft.applicationinsights.agent.bootstrap.diagnostics; +package com.microsoft.applicationinsights.agent.internal.diagnostics; public class DiagnosticsTestHelper { private DiagnosticsTestHelper() {} diff --git a/agent/agent-bootstrap/src/test/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/SubscriptionIdFinderTest.java b/agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/diagnostics/SubscriptionIdFinderTest.java similarity index 95% rename from agent/agent-bootstrap/src/test/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/SubscriptionIdFinderTest.java rename to agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/diagnostics/SubscriptionIdFinderTest.java index b381c74faf2..9671382aef2 100644 --- a/agent/agent-bootstrap/src/test/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/SubscriptionIdFinderTest.java +++ b/agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/diagnostics/SubscriptionIdFinderTest.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.microsoft.applicationinsights.agent.bootstrap.diagnostics; +package com.microsoft.applicationinsights.agent.internal.diagnostics; import static org.assertj.core.api.Assertions.assertThat; diff --git a/agent/agent-bootstrap/src/test/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/log/ApplicationInsightsDiagnosticsLogFilterTests.java b/agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/diagnostics/log/ApplicationInsightsDiagnosticsLogFilterTests.java similarity index 86% rename from agent/agent-bootstrap/src/test/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/log/ApplicationInsightsDiagnosticsLogFilterTests.java rename to agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/diagnostics/log/ApplicationInsightsDiagnosticsLogFilterTests.java index bb05c2fafe9..9c4143e9f6b 100644 --- a/agent/agent-bootstrap/src/test/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/log/ApplicationInsightsDiagnosticsLogFilterTests.java +++ b/agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/diagnostics/log/ApplicationInsightsDiagnosticsLogFilterTests.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.microsoft.applicationinsights.agent.bootstrap.diagnostics.log; +package com.microsoft.applicationinsights.agent.internal.diagnostics.log; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; @@ -10,8 +10,8 @@ import ch.qos.logback.classic.Level; import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.core.spi.FilterReply; -import com.microsoft.applicationinsights.agent.bootstrap.diagnostics.DiagnosticsHelper; -import com.microsoft.applicationinsights.agent.bootstrap.diagnostics.DiagnosticsTestHelper; +import com.microsoft.applicationinsights.agent.internal.diagnostics.DiagnosticsHelper; +import com.microsoft.applicationinsights.agent.internal.diagnostics.DiagnosticsTestHelper; import javax.annotation.Nullable; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/agent/agent-bootstrap/src/test/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/log/ApplicationInsightsJsonLayoutTests.java b/agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/diagnostics/log/ApplicationInsightsJsonLayoutTests.java similarity index 87% rename from agent/agent-bootstrap/src/test/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/log/ApplicationInsightsJsonLayoutTests.java rename to agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/diagnostics/log/ApplicationInsightsJsonLayoutTests.java index 6cba63e884c..827363704f6 100644 --- a/agent/agent-bootstrap/src/test/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/log/ApplicationInsightsJsonLayoutTests.java +++ b/agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/diagnostics/log/ApplicationInsightsJsonLayoutTests.java @@ -1,13 +1,13 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.microsoft.applicationinsights.agent.bootstrap.diagnostics.log; +package com.microsoft.applicationinsights.agent.internal.diagnostics.log; import static ch.qos.logback.contrib.json.classic.JsonLayout.FORMATTED_MESSAGE_ATTR_NAME; import static ch.qos.logback.contrib.json.classic.JsonLayout.LOGGER_ATTR_NAME; -import static com.microsoft.applicationinsights.agent.bootstrap.diagnostics.log.ApplicationInsightsJsonLayout.CUSTOM_FIELDS_PROP_NAME; -import static com.microsoft.applicationinsights.agent.bootstrap.diagnostics.log.ApplicationInsightsJsonLayout.TIMESTAMP_PROP_NAME; -import static com.microsoft.applicationinsights.agent.bootstrap.diagnostics.log.ApplicationInsightsJsonLayout.UNKNOWN_VALUE; +import static com.microsoft.applicationinsights.agent.internal.diagnostics.log.ApplicationInsightsJsonLayout.CUSTOM_FIELDS_PROP_NAME; +import static com.microsoft.applicationinsights.agent.internal.diagnostics.log.ApplicationInsightsJsonLayout.TIMESTAMP_PROP_NAME; +import static com.microsoft.applicationinsights.agent.internal.diagnostics.log.ApplicationInsightsJsonLayout.UNKNOWN_VALUE; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.mock; @@ -17,8 +17,8 @@ import ch.qos.logback.classic.Level; import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.classic.spi.ThrowableProxy; -import com.microsoft.applicationinsights.agent.bootstrap.diagnostics.DiagnosticsHelper; -import com.microsoft.applicationinsights.agent.bootstrap.diagnostics.DiagnosticsValueFinder; +import com.microsoft.applicationinsights.agent.internal.diagnostics.DiagnosticsHelper; +import com.microsoft.applicationinsights.agent.internal.diagnostics.DiagnosticsValueFinder; import java.util.HashMap; import java.util.Map; import javax.annotation.Nullable; diff --git a/agent/agent-bootstrap/src/test/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/log/MoshiJsonFormatterTests.java b/agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/diagnostics/log/MoshiJsonFormatterTests.java similarity index 93% rename from agent/agent-bootstrap/src/test/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/log/MoshiJsonFormatterTests.java rename to agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/diagnostics/log/MoshiJsonFormatterTests.java index f1916e6e105..af5b332f37e 100644 --- a/agent/agent-bootstrap/src/test/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/log/MoshiJsonFormatterTests.java +++ b/agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/diagnostics/log/MoshiJsonFormatterTests.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.microsoft.applicationinsights.agent.bootstrap.diagnostics.log; +package com.microsoft.applicationinsights.agent.internal.diagnostics.log; import static org.assertj.core.api.Assertions.assertThat; diff --git a/agent/agent-bootstrap/src/test/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/status/StatusFileTests.java b/agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/diagnostics/status/StatusFileTests.java similarity index 92% rename from agent/agent-bootstrap/src/test/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/status/StatusFileTests.java rename to agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/diagnostics/status/StatusFileTests.java index 50b936b52ad..db4bcca7410 100644 --- a/agent/agent-bootstrap/src/test/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/status/StatusFileTests.java +++ b/agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/diagnostics/status/StatusFileTests.java @@ -1,16 +1,15 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.microsoft.applicationinsights.agent.bootstrap.diagnostics.status; +package com.microsoft.applicationinsights.agent.internal.diagnostics.status; -import static com.microsoft.applicationinsights.agent.bootstrap.diagnostics.status.StatusFile.initLogDir; import static java.nio.charset.StandardCharsets.UTF_8; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assumptions.assumeTrue; -import com.microsoft.applicationinsights.agent.bootstrap.diagnostics.AgentExtensionVersionFinder; -import com.microsoft.applicationinsights.agent.bootstrap.diagnostics.DiagnosticsHelper; -import com.microsoft.applicationinsights.agent.bootstrap.diagnostics.DiagnosticsTestHelper; +import com.microsoft.applicationinsights.agent.internal.diagnostics.AgentExtensionVersionFinder; +import com.microsoft.applicationinsights.agent.internal.diagnostics.DiagnosticsHelper; +import com.microsoft.applicationinsights.agent.internal.diagnostics.DiagnosticsTestHelper; import com.squareup.moshi.JsonAdapter; import com.squareup.moshi.Moshi; import java.io.File; @@ -58,7 +57,7 @@ void resetStaticVariables() { void defaultDirectoryIsCorrect() { // TODO this test doesn't pass inside of windows + bash because bash sets HOME env assumeTrue(System.getenv(StatusFile.HOME_ENV_VAR) == null); - assertThat(initLogDir()).isEqualTo("./LogFiles/ApplicationInsights"); + assertThat(StatusFile.initLogDir()).isEqualTo("./LogFiles/ApplicationInsights"); } @Test diff --git a/agent/agent/build.gradle.kts b/agent/agent/build.gradle.kts index dfd956bf38e..e97611b7c88 100644 --- a/agent/agent/build.gradle.kts +++ b/agent/agent/build.gradle.kts @@ -104,14 +104,14 @@ tasks { val shadowJarWithDuplicates by registering(ShadowJar::class) { configurations = listOf(bootstrapLibs, upstreamAgent) - // this distro uses logback (and shaded slf4j in the bootstrap class loader - // so that it can be used prior to the agent starting up) - // - // the two exclusions below excludes slf4j and slf4j-simple from the agent class loader - // (which come from the upstream agent) - exclude("inst/io/opentelemetry/javaagent/slf4j/**") + // this distro uses logback, so need to exclude slf4j-simple + exclude("inst/io/opentelemetry/javaagent/slf4j/simple/**") + // unfortunately, this also excludes the same from our distro (which points to logback) + // and so we have to hackily re-add it via agent/agent/src/main/resources exclude("inst/META-INF/services/io.opentelemetry.javaagent.slf4j.spi.SLF4JServiceProvider") + // this excludes the upstream classes, but not the distro classes since the exclusion step + // takes place before the transformation step exclude("io/opentelemetry/javaagent/shaded/instrumentation/api/instrumenter/http/TemporaryMetricsView.class") exclude("io/opentelemetry/javaagent/shaded/instrumentation/api/instrumenter/InstrumenterBuilder.class") diff --git a/agent/agent/src/devtest/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/etw/DiagnosticsLoggerProxy.java b/agent/agent/src/devtest/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/etw/DiagnosticsLoggerProxy.java index 95a2e70adf8..a47539446a4 100644 --- a/agent/agent/src/devtest/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/etw/DiagnosticsLoggerProxy.java +++ b/agent/agent/src/devtest/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/etw/DiagnosticsLoggerProxy.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.microsoft.applicationinsights.agent.bootstrap.diagnostics.etw; +package com.microsoft.applicationinsights.agent.internal.diagnostics.etw; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -10,7 +10,7 @@ // TODO (trask) ETW: is this really needed? if so, need to restore devtest configuration public class DiagnosticsLoggerProxy implements Logger { // Hardcoded to avoid dependency: - // com.microsoft.applicationinsights.agent.bootstrap.diagnostics.DiagnosticsHelper.DIAGNOSTICS_LOGGER_NAME + // com.microsoft.applicationinsights.agent.internal.diagnostics.DiagnosticsHelper.DIAGNOSTICS_LOGGER_NAME private static final Logger LOGGER = LoggerFactory.getLogger("applicationinsights.extension.diagnostics"); diff --git a/agent/agent/src/main/resources/inst/META-INF/services/io.opentelemetry.javaagent.slf4j.spi.SLF4JServiceProvider b/agent/agent/src/main/resources/inst/META-INF/services/io.opentelemetry.javaagent.slf4j.spi.SLF4JServiceProvider new file mode 100644 index 00000000000..2b172053bd7 --- /dev/null +++ b/agent/agent/src/main/resources/inst/META-INF/services/io.opentelemetry.javaagent.slf4j.spi.SLF4JServiceProvider @@ -0,0 +1 @@ +com.microsoft.applicationinsights.agent.shadow.ch.qos.logback.classic.spi.LogbackServiceProvider diff --git a/agent/azure-monitor-exporter/gradle.lockfile b/agent/azure-monitor-exporter/gradle.lockfile index 233cf7abbe7..5dd4d2b1c48 100644 --- a/agent/azure-monitor-exporter/gradle.lockfile +++ b/agent/azure-monitor-exporter/gradle.lockfile @@ -55,6 +55,6 @@ net.minidev:json-smart:2.4.10=runtimeClasspath org.junit:junit-bom:5.9.3=runtimeClasspath org.ow2.asm:asm:9.3=runtimeClasspath org.reactivestreams:reactive-streams:1.0.4=runtimeClasspath -org.slf4j:slf4j-api:1.7.36=runtimeClasspath +org.slf4j:slf4j-api:2.0.7=runtimeClasspath org.testcontainers:testcontainers-bom:1.18.3=runtimeClasspath empty= diff --git a/buildSrc/src/main/kotlin/ai.smoke-test.gradle.kts b/buildSrc/src/main/kotlin/ai.smoke-test.gradle.kts index c8d82d8027c..8dba556def5 100644 --- a/buildSrc/src/main/kotlin/ai.smoke-test.gradle.kts +++ b/buildSrc/src/main/kotlin/ai.smoke-test.gradle.kts @@ -74,6 +74,16 @@ dependencies { old3xAgent("com.microsoft.azure:applicationinsights-agent:3.2.11") } +configurations.all { + // spring boot 2.x requires slf4j 1.x + val slf4jVersion = "1.7.36" + resolutionStrategy.force("org.slf4j:slf4j-api:${slf4jVersion}") + resolutionStrategy.force("org.slf4j:log4j-over-slf4j:${slf4jVersion}") + resolutionStrategy.force("org.slf4j:jcl-over-slf4j:${slf4jVersion}") + resolutionStrategy.force("org.slf4j:jul-to-slf4j:${slf4jVersion}") + resolutionStrategy.force("ch.qos.logback:logback-classic:1.2.12") +} + tasks { task("smokeTest") { useJUnitPlatform() diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index c83f8c85ea0..9642c9cda5f 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -40,12 +40,7 @@ val errorProneVersion = "2.19.1" val byteBuddyVersion = "1.12.18" val jmhVersion = "1.36" val mockitoVersion = "4.11.0" -// moving to 2.0 is problematic because the SPI mechanism in 2.0 doesn't work in the -// bootstrap class loader because, while we add the agent jar to the bootstrap class loader -// via Instrumentation.appendToBootstrapClassLoaderSearch(), there's nothing similar for -// resources (which is a known problem in the java agent world), and so the META-INF/services -// resource is not found -val slf4jVersion = "1.7.36" +val slf4jVersion = "2.0.7" // 1.12.0 and above use okio 2.x which pulls in kotlin libs val moshiVersion = "1.11.0" @@ -76,7 +71,7 @@ val CORE_DEPENDENCIES = listOf( ) val DEPENDENCIES = listOf( - "ch.qos.logback:logback-classic:1.2.12", + "ch.qos.logback:logback-classic:1.3.8", // logback 1.4+ requires Java 11+ "ch.qos.logback.contrib:logback-json-classic:0.1.5", "com.uber.nullaway:nullaway:0.10.11", "commons-codec:commons-codec:1.16.0", diff --git a/etw/etw-testapp/src/main/java/com/microsoft/applicationinsights/etw_testapp/EtwTestController.java b/etw/etw-testapp/src/main/java/com/microsoft/applicationinsights/etw_testapp/EtwTestController.java index 5bca965e728..81d7a0c263c 100644 --- a/etw/etw-testapp/src/main/java/com/microsoft/applicationinsights/etw_testapp/EtwTestController.java +++ b/etw/etw-testapp/src/main/java/com/microsoft/applicationinsights/etw_testapp/EtwTestController.java @@ -8,7 +8,7 @@ import java.util.concurrent.atomic.AtomicInteger; -import com.microsoft.applicationinsights.agent.bootstrap.diagnostics.etw.DiagnosticsLoggerProxy; +import com.microsoft.applicationinsights.agent.internal.diagnostics.etw.DiagnosticsLoggerProxy; @RestController public class EtwTestController { diff --git a/etw/etw-testapp/src/main/java/com/microsoft/applicationinsights/etw_testapp/LongTestController.java b/etw/etw-testapp/src/main/java/com/microsoft/applicationinsights/etw_testapp/LongTestController.java index 459d3f70b2e..3bcd3fd5e45 100644 --- a/etw/etw-testapp/src/main/java/com/microsoft/applicationinsights/etw_testapp/LongTestController.java +++ b/etw/etw-testapp/src/main/java/com/microsoft/applicationinsights/etw_testapp/LongTestController.java @@ -12,7 +12,7 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.function.BinaryOperator; -import com.microsoft.applicationinsights.agent.bootstrap.diagnostics.etw.DiagnosticsLoggerProxy; +import com.microsoft.applicationinsights.agent.internal.diagnostics.etw.DiagnosticsLoggerProxy; import org.apache.commons.lang3.RandomUtils; import org.apache.commons.lang3.exception.ExceptionUtils; diff --git a/etw/java/gradle.lockfile b/etw/java/gradle.lockfile index 6f20abb555b..e303b278bde 100644 --- a/etw/java/gradle.lockfile +++ b/etw/java/gradle.lockfile @@ -10,6 +10,6 @@ io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.27.0=runtim io.opentelemetry:opentelemetry-bom-alpha:1.27.0-alpha=runtimeClasspath io.opentelemetry:opentelemetry-bom:1.27.0=runtimeClasspath org.junit:junit-bom:5.9.3=runtimeClasspath -org.slf4j:slf4j-api:1.7.36=runtimeClasspath +org.slf4j:slf4j-api:2.0.7=runtimeClasspath org.testcontainers:testcontainers-bom:1.18.3=runtimeClasspath empty= diff --git a/etw/java/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/etw/events/IpaCritical.java b/etw/java/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/etw/events/IpaCritical.java deleted file mode 100644 index b2978528a82..00000000000 --- a/etw/java/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/etw/events/IpaCritical.java +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -package com.microsoft.applicationinsights.agent.bootstrap.diagnostics.etw.events; - -import com.microsoft.applicationinsights.agent.bootstrap.diagnostics.etw.events.model.IpaEtwEventBase; -import com.microsoft.applicationinsights.agent.bootstrap.diagnostics.etw.events.model.IpaEtwEventErrorBase; -import com.microsoft.applicationinsights.agent.bootstrap.diagnostics.etw.events.model.IpaEtwEventId; - -/** JavaIpaCritical. */ -public class IpaCritical extends IpaEtwEventErrorBase { - - public IpaCritical() { - super(); - } - - public IpaCritical(IpaEtwEventBase event) { - super(event); - } - - @Override - public IpaEtwEventId id() { - return IpaEtwEventId.CRITICAL; - } -} diff --git a/etw/java/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/etw/events/IpaError.java b/etw/java/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/etw/events/IpaError.java deleted file mode 100644 index 85c7d69138d..00000000000 --- a/etw/java/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/etw/events/IpaError.java +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -package com.microsoft.applicationinsights.agent.bootstrap.diagnostics.etw.events; - -import com.microsoft.applicationinsights.agent.bootstrap.diagnostics.etw.events.model.IpaEtwEventBase; -import com.microsoft.applicationinsights.agent.bootstrap.diagnostics.etw.events.model.IpaEtwEventErrorBase; -import com.microsoft.applicationinsights.agent.bootstrap.diagnostics.etw.events.model.IpaEtwEventId; - -public class IpaError extends IpaEtwEventErrorBase { - - public IpaError() { - super(); - } - - public IpaError(IpaEtwEventBase event) { - super(event); - } - - @Override - public IpaEtwEventId id() { - return IpaEtwEventId.ERROR; - } -} diff --git a/etw/java/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/etw/events/IpaWarn.java b/etw/java/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/etw/events/IpaWarn.java deleted file mode 100644 index 771010015f2..00000000000 --- a/etw/java/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/etw/events/IpaWarn.java +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -package com.microsoft.applicationinsights.agent.bootstrap.diagnostics.etw.events; - -import com.microsoft.applicationinsights.agent.bootstrap.diagnostics.etw.events.model.IpaEtwEventBase; -import com.microsoft.applicationinsights.agent.bootstrap.diagnostics.etw.events.model.IpaEtwEventErrorBase; -import com.microsoft.applicationinsights.agent.bootstrap.diagnostics.etw.events.model.IpaEtwEventId; - -public class IpaWarn extends IpaEtwEventErrorBase { - - public IpaWarn() { - super(); - } - - public IpaWarn(IpaEtwEventBase event) { - super(event); - } - - @Override - public IpaEtwEventId id() { - return IpaEtwEventId.WARN; - } -} diff --git a/etw/java/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/etw/ApplicationInsightsEtwException.java b/etw/java/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/etw/ApplicationInsightsEtwException.java similarity index 86% rename from etw/java/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/etw/ApplicationInsightsEtwException.java rename to etw/java/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/etw/ApplicationInsightsEtwException.java index 5a0310ed81f..a290f8e3f39 100644 --- a/etw/java/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/etw/ApplicationInsightsEtwException.java +++ b/etw/java/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/etw/ApplicationInsightsEtwException.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.microsoft.applicationinsights.agent.bootstrap.diagnostics.etw; +package com.microsoft.applicationinsights.agent.internal.diagnostics.etw; public class ApplicationInsightsEtwException extends Exception { private static final long serialVersionUID = 6108441736100165651L; diff --git a/etw/java/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/etw/DllFileUtils.java b/etw/java/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/etw/DllFileUtils.java similarity index 98% rename from etw/java/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/etw/DllFileUtils.java rename to etw/java/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/etw/DllFileUtils.java index 620e825bbdf..fb077d98422 100644 --- a/etw/java/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/etw/DllFileUtils.java +++ b/etw/java/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/etw/DllFileUtils.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.microsoft.applicationinsights.agent.bootstrap.diagnostics.etw; +package com.microsoft.applicationinsights.agent.internal.diagnostics.etw; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.File; diff --git a/etw/java/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/etw/events/IpaCritical.java b/etw/java/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/etw/events/IpaCritical.java new file mode 100644 index 00000000000..5a342a29bf6 --- /dev/null +++ b/etw/java/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/etw/events/IpaCritical.java @@ -0,0 +1,25 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +package com.microsoft.applicationinsights.agent.internal.diagnostics.etw.events; + +import com.microsoft.applicationinsights.agent.internal.diagnostics.etw.events.model.IpaEtwEventBase; +import com.microsoft.applicationinsights.agent.internal.diagnostics.etw.events.model.IpaEtwEventErrorBase; +import com.microsoft.applicationinsights.agent.internal.diagnostics.etw.events.model.IpaEtwEventId; + +/** JavaIpaCritical. */ +public class IpaCritical extends IpaEtwEventErrorBase { + + public IpaCritical() { + super(); + } + + public IpaCritical(IpaEtwEventBase event) { + super(event); + } + + @Override + public IpaEtwEventId id() { + return IpaEtwEventId.CRITICAL; + } +} diff --git a/etw/java/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/etw/events/IpaError.java b/etw/java/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/etw/events/IpaError.java new file mode 100644 index 00000000000..5b774cbac9a --- /dev/null +++ b/etw/java/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/etw/events/IpaError.java @@ -0,0 +1,24 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +package com.microsoft.applicationinsights.agent.internal.diagnostics.etw.events; + +import com.microsoft.applicationinsights.agent.internal.diagnostics.etw.events.model.IpaEtwEventBase; +import com.microsoft.applicationinsights.agent.internal.diagnostics.etw.events.model.IpaEtwEventErrorBase; +import com.microsoft.applicationinsights.agent.internal.diagnostics.etw.events.model.IpaEtwEventId; + +public class IpaError extends IpaEtwEventErrorBase { + + public IpaError() { + super(); + } + + public IpaError(IpaEtwEventBase event) { + super(event); + } + + @Override + public IpaEtwEventId id() { + return IpaEtwEventId.ERROR; + } +} diff --git a/etw/java/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/etw/events/IpaInfo.java b/etw/java/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/etw/events/IpaInfo.java similarity index 53% rename from etw/java/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/etw/events/IpaInfo.java rename to etw/java/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/etw/events/IpaInfo.java index 8ac3e67faa4..171827c4b66 100644 --- a/etw/java/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/etw/events/IpaInfo.java +++ b/etw/java/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/etw/events/IpaInfo.java @@ -1,10 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.microsoft.applicationinsights.agent.bootstrap.diagnostics.etw.events; +package com.microsoft.applicationinsights.agent.internal.diagnostics.etw.events; -import com.microsoft.applicationinsights.agent.bootstrap.diagnostics.etw.events.model.IpaEtwEventBase; -import com.microsoft.applicationinsights.agent.bootstrap.diagnostics.etw.events.model.IpaEtwEventId; +import com.microsoft.applicationinsights.agent.internal.diagnostics.etw.events.model.IpaEtwEventBase; +import com.microsoft.applicationinsights.agent.internal.diagnostics.etw.events.model.IpaEtwEventId; public class IpaInfo extends IpaEtwEventBase { diff --git a/etw/java/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/etw/events/IpaVerbose.java b/etw/java/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/etw/events/IpaVerbose.java similarity index 54% rename from etw/java/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/etw/events/IpaVerbose.java rename to etw/java/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/etw/events/IpaVerbose.java index e76b883bba5..67c5a3493df 100644 --- a/etw/java/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/etw/events/IpaVerbose.java +++ b/etw/java/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/etw/events/IpaVerbose.java @@ -1,10 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.microsoft.applicationinsights.agent.bootstrap.diagnostics.etw.events; +package com.microsoft.applicationinsights.agent.internal.diagnostics.etw.events; -import com.microsoft.applicationinsights.agent.bootstrap.diagnostics.etw.events.model.IpaEtwEventBase; -import com.microsoft.applicationinsights.agent.bootstrap.diagnostics.etw.events.model.IpaEtwEventId; +import com.microsoft.applicationinsights.agent.internal.diagnostics.etw.events.model.IpaEtwEventBase; +import com.microsoft.applicationinsights.agent.internal.diagnostics.etw.events.model.IpaEtwEventId; public class IpaVerbose extends IpaEtwEventBase { diff --git a/etw/java/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/etw/events/IpaWarn.java b/etw/java/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/etw/events/IpaWarn.java new file mode 100644 index 00000000000..b7daccf70be --- /dev/null +++ b/etw/java/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/etw/events/IpaWarn.java @@ -0,0 +1,24 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +package com.microsoft.applicationinsights.agent.internal.diagnostics.etw.events; + +import com.microsoft.applicationinsights.agent.internal.diagnostics.etw.events.model.IpaEtwEventBase; +import com.microsoft.applicationinsights.agent.internal.diagnostics.etw.events.model.IpaEtwEventErrorBase; +import com.microsoft.applicationinsights.agent.internal.diagnostics.etw.events.model.IpaEtwEventId; + +public class IpaWarn extends IpaEtwEventErrorBase { + + public IpaWarn() { + super(); + } + + public IpaWarn(IpaEtwEventBase event) { + super(event); + } + + @Override + public IpaEtwEventId id() { + return IpaEtwEventId.WARN; + } +} diff --git a/etw/java/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/etw/events/model/IpaEtwEvent.java b/etw/java/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/etw/events/model/IpaEtwEvent.java similarity index 63% rename from etw/java/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/etw/events/model/IpaEtwEvent.java rename to etw/java/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/etw/events/model/IpaEtwEvent.java index 51aa23d9688..4ab9ccb4e31 100644 --- a/etw/java/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/etw/events/model/IpaEtwEvent.java +++ b/etw/java/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/etw/events/model/IpaEtwEvent.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.microsoft.applicationinsights.agent.bootstrap.diagnostics.etw.events.model; +package com.microsoft.applicationinsights.agent.internal.diagnostics.etw.events.model; public interface IpaEtwEvent { IpaEtwEventId id(); diff --git a/etw/java/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/etw/events/model/IpaEtwEventBase.java b/etw/java/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/etw/events/model/IpaEtwEventBase.java similarity index 97% rename from etw/java/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/etw/events/model/IpaEtwEventBase.java rename to etw/java/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/etw/events/model/IpaEtwEventBase.java index 413cfecdbe7..5948e918f38 100644 --- a/etw/java/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/etw/events/model/IpaEtwEventBase.java +++ b/etw/java/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/etw/events/model/IpaEtwEventBase.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.microsoft.applicationinsights.agent.bootstrap.diagnostics.etw.events.model; +package com.microsoft.applicationinsights.agent.internal.diagnostics.etw.events.model; public abstract class IpaEtwEventBase implements IpaEtwEvent { private String extensionVersion; diff --git a/etw/java/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/etw/events/model/IpaEtwEventErrorBase.java b/etw/java/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/etw/events/model/IpaEtwEventErrorBase.java similarity index 89% rename from etw/java/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/etw/events/model/IpaEtwEventErrorBase.java rename to etw/java/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/etw/events/model/IpaEtwEventErrorBase.java index 428502bf1ff..8f0764a6da6 100644 --- a/etw/java/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/etw/events/model/IpaEtwEventErrorBase.java +++ b/etw/java/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/etw/events/model/IpaEtwEventErrorBase.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.microsoft.applicationinsights.agent.bootstrap.diagnostics.etw.events.model; +package com.microsoft.applicationinsights.agent.internal.diagnostics.etw.events.model; public abstract class IpaEtwEventErrorBase extends IpaEtwEventBase { private String stacktrace; diff --git a/etw/java/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/etw/events/model/IpaEtwEventId.java b/etw/java/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/etw/events/model/IpaEtwEventId.java similarity index 79% rename from etw/java/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/etw/events/model/IpaEtwEventId.java rename to etw/java/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/etw/events/model/IpaEtwEventId.java index 2b85a6b6bda..4372d85ec08 100644 --- a/etw/java/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/etw/events/model/IpaEtwEventId.java +++ b/etw/java/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/etw/events/model/IpaEtwEventId.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.microsoft.applicationinsights.agent.bootstrap.diagnostics.etw.events.model; +package com.microsoft.applicationinsights.agent.internal.diagnostics.etw.events.model; public enum IpaEtwEventId { CRITICAL(1), diff --git a/etw/java/src/main/jni/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/etw/EtwProvider.java b/etw/java/src/main/jni/com/microsoft/applicationinsights/agent/internal/diagnostics/etw/EtwProvider.java similarity index 92% rename from etw/java/src/main/jni/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/etw/EtwProvider.java rename to etw/java/src/main/jni/com/microsoft/applicationinsights/agent/internal/diagnostics/etw/EtwProvider.java index 9bb420f9814..bb69f2e015f 100644 --- a/etw/java/src/main/jni/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/etw/EtwProvider.java +++ b/etw/java/src/main/jni/com/microsoft/applicationinsights/agent/internal/diagnostics/etw/EtwProvider.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.microsoft.applicationinsights.agent.bootstrap.diagnostics.etw; +package com.microsoft.applicationinsights.agent.internal.diagnostics.etw; -import com.microsoft.applicationinsights.agent.bootstrap.diagnostics.etw.events.model.IpaEtwEventBase; +import com.microsoft.applicationinsights.agent.internal.diagnostics.etw.events.model.IpaEtwEventBase; import java.io.File; import java.io.IOException; import org.slf4j.Logger; diff --git a/etw/java/src/test/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/etw/EtwProviderTests.java b/etw/java/src/test/java/com/microsoft/applicationinsights/agent/internal/diagnostics/etw/EtwProviderTests.java similarity index 93% rename from etw/java/src/test/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/etw/EtwProviderTests.java rename to etw/java/src/test/java/com/microsoft/applicationinsights/agent/internal/diagnostics/etw/EtwProviderTests.java index 643657cf65e..deafe124f1c 100644 --- a/etw/java/src/test/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/etw/EtwProviderTests.java +++ b/etw/java/src/test/java/com/microsoft/applicationinsights/agent/internal/diagnostics/etw/EtwProviderTests.java @@ -1,19 +1,19 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.microsoft.applicationinsights.agent.bootstrap.diagnostics.etw; +package com.microsoft.applicationinsights.agent.internal.diagnostics.etw; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assumptions.assumeFalse; import static org.junit.jupiter.api.Assumptions.assumeTrue; -import com.microsoft.applicationinsights.agent.bootstrap.diagnostics.etw.events.IpaCritical; -import com.microsoft.applicationinsights.agent.bootstrap.diagnostics.etw.events.IpaError; -import com.microsoft.applicationinsights.agent.bootstrap.diagnostics.etw.events.IpaInfo; -import com.microsoft.applicationinsights.agent.bootstrap.diagnostics.etw.events.IpaVerbose; -import com.microsoft.applicationinsights.agent.bootstrap.diagnostics.etw.events.IpaWarn; -import com.microsoft.applicationinsights.agent.bootstrap.diagnostics.etw.events.model.IpaEtwEventBase; -import com.microsoft.applicationinsights.agent.bootstrap.diagnostics.etw.events.model.IpaEtwEventErrorBase; +import com.microsoft.applicationinsights.agent.internal.diagnostics.etw.events.IpaCritical; +import com.microsoft.applicationinsights.agent.internal.diagnostics.etw.events.IpaError; +import com.microsoft.applicationinsights.agent.internal.diagnostics.etw.events.IpaInfo; +import com.microsoft.applicationinsights.agent.internal.diagnostics.etw.events.IpaVerbose; +import com.microsoft.applicationinsights.agent.internal.diagnostics.etw.events.IpaWarn; +import com.microsoft.applicationinsights.agent.internal.diagnostics.etw.events.model.IpaEtwEventBase; +import com.microsoft.applicationinsights.agent.internal.diagnostics.etw.events.model.IpaEtwEventErrorBase; import java.io.File; import java.util.UUID; import javax.annotation.Nullable; diff --git a/licenses/jcl-over-slf4j-2.0.7.jar/META-INF/LICENSE.txt b/licenses/jcl-over-slf4j-2.0.7.jar/META-INF/LICENSE.txt new file mode 100644 index 00000000000..2bb9ad240fa --- /dev/null +++ b/licenses/jcl-over-slf4j-2.0.7.jar/META-INF/LICENSE.txt @@ -0,0 +1,176 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS \ No newline at end of file diff --git a/licenses/more-licenses.md b/licenses/more-licenses.md index 8f1ca00a97b..ea22cec55ab 100644 --- a/licenses/more-licenses.md +++ b/licenses/more-licenses.md @@ -1,7 +1,7 @@ # agent ## Dependency License Report -_2023-07-12 03:10:07 UTC_ +_2023-07-12 11:27:59 PDT_ ## Apache License, Version 2.0 **1** **Group:** `com.fasterxml.jackson.core` **Name:** `jackson-annotations` **Version:** `2.15.2` @@ -64,14 +64,14 @@ _2023-07-12 03:10:07 UTC_ **11** **Group:** `com.squareup.moshi` **Name:** `moshi` **Version:** `1.11.0` > - **POM Project URL**: [https://github.com/square/moshi/](https://github.com/square/moshi/) -> - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) +> - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0) **12** **Group:** `com.squareup.moshi` **Name:** `moshi-adapters` **Version:** `1.11.0` > - **POM Project URL**: [https://github.com/square/moshi/](https://github.com/square/moshi/) > - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0) **13** **Group:** `com.squareup.okio` **Name:** `okio` **Version:** `1.17.5` -> - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) +> - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0) **14** **Group:** `commons-codec` **Name:** `commons-codec` **Version:** `1.16.0` > - **Project URL**: [https://commons.apache.org/proper/commons-codec/](https://commons.apache.org/proper/commons-codec/) @@ -234,20 +234,22 @@ _2023-07-12 03:10:07 UTC_ > - **Embedded license files**: [commons-text-1.10.0.jar/META-INF/LICENSE.txt](commons-text-1.10.0.jar/META-INF/LICENSE.txt) - [commons-text-1.10.0.jar/META-INF/NOTICE.txt](commons-text-1.10.0.jar/META-INF/NOTICE.txt) -**45** **Group:** `org.slf4j` **Name:** `jcl-over-slf4j` **Version:** `1.7.36` -> - **POM Project URL**: [http://www.slf4j.org](http://www.slf4j.org) +**45** **Group:** `org.slf4j` **Name:** `jcl-over-slf4j` **Version:** `2.0.7` +> - **Project URL**: [http://www.slf4j.org](http://www.slf4j.org) +> - **Manifest License**: Apache License, Version 2.0 (Not Packaged) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) > - **POM License**: MIT License - [https://opensource.org/licenses/MIT](https://opensource.org/licenses/MIT) +> - **Embedded license files**: [jcl-over-slf4j-2.0.7.jar/META-INF/LICENSE.txt](jcl-over-slf4j-2.0.7.jar/META-INF/LICENSE.txt) ## Eclipse Public License - v 1.0 -**46** **Group:** `ch.qos.logback` **Name:** `logback-classic` **Version:** `1.2.12` +**46** **Group:** `ch.qos.logback` **Name:** `logback-classic` **Version:** `1.3.8` > - **Manifest Project URL**: [http://www.qos.ch](http://www.qos.ch) > - **Manifest License**: GNU LESSER GENERAL PUBLIC LICENSE, Version 2.1 (Not Packaged) > - **POM License**: Eclipse Public License - v 1.0 - [http://www.eclipse.org/legal/epl-v10.html](http://www.eclipse.org/legal/epl-v10.html) > - **POM License**: GNU LESSER GENERAL PUBLIC LICENSE, Version 2.1 - [https://www.gnu.org/licenses/lgpl-2.1](https://www.gnu.org/licenses/lgpl-2.1) -**47** **Group:** `ch.qos.logback` **Name:** `logback-core` **Version:** `1.2.12` +**47** **Group:** `ch.qos.logback` **Name:** `logback-core` **Version:** `1.3.8` > - **Manifest Project URL**: [http://www.qos.ch](http://www.qos.ch) > - **Manifest License**: GNU LESSER GENERAL PUBLIC LICENSE, Version 2.1 (Not Packaged) > - **POM License**: Eclipse Public License - v 1.0 - [http://www.eclipse.org/legal/epl-v10.html](http://www.eclipse.org/legal/epl-v10.html) @@ -265,13 +267,13 @@ _2023-07-12 03:10:07 UTC_ ## GNU LESSER GENERAL PUBLIC LICENSE, Version 2.1 -**50** **Group:** `ch.qos.logback` **Name:** `logback-classic` **Version:** `1.2.12` +**50** **Group:** `ch.qos.logback` **Name:** `logback-classic` **Version:** `1.3.8` > - **Manifest Project URL**: [http://www.qos.ch](http://www.qos.ch) > - **Manifest License**: GNU LESSER GENERAL PUBLIC LICENSE, Version 2.1 (Not Packaged) > - **POM License**: Eclipse Public License - v 1.0 - [http://www.eclipse.org/legal/epl-v10.html](http://www.eclipse.org/legal/epl-v10.html) > - **POM License**: GNU LESSER GENERAL PUBLIC LICENSE, Version 2.1 - [https://www.gnu.org/licenses/lgpl-2.1](https://www.gnu.org/licenses/lgpl-2.1) -**51** **Group:** `ch.qos.logback` **Name:** `logback-core` **Version:** `1.2.12` +**51** **Group:** `ch.qos.logback` **Name:** `logback-core` **Version:** `1.3.8` > - **Manifest Project URL**: [http://www.qos.ch](http://www.qos.ch) > - **Manifest License**: GNU LESSER GENERAL PUBLIC LICENSE, Version 2.1 (Not Packaged) > - **POM License**: Eclipse Public License - v 1.0 - [http://www.eclipse.org/legal/epl-v10.html](http://www.eclipse.org/legal/epl-v10.html) @@ -347,14 +349,17 @@ _2023-07-12 03:10:07 UTC_ > - **POM Project URL**: [https://github.com/Microsoft/jfr-streaming](https://github.com/Microsoft/jfr-streaming) > - **POM License**: MIT License - [https://opensource.org/licenses/MIT](https://opensource.org/licenses/MIT) -**67** **Group:** `org.slf4j` **Name:** `jcl-over-slf4j` **Version:** `1.7.36` -> - **POM Project URL**: [http://www.slf4j.org](http://www.slf4j.org) +**67** **Group:** `org.slf4j` **Name:** `jcl-over-slf4j` **Version:** `2.0.7` +> - **Project URL**: [http://www.slf4j.org](http://www.slf4j.org) +> - **Manifest License**: Apache License, Version 2.0 (Not Packaged) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) > - **POM License**: MIT License - [https://opensource.org/licenses/MIT](https://opensource.org/licenses/MIT) +> - **Embedded license files**: [jcl-over-slf4j-2.0.7.jar/META-INF/LICENSE.txt](jcl-over-slf4j-2.0.7.jar/META-INF/LICENSE.txt) -**68** **Group:** `org.slf4j` **Name:** `slf4j-api` **Version:** `1.7.36` -> - **POM Project URL**: [http://www.slf4j.org](http://www.slf4j.org) +**68** **Group:** `org.slf4j` **Name:** `slf4j-api` **Version:** `2.0.7` +> - **Project URL**: [http://www.slf4j.org](http://www.slf4j.org) > - **POM License**: MIT License - [https://opensource.org/licenses/MIT](https://opensource.org/licenses/MIT) +> - **Embedded license files**: [slf4j-api-2.0.7.jar/META-INF/LICENSE.txt](slf4j-api-2.0.7.jar/META-INF/LICENSE.txt) ## MIT-0 diff --git a/licenses/slf4j-api-2.0.7.jar/META-INF/LICENSE.txt b/licenses/slf4j-api-2.0.7.jar/META-INF/LICENSE.txt new file mode 100644 index 00000000000..e4079f54f6c --- /dev/null +++ b/licenses/slf4j-api-2.0.7.jar/META-INF/LICENSE.txt @@ -0,0 +1,24 @@ +Copyright (c) 2004-2023 QOS.ch +All rights reserved. + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + +