Merge pull request #1323 from microsoft/trask/update-to-otel-0.8.0

Update to otel 0.8.0

Author: heyams

agent/agent-bootstrap/build.gradle

@@ -24,11 +24,11 @@ task generateVersionProperties(type: PropsFileGen) {
 processResources.dependsOn generateVersionProperties
 
 dependencies {
-    compile (group: 'io.opentelemetry.instrumentation.auto', name: 'opentelemetry-auto-bootstrap', version: '0.8.0-SNAPSHOT') {
+    compile (group: 'io.opentelemetry.instrumentation.auto', name: 'opentelemetry-javaagent-bootstrap', version: '0.8.0') {
         exclude group: 'org.slf4j', module: 'slf4j-simple'
     }
-    compile group: 'io.opentelemetry.instrumentation', name: 'opentelemetry-library-api', version: '0.8.0-SNAPSHOT'
-    compile group: 'io.opentelemetry.instrumentation', name: 'opentelemetry-auto-api', version: '0.8.0-SNAPSHOT'
+    compile group: 'io.opentelemetry.instrumentation', name: 'opentelemetry-instrumentation-api', version: '0.8.0'
+    compile group: 'io.opentelemetry.instrumentation', name: 'opentelemetry-auto-api', version: '0.8.0'
     compile 'ch.qos.logback:logback-classic:1.2.3'
     compile 'ch.qos.logback.contrib:logback-json-classic:0.1.5'
 

agent/agent-bootstrap/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/MainEntryPoint.java

@@ -29,8 +29,8 @@
 import com.microsoft.applicationinsights.agent.bootstrap.configuration.InstrumentationSettings.SelfDiagnostics;
 import com.microsoft.applicationinsights.agent.bootstrap.diagnostics.DiagnosticsHelper;
 import com.microsoft.applicationinsights.agent.bootstrap.diagnostics.status.StatusFile;
-import io.opentelemetry.auto.bootstrap.Agent;
-import io.opentelemetry.auto.bootstrap.ConfigureLogging;
+import io.opentelemetry.javaagent.bootstrap.ConfigureLogging;
+import io.opentelemetry.javaagent.bootstrap.AgentInitializer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.MDC;
@@ -58,7 +58,7 @@ public static void start(Instrumentation instrumentation, URL bootstrapURL) {
             startupLogger = configureLogging(configuration.preview.selfDiagnostics);
             ConfigurationBuilder.logConfigurationMessages();
             MDC.put(DiagnosticsHelper.MDC_PROP_OPERATION, "Startup");
-            Agent.start(instrumentation, bootstrapURL, false);
+            AgentInitializer.start(instrumentation, bootstrapURL, false);
             success = true;
             LoggerFactory.getLogger(DiagnosticsHelper.DIAGNOSTICS_LOGGER_NAME)
                     .info("Application Insights Codeless Agent Attach Successful");

agent/agent-bootstrap/src/main/java/io/opentelemetry/auto/bootstrap/ConfigureLogging.java renamed to agent/agent-bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/ConfigureLogging.java

@@ -1,4 +1,4 @@
-package io.opentelemetry.auto.bootstrap;
+package io.opentelemetry.javaagent.bootstrap;
 
 // currently, the existence of this class and method trigger OpenTelemetry auto-instrumentation not to configure its own logging
 public class ConfigureLogging {

agent/agent-bootstrap/src/main/java/io/opentelemetry/auto/config/ConfigOverride.java renamed to agent/agent-bootstrap/src/main/java/io/opentelemetry/javaagent/config/ConfigOverride.java

@@ -1,4 +1,4 @@
-package io.opentelemetry.auto.config;
+package io.opentelemetry.javaagent.config;
 
 import java.util.Properties;
 

agent/agent-tooling/build.gradle

@@ -37,7 +37,7 @@ dependencies {
 
     compile 'com.google.guava:guava:27.1-android'
 
-    compile 'io.opentelemetry.instrumentation.auto:opentelemetry-auto-tooling:0.8.0-SNAPSHOT'
+    compile 'io.opentelemetry.instrumentation.auto:opentelemetry-javaagent-tooling:0.8.0'
     // TODO sync bytebuddy version with version from auto-tooling (above)
     compile group: 'net.bytebuddy', name: 'byte-buddy', version: '1.10.10'
 

agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/BeforeAgentInstaller.java

@@ -59,7 +59,7 @@
 import com.microsoft.applicationinsights.internal.config.TelemetryModulesXmlElement;
 import com.microsoft.applicationinsights.internal.system.SystemInformation;
 import com.microsoft.applicationinsights.internal.util.PropertyHelper;
-import io.opentelemetry.auto.config.ConfigOverride;
+import io.opentelemetry.javaagent.config.ConfigOverride;
 import io.opentelemetry.instrumentation.api.aiappid.AiAppId;
 import io.opentelemetry.instrumentation.api.config.Config;
 import org.apache.http.HttpHost;

agent/agent-tooling/src/main/java/io/opentelemetry/auto/tooling/BeforeAgentInstaller.java renamed to agent/agent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/BeforeAgentInstaller.java

@@ -1,4 +1,4 @@
-package io.opentelemetry.auto.tooling;
+package io.opentelemetry.javaagent.tooling;
 
 import java.lang.instrument.Instrumentation;
 import java.net.URL;

agent/agent-tooling/src/main/java/io/opentelemetry/auto/tooling/TracerInstaller.java renamed to agent/agent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/TracerInstaller.java

@@ -1,4 +1,4 @@
-package io.opentelemetry.auto.tooling;
+package io.opentelemetry.javaagent.tooling;
 
 import com.microsoft.applicationinsights.TelemetryClient;
 import com.microsoft.applicationinsights.agent.Exporter;
@@ -21,7 +21,7 @@ public static void installAgentTracer() {
         }
 
         OpenTelemetry.setPropagators(
-                DefaultContextPropagators.builder().addHttpTextFormat(new AiHttpTraceContext()).build());
+                DefaultContextPropagators.builder().addTextMapPropagator(new AiHttpTraceContext()).build());
 
         double fixedRateSamplingPercentage = Global.getFixedRateSamplingPercentage();
         if (fixedRateSamplingPercentage != 100) {

agent/agent/build.gradle

@@ -44,9 +44,9 @@ processResources {
 jar {
     manifest {
         attributes(
-                "Main-Class": "io.opentelemetry.auto.bootstrap.AgentBootstrap",
-                "Agent-Class": "io.opentelemetry.auto.bootstrap.AgentBootstrap",
-                "Premain-Class": "io.opentelemetry.auto.bootstrap.AgentBootstrap",
+                "Main-Class": "io.opentelemetry.javaagent.OpenTelemetryAgent",
+                "Agent-Class": "io.opentelemetry.javaagent.OpenTelemetryAgent",
+                "Premain-Class": "io.opentelemetry.javaagent.OpenTelemetryAgent",
                 "Can-Redefine-Classes": true,
                 "Can-Retransform-Classes": true,
         )
@@ -67,7 +67,7 @@ shadowJar {
     //exclude 'module-info.class'
 
     // Prevents conflict with other SLF4J instances. Important for premain.
-    relocate 'org.slf4j', 'io.opentelemetry.auto.slf4j'
+    relocate 'org.slf4j', 'io.opentelemetry.javaagent.slf4j'
 
     def shadowPrefix = 'com.microsoft.applicationinsights.agent.shadow'
 
@@ -78,22 +78,22 @@ shadowJar {
     // rewrite dependencies calling Logger.getLogger
     // this shades internal use of java util logging which is needed to prevent java util logging from being initialized
     // early (e.g. in the case of jboss which wants to do some setup before jul is initialized)
-    relocate 'java.util.logging.Logger', 'io.opentelemetry.auto.bootstrap.PatchLogger'
+    relocate 'java.util.logging.Logger', 'io.opentelemetry.javaagent.bootstrap.PatchLogger'
 
     // prevents conflict with library instrumentation
-    relocate 'io.opentelemetry.instrumentation.api', 'io.opentelemetry.auto.shaded.instrumentation.api'
+    relocate 'io.opentelemetry.instrumentation.api', 'io.opentelemetry.javaagent.shaded.instrumentation.api'
 
     // relocate OpenTelemetry API
-    relocate "io.opentelemetry.OpenTelemetry", "io.opentelemetry.auto.shaded.io.opentelemetry.OpenTelemetry"
-    relocate "io.opentelemetry.common", "io.opentelemetry.auto.shaded.io.opentelemetry.common"
-    relocate "io.opentelemetry.context", "io.opentelemetry.auto.shaded.io.opentelemetry.context"
-    relocate "io.opentelemetry.correlationcontext", "io.opentelemetry.auto.shaded.io.opentelemetry.correlationcontext"
-    relocate "io.opentelemetry.internal", "io.opentelemetry.auto.shaded.io.opentelemetry.internal"
-    relocate "io.opentelemetry.metrics", "io.opentelemetry.auto.shaded.io.opentelemetry.metrics"
-    relocate "io.opentelemetry.trace", "io.opentelemetry.auto.shaded.io.opentelemetry.trace"
+    relocate "io.opentelemetry.OpenTelemetry", "io.opentelemetry.javaagent.shaded.io.opentelemetry.OpenTelemetry"
+    relocate "io.opentelemetry.common", "io.opentelemetry.javaagent.shaded.io.opentelemetry.common"
+    relocate "io.opentelemetry.context", "io.opentelemetry.javaagent.shaded.io.opentelemetry.context"
+    relocate "io.opentelemetry.correlationcontext", "io.opentelemetry.javaagent.shaded.io.opentelemetry.correlationcontext"
+    relocate "io.opentelemetry.internal", "io.opentelemetry.javaagent.shaded.io.opentelemetry.internal"
+    relocate "io.opentelemetry.metrics", "io.opentelemetry.javaagent.shaded.io.opentelemetry.metrics"
+    relocate "io.opentelemetry.trace", "io.opentelemetry.javaagent.shaded.io.opentelemetry.trace"
 
     // relocate OpenTelemetry API dependency
-    relocate "io.grpc", "io.opentelemetry.auto.shaded.io.grpc"
+    relocate "io.grpc", "io.opentelemetry.javaagent.shaded.io.grpc"
 
     relocate('logback.configurationFile', 'applicationinsights.logback.configurationFile')
     relocate('logback.xml', 'applicationinsights.logback.xml')
@@ -135,7 +135,7 @@ task devtestJar(type: com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
     configurations = []
     manifest = shadowJar.manifest
 
-    relocate 'org.slf4j', 'io.opentelemetry.auto.slf4j'
+    relocate 'org.slf4j', 'io.opentelemetry.javaagent.slf4j'
 }
 
 artifacts {

agent/agent/jar_contents.regex

@@ -4,7 +4,7 @@ com/microsoft/applicationinsights/
 com/microsoft/applicationinsights/agent/.*
 io/
 io/opentelemetry/
-io/opentelemetry/auto/.*
+io/opentelemetry/javaagent/.*
 io/opentelemetry/instrumentation/
 io/opentelemetry/instrumentation/auto/.*
 META-INF/