Skip to content

Commit 5cd3cd0

Browse files
hgaoldashpole
andauthored
fix: property endpoint is ignored when using instrumentation_key (#34399)
**Description:** <Describe what has changed.> <!--Ex. Fixing a bug - Describe the bug and how this fixes the issue. Ex. Adding a feature - Explain what this achieves.--> Fixing a bug **Link to tracking Issue:** #33971 **Testing:** It's just one line and simple, so I just tested locally. If test cases needed, I can provide in this PR. **Documentation:** if no connection string and endpoint is provided, then use it instead of the default one. --------- Co-authored-by: David Ashpole <[email protected]>
1 parent 5abb189 commit 5cd3cd0

File tree

2 files changed

+32
-1
lines changed

2 files changed

+32
-1
lines changed
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# Use this changelog template to create an entry for release notes.
2+
3+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
4+
change_type: bug_fix
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
7+
component: azuremonitorexporter
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: fix issue for property endpoint is ignored when using instrumentation_key
11+
12+
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
13+
issues: [33971]
14+
15+
# (Optional) One or more lines of additional information to render under the primary note.
16+
# These lines will be padded with 2 spaces and then inserted directly into the document.
17+
# Use pipe (|) for multiline entries.
18+
subtext:
19+
20+
# If your change doesn't affect end users or the exported elements of any package,
21+
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
22+
# Optional: The change log or logs in which this entry should be included.
23+
# e.g. '[user]' or '[user, api]'
24+
# Include 'user' if the change is relevant to end users.
25+
# Include 'api' if there is a change to a library API.
26+
# Default: '[user]'
27+
change_logs: [user]

exporter/azuremonitorexporter/connection_string_parser.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,11 @@ func parseConnectionString(exporterConfig *Config) (*ConnectionVars, error) {
4444
}
4545
if connectionString == "" {
4646
connectionVars.InstrumentationKey = instrumentationKey
47-
connectionVars.IngestionURL = getIngestionURL(DefaultIngestionEndpoint)
47+
if exporterConfig.Endpoint == "" {
48+
connectionVars.IngestionURL = getIngestionURL(DefaultIngestionEndpoint)
49+
} else {
50+
connectionVars.IngestionURL = getIngestionURL(exporterConfig.Endpoint)
51+
}
4852
return connectionVars, nil
4953
}
5054

0 commit comments

Comments
 (0)