Skip to content

Commit

Permalink
Merge branch 'tracestate-traceflags-2x-interop' into more-2x-interop
Browse files Browse the repository at this point in the history
  • Loading branch information
trask committed Jan 25, 2021
2 parents 02d4a87 + 1f5374a commit fc96ce0
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion agent/instrumentation/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ dependencies {
compile group: 'io.opentelemetry.javaagent.instrumentation', name: 'opentelemetry-javaagent-apache-httpasyncclient-4.0', version: instrumentationVersion
compile group: 'io.opentelemetry.javaagent.instrumentation', name: 'opentelemetry-javaagent-apache-httpclient-2.0', version: instrumentationVersion
compile group: 'io.opentelemetry.javaagent.instrumentation', name: 'opentelemetry-javaagent-apache-httpclient-4.0', version: instrumentationVersion
compile group: 'io.opentelemetry.javaagent.instrumentation', name: 'opentelemetry-javaagent-applicationinsights-web-2.1', version: instrumentationVersion
compile group: 'io.opentelemetry.javaagent.instrumentation', name: 'opentelemetry-javaagent-applicationinsights-web-2.3', version: instrumentationVersion
compile group: 'io.opentelemetry.javaagent.instrumentation', name: 'opentelemetry-javaagent-azure-functions', version: instrumentationVersion
compile group: 'io.opentelemetry.javaagent.instrumentation', name: 'opentelemetry-javaagent-cassandra-3.0', version: instrumentationVersion
compile group: 'io.opentelemetry.javaagent.instrumentation', name: 'opentelemetry-javaagent-cassandra-4.0', version: instrumentationVersion
Expand Down
2 changes: 1 addition & 1 deletion otel
Submodule otel updated 14 files
+4 −2 instrumentation/applicationinsights-web-2.3/javaagent/applicationinsights-web-2.3-javaagent.gradle
+0 −0 ...telemetry.javaagent.instrumentation.applicationinsightsweb/ApplicationInsightsWebInstrumentationModule.java
+0 −0 ...in/java/io.opentelemetry.javaagent.instrumentation.applicationinsightsweb/BaseTelemetryInstrumentation.java
+0 −0 ...-2.3/javaagent/src/main/java/io.opentelemetry.javaagent.instrumentation.applicationinsightsweb/LogOnce.java
+1 −1 ...java/io.opentelemetry.javaagent.instrumentation.applicationinsightsweb/OperationContextInstrumentation.java
+70 −1 ....opentelemetry.javaagent.instrumentation.applicationinsightsweb/RequestTelemetryContextInstrumentation.java
+0 −0 ...java/io.opentelemetry.javaagent.instrumentation.applicationinsightsweb/RequestTelemetryInstrumentation.java
+0 −0 ...rc/main/java/io.opentelemetry.javaagent.instrumentation.applicationinsightsweb/SpanAttributeProperties.java
+0 −0 ...java/io.opentelemetry.javaagent.instrumentation.applicationinsightsweb/TelemetryContextInstrumentation.java
+0 −0 ...in/java/io.opentelemetry.javaagent.instrumentation.applicationinsightsweb/ThreadContextInstrumentation.java
+0 −0 ...main/java/io.opentelemetry.javaagent.instrumentation.applicationinsightsweb/UserContextInstrumentation.java
+90 −2 instrumentation/applicationinsights-web-2.3/javaagent/src/test/groovy/ApplicationInsightsWebTest.groovy
+0 −0 instrumentation/applicationinsights-web-2.3/javaagent/src/test/java/Code.java
+1 −1 settings.gradle

0 comments on commit fc96ce0

Please sign in to comment.