From 9911a970f2ae0cbccf44b8acd371269356c437e5 Mon Sep 17 00:00:00 2001
From: Yang Song <yang.song@datadoghq.com>
Date: Fri, 4 Aug 2023 17:08:06 -0400
Subject: [PATCH] Add changelog, fix tests

---
 .chloggen/datadogexporter-deps.yaml           | 27 +++++++++++++++++++
 .../datadogexporter/logs_exporter_test.go     |  7 +++++
 2 files changed, 34 insertions(+)
 create mode 100644 .chloggen/datadogexporter-deps.yaml

diff --git a/.chloggen/datadogexporter-deps.yaml b/.chloggen/datadogexporter-deps.yaml
new file mode 100644
index 000000000000..53f7d74f946c
--- /dev/null
+++ b/.chloggen/datadogexporter-deps.yaml
@@ -0,0 +1,27 @@
+# Use this changelog template to create an entry for release notes.
+
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: 'bug_fix'
+
+# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
+component: datadogexporter
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: "Populate OTLP resource attributes in Datadog logs. Changes mapping for `jvm.loaded_classes` from `process.runtime.jvm.classes.loaded` to `process.runtime.jvm.classes.current_loaded`."
+
+# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
+issues: [24674]
+
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext:
+
+# If your change doesn't affect end users or the exported elements of any package,
+# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
+# Optional: The change log or logs in which this entry should be included.
+# e.g. '[user]' or '[user, api]'
+# Include 'user' if the change is relevant to end users.
+# Include 'api' if there is a change to a library API.
+# Default: '[user]'
+change_logs: []
diff --git a/exporter/datadogexporter/logs_exporter_test.go b/exporter/datadogexporter/logs_exporter_test.go
index 0c17f2e23427..7f01c3629af9 100644
--- a/exporter/datadogexporter/logs_exporter_test.go
+++ b/exporter/datadogexporter/logs_exporter_test.go
@@ -54,6 +54,7 @@ func TestLogsExporter(t *testing.T) {
 					"otel.span_id":         traceutil.SpanIDToHexOrEmptyString(ld.SpanID()),
 					"otel.trace_id":        traceutil.TraceIDToHexOrEmptyString(ld.TraceID()),
 					"otel.timestamp":       fmt.Sprintf("%d", testdata.TestLogTime.UnixNano()),
+					"resource-attr":        "resource-attr-val-1",
 				},
 			},
 		},
@@ -83,6 +84,7 @@ func TestLogsExporter(t *testing.T) {
 					"otel.span_id":         traceutil.SpanIDToHexOrEmptyString(ld.SpanID()),
 					"otel.trace_id":        traceutil.TraceIDToHexOrEmptyString(ld.TraceID()),
 					"otel.timestamp":       fmt.Sprintf("%d", testdata.TestLogTime.UnixNano()),
+					"resource-attr":        "resource-attr-val-1",
 				},
 			},
 		},
@@ -112,6 +114,7 @@ func TestLogsExporter(t *testing.T) {
 					"otel.span_id":         traceutil.SpanIDToHexOrEmptyString(ld.SpanID()),
 					"otel.trace_id":        traceutil.TraceIDToHexOrEmptyString(ld.TraceID()),
 					"otel.timestamp":       fmt.Sprintf("%d", testdata.TestLogTime.UnixNano()),
+					"resource-attr":        "resource-attr-val-1",
 				},
 			},
 		},
@@ -143,6 +146,7 @@ func TestLogsExporter(t *testing.T) {
 					"otel.span_id":         traceutil.SpanIDToHexOrEmptyString(ld.SpanID()),
 					"otel.trace_id":        traceutil.TraceIDToHexOrEmptyString(ld.TraceID()),
 					"otel.timestamp":       fmt.Sprintf("%d", testdata.TestLogTime.UnixNano()),
+					"resource-attr":        "resource-attr-val-1",
 				},
 				{
 					"message":              "something happened",
@@ -154,6 +158,7 @@ func TestLogsExporter(t *testing.T) {
 					"otel.severity_text":   "Info",
 					"otel.severity_number": "9",
 					"otel.timestamp":       fmt.Sprintf("%d", testdata.TestLogTime.UnixNano()),
+					"resource-attr":        "resource-attr-val-1",
 				},
 			},
 		},
@@ -185,6 +190,7 @@ func TestLogsExporter(t *testing.T) {
 					"otel.span_id":         traceutil.SpanIDToHexOrEmptyString(ld.SpanID()),
 					"otel.trace_id":        traceutil.TraceIDToHexOrEmptyString(ld.TraceID()),
 					"otel.timestamp":       fmt.Sprintf("%d", testdata.TestLogTime.UnixNano()),
+					"resource-attr":        "resource-attr-val-1",
 				},
 				{
 					"message":              "something happened",
@@ -196,6 +202,7 @@ func TestLogsExporter(t *testing.T) {
 					"otel.severity_text":   "Info",
 					"otel.severity_number": "9",
 					"otel.timestamp":       fmt.Sprintf("%d", testdata.TestLogTime.UnixNano()),
+					"resource-attr":        "resource-attr-val-1",
 				},
 			},
 		},