diff --git a/sdk/eventhub/azure-eventhub-checkpointstoreblob-aio/dev_requirements.txt b/sdk/eventhub/azure-eventhub-checkpointstoreblob-aio/dev_requirements.txt
index 8b068466e84b..9b191e86dc54 100644
--- a/sdk/eventhub/azure-eventhub-checkpointstoreblob-aio/dev_requirements.txt
+++ b/sdk/eventhub/azure-eventhub-checkpointstoreblob-aio/dev_requirements.txt
@@ -1,2 +1,3 @@
 -e ../../../tools/azure-sdk-tools
+../../core/azure-core
 ../azure-eventhub
diff --git a/sdk/eventhub/azure-eventhub-checkpointstoreblob/dev_requirements.txt b/sdk/eventhub/azure-eventhub-checkpointstoreblob/dev_requirements.txt
index 8b068466e84b..9b191e86dc54 100644
--- a/sdk/eventhub/azure-eventhub-checkpointstoreblob/dev_requirements.txt
+++ b/sdk/eventhub/azure-eventhub-checkpointstoreblob/dev_requirements.txt
@@ -1,2 +1,3 @@
 -e ../../../tools/azure-sdk-tools
+../../core/azure-core
 ../azure-eventhub
diff --git a/sdk/eventhub/azure-eventhub/azure/eventhub/_utils.py b/sdk/eventhub/azure-eventhub/azure/eventhub/_utils.py
index 9ce8e5656cf0..e37349a94b06 100644
--- a/sdk/eventhub/azure-eventhub/azure/eventhub/_utils.py
+++ b/sdk/eventhub/azure-eventhub/azure/eventhub/_utils.py
@@ -29,7 +29,7 @@
     PROP_LAST_ENQUEUED_TIME_UTC,
     PROP_RUNTIME_INFO_RETRIEVAL_TIME_UTC,
     PROP_LAST_ENQUEUED_OFFSET,
-)
+    PROP_TIMESTAMP)
 
 if TYPE_CHECKING:
     # pylint: disable=ungrouped-imports
@@ -193,12 +193,14 @@ def trace_link_message(events, parent_span=None):
                     if event.properties:
                         traceparent = event.properties.get(b"Diagnostic-Id", "").decode("ascii")
                         if traceparent:
-                            current_span.link(traceparent)
+                            current_span.link(
+                                traceparent,
+                                attributes={"enqueuedTime": event.message.annotations.get(PROP_TIMESTAMP)}
+                            )
     except Exception as exp:  # pylint:disable=broad-except
         _LOGGER.warning("trace_link_message had an exception %r", exp)
 
 
-
 def event_position_selector(value, inclusive=False):
     # type: (Union[int, str, datetime.datetime], bool) -> bytes
     """Creates a selector expression of the offset."""
diff --git a/sdk/eventhub/azure-eventhub/setup.py b/sdk/eventhub/azure-eventhub/setup.py
index 7924cd5c1a09..7f8bca9e4269 100644
--- a/sdk/eventhub/azure-eventhub/setup.py
+++ b/sdk/eventhub/azure-eventhub/setup.py
@@ -68,7 +68,7 @@
     zip_safe=False,
     packages=find_packages(exclude=exclude_packages),
     install_requires=[
-        "azure-core<2.0.0,>=1.0.0",
+        "azure-core<2.0.0,>=1.5.0",
         "uamqp<2.0,>=1.2.5",
     ],
     extras_require={
diff --git a/shared_requirements.txt b/shared_requirements.txt
index 9c5347dd35fd..a9cdd1d0ec0c 100644
--- a/shared_requirements.txt
+++ b/shared_requirements.txt
@@ -114,7 +114,7 @@ six>=1.6
 #override azure-core-tracing-opencensus azure-core<2.0.0,>=1.0.0
 #override azure-core-tracing-opentelemetry azure-core<2.0.0,>=1.0.0
 #override azure-cosmos azure-core<2.0.0,>=1.0.0
-#override azure-eventhub azure-core<2.0.0,>=1.0.0
+#override azure-eventhub azure-core<2.0.0,>=1.5.0
 #override azure-identity azure-core<2.0.0,>=1.0.0
 #override azure-keyvault-certificates msrest>=0.6.0
 #override azure-keyvault-keys msrest>=0.6.0