Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to latest instrumentation #1132

Merged
merged 1 commit into from
Nov 2, 2019
Merged

Update to latest instrumentation #1132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion NOTICE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ Microsoft Application Insights Java Software Development Kit consists of materia
21. Guava dependency: Google ErrorProne annotations 2.2.0 (https://github.com/google/error-prone/tree/master/annotations)
22. Guava dependency: Google J2ObjC annotations 1.1 (https://github.com/google/j2objc/tree/master/annotations)
23. Guava dependency: Animal Sniffer annotations 1.17 (https://github.com/mojohaus/animal-sniffer/tree/master/animal-sniffer-annotations)
24. Glowroot Instrumentation 0.14.5 (https://github.com/glowroot/instrumentation)
24. Glowroot Instrumentation 0.14.8 (https://github.com/glowroot/instrumentation)
25. CheckerFramework annotations for Java 6 1.0.0 (https://github.com/trask/checker-framework-annotations-for-jdk6)
26. Gson 2.8.5 (https://github.com/google/gson)
27. os-maven-plugin 1.6.2 (https://github.com/trustin/os-maven-plugin)
Expand Down
2 changes: 1 addition & 1 deletion agent/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ plugins {
apply from: "$buildScriptsDir/common-java.gradle"
apply from: "$buildScriptsDir/publishing.gradle"

def instrumentationVersion = '0.14.6'
def instrumentationVersion = '0.14.8'

def shadowPrefix = 'com.microsoft.applicationinsights.agent.shadow'

Expand Down
5 changes: 2 additions & 3 deletions agent/src/main/java/com/microsoft/applicationinsights/agent/internal/AIAgentXmlLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
package com.microsoft.applicationinsights.agent.internal;

import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
Expand All @@ -36,8 +35,8 @@
import com.microsoft.applicationinsights.agent.internal.config.ClassInstrumentationData;
import com.microsoft.applicationinsights.agent.internal.config.MethodInfo;
import com.microsoft.applicationinsights.agent.internal.config.builder.XmlAgentConfigurationBuilder;
import org.glowroot.instrumentation.api.Descriptor.CaptureKind;
import org.glowroot.instrumentation.engine.config.AdviceConfig;
import org.glowroot.instrumentation.engine.config.AdviceConfig.CaptureKind;
import org.glowroot.instrumentation.engine.config.ImmutableAdviceConfig;
import org.glowroot.instrumentation.engine.config.ImmutableInstrumentationDescriptor;
import org.glowroot.instrumentation.engine.config.InstrumentationDescriptor;
Expand All @@ -56,7 +55,7 @@ static AgentConfiguration load(File agentJarParentFile) {
}

static List<InstrumentationDescriptor> getInstrumentationDescriptors(AgentConfiguration agentConfiguration)
throws IOException {
throws Exception {

BuiltInInstrumentation builtInConfiguration = agentConfiguration.getBuiltInInstrumentation();
boolean httpEnabled = builtInConfiguration.isHttpEnabled();
Expand Down
5 changes: 5 additions & 0 deletions agent/src/main/java/com/microsoft/applicationinsights/agent/internal/AgentImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
package com.microsoft.applicationinsights.agent.internal;

import com.microsoft.applicationinsights.agent.internal.model.NopThreadSpan;
import org.checkerframework.checker.nullness.qual.Nullable;
import org.glowroot.instrumentation.api.Getter;
import org.glowroot.instrumentation.api.MessageSupplier;
import org.glowroot.instrumentation.api.Span;
Expand All @@ -44,4 +45,8 @@ public <C> Span startIncomingSpan(String transactionType, String transactionName
threadContextHolder.set(new NopThreadContext(rootNestingGroupId, rootSuppressionKeyId));
return nopThreadSpan;
}

@Override
public void captureLoggerSpan(MessageSupplier messageSupplier, @Nullable Throwable throwable) {
}
}
2 changes: 1 addition & 1 deletion core/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ archivesBaseName = 'applicationinsights-core'

dependencies {
compileOnly (project(':agent')) { transitive = false }
compileOnly ([group: 'org.glowroot.instrumentation', name: 'instrumentation-api', version: '0.14.5']) { transitive = false }
compileOnly ([group: 'org.glowroot.instrumentation', name: 'instrumentation-api', version: '0.14.8']) { transitive = false }
compile(project(':ApplicationInsightsInternalLogger'))
compile ([group: 'eu.infomas', name: 'annotation-detector', version: '3.0.5'])
compile ([group: 'commons-io', name: 'commons-io', version: '2.6' ])
Expand Down