forked from organicmaps/organicmaps
Merge pull request #2722 from trashkalmar/crashlytics-native-logs
[new downloader][android] add: Logging with Crashlytics.
This commit is contained in:
Sergey Yershov
commit
71aa89a2e6
5 changed files with 269 additions and 5 deletions
|
|
@ -8,11 +8,15 @@
|
|||
#include "platform/file_logging.hpp"
|
||||
#include "platform/platform.hpp"
|
||||
|
||||
#include "../util/crashlytics.h"
|
||||
|
||||
#include <android/log.h>
|
||||
#include <cassert>
|
||||
#include <cstdlib>
|
||||
|
||||
|
||||
extern crashlytics_context_t * g_crashlytics;
|
||||
|
||||
namespace jni
|
||||
{
|
||||
|
||||
|
|
@ -32,6 +36,8 @@ void AndroidMessage(LogLevel level, SrcPoint const & src, string const & s)
|
|||
}
|
||||
|
||||
string const out = DebugPrint(src) + " " + s;
|
||||
if (g_crashlytics)
|
||||
g_crashlytics->log(g_crashlytics, out.c_str());
|
||||
__android_log_write(pr, "MapsWithMe_JNI", out.c_str());
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -112,14 +112,14 @@ Java_com_mapswithme_maps_downloader_MapManager_nativeNeedMigrate(JNIEnv * env, j
|
|||
|
||||
static void FinishMigration(JNIEnv * env)
|
||||
{
|
||||
ASSERT(g_migrationListener);
|
||||
ASSERT(g_migrationListener, ());
|
||||
env->DeleteGlobalRef(g_migrationListener);
|
||||
g_migrationListener = nullptr;
|
||||
}
|
||||
|
||||
static void OnPrefetchComplete(bool keepOldMaps)
|
||||
{
|
||||
ASSERT(g_migrationListener);
|
||||
ASSERT(g_migrationListener, ());
|
||||
|
||||
g_framework->Migrate(keepOldMaps);
|
||||
|
||||
|
|
@ -132,7 +132,7 @@ static void OnPrefetchComplete(bool keepOldMaps)
|
|||
|
||||
static void OnMigrationError(NodeErrorCode error)
|
||||
{
|
||||
ASSERT(g_migrationListener);
|
||||
ASSERT(g_migrationListener, ());
|
||||
|
||||
JNIEnv * env = jni::GetEnv();
|
||||
static jmethodID const callback = jni::GetMethodID(env, g_migrationListener, "onError", "(I)V");
|
||||
|
|
|
|||
|
|
@ -1,9 +1,12 @@
|
|||
#include "Framework.hpp"
|
||||
|
||||
#include "../core/jni_helper.hpp"
|
||||
#include "../util/crashlytics.h"
|
||||
|
||||
#include "../platform/Platform.hpp"
|
||||
|
||||
crashlytics_context_t * g_crashlytics;
|
||||
|
||||
extern "C"
|
||||
{
|
||||
JNIEXPORT void JNICALL
|
||||
|
|
@ -38,4 +41,11 @@ extern "C"
|
|||
g_framework->AddString(jni::ToNativeString(env, name),
|
||||
jni::ToNativeString(env, value));
|
||||
}
|
||||
|
||||
JNIEXPORT void JNICALL
|
||||
Java_com_mapswithme_maps_MwmApplication_nativeInitCrashlytics(JNIEnv * env, jclass clazz)
|
||||
{
|
||||
ASSERT(!g_crashlytics, ());
|
||||
g_crashlytics = crashlytics_init();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
241
android/jni/com/mapswithme/util/crashlytics.h
Normal file
241
android/jni/com/mapswithme/util/crashlytics.h
Normal file
|
|
@ -0,0 +1,241 @@
|
|||
#ifndef __CRASHLYTICS_H__
|
||||
#define __CRASHLYTICS_H__
|
||||
|
||||
/* Copyright (C) 2015 Twitter, Inc.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License. */
|
||||
|
||||
#if defined (__cplusplus)
|
||||
#include <cstddef>
|
||||
#else
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#endif
|
||||
|
||||
#include <dlfcn.h>
|
||||
|
||||
/*! Custom logs and keys ---------------------------------------------------------------------------------------*/
|
||||
/*! Native API:
|
||||
|
||||
crashlytics_context_t* crashlytics_init();
|
||||
void crashlytics_context_t::set(crashlytics_context_t* context, const char* key, const char* value);
|
||||
void crashlytics_context_t::log(crashlytics_context_t* context, const char* message);
|
||||
|
||||
void crashlytics_context_t::set_user_identifier(crashlytics_context_t* context, const char* identifier);
|
||||
void crashlytics_context_t::set_user_name (crashlytics_context_t* context, const char* name);
|
||||
void crashlytics_context_t::set_user_email (crashlytics_context_t* context, const char* email);
|
||||
|
||||
void crashlytics_free(crashlytics_context_t** context);
|
||||
|
||||
Example:
|
||||
|
||||
...
|
||||
crashlytics_context_t* context = crashlytics_init();
|
||||
...
|
||||
|
||||
context->set(context, "key", "value");
|
||||
context->log(context, "this is a message");
|
||||
|
||||
context->set_user_identifier(context, "identifier");
|
||||
context->set_user_name(context, "name");
|
||||
context->set_user_email(context, "email");
|
||||
|
||||
...
|
||||
crashlytics_free(&context);
|
||||
...
|
||||
|
||||
*/
|
||||
|
||||
struct __crashlytics_context;
|
||||
struct __crashlytics_unspecified;
|
||||
typedef struct __crashlytics_context crashlytics_context_t;
|
||||
typedef struct __crashlytics_unspecified __crashlytics_unspecified_t;
|
||||
|
||||
typedef void (*__crashlytics_set_t) (crashlytics_context_t *, const char *, const char *);
|
||||
typedef void (*__crashlytics_log_t) (crashlytics_context_t *, const char *);
|
||||
typedef void (*__crashlytics_set_user_identifier_t) (crashlytics_context_t *, const char *);
|
||||
typedef void (*__crashlytics_set_user_name_t) (crashlytics_context_t *, const char *);
|
||||
typedef void (*__crashlytics_set_user_email_t) (crashlytics_context_t *, const char *);
|
||||
|
||||
typedef __crashlytics_unspecified_t* (*__crashlytics_initialize_t) ();
|
||||
typedef void (*__crashlytics_set_internal_t) (__crashlytics_unspecified_t *, const char *, const char *);
|
||||
typedef void (*__crashlytics_log_internal_t) (__crashlytics_unspecified_t *, const char *);
|
||||
typedef void (*__crashlytics_dispose_t) (__crashlytics_unspecified_t *);
|
||||
|
||||
typedef void (*__crashlytics_set_user_identifier_internal_t)(__crashlytics_unspecified_t *, const char *);
|
||||
typedef void (*__crashlytics_set_user_name_internal_t) (__crashlytics_unspecified_t *, const char *);
|
||||
typedef void (*__crashlytics_set_user_email_internal_t) (__crashlytics_unspecified_t *, const char *);
|
||||
|
||||
struct __crashlytics_context {
|
||||
/* API ---------------------------------------------------------------------------------------------------------*/
|
||||
__crashlytics_set_t set;
|
||||
__crashlytics_log_t log;
|
||||
__crashlytics_set_user_identifier_t set_user_identifier;
|
||||
__crashlytics_set_user_name_t set_user_name;
|
||||
__crashlytics_set_user_email_t set_user_email;
|
||||
/*--------------------------------------------------------------------------------------------------------------*/
|
||||
|
||||
__crashlytics_set_internal_t __set;
|
||||
__crashlytics_log_internal_t __log;
|
||||
__crashlytics_set_user_identifier_internal_t __set_user_identifier;
|
||||
__crashlytics_set_user_name_internal_t __set_user_name;
|
||||
__crashlytics_set_user_email_internal_t __set_user_email;
|
||||
|
||||
__crashlytics_unspecified_t* __ctx;
|
||||
__crashlytics_dispose_t __dispose;
|
||||
};
|
||||
|
||||
#define __CRASHLYTICS_NULL_CONTEXT (struct __crashlytics_context *) 0
|
||||
#define __CRASHLYTICS_INITIALIZE_FAILURE (struct __crashlytics_unspecified *) 0
|
||||
#define __CRASHLYTICS_DECORATED __attribute__ ((always_inline))
|
||||
|
||||
/* API ---------------------------------------------------------------------------------------------------------*/
|
||||
|
||||
static inline crashlytics_context_t* crashlytics_init() __CRASHLYTICS_DECORATED;
|
||||
static inline void crashlytics_free(crashlytics_context_t** context) __CRASHLYTICS_DECORATED;
|
||||
|
||||
/*! Implementation ---------------------------------------------------------------------------------------------*/
|
||||
|
||||
#define __CRASHLYTICS_NULL_ON_NULL(expression) \
|
||||
do { \
|
||||
if (((expression)) == NULL) { \
|
||||
return NULL; \
|
||||
} \
|
||||
} while (0)
|
||||
|
||||
static inline crashlytics_context_t* __crashlytics_allocate() __CRASHLYTICS_DECORATED;
|
||||
static inline crashlytics_context_t* __crashlytics_allocate()
|
||||
{
|
||||
#if defined (__cplusplus)
|
||||
return new crashlytics_context_t;
|
||||
#else
|
||||
crashlytics_context_t* context = (crashlytics_context_t *) malloc(sizeof (crashlytics_context_t));
|
||||
memset(context, 0, sizeof (crashlytics_context_t));
|
||||
return context;
|
||||
#endif
|
||||
}
|
||||
|
||||
static inline void __crashlytics_forward_context_to_set(crashlytics_context_t* context, const char* key, const char* value) __CRASHLYTICS_DECORATED;
|
||||
static inline void __crashlytics_forward_context_to_set(crashlytics_context_t* context, const char* key, const char* value)
|
||||
{
|
||||
context->__set(context->__ctx, key, value);
|
||||
}
|
||||
|
||||
static inline void __crashlytics_forward_context_to_log(crashlytics_context_t* context, const char* message) __CRASHLYTICS_DECORATED;
|
||||
static inline void __crashlytics_forward_context_to_log(crashlytics_context_t* context, const char* message)
|
||||
{
|
||||
context->__log(context->__ctx, message);
|
||||
}
|
||||
|
||||
static inline void __crashlytics_forward_context_to_set_user_identifier(crashlytics_context_t* context, const char* identifier) __CRASHLYTICS_DECORATED;
|
||||
static inline void __crashlytics_forward_context_to_set_user_identifier(crashlytics_context_t* context, const char* identifier)
|
||||
{
|
||||
context->__set_user_identifier(context->__ctx, identifier);
|
||||
}
|
||||
|
||||
static inline void __crashlytics_forward_context_to_set_user_name(crashlytics_context_t* context, const char* name) __CRASHLYTICS_DECORATED;
|
||||
static inline void __crashlytics_forward_context_to_set_user_name(crashlytics_context_t* context, const char* name)
|
||||
{
|
||||
context->__set_user_name(context->__ctx, name);
|
||||
}
|
||||
|
||||
static inline void __crashlytics_forward_context_to_set_user_email(crashlytics_context_t* context, const char* email) __CRASHLYTICS_DECORATED;
|
||||
static inline void __crashlytics_forward_context_to_set_user_email(crashlytics_context_t* context, const char* email)
|
||||
{
|
||||
context->__set_user_email(context->__ctx, email);
|
||||
}
|
||||
|
||||
|
||||
static inline crashlytics_context_t* __crashlytics_construct(
|
||||
__crashlytics_unspecified_t* ctx, void* sym_set, void* sym_log, void* sym_dispose, void* sym_set_user_identifier, void* sym_set_user_name, void* sym_set_user_email
|
||||
) __CRASHLYTICS_DECORATED;
|
||||
static inline crashlytics_context_t* __crashlytics_construct(
|
||||
__crashlytics_unspecified_t* ctx, void* sym_set, void* sym_log, void* sym_dispose, void* sym_set_user_identifier, void* sym_set_user_name, void* sym_set_user_email
|
||||
)
|
||||
{
|
||||
crashlytics_context_t* context;
|
||||
|
||||
__CRASHLYTICS_NULL_ON_NULL(context = __crashlytics_allocate());
|
||||
|
||||
context->set = (__crashlytics_set_t) __crashlytics_forward_context_to_set;
|
||||
context->log = (__crashlytics_log_t) __crashlytics_forward_context_to_log;
|
||||
context->set_user_identifier = (__crashlytics_set_user_identifier_t) __crashlytics_forward_context_to_set_user_identifier;
|
||||
context->set_user_name = (__crashlytics_set_user_name_t) __crashlytics_forward_context_to_set_user_name;
|
||||
context->set_user_email = (__crashlytics_set_user_email_t) __crashlytics_forward_context_to_set_user_email;
|
||||
|
||||
context->__set = (__crashlytics_set_internal_t) sym_set;
|
||||
context->__log = (__crashlytics_log_internal_t) sym_log;
|
||||
context->__set_user_identifier = (__crashlytics_set_user_identifier_internal_t) sym_set_user_identifier;
|
||||
context->__set_user_name = (__crashlytics_set_user_name_internal_t) sym_set_user_name;
|
||||
context->__set_user_email = (__crashlytics_set_user_email_internal_t) sym_set_user_email;
|
||||
context->__ctx = ctx;
|
||||
context->__dispose = (__crashlytics_dispose_t) sym_dispose;
|
||||
|
||||
return context;
|
||||
}
|
||||
|
||||
static inline crashlytics_context_t* crashlytics_init()
|
||||
{
|
||||
void* lib;
|
||||
void* sym_ini;
|
||||
void* sym_log;
|
||||
void* sym_set;
|
||||
void* sym_dispose;
|
||||
void* sym_set_user_identifier;
|
||||
void* sym_set_user_name;
|
||||
void* sym_set_user_email;
|
||||
|
||||
__CRASHLYTICS_NULL_ON_NULL(lib = dlopen("libcrashlytics.so", RTLD_LAZY | RTLD_LOCAL));
|
||||
__CRASHLYTICS_NULL_ON_NULL(sym_ini = dlsym(lib, "external_api_initialize"));
|
||||
__CRASHLYTICS_NULL_ON_NULL(sym_set = dlsym(lib, "external_api_set"));
|
||||
__CRASHLYTICS_NULL_ON_NULL(sym_log = dlsym(lib, "external_api_log"));
|
||||
__CRASHLYTICS_NULL_ON_NULL(sym_dispose = dlsym(lib, "external_api_dispose"));
|
||||
__CRASHLYTICS_NULL_ON_NULL(sym_set_user_identifier = dlsym(lib, "external_api_set_user_identifier"));
|
||||
__CRASHLYTICS_NULL_ON_NULL(sym_set_user_name = dlsym(lib, "external_api_set_user_name"));
|
||||
__CRASHLYTICS_NULL_ON_NULL(sym_set_user_email = dlsym(lib, "external_api_set_user_email"));
|
||||
|
||||
__crashlytics_unspecified_t* ctx = ((__crashlytics_initialize_t) sym_ini)();
|
||||
|
||||
return ctx == __CRASHLYTICS_INITIALIZE_FAILURE ? __CRASHLYTICS_NULL_CONTEXT : __crashlytics_construct(
|
||||
ctx,
|
||||
sym_set,
|
||||
sym_log,
|
||||
sym_dispose,
|
||||
sym_set_user_identifier,
|
||||
sym_set_user_name,
|
||||
sym_set_user_email
|
||||
);
|
||||
}
|
||||
|
||||
static inline void __crashlytics_deallocate(crashlytics_context_t* context) __CRASHLYTICS_DECORATED;
|
||||
static inline void __crashlytics_deallocate(crashlytics_context_t* context)
|
||||
{
|
||||
#if defined (__cplusplus)
|
||||
delete context;
|
||||
#else
|
||||
free(context);
|
||||
#endif
|
||||
}
|
||||
|
||||
static inline void crashlytics_free(crashlytics_context_t** context)
|
||||
{
|
||||
if ((*context) != __CRASHLYTICS_NULL_CONTEXT) {
|
||||
(*context)->__dispose((*context)->__ctx);
|
||||
|
||||
__crashlytics_deallocate(*context);
|
||||
|
||||
(*context) = __CRASHLYTICS_NULL_CONTEXT;
|
||||
}
|
||||
}
|
||||
|
||||
#endif /* __CRASHLYTICS_H__ */
|
||||
|
|
@ -7,6 +7,7 @@ import android.os.Environment;
|
|||
import android.os.Handler;
|
||||
import android.os.Message;
|
||||
import android.preference.PreferenceManager;
|
||||
import android.support.annotation.UiThread;
|
||||
import android.text.TextUtils;
|
||||
import android.util.Log;
|
||||
|
||||
|
|
@ -176,8 +177,11 @@ public class MwmApplication extends Application
|
|||
|
||||
private void initCrashlytics()
|
||||
{
|
||||
if (!BuildConfig.FABRIC_API_KEY.startsWith("0000"))
|
||||
Fabric.with(this, new Crashlytics(), new CrashlyticsNdk());
|
||||
if (BuildConfig.FABRIC_API_KEY.startsWith("0000"))
|
||||
return;
|
||||
|
||||
Fabric.with(this, new Crashlytics(), new CrashlyticsNdk());
|
||||
nativeInitCrashlytics();
|
||||
}
|
||||
|
||||
public boolean isFrameworkInitialized()
|
||||
|
|
@ -303,4 +307,7 @@ public class MwmApplication extends Application
|
|||
private static native void nativeAddLocalization(String name, String value);
|
||||
|
||||
private static native void nativeProcessFunctor(long functorPointer);
|
||||
|
||||
@UiThread
|
||||
private static native void nativeInitCrashlytics();
|
||||
}
|
||||
Loading…
Add table
Reference in a new issue