Skip to content

Commit

Permalink
Update to otel 0.17.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@trask
trask committed Feb 21, 2021
1 parent bc5ca29 commit 628c3bd
Show file tree
Hide file tree
Showing 56 changed files with 585 additions and 741 deletions.
6 changes: 3 additions & 3 deletions agent/agent-bootstrap/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ task generateVersionProperties(type: PropsFileGen) {
processResources.dependsOn generateVersionProperties

dependencies {
compile (group: 'io.opentelemetry.javaagent', name: 'opentelemetry-javaagent-bootstrap', version: '0.16.0+ai.patch.1') {
compile (group: 'io.opentelemetry.javaagent', name: 'opentelemetry-javaagent-bootstrap', version: '0.17.0+ai.patch.1-alpha') {
exclude group: 'org.slf4j', module: 'slf4j-simple'
}
compile group: 'io.opentelemetry.instrumentation', name: 'opentelemetry-instrumentation-api', version: '0.16.0+ai.patch.1'
compile group: 'io.opentelemetry.javaagent', name: 'opentelemetry-javaagent-api', version: '0.16.0+ai.patch.1'
compile group: 'io.opentelemetry.instrumentation', name: 'opentelemetry-instrumentation-api', version: '0.17.0+ai.patch.1-alpha'
compile group: 'io.opentelemetry.javaagent', name: 'opentelemetry-javaagent-api', version: '0.17.0+ai.patch.1-alpha'
compile 'ch.qos.logback:logback-classic:1.2.3'
compile 'ch.qos.logback.contrib:logback-json-classic:0.1.5'

Expand Down
45 changes: 3 additions & 42 deletions agent/agent-bootstrap/spotbugs.exclude.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,53 +11,14 @@
</Match>
<Match>
<Bug pattern="PATH_TRAVERSAL_IN" />
<Or>
<And>
<!-- False Positive. Path is not from an external source. -->
<Class name="com.microsoft.applicationinsights.agent.bootstrap.diagnostics.status.StatusFile$2" />
<Method name="run" />
</And>
<And>
<!-- False Positive. Path is not from an external source. -->
<Class name="com.microsoft.applicationinsights.agent.bootstrap.MainEntryPoint" />
<Method name="start"/>
</And>
<And>
<!-- False Positive. Path is not from an external source. -->
<Class name="com.microsoft.applicationinsights.agent.bootstrap.MainEntryPoint" />
<Method name="logErrorMessage"/>
</And>
</Or>
</Match>
<Match>
<Bug pattern="UUF_UNUSED_PUBLIC_OR_PROTECTED_FIELD" />
<!-- used from agent-tooling -->
<Class name="~com\.microsoft\.applicationinsights\.agent\.bootstrap\.configuration\..*" />
</Match>
<Match>
<Bug pattern="URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD" />
<!-- used from agent-tooling -->
<Class name="~com\.microsoft\.applicationinsights\.agent\.bootstrap\.configuration\..*" />
</Match>
<Match>
<Bug pattern="UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD" />
<!-- used from agent-tooling -->
<Class name="~com\.microsoft\.applicationinsights\.agent\.bootstrap\.configuration\..*" />
<!-- False Positive. Path is not from an external source. -->
<Class name="com.microsoft.applicationinsights.agent.bootstrap.diagnostics.status.StatusFile$2" />
<Method name="run" />
</Match>
<Match>
<!-- The exception in question comes from Class.forName. It may throw with different versions of java. -->
<Bug pattern="REC_CATCH_EXCEPTION" />
<Class name="com.microsoft.applicationinsights.agent.bootstrap.diagnostics.PidFinder" />
<Method name="getPidUsingProcessHandle" />
</Match>
<Match>
<Bug pattern="CRLF_INJECTION_LOGS" />
<Class name="com.microsoft.applicationinsights.agent.bootstrap.MainEntryPoint" />
<Method name="logErrorMessage" />
</Match>
<Match>
<Bug pattern="CRLF_INJECTION_LOGS" />
<Class name="com.microsoft.applicationinsights.agent.bootstrap.MainEntryPoint" />
<Method name="start" />
</Match>
</FindBugsFilter>
40 changes: 0 additions & 40 deletions ...com/microsoft/applicationinsights/agent/bootstrap/customExceptions/FriendlyException.java
View file

This file was deleted.

8 changes: 0 additions & 8 deletions .../agent-bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/ConfigureLogging.java
View file

This file was deleted.

22 changes: 11 additions & 11 deletions agent/agent-bootstrap/src/main/resources/rp-logger-config/etw.appender.xml
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<included>
<!-- internal troubleshooting/diagnostics logs -->
<appender name="ETW_PROVIDER" class="com.microsoft.applicationinsights.agent.bootstrap.diagnostics.etw.EtwAppender">
<!-- accepts logs only from applicationinsights.extension.diagnostics or errors -->
<filter class="com.microsoft.applicationinsights.agent.bootstrap.diagnostics.log.ApplicationInsightsDiagnosticsLogFilter"/>
</appender>

<root>
<appender-ref ref="ETW_PROVIDER" /><!-- optional; windows only, platform dependent -->
</root>
<?xml version="1.0" encoding="UTF-8"?>
<included>
<!-- internal troubleshooting/diagnostics logs -->
<appender name="ETW_PROVIDER" class="com.microsoft.applicationinsights.agent.bootstrap.diagnostics.etw.EtwAppender">
<!-- accepts logs only from applicationinsights.extension.diagnostics or errors -->
<filter class="com.microsoft.applicationinsights.agent.bootstrap.diagnostics.log.ApplicationInsightsDiagnosticsLogFilter"/>
</appender>

<root>
<appender-ref ref="ETW_PROVIDER" /><!-- optional; windows only, platform dependent -->
</root>
</included>
59 changes: 0 additions & 59 deletions agent/agent-bootstrap/src/test/resources/applicationinsights.json
View file

This file was deleted.

8 changes: 4 additions & 4 deletions agent/agent-tooling/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ dependencies {

compile 'com.google.guava:guava:27.1-android'

compile ('io.opentelemetry.javaagent:opentelemetry-javaagent-tooling:0.16.0+ai.patch.1') {
compile ('io.opentelemetry.javaagent:opentelemetry-javaagent-tooling:0.17.0+ai.patch.1-alpha') {
exclude group: 'io.opentelemetry', module: 'opentelemetry-exporter-jaeger'
exclude group: 'io.opentelemetry', module: 'opentelemetry-exporter-logging'
exclude group: 'io.opentelemetry', module: 'opentelemetry-exporter-otlp'
Expand All @@ -46,7 +46,7 @@ dependencies {
exclude group: 'io.opentelemetry', module: 'opentelemetry-exporter-zipkin'
exclude group: 'io.grpc', module: 'grpc-netty'
}
compile 'io.opentelemetry.javaagent:opentelemetry-javaagent-spi:0.16.0+ai.patch.1'
compile 'io.opentelemetry.javaagent:opentelemetry-javaagent-spi:0.17.0+ai.patch.1-alpha'
// TODO sync bytebuddy version with version from auto-tooling (above)
compile group: 'net.bytebuddy', name: 'byte-buddy', version: '1.10.10'

Expand All @@ -64,8 +64,8 @@ dependencies {
compile 'org.slf4j:jcl-over-slf4j:1.7.30'

compile(project(':agent:exporter'))
compile 'io.opentelemetry:opentelemetry-sdk-extension-tracing-incubator:0.16.0-alpha'
compile 'io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:0.16.0-alpha'
compile 'io.opentelemetry:opentelemetry-sdk-extension-tracing-incubator:0.17.0-alpha'
compile 'io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:0.17.0-alpha'

compileOnly(project(':agent:agent-bootstrap'))
testCompile(project(':agent:agent-bootstrap'))
Expand Down
46 changes: 45 additions & 1 deletion agent/agent-tooling/spotbugs.exclude.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,5 +57,49 @@
<Class name="com.microsoft.applicationinsights.agent.internal.processors.AttributeProcessor" />
<Method name="procesHashAction" />
</Match>

<Match>
<Bug pattern="PATH_TRAVERSAL_IN" />
<Or>
<And>
<!-- False Positive. Path is not from an external source. -->
<Class name="com.microsoft.applicationinsights.agent.internal.wasbootstrap.MainEntryPoint" />
<Method name="start"/>
</And>
<And>
<!-- False Positive. Path is not from an external source. -->
<Class name="com.microsoft.applicationinsights.agent.internal.wasbootstrap.MainEntryPoint" />
<Method name="logErrorMessage"/>
</And>
</Or>
</Match>
<Match>
<Bug pattern="UUF_UNUSED_PUBLIC_OR_PROTECTED_FIELD" />
<!-- used from agent-tooling -->
<Class name="~com\.microsoft\.applicationinsights\.agent\.internal\.wasbootstrap\.configuration\..*" />
</Match>
<Match>
<Bug pattern="URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD" />
<!-- used from agent-tooling -->
<Class name="~com\.microsoft\.applicationinsights\.agent\.internal\.wasbootstrap\.configuration\..*" />
</Match>
<Match>
<Bug pattern="UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD" />
<!-- used from agent-tooling -->
<Class name="~com\.microsoft\.applicationinsights\.agent\.internal\.wasbootstrap\.configuration\..*" />
</Match>
<Match>
<Bug pattern="CRLF_INJECTION_LOGS" />
<Class name="com.microsoft.applicationinsights.agent.internal.wasbootstrap.MainEntryPoint" />
<Method name="logErrorMessage" />
</Match>
<Match>
<Bug pattern="CRLF_INJECTION_LOGS" />
<Class name="com.microsoft.applicationinsights.agent.internal.wasbootstrap.MainEntryPoint" />
<Method name="start" />
</Match>
<Match>
<Bug pattern="NP_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD" />
<Class name="com.microsoft.applicationinsights.agent.internal.processors.SpanProcessor" />
<Method name="create" />
</Match>
</FindBugsFilter>
Loading

0 comments on commit 628c3bd

Please sign in to comment.