From 6b4389b235dd1eab79036223d9bb76b14b0130d6 Mon Sep 17 00:00:00 2001
From: Trask Stalnaker <trask.stalnaker@gmail.com>
Date: Thu, 15 Sep 2022 08:37:10 -0700
Subject: [PATCH] Fix

---
 .../agent/internal/init/AiConfigCustomizer.java      | 12 +++++++++---
 .../exporter/implementation/SpanDataMapper.java      |  3 ++-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/AiConfigCustomizer.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/AiConfigCustomizer.java
index 529755a56a7..6f8efa9c162 100644
--- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/AiConfigCustomizer.java
+++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/AiConfigCustomizer.java
@@ -230,7 +230,10 @@ private static void enableInstrumentations(Configuration config, Map<String, Str
     if (config.instrumentation.quartz.enabled) {
       properties.put("otel.instrumentation.quartz.enabled", "true");
       // this is needed for the job.system attribute in order to map those spans to requests
-      properties.put("otel.instrumentation.quartz.experimental-span-attributes.enabled", "true");
+      properties.put("otel.instrumentation.quartz.experimental-span-attributes", "true");
+      // TODO (trask) this line is temporary until 1.19.0, see
+      // https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/6633
+      System.setProperty("otel.instrumentation.quartz.experimental-span-attributes", "true");
     }
     if (config.instrumentation.rabbitmq.enabled) {
       properties.put("otel.instrumentation.rabbitmq.enabled", "true");
@@ -243,8 +246,11 @@ private static void enableInstrumentations(Configuration config, Map<String, Str
     if (config.instrumentation.springScheduling.enabled) {
       properties.put("otel.instrumentation.spring-scheduling.enabled", "true");
       // this is needed for the job.system attribute in order to map those spans to requests
-      properties.put(
-          "otel.instrumentation.spring-scheduling.experimental-span-attributes.enabled", "true");
+      properties.put("otel.instrumentation.spring-scheduling.experimental-span-attributes", "true");
+      // TODO (trask) this line is temporary until 1.19.0, see
+      // https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/6633
+      System.setProperty(
+          "otel.instrumentation.spring-scheduling.experimental-span-attributes", "true");
     }
     if (config.preview.instrumentation.akka.enabled) {
       properties.put("otel.instrumentation.akka-actor.enabled", "true");
diff --git a/agent/azure-monitor-exporter/src/main/java/com/azure/monitor/opentelemetry/exporter/implementation/SpanDataMapper.java b/agent/azure-monitor-exporter/src/main/java/com/azure/monitor/opentelemetry/exporter/implementation/SpanDataMapper.java
index 0ee16cdafcb..99a6ca63432 100644
--- a/agent/azure-monitor-exporter/src/main/java/com/azure/monitor/opentelemetry/exporter/implementation/SpanDataMapper.java
+++ b/agent/azure-monitor-exporter/src/main/java/com/azure/monitor/opentelemetry/exporter/implementation/SpanDataMapper.java
@@ -89,6 +89,7 @@ public final class SpanDataMapper {
             .put("thread.", true)
             .put("faas.", true)
             .put("code.", true)
+            .put("job.", true) // proposed semantic convention which we use for job.system
             .build();
   }
 
@@ -144,7 +145,7 @@ public static boolean isRequest(
       SpanKind kind, SpanContext parentSpanContext, Function<AttributeKey<String>, String> attrFn) {
     if (kind == SpanKind.INTERNAL) {
       // INTERNAL scheduled job spans with no parent are mapped to requests
-      return !parentSpanContext.isValid() && attrFn.apply(JOB_SYSTEM) != null;
+      return attrFn.apply(JOB_SYSTEM) != null && !parentSpanContext.isValid();
     } else if (kind == SpanKind.CLIENT || kind == SpanKind.PRODUCER) {
       return false;
     } else if (kind == SpanKind.CONSUMER